From e930c781ebb22bc6c7236baa26c35ee5a169ba87 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Wed, 15 Jun 2022 08:03:43 +0200
Subject: [PATCH 01/41] improve placeholders

---
 projects/quick-dialog/src/index-raw.html | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/projects/quick-dialog/src/index-raw.html b/projects/quick-dialog/src/index-raw.html
index 6f49e977b..a20642c58 100644
--- a/projects/quick-dialog/src/index-raw.html
+++ b/projects/quick-dialog/src/index-raw.html
@@ -1,16 +1,14 @@
 <!doctype html>
 <html>
   <head>
-    <!-- This meta-tag will be pre-filled by the backend before delivery to the browser -->
-    <meta name="_jsApi" content="">
+    <!-- This will be pre-filled by the backend -->
+    <meta name="_jsApi" content="@jsapi">
 
     <!-- Load the $2sxc script; the @... below will be replaced by the backend for cache-breaking -->
     <script src="../../js/2sxc.api.min.js?cacheBreak=@sxcver"></script>
 
     <!-- the base tag is required for Angular to work properly -->
-    <script>
-      document.write('<base href="' + window.location.pathname + '">');
-    </script>
+    <base href="@base">
 
     <script>
       // send message to the angular-observable to restart the app

From 6d37e74646ae9a2a20b8a6789f3a3b136d71fd8b Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Wed, 15 Jun 2022 09:17:43 +0200
Subject: [PATCH 02/41] version bump

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

diff --git a/package.json b/package.json
index 0891c2ecd..37deec8ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "2sxc-ui",
-  "version": "14.02.00",
+  "version": "14.03.00",
   "description": "2sxc UI - the JS UI of 2sxc",
   "scripts": {
     "release-all": "npm run js2sxc && npm run inpage && npm run snippets && npm run quickdialog && npm run turn-on",

From 0ddca9fa3d6d4192b9d62e7051ef12492e151c2d Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Wed, 15 Jun 2022 10:54:43 +0200
Subject: [PATCH 03/41] minor catch oqtane issue

---
 projects/$2sxc/src/environment/env-loader-dynamic.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/$2sxc/src/environment/env-loader-dynamic.ts b/projects/$2sxc/src/environment/env-loader-dynamic.ts
index cd424e833..35295eee9 100644
--- a/projects/$2sxc/src/environment/env-loader-dynamic.ts
+++ b/projects/$2sxc/src/environment/env-loader-dynamic.ts
@@ -48,6 +48,10 @@ export class EnvironmentLoaderDynamic {
     });
     this.log.add('start observing Rvt Input');
     const hiddenField = document.querySelector(SelectorInputRvt);
+    if (hiddenField == null) {
+      console.error(`Can't find Oqtane RVT field with selector ${SelectorInputRvt}\n` +`So we cannot watch it for changes.\n` +`This will probably cause the $2sxc to fail.`);
+      return;
+    }
     this.loadRvtFromHiddenInput(hiddenField as HTMLInputElement);
     this.inputRvtObserver.observe(hiddenField, { attributes: true, childList: false, subtree: false });
   }

From ca849885d7c63bdd03de7f107e1d6b15248e3223 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Wed, 15 Jun 2022 11:00:29 +0200
Subject: [PATCH 04/41] add custom headers placeholder

---
 projects/quick-dialog/src/index-raw.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/quick-dialog/src/index-raw.html b/projects/quick-dialog/src/index-raw.html
index a20642c58..9933129dd 100644
--- a/projects/quick-dialog/src/index-raw.html
+++ b/projects/quick-dialog/src/index-raw.html
@@ -4,6 +4,9 @@
     <!-- This will be pre-filled by the backend -->
     <meta name="_jsApi" content="@jsapi">
 
+    <!-- optional headers - must be added before 2sxc is loaded -->
+    @customheaders
+
     <!-- Load the $2sxc script; the @... below will be replaced by the backend for cache-breaking -->
     <script src="../../js/2sxc.api.min.js?cacheBreak=@sxcver"></script>
 

From a3ee5f647316dc8c10db00986a85e97add0d0951 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Wed, 15 Jun 2022 11:47:32 +0200
Subject: [PATCH 05/41] quick dialog index raw placeholders

---
 projects/quick-dialog/src/index-raw.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/quick-dialog/src/index-raw.html b/projects/quick-dialog/src/index-raw.html
index 9933129dd..f00277eaa 100644
--- a/projects/quick-dialog/src/index-raw.html
+++ b/projects/quick-dialog/src/index-raw.html
@@ -5,7 +5,7 @@
     <meta name="_jsApi" content="@jsapi">
 
     <!-- optional headers - must be added before 2sxc is loaded -->
-    @customheaders
+    <!--@customheaders-->
 
     <!-- Load the $2sxc script; the @... below will be replaced by the backend for cache-breaking -->
     <script src="../../js/2sxc.api.min.js?cacheBreak=@sxcver"></script>
@@ -30,6 +30,7 @@
   </head>
 
   <body>
+    <!--@custombody-->
     <app-root></app-root>
   </body>
 </html>

From e09a0b9cec88445091e03b6084306b4dc24d6f05 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Wed, 15 Jun 2022 11:53:40 +0200
Subject: [PATCH 06/41] quick dialog - move script location

---
 projects/quick-dialog/src/index-raw.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/quick-dialog/src/index-raw.html b/projects/quick-dialog/src/index-raw.html
index f00277eaa..4d818a1e4 100644
--- a/projects/quick-dialog/src/index-raw.html
+++ b/projects/quick-dialog/src/index-raw.html
@@ -7,9 +7,6 @@
     <!-- optional headers - must be added before 2sxc is loaded -->
     <!--@customheaders-->
 
-    <!-- Load the $2sxc script; the @... below will be replaced by the backend for cache-breaking -->
-    <script src="../../js/2sxc.api.min.js?cacheBreak=@sxcver"></script>
-
     <!-- the base tag is required for Angular to work properly -->
     <base href="@base">
 
@@ -31,6 +28,8 @@
 
   <body>
     <!--@custombody-->
+    <!-- Load the $2sxc script - after the custom-body; the @... below will be replaced by the backend for cache-breaking -->
+    <script src="../../js/2sxc.api.min.js?cacheBreak=@sxcver"></script>
     <app-root></app-root>
   </body>
 </html>

From e36e33d9b8c6e3fe094b2f615ce8408dcdda3579 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 08:26:50 +0200
Subject: [PATCH 07/41] minor

---
 projects/quick-dialog/src/index-raw.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/quick-dialog/src/index-raw.html b/projects/quick-dialog/src/index-raw.html
index 4d818a1e4..4db4815ec 100644
--- a/projects/quick-dialog/src/index-raw.html
+++ b/projects/quick-dialog/src/index-raw.html
@@ -1,15 +1,15 @@
 <!doctype html>
 <html>
   <head>
+    <!-- the base tag, required by Angular - from backend -->
+    <base href="@base">
+
     <!-- This will be pre-filled by the backend -->
     <meta name="_jsApi" content="@jsapi">
 
     <!-- optional headers - must be added before 2sxc is loaded -->
     <!--@customheaders-->
 
-    <!-- the base tag is required for Angular to work properly -->
-    <base href="@base">
-
     <script>
       // send message to the angular-observable to restart the app
       window.reboot = function () {

From aac6985c73758cb1ffef808a1e630fb6f30077a9 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 10:43:34 +0200
Subject: [PATCH 08/41] reduce params passed in url to dialogs #2788

---
 .../inpage/src/manage/ng-dialog-params.ts     | 64 +++++++++--------
 projects/inpage/src/manage/reduce-env-vars.md | 68 +++++++++++++++++++
 2 files changed, 99 insertions(+), 33 deletions(-)
 create mode 100644 projects/inpage/src/manage/reduce-env-vars.md

diff --git a/projects/inpage/src/manage/ng-dialog-params.ts b/projects/inpage/src/manage/ng-dialog-params.ts
index 25c75b4f2..8e4c4986c 100644
--- a/projects/inpage/src/manage/ng-dialog-params.ts
+++ b/projects/inpage/src/manage/ng-dialog-params.ts
@@ -9,65 +9,59 @@
 export class NgUrlValuesWithoutParams {
   readonly zoneId: number;
   readonly appId: number;
-  readonly tid: number;
+  // #reduceEnvVars
+  // readonly tid: number;
   readonly mid: number;
   readonly cbid: number;
 
-  // 2021-01-19
-  // readonly lang: string;
-  // readonly langpri: string;
-  // readonly langs: string;
-  // 2020-11-28 #cleanup11.11 2dm - not used, disabled - keep till Jan 2021, then remove from backend-json and drop these comments
-  // readonly portalroot: string;
-  // 2020-12-11 #cleanup11.11 2dm - doesn't seem used, disabled
-  // readonly websiteroot: string;
   readonly partOfPage?: boolean;
   readonly publishing?: string;
-  // 2021-01-19
-  // readonly user: ContextOfUser;
-  readonly approot: string | null;
+  // #reduceEnvVars
+  // readonly approot: string | null;
 
+  // #reduceEnvVars
   /** The api root for all 2sxc API calls - will vary by platform */
-  readonly api: string;
+  // readonly api: string;
 
-  /** The root path to the UIs (scripts, css etc.) */
-  // 2021-01-19
-  // readonly uiRoot: string;
-
-  /** new in 10.27 */
+  /** new in 10.27 - for quick-dialog */
   readonly apps?: string;
 
+  // 2022-06-16 2dm disabled, believe it's not used any more
   /** features of App - this is to tell the UI it can show advanced features of an app like permissions, API, REST etc. */
-  readonly fa: boolean;
+  // readonly fa: boolean;
 
+  // #reduceEnvVars
   /** request verification token header name */
-  readonly rvth: string;
+  // readonly rvth: string;
 
+  // #reduceEnvVars
   /** request verification token value */
-  readonly rvt: string;
+  // readonly rvt: string;
 
   constructor(context: ContextComplete, partOfPage: boolean) {
 
     const $2sxc = window.$2sxc;
     // #CustomContext
     const ctx = context.sxc?.ctx;
-    const ctxAny = ctx as any;
-    if (ctxAny?.complete === true) {
+    if (ctx?.complete === true) {
         this.zoneId = ctx.zoneId;
         this.appId = ctx.appId;
-        if (ctx.pageId != null) this.tid = ctx.pageId;
+        // #reduceEnvVars
+        // if (ctx.pageId != null) this.tid = ctx.pageId;
         if (ctx.moduleId != null) this.mid = ctx.moduleId;
-        const cbid = ctxAny?.blockId ?? this.mid;
-        if (cbid != null && cbid !== '') this.cbid = cbid;
+        const cbid = ctx?.blockId ?? this.mid;
+        if (cbid != null && cbid) this.cbid = cbid;
     } else {
         this.zoneId = ctx?.zoneId ?? context.app.zoneId;
         this.appId = ctx?.appId ?? context.app.id;
-        this.tid = ctx?.pageId ?? context.page.id;
+        // #reduceEnvVars
+        // this.tid = ctx?.pageId ?? context.page.id;
         this.mid = ctx?.moduleId ?? context.instance.id;
-        this.cbid = ctxAny?.blockId ?? context.contentBlockReference.id;
+        this.cbid = ctx?.blockId ?? context.contentBlockReference.id;
     }
 
-    this.api = $2sxc.env.api();
+    // #reduceEnvVars
+    // this.api = $2sxc.env.api();
 
     this.partOfPage = partOfPage;
     if (partOfPage) this.publishing = context.contentBlockReference.publishingMode;
@@ -75,12 +69,16 @@ export class NgUrlValuesWithoutParams {
     // 2021-01-19 2dm - should now not be used any more
     // this.user = ContextOfUser.fromContext(context);
     // TODO: #paramCleanUp - approot is probably not used anymore. verify and remove
-    this.approot = context.app.appPath || null; // this is the only value which doesn't have a slash by default. note that the app-root doesn't exist when opening "manage-app"
+
+    // #reduceEnvVars
+    // this.approot = context.app.appPath || null; // this is the only value which doesn't have a slash by default. note that the app-root doesn't exist when opening "manage-app"
     if (context?.button?.command?.params?.apps)
         this.apps = context.button.command.params.apps;
+
     // TODO: #paramCleanUp - fa is probably not used anymore. verify and remove
-    this.fa = !context.app.isContent;
-    this.rvth = $2sxc.env.rvtHeader();
-    this.rvt = $2sxc.env.rvt();
+    // #reduceEnvVars
+    // this.fa = !context.app.isContent;
+    // this.rvth = $2sxc.env.rvtHeader();
+    // this.rvt = $2sxc.env.rvt();
   }
 }
diff --git a/projects/inpage/src/manage/reduce-env-vars.md b/projects/inpage/src/manage/reduce-env-vars.md
new file mode 100644
index 000000000..0f6445eb5
--- /dev/null
+++ b/projects/inpage/src/manage/reduce-env-vars.md
@@ -0,0 +1,68 @@
+# Reduce Environment Variables in URL 2022-06-16
+
+2dm notes in case things fail
+
+These are just some links before/after cleaning the parameters, to see the difference. 
+
+It would help to find issues when things break.
+
+We can delete this document in a few months
+
+
+## Dialog open before/after
+
+Edit dialog on home
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&tid=56&mid=6935&cbid=6935&api=/en/api/e.x.t/&partOfPage=true&publishing=DraftForbidden&approot=/Portals/0/2sxc/Content&fa=false&rvth=RequestVerificationToken&rvt=w3dWhG-mxScB41yFShD5CsycmbE1fCu8UF_B_fh8ydGXtbvMHZn8NXbe3M99blOw6BNOE0yZk66ZD8I60&dialog=edit&mode=edit&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&mid=6935&cbid=6935&partOfPage=true&publishing=DraftForbidden&dialog=edit&mode=edit&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+
+New dialog on home
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&tid=56&mid=6935&cbid=6935&api=/en/api/e.x.t/&partOfPage=true&publishing=DraftForbidden&approot=/Portals/0/2sxc/Content&fa=false&rvth=RequestVerificationToken&rvt=w3dWhG-mxScB41yFShD5CsycmbE1fCu8UF_B_fh8ydGXtbvMHZn8NXbe3M99blOw6BNOE0yZk66ZD8I60&dialog=edit&mode=new&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A1%2C%22Part%22%3A%22content%22%2C%22Add%22%3Atrue%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A1%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Atrue%7D%7D%5D
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&mid=6935&cbid=6935&partOfPage=true&publishing=DraftForbidden&dialog=edit&mode=new&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A1%2C%22Part%22%3A%22content%22%2C%22Add%22%3Atrue%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A1%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Atrue%7D%7D%5D
+
+
+Admin Blog App
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=680&sxcver=14.3.0.1655366375#zoneId=2&appId=78&tid=680&mid=3002&cbid=3002&api=/en/api/e.x.t/&partOfPage=false&approot=/Portals/0/2sxc/Blog%20App&fa=true&rvth=RequestVerificationToken&rvt=d8_mdKJKP_hwxuiBh9VJXaOdw92do2OiS8fohXFwGcikIj7xngcR6WDwi1QVmeJ-HKJSaFlVOJuLOUVb0&dialog=app&items=%5B%7B%22EntityId%22%3A43664%7D%5D
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=680&sxcver=14.3.0.1655366375#zoneId=2&appId=78&mid=3002&cbid=3002&partOfPage=false&dialog=app&items=%5B%7B%22EntityId%22%3A43664%7D%5D
+
+
+Admin Content App
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&tid=56&mid=6935&cbid=6935&api=/en/api/e.x.t/&partOfPage=false&approot=/Portals/0/2sxc/Content&fa=false&rvth=RequestVerificationToken&rvt=RKmKD7uTb9bEznNfkuhwSs1v2ADHUil8RX13hcEW4gKpzX3Ecp5ILvRpNsbbDRMkGM2do5eien8o7jvV0&dialog=app&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&mid=6935&cbid=6935&partOfPage=false&dialog=app&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+
+Admin all Apps
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&tid=56&mid=6935&cbid=6935&api=/en/api/e.x.t/&partOfPage=false&approot=/Portals/0/2sxc/Content&fa=false&rvth=RequestVerificationToken&rvt=RKmKD7uTb9bEznNfkuhwSs1v2ADHUil8RX13hcEW4gKpzX3Ecp5ILvRpNsbbDRMkGM2do5eien8o7jvV0&dialog=zone&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&mid=6935&cbid=6935&partOfPage=false&dialog=zone&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+
+Quick Dialog Content
+
+/desktopmodules/tosic_sexycontent/dist/quickDialog/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&tid=56&mid=6935&cbid=6935&api=/en/api/e.x.t/&partOfPage=true&publishing=DraftForbidden&approot=/Portals/0/2sxc/Content&fa=false&rvth=RequestVerificationToken&rvt=RKmKD7uTb9bEznNfkuhwSs1v2ADHUil8RX13hcEW4gKpzX3Ecp5ILvRpNsbbDRMkGM2do5eien8o7jvV0&dialog=layout&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+/desktopmodules/tosic_sexycontent/dist/quickDialog/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&mid=6935&cbid=6935&partOfPage=true&publishing=DraftForbidden&dialog=layout&items=%5B%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22content%22%2C%22Add%22%3Afalse%7D%7D%2C%7B%22Group%22%3A%7B%22Guid%22%3A%22f8ae3d07-5805-4650-a46d-a047e113ab53%22%2C%22Index%22%3A0%2C%22Part%22%3A%22presentation%22%2C%22Add%22%3Afalse%7D%7D%5D
+
+
+Quick Dialog Blog View-Change
+
+/desktopmodules/tosic_sexycontent/dist/quickDialog/?pageId=680&sxcver=14.3.0.1655366375#zoneId=2&appId=78&tid=680&mid=3002&cbid=3002&api=/en/api/e.x.t/&partOfPage=true&publishing=DraftForbidden&approot=/Portals/0/2sxc/Blog%20App&fa=true&rvth=RequestVerificationToken&rvt=xSRaq-c_rUdqBIb3X8bcBRTvZLD1zZDgD5iYsibL8bcpXTVoXwZEGqaHHhDn1O5UTM2a_NeECeLMBzrq0&dialog=layout&items=%5B%7B%22EntityId%22%3A43664%7D%5D
+
+/desktopmodules/tosic_sexycontent/dist/quickDialog/?pageId=680&sxcver=14.3.0.1655366375#zoneId=2&appId=78&mid=3002&cbid=3002&partOfPage=true&publishing=DraftForbidden&dialog=layout&items=%5B%5D
+
+
+
+Code Editor Content
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&tid=56&mid=6935&cbid=6935&api=/en/api/e.x.t/&partOfPage=false&approot=/Portals/0/2sxc/Content&fa=false&rvth=RequestVerificationToken&rvt=RKmKD7uTb9bEznNfkuhwSs1v2ADHUil8RX13hcEW4gKpzX3Ecp5ILvRpNsbbDRMkGM2do5eien8o7jvV0&dialog=develop&isshared=true&items=%5B%7B%22EntityId%22%3A3784%2C%22Path%22%3A%22%2FDefaultTemplates%2F_Image%20right%2033%25.cshtml%22%7D%5D
+
+http://2sxc-dnn961.dnndev.me/desktopmodules/tosic_sexycontent/dist/ng-edit/?pageId=56&sxcver=14.3.0.1655366375#zoneId=2&appId=2&mid=6935&cbid=6935&partOfPage=false&dialog=develop&isshared=true&items=%5B%7B%22EntityId%22%3A3785%2C%22Path%22%3A%22%2FDefaultTemplates%2F_Image%20right%2050%25.cshtml%22%7D%5D
\ No newline at end of file

From 2e929a8c9138c69303f05ab227ad04571f7dad0e Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Thu, 16 Jun 2022 12:41:52 +0200
Subject: [PATCH 09/41] migrated commands to command-names, minor SxcGlobal

---
 projects/$2sxc/src/_/Window.ts                |   2 +-
 projects/inpage/src/bootstrap/bootstrap.ts    |   6 +-
 projects/inpage/src/commands/command-names.ts | 151 +++++++++++++++++-
 .../src/commands/command/app-resources.ts     |   6 +-
 .../src/commands/command/app-settings.ts      |   7 +-
 projects/inpage/src/commands/command/app.ts   |   8 +-
 projects/inpage/src/commands/command/apps.ts  |   8 +-
 .../src/commands/command/content-items.ts     |   9 +-
 .../src/commands/command/content-type.ts      |   8 +-
 projects/inpage/src/commands/command/copy.ts  |   1 +
 .../inpage/src/commands/command/custom.ts     |   6 +-
 .../inpage/src/commands/command/delete.ts     |   9 +-
 projects/inpage/src/commands/command/edit.ts  |   1 +
 projects/inpage/src/commands/command/index.ts |  51 +++---
 .../src/commands/command/insights-server.ts   |  10 +-
 .../src/commands/command/instance-list.ts     |   9 +-
 .../inpage/src/commands/command/layout.ts     |   9 +-
 .../inpage/src/commands/command/metadata.ts   |  16 +-
 projects/inpage/src/commands/command/more.ts  |   9 +-
 .../inpage/src/commands/command/movedown.ts   |  10 +-
 .../inpage/src/commands/command/moveup.ts     |  10 +-
 projects/inpage/src/commands/command/new.ts   |  15 +-
 .../inpage/src/commands/command/publish.ts    |  13 +-
 .../inpage/src/commands/command/remove.ts     |  10 +-
 .../inpage/src/commands/command/replace.ts    |   9 +-
 .../src/commands/command/template-develop.ts  |  11 +-
 .../src/commands/command/template-query.ts    |  10 +-
 .../src/commands/command/template-settings.ts |  10 +-
 .../src/commands/command/workflow-commands.ts |   1 -
 projects/inpage/src/commands/command/zone.ts  |  10 +-
 .../dnn/dnn-menu-helper/dnn-inpage-edit.ts    |   4 +-
 .../config-loaders/button-config-loader.ts    |   7 +-
 .../config-loaders/group-config-loader.ts     |   9 +-
 33 files changed, 254 insertions(+), 201 deletions(-)

diff --git a/projects/$2sxc/src/_/Window.ts b/projects/$2sxc/src/_/Window.ts
index 01595de07..eb878fa71 100644
--- a/projects/$2sxc/src/_/Window.ts
+++ b/projects/$2sxc/src/_/Window.ts
@@ -1,4 +1,4 @@
-import { SxcGlobal } from '../sxc-root';
+import { SxcGlobal } from '../sxc-global';
 
 /**
  * export interface WindowInternal extends
diff --git a/projects/inpage/src/bootstrap/bootstrap.ts b/projects/inpage/src/bootstrap/bootstrap.ts
index 32d6aaba1..218f16f45 100644
--- a/projects/inpage/src/bootstrap/bootstrap.ts
+++ b/projects/inpage/src/bootstrap/bootstrap.ts
@@ -1,5 +1,5 @@
 import { Sxc } from '../../../$2sxc/src';
-import { CmdLayout } from '../commands/command/layout';
+import { CommandNames } from '../commands';
 import { C } from '../constants';
 import { HasLog, Insights, Log } from '../core';
 import { EditManager } from '../manage/edit-manager';
@@ -165,7 +165,7 @@ export class BootstrapInPage extends HasLog {
         }
 
         if (sxc) {
-            (sxc.manage as EditManager).run(CmdLayout);
+            (sxc.manage as EditManager).run(CommandNames.layout);
             this.openedTemplatePickerOnce = true;
         }
         return cl.return(true, 'tryShowTemplatePicker() done');
@@ -218,7 +218,7 @@ export class BootstrapInPage extends HasLog {
             '</div>',
         )[0];
 
-        btn.addEventListener('click', () => (sxci.manage as EditManager).run(CmdLayout));
+        btn.addEventListener('click', () => (sxci.manage as EditManager).run(CommandNames.layout));
 
         tag.append(btn);
         return callLog.return(true, 'ok');
diff --git a/projects/inpage/src/commands/command-names.ts b/projects/inpage/src/commands/command-names.ts
index bca66de53..1c4a10110 100644
--- a/projects/inpage/src/commands/command-names.ts
+++ b/projects/inpage/src/commands/command-names.ts
@@ -19,6 +19,36 @@ export enum CommandNames {
      */
     appImport = 'app-import',
 
+    /**
+     * `app-resources` will open the edit for app-resources (multi-language texts, labels etc.). It's disabled if the app doesn't have resource-values to configure
+     */
+    appResources = 'app-resources',
+
+    /**
+     * `app-settings` will open the edit dialog for the app-settings. It's disabled if the app doesn't have setting-values to configure
+     */
+    appSettings = 'app-settings',
+
+    /**
+     * `app` will open the app-admin dialog
+     */
+    app = 'app',
+
+    /**
+     * `apps` will open the manage all apps dialog
+     */
+    apps = 'apps',
+
+    /**
+     * `contentitems` will open the dialog to manage content-items for the current template. Will use the settings of the current template to open.
+     *  contentType (optional) - name of data-type to manage/open
+     */
+    contentItems = 'contentitems',
+
+    /**
+     * `contenttype` will open the dialog to view or change the current content-type, meaning you can change what fields it has, their types etc
+     */
+    contentType = 'contenttype',
 
     /**
      * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item
@@ -28,18 +58,123 @@ export enum CommandNames {
      */
     copy = 'copy',
 
+    /**
+     * `custom` will execute custom javascript
+     * customCode - some JS like "alert('hello');"
+     */
+    custom = 'custom',
+
+    /**
+     * `delete` will delete (not just remove) a content-item. Needs:
+     * entityId
+     * entityGuid
+     * entityTitle
+     */
+    delete = 'delete',
+
     /**
      * `edit` command will open the edit-dialog for the current item.
      * In scenarios where we have a list of items and it's currently showing the demo, this will have the same effect as `add`
      */
     edit = 'edit',
 
-    // TODO: @2mh / 2dar - Move all the verbs here
-    // 1. Create the variable using camelCase
-    // 2. Use it in the command - but only for the command, not the icon
-    // 3. Test where the old variable is still used - replace that
-    // 4. remove the old variable
-    // 5. change the export * in the index.ts to be an import with the @internal prefix
-    // 5. Add minimal documentation what the command does to this document
-    // 6. build to verify nothing breaks (best keep the watcher on)
+    /**
+     * `insights-server` command will open the insights logs page
+     */
+    insightsServer = 'insights-server',
+
+    /**
+     * `instance-list` command will open a dialog to manually re-order items in a list. (note: in older versions was called "sort"
+     */
+    instanceList = 'instance-list',
+
+    /**
+     * `layout` command will open the in-page dialog to change the layout of the current content.
+     * [no parameters needed]
+     */
+    layout = 'layout',
+
+    /**
+     * `metadata` command will open the edit-dialog for the current metadata item
+     */
+    metadata = 'metadata',
+
+    /**
+     * `image` command will open the edit-dialog for the metadata of the current image
+     */
+    image = 'image',
+
+    /**
+     * `more` command create a "…" button which flips through the menu-buttons of toolbars
+     */
+    more = 'more',
+
+    /**
+     * `movedown` command moves a content-item down one position in the list
+     * useModuleList: true (required to be true for it to work)
+     * sortOrder: [number] (important so it knows the position)
+     */
+    moveDown = 'movedown',
+
+    /**
+     * `moveup` command moves a content-item up one position in the list
+     * useModuleList: true (required to be true for it to work)
+     * sortOrder: [number] (important so it knows the position)
+     */
+    moveUp = 'moveup',
+
+    /**
+     * `new` command opens the edit-dialog for a new content-item.
+     * contentType
+     *
+     * Then it needs either the ID...:
+     * entityId
+     *
+     * ...or it needs the position within the list:
+     * useModuleList: true
+     * sortOrder: [number] (important so it knows the position
+     */
+    new = 'new',
+
+    /**
+     * `new` command sets new mode used in parameters
+     */
+    newMode = 'new',
+
+    /**
+     * `publish` command tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
+     */
+    publish = 'publish',
+
+    /**
+     * `remove` command removes an item from a list of items.
+     * useModuleList: true (required to be true for it to work)
+     * sortOrder: [number] (important so it knows the position)
+     */
+    remove = 'remove',
+
+    /**
+     * `replace` command will open the dialog to assign a different content-item in this slot on module-assigned content items
+     */
+    replace = 'replace',
+
+    /**
+     * `template-develop` will open the template-editor dialog in a new window. (note: in older versions was called "develop")
+     */
+    templateDevelop = 'replace',
+
+    /**
+     * `template-query` will open the pipeline/query-designer in a new window. It's invisible on content, and disabled if no pipeline is configured
+     */
+    templateQuery = 'template-query',
+
+    /**
+     * `template-settings` will change settings on the template currently used
+     */
+    templateSettings = 'template-settings',
+
+    /**
+     * `zone` will open the manage all apps dialog
+     */
+    zone = 'zone',
 }
diff --git a/projects/inpage/src/commands/command/app-resources.ts b/projects/inpage/src/commands/command/app-resources.ts
index 8c247ffea..bad481376 100644
--- a/projects/inpage/src/commands/command/app-resources.ts
+++ b/projects/inpage/src/commands/command/app-resources.ts
@@ -1,14 +1,10 @@
 ﻿import { CommandNames, Commands } from '..';
 
-/**
- * @internal
- */
-export const CmdAppResources = 'app-resources';
 /**
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CmdAppResources, 'AppResources', 'translate', true, false, {
+Commands.add(CommandNames.appImport, 'AppResources', 'translate', true, false, {
     dialog: (_) => CommandNames.edit,
 
     disabled: (context) => context.app.resourcesId === null,
diff --git a/projects/inpage/src/commands/command/app-settings.ts b/projects/inpage/src/commands/command/app-settings.ts
index 923425776..79b5e2e39 100644
--- a/projects/inpage/src/commands/command/app-settings.ts
+++ b/projects/inpage/src/commands/command/app-settings.ts
@@ -1,15 +1,10 @@
 ﻿import { CommandNames, Commands } from '..';
 
-/**
- * @internal
- */
-export const CmdAppSettings = 'app-settings';
-
 /**
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CmdAppSettings, 'AppSettings', 'sliders', true, false, {
+Commands.add(CommandNames.appSettings, 'AppSettings', 'sliders', true, false, {
 
     dialog: () => CommandNames.edit,
 
diff --git a/projects/inpage/src/commands/command/app.ts b/projects/inpage/src/commands/command/app.ts
index eee16528a..a0cd6ae50 100644
--- a/projects/inpage/src/commands/command/app.ts
+++ b/projects/inpage/src/commands/command/app.ts
@@ -1,14 +1,10 @@
-﻿import { Commands } from '..';
+﻿import { Commands, CommandNames } from '..';
 
-/**
- * @internal
- */
-export const CmdApp = 'app';
 /**
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CmdApp, 'App', 'settings', true, false, {
+Commands.add(CommandNames.app, 'App', 'settings', true, false, {
     showCondition: (context) => {
         return context.user.CanAdmin;
     },
diff --git a/projects/inpage/src/commands/command/apps.ts b/projects/inpage/src/commands/command/apps.ts
index 13bca0400..a6d4da648 100644
--- a/projects/inpage/src/commands/command/apps.ts
+++ b/projects/inpage/src/commands/command/apps.ts
@@ -1,14 +1,10 @@
-﻿import { Commands } from '..';
+﻿import { Commands, CommandNames } from '..';
 
-/**
- * @internal
- */
-export const CmdApps = 'apps';
 /**
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CmdApps, 'Zone', 'manage', true, false, {
+Commands.add(CommandNames.apps, 'Zone', 'manage', true, false, {
     showCondition: (context) => {
         return !!context.user.CanAdmin;
     },
diff --git a/projects/inpage/src/commands/command/content-items.ts b/projects/inpage/src/commands/command/content-items.ts
index 3e4b04bc0..af19b61e4 100644
--- a/projects/inpage/src/commands/command/content-items.ts
+++ b/projects/inpage/src/commands/command/content-items.ts
@@ -1,13 +1,10 @@
-﻿import { Commands } from '..';
+﻿import { Commands, CommandNames } from '..';
 
-/**
- * @internal
- */
-export const CmdContentItems = 'contentitems';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdContentItems, 'ContentItems', 'table', true, false, {
+Commands.add(CommandNames.contentItems, 'ContentItems', 'table', true, false, {
     addParamsToLink: (context) => {
         const typeName = context.button.command.params.contentType
             || context.contentBlock.contentTypeId;
diff --git a/projects/inpage/src/commands/command/content-type.ts b/projects/inpage/src/commands/command/content-type.ts
index 366edd709..ee2c8e354 100644
--- a/projects/inpage/src/commands/command/content-type.ts
+++ b/projects/inpage/src/commands/command/content-type.ts
@@ -1,14 +1,10 @@
-﻿import { Commands } from '..';
+﻿import { Commands, CommandNames } from '..';
 
-/**
- * @internal
- */
-export const CmdContentType = 'contenttype';
 /**
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CmdContentType, 'ContentType', 'fields', true, false, {
+Commands.add(CommandNames.contentType, 'ContentType', 'fields', true, false, {
     addParamsToLink: (context) => ({
         // added in 10.27 to help with the new edit ui
         contentType: context.button.command.params.contentType
diff --git a/projects/inpage/src/commands/command/copy.ts b/projects/inpage/src/commands/command/copy.ts
index 59a4cb44a..3e068c393 100644
--- a/projects/inpage/src/commands/command/copy.ts
+++ b/projects/inpage/src/commands/command/copy.ts
@@ -4,6 +4,7 @@
  * open an edit-item dialog
  *
  * import this module to commands.ts
+ * @internal
  */
 Commands.add(CommandNames.copy, 'Copy', 'copy', false, true, {
   dialog: (_) => CommandNames.edit,
diff --git a/projects/inpage/src/commands/command/custom.ts b/projects/inpage/src/commands/command/custom.ts
index 5c2a00c9a..55fae4d18 100644
--- a/projects/inpage/src/commands/command/custom.ts
+++ b/projects/inpage/src/commands/command/custom.ts
@@ -1,9 +1,9 @@
-﻿import { Commands } from '../commands';
+﻿import { CommandNames } from '../command-names';
+import { Commands } from '../commands';
 
 /**
  * @internal
  */
-export const CmdCustom = 'custom';
 const ctxName = 'context';
 const evtName = 'event';
 
@@ -13,7 +13,7 @@ const errNoCode = "Trying to run Custom-Code action, but no 'customCode' (v9) or
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CmdCustom, 'Custom', 'bomb', true, false, {
+Commands.add(CommandNames.custom, 'Custom', 'bomb', true, false, {
     code(context, event) {
         return new Promise((resolve, reject) => {
             const actPar = context.button.command.params;
diff --git a/projects/inpage/src/commands/command/delete.ts b/projects/inpage/src/commands/command/delete.ts
index f61629e2d..36c1e9667 100644
--- a/projects/inpage/src/commands/command/delete.ts
+++ b/projects/inpage/src/commands/command/delete.ts
@@ -1,14 +1,11 @@
-﻿import { Commands } from '..';
+﻿import { Commands, CommandNames } from '..';
 import { contentItems } from '../../entity-manipulation/item-commands';
 
-/**
- * @internal
- */
-export const CmdDelete = 'delete';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdDelete, 'Delete', 'cancel', true, false, {
+Commands.add(CommandNames.delete, 'Delete', 'cancel', true, false, {
     // disabled: true,
     showCondition(context) {
         const p = context.button.command.params;
diff --git a/projects/inpage/src/commands/command/edit.ts b/projects/inpage/src/commands/command/edit.ts
index 84ad66759..98dac6902 100644
--- a/projects/inpage/src/commands/command/edit.ts
+++ b/projects/inpage/src/commands/command/edit.ts
@@ -4,6 +4,7 @@
  * open an edit-item dialog
  *
  * import this module to commands.ts
+ * @internal
  */
 Commands.add(CommandNames.edit, 'Edit', 'pencil', false, true, {
     addParamsToLink: (ctx) => ({ mode: CommandNames.edit }),
diff --git a/projects/inpage/src/commands/command/index.ts b/projects/inpage/src/commands/command/index.ts
index 11c2d018d..15ba19d57 100644
--- a/projects/inpage/src/commands/command/index.ts
+++ b/projects/inpage/src/commands/command/index.ts
@@ -2,44 +2,39 @@
 
 // tslint:disable: align
 
-// Already migrated to form which gets the documentation right
 /** @internal */ export * from './shared-logic';
 /** @internal */ import './add';
 /** @internal */ import './add-existing';
+/** @internal */ import './app';
 /** @internal */ import './app-import';
-
+/** @internal */ import './app-resources';
+/** @internal */ import './app-settings';
+/** @internal */ import './apps';
+/** @internal */ import './content-items';
+/** @internal */ import './content-type';
 /** @internal */ import './copy';
-
+/** @internal */ import './custom';
+/** @internal */ import './delete';
 /** @internal */ import './edit';
+/** @internal */ import './insights-server';
+/** @internal */ import './instance-list';
+/** @internal */ import './layout';
+/** @internal */ import './metadata';
+/** @internal */ import './more';
+/** @internal */ import './movedown';
+/** @internal */ import './moveup';
+/** @internal */ import './new';
+/** @internal */ import './publish';
+/** @internal */ import './remove';
+/** @internal */ import './replace';
+/** @internal */ import './template-develop';
+/** @internal */ import './template-query';
+/** @internal */ import './template-settings';
+/** @internal */ import './zone';
 
 
-
-// To Migrate TODO: @2mh/2dar
-/** @internal */ export * from './app-resources';
-/** @internal */ export * from './app-settings';
-/** @internal */ export * from './app';
-/** @internal */ export * from './apps';
-/** @internal */ export * from './content-items';
 /** @internal */ export * from './content-list-action-params';
 /** @internal */ export * from './content-list-actions';
-/** @internal */ export * from './content-type';
-/** @internal */ export * from './custom';
-/** @internal */ export * from './delete';
-/** @internal */ export * from './insights-server';
-/** @internal */ export * from './instance-list';
-/** @internal */ export * from './layout';
-/** @internal */ export * from './metadata';
-/** @internal */ export * from './more';
-/** @internal */ export * from './movedown';
-/** @internal */ export * from './moveup';
-/** @internal */ export * from './new';
-/** @internal */ export * from './publish';
-/** @internal */ export * from './remove';
-/** @internal */ export * from './replace';
-/** @internal */ export * from './template-develop';
-/** @internal */ export * from './template-query';
-/** @internal */ export * from './template-settings';
-/** @internal */ export * from './zone';
 
 // Workflow
 /** @internal */ export * from './workflow-commands';
diff --git a/projects/inpage/src/commands/command/insights-server.ts b/projects/inpage/src/commands/command/insights-server.ts
index 2cbb53250..3b4bf0796 100644
--- a/projects/inpage/src/commands/command/insights-server.ts
+++ b/projects/inpage/src/commands/command/insights-server.ts
@@ -1,14 +1,10 @@
-﻿import { Commands } from '..';
-
-/**
- * @internal
- */
-export const CmdInsightsServer = 'insights-server';
+﻿import { Commands, CommandNames } from '..';
 
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdInsightsServer, 'Insights', 'speed', true, false, {
+Commands.add(CommandNames.insightsServer, 'Insights', 'speed', true, false, {
     showCondition: (context) => context.user.CanDevelop,
     code(context, event) {
         return new Promise((resolve, reject) => {
diff --git a/projects/inpage/src/commands/command/instance-list.ts b/projects/inpage/src/commands/command/instance-list.ts
index eef9c23a6..a283fee3e 100644
--- a/projects/inpage/src/commands/command/instance-list.ts
+++ b/projects/inpage/src/commands/command/instance-list.ts
@@ -1,13 +1,10 @@
-﻿import { Commands, SharedLogic } from '..';
+﻿import { Commands, SharedLogic, CommandNames } from '..';
 
-/**
- * @internal
- */
-export const CmdInstanceList = 'instance-list';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdInstanceList, 'Sort', 'list-numbered', false, true, {
+Commands.add(CommandNames.instanceList, 'Sort', 'list-numbered', false, true, {
     showCondition: (context) => SharedLogic.isList(context),
 
     configureLinkGenerator: (context, linkGenerator) => {
diff --git a/projects/inpage/src/commands/command/layout.ts b/projects/inpage/src/commands/command/layout.ts
index ac8fce643..4a870fd09 100644
--- a/projects/inpage/src/commands/command/layout.ts
+++ b/projects/inpage/src/commands/command/layout.ts
@@ -1,17 +1,14 @@
-﻿import { CmsEngine } from '..';
+﻿import { CmsEngine, CommandNames } from '..';
 import { QeSelectors } from '../../quick-edit';
 import { ContextForLists } from '../../quick-edit/context-for-lists';
 import { SxcTools } from '../../sxc/sxc-tools';
 import { Commands } from '../commands';
 
-/**
- * @internal
- */
-export const CmdLayout = 'layout';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdLayout, 'ChangeLayout', 'glasses', true, true, {
+Commands.add(CommandNames.layout, 'ChangeLayout', 'glasses', true, true, {
 
     inlineWindow: (_) => true,
 
diff --git a/projects/inpage/src/commands/command/metadata.ts b/projects/inpage/src/commands/command/metadata.ts
index b4c891bc7..3e5b90072 100644
--- a/projects/inpage/src/commands/command/metadata.ts
+++ b/projects/inpage/src/commands/command/metadata.ts
@@ -1,16 +1,6 @@
 ﻿import { Command, CommandNames, Commands } from '..';
 import { ItemIdentifierSimple } from '../../../../$2sxc/src/cms';
-import { CmdNewMode } from './new';
 
-/**
- * @internal
- */
-export const CmdMetadata = 'metadata';
-
-/**
- * @internal
- */
-export const CmdImage = 'image';
 const MetadataDefaultKeyType = 'string';
 const MetadataDefaultTargetType = 10; // cms-item
 /**
@@ -19,9 +9,9 @@ const MetadataDefaultTargetType = 10; // cms-item
  * import this module to commands.ts
  * @internal
  */
-export const MetadataCommand = Command.build(CmdMetadata, 'Metadata', 'tag', false, false, {
+export const MetadataCommand = Command.build(CommandNames.metadata, 'Metadata', 'tag', false, false, {
 
-    addParamsToLink: (_) => ({ mode: CmdNewMode }),
+    addParamsToLink: (_) => ({ mode: CommandNames.newMode }),
 
     dialog: (_) => CommandNames.edit, // don't use "new" (default) but use "edit"
 
@@ -44,7 +34,7 @@ export const MetadataCommand = Command.build(CmdMetadata, 'Metadata', 'tag', fal
 /**
  * @internal
  */
-export const ImageMetadataCommand = Command.build(CmdImage, 'Image', 'focus', false, false, {
+export const ImageMetadataCommand = Command.build(CommandNames.image, 'Image', 'focus', false, false, {
     addParamsToLink: MetadataCommand.buttonDefaults.addParamsToLink,
     dialog: MetadataCommand.buttonDefaults.dialog,
     classes: 'single-field',
diff --git a/projects/inpage/src/commands/command/more.ts b/projects/inpage/src/commands/command/more.ts
index 6435f6252..3f7456f68 100644
--- a/projects/inpage/src/commands/command/more.ts
+++ b/projects/inpage/src/commands/command/more.ts
@@ -1,15 +1,14 @@
 ﻿import { C } from '../../constants';
 import { IDs } from '../../constants/ids';
+import { CommandNames } from '../command-names';
 import { Commands } from '../commands';
 
-/**
- * @internal
- */
-export const CmdMore = 'more';
+
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdMore, 'MoreActions', 'options btn-mode', true, false, {
+Commands.add(CommandNames.more, 'MoreActions', 'options btn-mode', true, false, {
     code(context, event) {
         return new Promise((resolve, reject) => {
             const btn2 = event.target as HTMLElement;
diff --git a/projects/inpage/src/commands/command/movedown.ts b/projects/inpage/src/commands/command/movedown.ts
index dbedec622..f22c0fa27 100644
--- a/projects/inpage/src/commands/command/movedown.ts
+++ b/projects/inpage/src/commands/command/movedown.ts
@@ -1,15 +1,11 @@
-﻿import { Commands, SharedLogic } from '..';
+﻿import { Commands, SharedLogic, CommandNames } from '..';
 import { Actions } from './content-list-actions';
 
-/**
- * @internal
- */
-export const CmdMoveDown = 'movedown';
-
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdMoveDown, 'MoveDown', 'move-down', false, true, {
+Commands.add(CommandNames.moveDown, 'MoveDown', 'move-down', false, true, {
     // TODO: do not display if is last item in list
     showCondition: (context) => SharedLogic.isList(context),
     code(context) {
diff --git a/projects/inpage/src/commands/command/moveup.ts b/projects/inpage/src/commands/command/moveup.ts
index b3970a654..c1e4e4c0e 100644
--- a/projects/inpage/src/commands/command/moveup.ts
+++ b/projects/inpage/src/commands/command/moveup.ts
@@ -1,15 +1,13 @@
-﻿import { Commands } from '../commands';
+﻿import { CommandNames } from '../command-names';
+import { Commands } from '../commands';
 import { Actions } from './content-list-actions';
 import { SharedLogic } from './shared-logic';
 
-/**
- * @internal
- */
-export const CmdMoveUp = 'moveup';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdMoveUp, 'MoveUp', 'move-up', false, true, {
+Commands.add(CommandNames.moveUp, 'MoveUp', 'move-up', false, true, {
     showCondition(context) {
         return !!(SharedLogic.isList(context) &&
             context.button.command.params.sortOrder !== 0
diff --git a/projects/inpage/src/commands/command/new.ts b/projects/inpage/src/commands/command/new.ts
index dd31ff282..915f8ab65 100644
--- a/projects/inpage/src/commands/command/new.ts
+++ b/projects/inpage/src/commands/command/new.ts
@@ -1,16 +1,6 @@
 ﻿import { CmsEngine, CommandNames, Commands } from '..';
 import { SharedLogic } from './shared-logic';
 
-/**
- * @internal
- */
-export const CmdNew = 'new';
-
-/**
- * @internal
- */
-export const CmdNewMode = 'new';
-
 /**
  * 'new' is a dialog to add something, and will not add if cancelled
  * new can also be used for mini-toolbars which just add an entity not attached to a module
@@ -18,9 +8,10 @@ export const CmdNewMode = 'new';
  * <ul class="sc-menu" data-toolbar='{"action":"new", "contentType": "Category"}'></ul>
  *
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdNew, 'New', 'plus', false, true, {
-    addParamsToLink: (_) => ({ mode: CmdNewMode }),
+Commands.add(CommandNames.new, 'New', 'plus', false, true, {
+    addParamsToLink: (_) => ({ mode: CommandNames.newMode }),
 
     dialog: (_) => CommandNames.edit, // don't use "new" (default) but use "edit"
 
diff --git a/projects/inpage/src/commands/command/publish.ts b/projects/inpage/src/commands/command/publish.ts
index 4a985e729..12adb2b0d 100644
--- a/projects/inpage/src/commands/command/publish.ts
+++ b/projects/inpage/src/commands/command/publish.ts
@@ -1,18 +1,15 @@
-﻿import { Commands } from '..';
+﻿import { Actions } from './content-list-actions';
+import { CommandNames } from './../command-names';
+import { Commands } from '..';
 import { translate } from '../../i18n';
-import { Actions } from './content-list-actions';
-
-/**
- * @internal
- */
-export const CmdPublish = 'publish';
 
 /**
  * todo: shouldn't be available if changes are not allowed
  *
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdPublish, 'Unpublished', 'eye-off', false, false, {
+Commands.add(CommandNames.publish, 'Unpublished', 'eye-off', false, false, {
     showCondition(context) {
         return context.button.command.params.isPublished === false;
     },
diff --git a/projects/inpage/src/commands/command/remove.ts b/projects/inpage/src/commands/command/remove.ts
index c5c9098ed..a613d4776 100644
--- a/projects/inpage/src/commands/command/remove.ts
+++ b/projects/inpage/src/commands/command/remove.ts
@@ -1,17 +1,15 @@
-﻿import { Commands, SharedLogic } from '..';
+﻿import { CommandNames } from './../command-names';
+import { Commands, SharedLogic } from '..';
 import { translate } from '../../i18n';
 import { Actions } from './content-list-actions';
 
-/**
- * @internal
- */
-export const CmdRemove = 'remove';
 /**
  * remove an item from the placeholder (usually for lists)
  *
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdRemove, 'Remove', 'minus-circled', false, true, {
+Commands.add(CommandNames.remove, 'Remove', 'minus-circled', false, true, {
     showCondition: (context) => SharedLogic.isList(context),
     code(context) {
         return new Promise((resolve, reject) => {
diff --git a/projects/inpage/src/commands/command/replace.ts b/projects/inpage/src/commands/command/replace.ts
index f215dc467..438b858bd 100644
--- a/projects/inpage/src/commands/command/replace.ts
+++ b/projects/inpage/src/commands/command/replace.ts
@@ -1,14 +1,11 @@
-﻿import { Commands } from '..';
+﻿import { Commands, CommandNames } from '..';
 import { SharedLogic } from './shared-logic';
 
-/**
- * @internal
- */
-export const CmdReplace = 'replace';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdReplace, 'Replace', 'replace', false, true, {
+Commands.add(CommandNames.replace, 'Replace', 'replace', false, true, {
 
     showCondition(context) {
         return SharedLogic.isReferencedItem(context);
diff --git a/projects/inpage/src/commands/command/template-develop.ts b/projects/inpage/src/commands/command/template-develop.ts
index 901ff0f50..12fba8486 100644
--- a/projects/inpage/src/commands/command/template-develop.ts
+++ b/projects/inpage/src/commands/command/template-develop.ts
@@ -1,15 +1,12 @@
-﻿import { Commands } from '..';
+﻿import { CommandNames } from './../command-names';
+import { Commands } from '..';
 import { TemplateIdentifier } from '../../../../$2sxc/src/cms';
 
-/**
- * @internal
- */
-export const CmdTemplateDevelop = 'template-develop';
-
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdTemplateDevelop, 'Develop', 'code', true, false, {
+Commands.add(CommandNames.templateDevelop, 'Develop', 'code', true, false, {
   newWindow: (_) => true,
   dialog: (_) => 'develop',
 
diff --git a/projects/inpage/src/commands/command/template-query.ts b/projects/inpage/src/commands/command/template-query.ts
index c5572ba17..b62fdfb2d 100644
--- a/projects/inpage/src/commands/command/template-query.ts
+++ b/projects/inpage/src/commands/command/template-query.ts
@@ -1,13 +1,11 @@
-﻿import { Commands } from '..';
+﻿import { CommandNames } from './../command-names';
+import { Commands } from '..';
 
-/**
- * @internal
- */
-export const CmdTemplateQuery = 'template-query';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdTemplateQuery, 'QueryEdit', 'filter', true, false, {
+Commands.add(CommandNames.templateQuery, 'QueryEdit', 'filter', true, false, {
     dialog: (_) => 'pipeline-designer',
 
     addParamsToLink: (ctx) => ({ pipelineId: ctx.contentBlock.queryId }),
diff --git a/projects/inpage/src/commands/command/template-settings.ts b/projects/inpage/src/commands/command/template-settings.ts
index 459439f3a..906fce676 100644
--- a/projects/inpage/src/commands/command/template-settings.ts
+++ b/projects/inpage/src/commands/command/template-settings.ts
@@ -1,13 +1,11 @@
-﻿import { Commands } from '..';
+﻿import { CommandNames } from './../command-names';
+import { Commands } from '..';
 
-/**
- * @internal
- */
-export const CmdTemplateSettings = 'template-settings';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdTemplateSettings, 'TemplateSettings', 'sliders', true, false, {
+Commands.add(CommandNames.templateSettings, 'TemplateSettings', 'sliders', true, false, {
     dialog: (_) => 'edit',
 
     showCondition: (ctx) => !!ctx.user.CanDevelop && !ctx.app.isContent,
diff --git a/projects/inpage/src/commands/command/workflow-commands.ts b/projects/inpage/src/commands/command/workflow-commands.ts
index 54d016113..121881a9b 100644
--- a/projects/inpage/src/commands/command/workflow-commands.ts
+++ b/projects/inpage/src/commands/command/workflow-commands.ts
@@ -7,5 +7,4 @@ export const WorkflowCommands = {
 
     /** Special Command: 'refresh' is usually run inside other commands after execution */
     refresh: 'refresh',
-
 };
diff --git a/projects/inpage/src/commands/command/zone.ts b/projects/inpage/src/commands/command/zone.ts
index 3cd272d6d..6c1d3c567 100644
--- a/projects/inpage/src/commands/command/zone.ts
+++ b/projects/inpage/src/commands/command/zone.ts
@@ -1,13 +1,11 @@
-﻿import { Commands } from '..';
+﻿import { CommandNames } from './../command-names';
+import { Commands } from '..';
 
-/**
- * @internal
- */
-export const CmdZone = 'zone';
 /**
  * import this module to commands.ts
+ * @internal
  */
-Commands.add(CmdZone, 'Zone', 'manage', true, false, {
+Commands.add(CommandNames.zone, 'Zone', 'manage', true, false, {
     showCondition: (context) => {
         return !!context.user.CanAdmin;
     },
diff --git a/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts b/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts
index 5529d4dee..e7be5842b 100644
--- a/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts
+++ b/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts
@@ -1,5 +1,5 @@
 ﻿import { Sxc } from '../../../../$2sxc/src';
-import { CmdLayout } from '../../commands/command/layout';
+import { CommandNames } from '../../commands';
 import { HasLog, Insights } from '../../core';
 import { EditManager } from '../../manage/edit-manager';
 
@@ -19,7 +19,7 @@ export class DnnActionMenu extends HasLog {
         this.run = (this.sxc.manage as EditManager).run;
     }
 
-    changeLayoutOrContent = () => { this.run(CmdLayout); };
+    changeLayoutOrContent = () => { this.run(CommandNames.layout); };
 
     // 2020-04-21 2dm disabled this, as it doesn't make sense to have this in the DNN menu - since add can be used in each position
     // addItem = () => { this.run('new', { useModuleList: true, sortOrder: 0 }); };
diff --git a/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts b/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts
index ce74078ba..97d436e09 100644
--- a/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts
+++ b/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts
@@ -1,7 +1,8 @@
-﻿import { InPageCommandJson } from '.';
+﻿import { CommandNames } from './../../commands/command-names';
+import { InPageCommandJson } from '.';
 import { InPageButtonJson } from '.';
 import { ToolbarConfigLoader } from '.';
-import { CmdMore, Commands } from '../../commands';
+import { Commands } from '../../commands';
 import { ContextComplete } from '../../context/bundles';
 import { HasLog } from '../../core';
 import { TypeValue } from '../../plumbing';
@@ -87,7 +88,7 @@ export class ButtonConfigLoader extends HasLog {
             // disableButtons(context, btns/*, config */);
 
             // remove the group, if no buttons left, or only "more"
-            if (btns.length === 0 || (btns.length === 1 && btns[0].command.name === CmdMore)) {
+            if (btns.length === 0 || (btns.length === 1 && btns[0].command.name === CommandNames.more)) {
                 wrapLog.add('found no more buttons except for the "more" - will remove that group');
                 btnGroups.splice(g--, 1); // remove, and decrement counter
             }
diff --git a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
index fb4413840..204120786 100644
--- a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
+++ b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
@@ -1,7 +1,8 @@
-﻿import { ToolbarWip } from '.';
+﻿import { CommandNames } from './../../commands/command-names';
+import { ToolbarWip } from '.';
 import { InPageButtonJson, InPageCommandJson } from '.';
 import { ButtonGroupWip } from '.';
-import { CmdMore, CommandParams, Commands } from '../../commands';
+import { CommandParams, Commands } from '../../commands';
 import { HasLog } from '../../core';
 import { TypeValue } from '../../plumbing';
 import { Button, ButtonCommand, Toolbar, ToolbarSettings } from '../config';
@@ -162,7 +163,7 @@ debugger;
         const cl = this.log.call('addMoreButtons');
         const addMore = settings.autoAddMore;
         if (addMore) {
-            const moreButton = this.toolbar.button.btnConfigStructure(CmdMore, {});
+            const moreButton = this.toolbar.button.btnConfigStructure(CommandNames.more, {});
             if ((addMore === 'end') || (addMore.toString() === 'right')) { // fallback for older v1 setting
                 this.log.add('will add a more "..." button to end');
                 list.push(moreButton);
@@ -183,7 +184,7 @@ debugger;
         if (toolbar.groups.length !== 1) return cl.done('not just 1 group');
         cl.add('exactly one group found, will remove more');
         const buttons = toolbar.groups[0].buttons;
-        const index = buttons.findIndex((b) => b.command?.name === CmdMore);
+        const index = buttons.findIndex((b) => b.command?.name === CommandNames.more);
         if (index === -1) return cl.done("no 'more' button found");
         buttons.splice(index, 1);
         cl.done('more removed');

From 6f6729293863e3ffef419e77b7b770133774eec1 Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Thu, 16 Jun 2022 12:50:15 +0200
Subject: [PATCH 10/41] improvements imports

---
 projects/inpage/src/commands/command/app.ts               | 2 +-
 projects/inpage/src/commands/command/apps.ts              | 2 +-
 projects/inpage/src/commands/command/content-items.ts     | 2 +-
 projects/inpage/src/commands/command/content-type.ts      | 2 +-
 projects/inpage/src/commands/command/custom.ts            | 3 +--
 projects/inpage/src/commands/command/delete.ts            | 2 +-
 projects/inpage/src/commands/command/insights-server.ts   | 2 +-
 projects/inpage/src/commands/command/instance-list.ts     | 2 +-
 projects/inpage/src/commands/command/layout.ts            | 3 +--
 projects/inpage/src/commands/command/more.ts              | 5 ++---
 projects/inpage/src/commands/command/moveup.ts            | 3 +--
 projects/inpage/src/commands/command/publish.ts           | 3 +--
 projects/inpage/src/commands/command/remove.ts            | 3 +--
 projects/inpage/src/commands/command/replace.ts           | 2 +-
 projects/inpage/src/commands/command/template-develop.ts  | 3 +--
 projects/inpage/src/commands/command/template-query.ts    | 3 +--
 projects/inpage/src/commands/command/template-settings.ts | 3 +--
 projects/inpage/src/commands/command/zone.ts              | 3 +--
 18 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/projects/inpage/src/commands/command/app.ts b/projects/inpage/src/commands/command/app.ts
index a0cd6ae50..5a0ef347f 100644
--- a/projects/inpage/src/commands/command/app.ts
+++ b/projects/inpage/src/commands/command/app.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/apps.ts b/projects/inpage/src/commands/command/apps.ts
index a6d4da648..a06bf65b1 100644
--- a/projects/inpage/src/commands/command/apps.ts
+++ b/projects/inpage/src/commands/command/apps.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/content-items.ts b/projects/inpage/src/commands/command/content-items.ts
index af19b61e4..2bb1ab71b 100644
--- a/projects/inpage/src/commands/command/content-items.ts
+++ b/projects/inpage/src/commands/command/content-items.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/content-type.ts b/projects/inpage/src/commands/command/content-type.ts
index ee2c8e354..872b9358e 100644
--- a/projects/inpage/src/commands/command/content-type.ts
+++ b/projects/inpage/src/commands/command/content-type.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/custom.ts b/projects/inpage/src/commands/command/custom.ts
index 55fae4d18..1e208dd52 100644
--- a/projects/inpage/src/commands/command/custom.ts
+++ b/projects/inpage/src/commands/command/custom.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from '../command-names';
-import { Commands } from '../commands';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * @internal
diff --git a/projects/inpage/src/commands/command/delete.ts b/projects/inpage/src/commands/command/delete.ts
index 36c1e9667..c794c148a 100644
--- a/projects/inpage/src/commands/command/delete.ts
+++ b/projects/inpage/src/commands/command/delete.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 import { contentItems } from '../../entity-manipulation/item-commands';
 
 /**
diff --git a/projects/inpage/src/commands/command/insights-server.ts b/projects/inpage/src/commands/command/insights-server.ts
index 3b4bf0796..d0cd4e910 100644
--- a/projects/inpage/src/commands/command/insights-server.ts
+++ b/projects/inpage/src/commands/command/insights-server.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/instance-list.ts b/projects/inpage/src/commands/command/instance-list.ts
index a283fee3e..09c0aa666 100644
--- a/projects/inpage/src/commands/command/instance-list.ts
+++ b/projects/inpage/src/commands/command/instance-list.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, SharedLogic, CommandNames } from '..';
+﻿import { CommandNames, Commands, SharedLogic } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/layout.ts b/projects/inpage/src/commands/command/layout.ts
index 4a870fd09..2836af91c 100644
--- a/projects/inpage/src/commands/command/layout.ts
+++ b/projects/inpage/src/commands/command/layout.ts
@@ -1,8 +1,7 @@
-﻿import { CmsEngine, CommandNames } from '..';
+﻿import { CmsEngine, CommandNames, Commands } from '..';
 import { QeSelectors } from '../../quick-edit';
 import { ContextForLists } from '../../quick-edit/context-for-lists';
 import { SxcTools } from '../../sxc/sxc-tools';
-import { Commands } from '../commands';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/more.ts b/projects/inpage/src/commands/command/more.ts
index 3f7456f68..3611756d7 100644
--- a/projects/inpage/src/commands/command/more.ts
+++ b/projects/inpage/src/commands/command/more.ts
@@ -1,7 +1,6 @@
-﻿import { C } from '../../constants';
+﻿import { CommandNames, Commands } from '..';
+import { C } from '../../constants';
 import { IDs } from '../../constants/ids';
-import { CommandNames } from '../command-names';
-import { Commands } from '../commands';
 
 
 /**
diff --git a/projects/inpage/src/commands/command/moveup.ts b/projects/inpage/src/commands/command/moveup.ts
index c1e4e4c0e..2f8ea3418 100644
--- a/projects/inpage/src/commands/command/moveup.ts
+++ b/projects/inpage/src/commands/command/moveup.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from '../command-names';
-import { Commands } from '../commands';
+﻿import { CommandNames, Commands } from '..';
 import { Actions } from './content-list-actions';
 import { SharedLogic } from './shared-logic';
 
diff --git a/projects/inpage/src/commands/command/publish.ts b/projects/inpage/src/commands/command/publish.ts
index 12adb2b0d..d4608ce34 100644
--- a/projects/inpage/src/commands/command/publish.ts
+++ b/projects/inpage/src/commands/command/publish.ts
@@ -1,6 +1,5 @@
 ﻿import { Actions } from './content-list-actions';
-import { CommandNames } from './../command-names';
-import { Commands } from '..';
+import { CommandNames, Commands } from '..';
 import { translate } from '../../i18n';
 
 /**
diff --git a/projects/inpage/src/commands/command/remove.ts b/projects/inpage/src/commands/command/remove.ts
index a613d4776..44a4d6978 100644
--- a/projects/inpage/src/commands/command/remove.ts
+++ b/projects/inpage/src/commands/command/remove.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from './../command-names';
-import { Commands, SharedLogic } from '..';
+﻿import { CommandNames, Commands, SharedLogic } from '..';
 import { translate } from '../../i18n';
 import { Actions } from './content-list-actions';
 
diff --git a/projects/inpage/src/commands/command/replace.ts b/projects/inpage/src/commands/command/replace.ts
index 438b858bd..ef187a9ba 100644
--- a/projects/inpage/src/commands/command/replace.ts
+++ b/projects/inpage/src/commands/command/replace.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, CommandNames } from '..';
+﻿import { CommandNames, Commands } from '..';
 import { SharedLogic } from './shared-logic';
 
 /**
diff --git a/projects/inpage/src/commands/command/template-develop.ts b/projects/inpage/src/commands/command/template-develop.ts
index 12fba8486..e01d31899 100644
--- a/projects/inpage/src/commands/command/template-develop.ts
+++ b/projects/inpage/src/commands/command/template-develop.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from './../command-names';
-import { Commands } from '..';
+﻿import { CommandNames, Commands } from '..';
 import { TemplateIdentifier } from '../../../../$2sxc/src/cms';
 
 /**
diff --git a/projects/inpage/src/commands/command/template-query.ts b/projects/inpage/src/commands/command/template-query.ts
index b62fdfb2d..20b31673d 100644
--- a/projects/inpage/src/commands/command/template-query.ts
+++ b/projects/inpage/src/commands/command/template-query.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from './../command-names';
-import { Commands } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/template-settings.ts b/projects/inpage/src/commands/command/template-settings.ts
index 906fce676..b63c6007f 100644
--- a/projects/inpage/src/commands/command/template-settings.ts
+++ b/projects/inpage/src/commands/command/template-settings.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from './../command-names';
-import { Commands } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts
diff --git a/projects/inpage/src/commands/command/zone.ts b/projects/inpage/src/commands/command/zone.ts
index 6c1d3c567..cecbfd183 100644
--- a/projects/inpage/src/commands/command/zone.ts
+++ b/projects/inpage/src/commands/command/zone.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from './../command-names';
-import { Commands } from '..';
+﻿import { CommandNames, Commands } from '..';
 
 /**
  * import this module to commands.ts

From 4ba7433244f6dd59a99f899f11a6937b9bc2499b Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 16:12:27 +0200
Subject: [PATCH 11/41] clean-up

---
 .../data/sxc-data-service-base.ts             |  33 ---
 .../$2sxc/src/sxc-instance/data/sxc-data.ts   | 109 -------
 .../$2sxc/src/sxc-instance/data/sxc-query.ts  |  81 ------
 projects/$2sxc/src/sxc-instance/index.ts      |   6 -
 projects/$2sxc/src/sxc-instance/sxc-cms.ts    |  19 --
 projects/$2sxc/src/sxc-instance/sxc-manage.ts |  18 --
 projects/$2sxc/src/sxc-instance/sxc-part.ts   |  23 --
 .../src/sxc-instance/web-api/ajax-promise.ts  |  65 -----
 .../src/sxc-instance/web-api/ajax-settings.ts |  16 -
 .../src/sxc-instance/web-api/sxc-web-api.ts   | 273 ------------------
 .../$2sxc/src/sxc-root/context-identifier.ts  |  73 -----
 projects/$2sxc/src/sxc-root/debug.ts          |  22 --
 projects/$2sxc/src/sxc-root/http-global.ts    | 148 ----------
 projects/$2sxc/src/sxc-root/index.ts          |   5 -
 .../src/sxc-root/sxc-global-bootstrap.ts      |  73 -----
 projects/$2sxc/src/sxc-root/sxc-global-get.ts |  70 -----
 projects/$2sxc/src/sxc-root/sxc-global.ts     | 114 --------
 projects/inpage/src/logging/index.ts          |   5 -
 .../sxc-typings/dist/$2sxc/src/_/window.d.ts  |   5 +-
 .../src/environment/root-environment.d.ts     |  36 ---
 .../data/sxc-data-service-base.d.ts           |   1 -
 .../$2sxc/src/sxc-instance/data/sxc-data.d.ts |  40 ---
 .../src/sxc-instance/data/sxc-query.d.ts      |  24 --
 .../dist/$2sxc/src/sxc-instance/index.d.ts    |   5 -
 .../dist/$2sxc/src/sxc-instance/sxc-cms.d.ts  |   1 -
 .../$2sxc/src/sxc-instance/sxc-manage.d.ts    |   1 -
 .../dist/$2sxc/src/sxc-instance/sxc-part.d.ts |   1 -
 .../dist/$2sxc/src/sxc-instance/sxc.d.ts      |  48 ---
 .../sxc-instance/web-api/ajax-promise.d.ts    |   1 -
 .../sxc-instance/web-api/ajax-settings.d.ts   |   1 -
 .../src/sxc-instance/web-api/sxc-web-api.d.ts | 120 --------
 .../src/sxc-root/context-identifier.d.ts      |  25 --
 .../dist/$2sxc/src/sxc-root/debug.d.ts        |   1 -
 .../dist/$2sxc/src/sxc-root/http-global.d.ts  |  51 ----
 .../dist/$2sxc/src/sxc-root/index.d.ts        |   4 -
 .../src/sxc-root/sxc-global-bootstrap.d.ts    |   1 -
 .../$2sxc/src/sxc-root/sxc-global-get.d.ts    |   1 -
 .../dist/$2sxc/src/sxc-root/sxc-global.d.ts   |  66 -----
 .../dist/core/plumbing/dictionary-value.d.ts  |   1 -
 .../sxc-typings/dist/inpage/src/cms/Cms.d.ts  |   1 -
 .../inpage/src/commands/command-names.d.ts    | 122 +++++++-
 .../inpage/src/commands/command-params.d.ts   |   1 -
 .../commands/command/special-commands.d.ts    |   1 -
 .../src/commands/engine/run-parameters.d.ts   |   1 -
 .../src/commands/engine/run-params.d.ts       |   1 -
 .../inpage/src/commands/metadata-for.d.ts     |   1 -
 .../dist/inpage/src/interfaces/hashtable.d.ts |   0
 .../src/interfaces/item-identifiers.d.ts      |   1 -
 .../dist/inpage/src/interfaces/jquery.d.ts    |   0
 .../interfaces/sxc-controller-in-page.d.ts    |   1 -
 .../src/interfaces/sxc-instance-editable.d.ts |   1 -
 .../dist/inpage/src/logging/index.d.ts        |   1 -
 .../dist/inpage/src/manage/manage.d.ts        |   1 -
 .../sxc-typings/dist/inpage/src/sxc/sxc.d.ts  |   1 -
 .../inpage/src/toolbar/rules/operators.d.ts   |   1 -
 .../src/workflow/workflow-arguments.d.ts      |   1 -
 projects/sxc-typings/package.json             |   4 +-
 57 files changed, 125 insertions(+), 1602 deletions(-)
 delete mode 100644 projects/$2sxc/src/sxc-instance/data/sxc-data-service-base.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/data/sxc-data.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/data/sxc-query.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/index.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/sxc-cms.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/sxc-manage.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/sxc-part.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/web-api/ajax-promise.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/web-api/ajax-settings.ts
 delete mode 100644 projects/$2sxc/src/sxc-instance/web-api/sxc-web-api.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/context-identifier.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/debug.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/http-global.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/index.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/sxc-global-bootstrap.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/sxc-global-get.ts
 delete mode 100644 projects/$2sxc/src/sxc-root/sxc-global.ts
 delete mode 100644 projects/inpage/src/logging/index.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/environment/root-environment.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data-service-base.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-query.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/index.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-cms.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-manage.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-part.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-promise.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-settings.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/sxc-web-api.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/context-identifier.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/debug.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/http-global.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/index.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-bootstrap.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-get.d.ts
 delete mode 100644 projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global.d.ts
 delete mode 100644 projects/sxc-typings/dist/core/plumbing/dictionary-value.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/cms/Cms.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command-params.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/special-commands.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/engine/run-parameters.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/engine/run-params.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/metadata-for.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/interfaces/hashtable.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/interfaces/item-identifiers.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/interfaces/jquery.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/interfaces/sxc-controller-in-page.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/interfaces/sxc-instance-editable.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/logging/index.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/manage/manage.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/sxc/sxc.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/toolbar/rules/operators.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/workflow/workflow-arguments.d.ts

diff --git a/projects/$2sxc/src/sxc-instance/data/sxc-data-service-base.ts b/projects/$2sxc/src/sxc-instance/data/sxc-data-service-base.ts
deleted file mode 100644
index 327c93e26..000000000
--- a/projects/$2sxc/src/sxc-instance/data/sxc-data-service-base.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Sxc } from '..';
-import { SxcPart } from '../sxc-part';
-import { SxcWebApi } from '../web-api/sxc-web-api';
-
-/**
-* Base class doing common checks
-* @internal
-*/
-export class SxcDataServiceBase extends SxcPart {
-  protected readonly webApi: SxcWebApi;
-  /**
-  * Creates an instance of SxcData.
-  * @param {Sxc} sxc
-  * @param {string} name the content-type name
-  * @memberof SxcData
-  */
-  constructor(
-    sxc: Sxc,
-    readonly name: string,
-    nameInError: string
-  ) {
-    super(sxc, 'data');
-    this.webApi = sxc.webApi;
-    
-    // Fail early if something is wrong
-    nameInError += ' name ';
-    if (name == null) throw nameInError + 'is empty';
-    if (name.indexOf("/") != -1 || name.indexOf("\\") != -1) throw nameInError + 'has slashes - not allowed';
-    if (name.indexOf("?") != -1) throw nameInError + 'has "?" - not allowed';
-  }
-
-}
-  
\ No newline at end of file
diff --git a/projects/$2sxc/src/sxc-instance/data/sxc-data.ts b/projects/$2sxc/src/sxc-instance/data/sxc-data.ts
deleted file mode 100644
index db6ee2f06..000000000
--- a/projects/$2sxc/src/sxc-instance/data/sxc-data.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { Sxc } from '..';
-import { TargetTypes } from '../../data';
-import { MetadataFor } from '../../data/metadata-for';
-import { SxcDataServiceBase } from './sxc-data-service-base';
-
-const ContentApiRoot = 'app/auto/data';
-
-/**
-* Data Service for an App / Sxc-Instance to get/create data of a specific Content-Type
-*/
-export class SxcData<T = unknown> extends SxcDataServiceBase {
-  /**
-  * Creates an instance of SxcData.
-  * @param {Sxc} sxc
-  * @param {string} name the content-type name
-  * @memberof SxcData
-  * @internal
-  */
-  constructor(sxc: Sxc, readonly name: string) {
-    super(sxc, name, 'ContentType');
-  }
-
-  /**
-   * Get all items of this type.
-   */
-  getAll(): Promise<T[]> {
-    return this.getInternal<T[]>();
-  }
-
-  /**
-   * Get the specific item with the ID. It will return null if not found
-   */
-  getOne(id: number): Promise<T> | null {
-    return this.getInternal<T>(id);
-  };
-
-  /** Future
-   *  @internal 
-   */
-  private getMany(criteria: Record<string, unknown>, fields: Array<string>): Promise<T[]> {
-    throw 'not implemented - probably v13.5 or something';
-  }
-
-
-  /**
-   * Get all or one data entity from the backend
-   * @param id optional id as number or string - if not provided, will get all
-   * @param params optional parameters - ATM not usefuly but we plan to support more filters etc. 
-   * @returns an array with 1 or n entities in the simple JSON format
-   * @internal
-   */
-  private getInternal<TCall>(id?: string | number, params?: string | Record<string, unknown>): Promise<TCall> {
-    let path = `${ContentApiRoot}/${this.name}`;
-    if (id && (typeof id === 'string' || typeof id === 'number')) path += "/" + id;
-    return this.webApi.fetchJson(this.webApi.url(path, params));
-  }
-
-  /**
-   * Create a new entity with the values supplied
-   * @param values a simple object containing the values to create
-   */
-  create(values: Record<string, unknown>): Promise<Record<string, unknown>>;
-
-  /**
-   * Create a new entity with the values supplied and also a metadata-for reference
-   * @param values a simple object containing the values to create
-   */
-  create(values: Record<string, unknown>, metadataFor: MetadataFor | string): Promise<Record<string, unknown>>;
-
-  /** @internal */
-  create(values: Record<string, unknown>, metadataFor?: MetadataFor | string): Promise<Record<string, unknown>> {
-    const path = `${ContentApiRoot}/${this.name}`;
-    if (metadataFor != null) {
-      if (typeof(metadataFor) === 'string')
-        metadataFor = { Target: TargetTypes.Entity, Guid: metadataFor } as MetadataFor;
-      try {
-        values.For = metadataFor;
-      } catch { }
-    }
-    return this.webApi.fetchJson(this.webApi.url(path), values, 'POST');
-  }
-
-  /**
-   * Update an existing entity with the values supplied
-   */
-  update(id: number, values: Record<string, unknown>): Promise<Record<string, unknown>> {
-    const path = `${ContentApiRoot}/${this.name}/${id}`;
-    return this.webApi.fetchJson(this.webApi.url(path), values, 'POST');
-  }
-
-  /**
-   * Delete an entity
-   * @param id id of the item to delete
-   */
-  delete(id: number): Promise<null>;
-
-  /**
-   * Delete an entity
-   * @param guid GUID of the item to delete
-   */
-  delete(guid: string): Promise<null>;
-
-  /** @internal */
-  delete(idOrGuid: number | string): Promise<null> {
-    const path = `${ContentApiRoot}/${this.name}/${idOrGuid}`;
-    return this.webApi.fetchRaw(this.webApi.url(path), undefined, 'DELETE').then(response => null);
-  }
-}
-
diff --git a/projects/$2sxc/src/sxc-instance/data/sxc-query.ts b/projects/$2sxc/src/sxc-instance/data/sxc-query.ts
deleted file mode 100644
index acbd98f5a..000000000
--- a/projects/$2sxc/src/sxc-instance/data/sxc-query.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { Sxc } from '..';
-import { SxcDataServiceBase } from './sxc-data-service-base';
-
-/**
- * Instance Query Service
- */
-export class SxcQuery extends SxcDataServiceBase {
-
-  /**
-   * Creates an instance of SxcQuery.
-   * @param {Sxc} sxc
-   * @param {string} name
-   * @memberof SxcQuery
-   * @internal
-   */
-  constructor(sxc: Sxc, readonly name: string) {
-    super(sxc, name, 'Query');
-  }
-
-  getAll<T = unknown>(): Promise<T>;
-  getAll<T = unknown>(urlParams: string | Record<string, unknown>): Promise<T>;
-  getAll<T = unknown>(urlParams: string | Record<string, unknown>, data: string | Record<string, unknown>): Promise<T>;
-  /**
-   * Retrieve the entire query with all streams
-   *
-   * @template T
-   * @returns {Promise<T>} containing a object with stream-names and items in the streams.
-   * @memberof SxcQuery
-   */
-  getAll<T = unknown>(urlParams?: string | Record<string, unknown>, data?: string | Record<string, unknown>): Promise<T> {
-    return this.getInternal<T>(undefined, urlParams, data);
-  }
-
-  /**
-   * Get just one stream, returning an array of items in that stream
-   *
-   * @template T
-   * @param {string} stream
-   * @returns {Promise<T[]>} containing an array of items - or empty if stream not found or nothing returned
-   * @memberof SxcQuery
-   */
-  getStream<T = unknown>(stream: string): Promise<T[]>;
-  getStream<T = unknown>(stream: string, urlParams: string | Record<string, unknown>): Promise<T[]>;
-  getStream<T = unknown>(stream: string, urlParams: string | Record<string, unknown>, data: string | Record<string, unknown>): Promise<T[]>;
-  
-  getStream<T = unknown>(stream: string, urlParams?: string | Record<string, unknown>, data?: string | Record<string, unknown>): Promise<T[]> {
-    if (stream.indexOf(',') !== -1) throw "parameter 'stream' can only contain one stream name for 'getStream'";
-    return this.getInternal<unknown>(stream, urlParams, data).then((data) => {
-      if (data == null || !data.hasOwnProperty(stream)) return [];
-      return (data as any)[stream] as T[];
-    })
-  }
-
-  getStreams<T = unknown>(streams: string): Promise<T>;
-  getStreams<T = unknown>(streams: string, urlParams: string | Record<string, unknown>): Promise<T>;
-  getStreams<T = unknown>(streams: string, urlParams: string | Record<string, unknown>, data: string | Record<string, unknown>): Promise<T>;
-  /**
-   * Get a query but only the selected streams.
-   *
-   * @template T
-   * @param {string} streams
-   * @returns {Promise<T>} containing a object with stream-names and items in the streams.
-   * @memberof SxcQuery
-   */
-  getStreams<T = unknown>(streams: string, urlParams?: string | Record<string, unknown>, data?: string | Record<string, unknown>): Promise<T> {
-    return this.getInternal<T>(streams, urlParams, data);
-  }
-
-  /**
-   * Get all or one data entity from the backend
-   * @param id optional id as number or string - if not provided, will get all
-   * @param params optional parameters - ATM not usefuly but we plan to support more filters etc. 
-   * @returns an array with 1 or n entities in the simple JSON format
-   * @internal
-   */
-  private getInternal<T = unknown>(streams?: string, params?: string | Record<string, any>, data?: string | Record<string, unknown>): Promise<T> {
-    let path = "app/auto/query/" + this.name;
-    if (streams && (typeof streams === 'string')) path += "?stream=" + streams;
-    return this.webApi.fetchJson(this.webApi.url(path, params), data);
-  }
-}
diff --git a/projects/$2sxc/src/sxc-instance/index.ts b/projects/$2sxc/src/sxc-instance/index.ts
deleted file mode 100644
index 4dac4a989..000000000
--- a/projects/$2sxc/src/sxc-instance/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-
-export * from './sxc';
-export * from './sxc-manage';
-export * from './web-api/sxc-web-api';
-export * from './web-api/ajax-promise';
-export * from './web-api/ajax-settings';
diff --git a/projects/$2sxc/src/sxc-instance/sxc-cms.ts b/projects/$2sxc/src/sxc-instance/sxc-cms.ts
deleted file mode 100644
index 88fb810f9..000000000
--- a/projects/$2sxc/src/sxc-instance/sxc-cms.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { SxcPart } from './sxc-part';
-import { RunParams } from '../cms/run-params';
-
-/**
- * This is in charge of sxc.cms on the instance level.
- * ATM it just has the run command.
- * In future, it may also have dedicated command like `layout` etc.
- */
-export class SxcCms extends SxcPart {
-  /**
-   * Run a command on this sxc-instance. 
-   * Requires edit mode to be on, which would enable the edit-JS parts.
-   * To use, remember to activate `2sxc.JsCms` on the page
-   * @param runParams - real type is actually RunParams
-   */
-  run<T>(runParams: RunParams): Promise<void | T> { 
-    throw 'cms.run() requires editing to be on, or page-feature "2sxc.JsCms" to be enabled to work';
-  }
-}
\ No newline at end of file
diff --git a/projects/$2sxc/src/sxc-instance/sxc-manage.ts b/projects/$2sxc/src/sxc-instance/sxc-manage.ts
deleted file mode 100644
index f95cafffd..000000000
--- a/projects/$2sxc/src/sxc-instance/sxc-manage.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* 
-  This is the base class for the Manage object on 2sxc instances.
-  It's typed here, so that API code is strongly typed, but it's incomplete.
-*/
-
-/** @internal */
-export interface SxcManage {
-  /**
-   * The context contains information about the Sxc Instance, like module-id, etc.
-   */
-  context: any;
-
-  /**
-   * This checks / reports whether the API is in edit mode.
-   * Used to enabled/disable various features
-   */
-  _isEditMode(): boolean;
-}
diff --git a/projects/$2sxc/src/sxc-instance/sxc-part.ts b/projects/$2sxc/src/sxc-instance/sxc-part.ts
deleted file mode 100644
index 284dcccac..000000000
--- a/projects/$2sxc/src/sxc-instance/sxc-part.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Sxc } from '..';
-
-/**
-* Base class for anything attached to an sxc-instance
-* @internal
-*/
-export class SxcPart {
-  /**
-  * Creates an instance of SxcData.
-  * @param {Sxc} sxc
-  * @param {string} partName name of the part
-  * @memberof SxcData
-  * @internal
-  */
-  constructor(
-    /** @internal */
-    public sxc: Sxc, 
-    /** @internal */
-    public partName: string) {      
-  }
-
-}
-  
\ No newline at end of file
diff --git a/projects/$2sxc/src/sxc-instance/web-api/ajax-promise.ts b/projects/$2sxc/src/sxc-instance/web-api/ajax-promise.ts
deleted file mode 100644
index 0e3e597d9..000000000
--- a/projects/$2sxc/src/sxc-instance/web-api/ajax-promise.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Sxc, SxcWebApi } from '..';
-import { NoJQ } from '../../../../core';
-import { AjaxSettings } from './ajax-settings';
-
-declare const window: Window;
-
-/** @internal */
-export class AjaxPromise {
-  constructor(private api: SxcWebApi, private sxc: Sxc) {
-  }
-
-  /**
-   * Make a jQuery style promise request
-   * @param {AjaxSettings} settings
-   * @returns {JQueryPromise<any>}
-   * @memberof AjaxPromise
-   */
-  public makePromise(settings: AjaxSettings): JQueryPromise<any> {
-    var headers = this.api.headers();
-    // debugger;
-    if (window.$ == null) {
-      throw new Error('JQuery is now removed from 2sxc installation. Please use newer api like fetch or include JQuery in your project');
-    }
-    const promise = window.$.ajax({
-      async: true,
-      dataType: settings.dataType || 'json', // default is json if not specified
-      data: JSON.stringify(settings.data),
-      contentType: 'application/json',
-      type: settings.method,
-      url: this.getActionUrl(settings),
-      beforeSend(xhr: JQueryXHR) {
-        for (var key in headers)
-          if (headers.hasOwnProperty(key))
-            xhr.setRequestHeader(key, headers[key]);
-      },
-    }) as JQueryPromise<any>;
-
-    if (!settings.preventAutoFail)
-      promise.fail(this.sxc.showDetailedHttpError);
-
-    return promise;
-  }
-
-
-  /**
-   * Generate the correct WebApi url
-   * @param settings the settings as they would be in jQuery
-   */
-  private getActionUrl(settings: AjaxSettings): string {
-    var url = settings.url || 'app/auto/api/' + settings.controller + '/' + settings.action;
-    // 2020-03-13 stop adding 2sxc endpoint-name, it's already happening in apiUrl so with this it happens 2x
-    // var endpoint = settings.endpoint || ToSxcName;
-    var base = this.sxc.root.http.apiUrl(url, settings.endpoint);
-    // let base = (settings.url)
-    //   ? this.sxc.root.http.apiUrl(settings.url) // this.sxc.resolveServiceUrl(settings.url)  // use url -> TODO: change this to use the new root.http.apiUrl
-    //   : env.apiRoot('2sxc')               // use controller/action
-    //     + 'app/auto/api/' + settings.controller + '/' + settings.action;
-
-    // if(settings.endpoint)
-    //     base = base.replace(env.apiRoot('2sxc'), 
-    //         env.apiRoot(settings.endpoint));
-
-    return base + (!settings.params ? '' : ('?' + NoJQ.param(settings.params)));
-  }
-}
diff --git a/projects/$2sxc/src/sxc-instance/web-api/ajax-settings.ts b/projects/$2sxc/src/sxc-instance/web-api/ajax-settings.ts
deleted file mode 100644
index 0fe6c21ce..000000000
--- a/projects/$2sxc/src/sxc-instance/web-api/ajax-settings.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/** @internal */
-export interface AjaxSettings extends JQueryAjaxSettings {
-    /** Override the endpoint, which is usually '2sxc' */
-    endpoint?: string;
-
-    /** Controller name, for controller/action calls */
-    controller?: string;
-
-    /** action name, for controller/action calls */
-    action?: string;
-
-    /** The params to be used in the url for the request */
-    params?: any;
-
-    preventAutoFail?: boolean;
-}
diff --git a/projects/$2sxc/src/sxc-instance/web-api/sxc-web-api.ts b/projects/$2sxc/src/sxc-instance/web-api/sxc-web-api.ts
deleted file mode 100644
index 8ea69cde5..000000000
--- a/projects/$2sxc/src/sxc-instance/web-api/sxc-web-api.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-﻿import { Sxc } from '../sxc';
-import { AjaxPromise } from './ajax-promise';
-import { Environment } from '../../environment';
-import { AjaxSettings } from './ajax-settings';
-import { NoJQ } from '../../../../core';
-
-/**
- * helper API to run ajax / REST calls to the server
- * it will ensure that the headers etc. are set correctly
- * and that urls are rewritten
- */
-export class SxcWebApi {
-    /**
-     * @type {Environment}
-     * @memberof SxcWebApi
-     * @internal
-     */
-    public readonly env: Environment;
-
-    /**
-     * 
-     * @param sxc 
-     * @internal
-     */
-    constructor(private readonly sxc: Sxc) {
-        this.env = sxc.root.env;
-    }
-
-    /**
-     * **Deprecated** 
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson) 
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     * 
-     * Returns an http-get promise using jQuery
-     * @param settingsOrUrl the url to get
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    get(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any> {
-        return this.request(settingsOrUrl, params, data, preventAutoFail, 'GET');
-    }
-
-    /**
-     * **Deprecated** 
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson) 
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     * 
-     * Returns an http-post promise using jQuery
-     * @param settingsOrUrl the url to get
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    post(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any> {
-        return this.request(settingsOrUrl, params, data, preventAutoFail, 'POST');
-    }
-
-    /**
-     * **Deprecated** 
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson) 
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     * 
-     * Returns an http-delete promise using jQuery
-     * @param settingsOrUrl the url to talk to
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    delete(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any> {
-        return this.request(settingsOrUrl, params, data, preventAutoFail, 'DELETE');
-    }
-
-    /**
-     * **Deprecated** 
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson) 
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     * 
-     * Returns an http-put promise using jQuery
-     * @param settingsOrUrl the url to put
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    put(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any> {
-        return this.request(settingsOrUrl, params, data, preventAutoFail, 'PUT');
-    }
-
-    /**
-     * **Deprecated** 
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson) 
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     * 
-     * Generic http request using jQuery
-     * @param settingsOrUrl the url to get
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @param method the http verb name
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    request(settings: string | AjaxSettings, params: any, data: any, preventAutoFail: boolean, method: string): JQueryPromise<any> {
-
-        // url parameter: auto convert a single value (instead of object of values) to an id=... parameter
-        // tslint:disable-next-line:curly
-        if (typeof params !== 'object' && typeof params !== 'undefined')
-            params = { id: params };
-
-        // if the first parameter is a string, resolve settings
-        if (typeof settings === 'string') {
-            const controllerAction = settings.split('/');
-            const controllerName = controllerAction[0];
-            const actionName = controllerAction[1];
-
-            if (controllerName === '' || actionName === '')
-                console.warn('Error: controller or action not defined. Will continue with likely errors.');
-
-            settings = {
-                controller: controllerName,
-                action: actionName,
-                params,
-                data,
-                url: controllerAction.length > 2 ? settings : null,
-                preventAutoFail,
-            };
-        }
-
-        const defaults = {
-            method: method === null ? 'POST' : method,
-            params: null as any,
-            preventAutoFail: false,
-        };
-        // new 10.25
-        var http = new AjaxPromise(this, this.sxc);
-
-        settings = Object.assign({}, defaults, settings);
-
-        const promise = http.makePromise(settings as AjaxSettings);
-
-        return promise;
-    }
-
-    /**
-     * Will retrieve data from the backend using a standard fetch. 
-     * @param url a full url or short-hand like `controller/method?params` `app/auto/api/controller/method?params`. Note that params would also be specified on the url. 
-     * @param data optional POST data
-     * @param method optional method, defaults to `GET` unless it has data, in which case it defaults to `POST`
-     * @returns a Promise containing a Response object, just like a normal fetch would. 
-     * example: webApi.fetchRaw('Rss/Feed');
-     * example: webApi.fetchRaw(webApi.url('Rss/Feed', { id: 47 })); // url params
-     * example: webApi.fetchRaw('Rss/Feed', { id: 47 }); // post params
-     * example: webApi.fetchRaw(webApi.url('Rss/Feed', { id: 47 }), { something: 'this is a test' }); // url & post params
-     * maybe: webApi.fetchRaw({url: 'Rss/Feed', params: { id: 47 }})
-     * maybe: webApi.fetchRaw({url: ..., params: { ...}, body: { ...}, method: 'GET' })
-     */
-    fetchRaw(url: string, data?: string | Record<string, any>, method?: string): Promise<Response> {
-        const ctxParams = {} as { appId?: number; zoneId?: number; };
-        const ctx = this.sxc.ctx;
-        const urlLower = url.toLocaleLowerCase();
-        if (ctx?._ignoreHeaders && urlLower.includes('app/auto/')) {
-            if (ctx?.appId && !urlLower.includes('appid=')) ctxParams.appId = ctx.appId;
-            if (ctx?.zoneId && !urlLower.includes('zoneId=')) ctxParams.zoneId = ctx.zoneId;
-        }
-        url = this.url(url, ctxParams);
-        method = method || (data ? 'POST' : 'GET');
-        const headers = this.headers(method);
-
-        if (data) {
-            // test if data is a json. If it's not, convert it to json
-            try {
-                JSON.parse(data as string);
-            } catch {
-                data = JSON.stringify(data);
-            }
-        }
-
-        return fetch(url, {
-            headers,
-            method,
-            ...(data && { body: data as string }),
-        });
-    }
-
-    // Note: fetch was documented in v12.10 (December 2021) but will probably never be used externally
-    // So we rename it to fetchRaw and later will make fetch just be the json implementation.
-    // Renamed and added this warning in 13.04 (2022-03-14), will drop in v14 and probably make it do fetchJson by default
-    // Changed functionality in 13.10 (2022-05-04) to make it do fetchJson by default
-    // Changed functionality back in 13.11 (2022-05-10) because it seems that Mobius was published using fetch
-    // Important: Do not document in the docs, as it shouldn't be used
-    /** @internal */
-    fetch(url: string, data?: string | Record<string, any>, method?: string): Promise<Response> {
-        console.warn(`You are calling 'fetch' on the sxc.webApi. This is deprecated will stop in 2sxc v15, please use fetchRaw(...) or fetchJson(...) instead.`)
-        return this.fetchJson(url, data, method);
-    }
-
-    /**
-     * Will retrieve data from the backend using a standard fetch and give you an object. 
-     * @param url a full url or short-hand like `controller/method?params` `app/auto/api/controller/method?params`. Note that params would also be specified on the url. 
-     * @param data optional POST data
-     * @param method optional method, defaults to `GET` unless it has data, in which case it defaults to `POST`
-     * @returns a Promise containing any object.
-     */
-    fetchJson<T = any>(url: string, data?: string | Record<string, any>, method?: string): Promise<T> {
-        return this.fetchRaw(url, data, method).then(response => response.json());
-    }
-
-    /**
-     * All the headers which are needed in an ajax call for this to work reliably.
-     * Use this if you need to get a list of headers in another system
-     */
-    headers(method?: string): Record<string, string> {
-        const headers = this.sxc.root.http.headers(this.sxc.id, this.sxc.cbid, this.sxc.ctx);
-        if (!method) {
-            return headers;
-        }
-
-        switch (method.toLocaleUpperCase()) {
-            case 'GET':
-                headers['Accept'] = 'application/json';
-                break;
-            default:
-                headers['Accept'] = 'application/json';
-                headers['Content-Type'] = 'application/json';
-        }
-        return headers;
-    }
-
-    /**
-     * 
-     * @param url A short, medium or long url. 
-     * Short like `controller/method`, 
-     * medium like `app/auto/api/controller/method`
-     * long like `https://xyz.
-     * In all cases it can also have ?params etc.
-     * @param params Optional parameters as string or object, will be added to url-params. 
-     * @returns In the cases of a short/medium url, 
-     * it will auto-expand to have the full url as needed for an API call. 
-     */
-    url(url: string, params?: string | Record<string, any>): string {
-        if (url == null) return url;
-
-        const urlAndParams = url.split('#')[0].split('?');
-
-        // url fixes
-        url = urlAndParams[0];
-        const urlParts = url.split('/');
-        if (urlParts.length === 2 && urlParts[0] && urlParts[1]) {
-            const controller = urlParts[0];
-            const action = urlParts[1];
-            url = `app/auto/api/${controller}/${action}`;
-        }
-        url = this.sxc.root.http.apiUrl(url);
-
-        // params fixes
-        params = `${urlAndParams[1] || ''}&${params ? typeof params === 'string' ? params : NoJQ.param(params) : ''}`
-            .split('&')
-            .filter(p => !!p)
-            .join('&');
-
-        // result
-        url = [url, params].filter(p => !!p).join('?');
-        return url;
-    }
-}
diff --git a/projects/$2sxc/src/sxc-root/context-identifier.ts b/projects/$2sxc/src/sxc-root/context-identifier.ts
deleted file mode 100644
index 8caf04060..000000000
--- a/projects/$2sxc/src/sxc-root/context-identifier.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * ContextIdentifier is used to initialize a Sxc object outside of the default context.
- */
-export class ContextIdentifier {
-  /**
-   * ZoneId of this Context
-   * @requires zoneId
-   */
-  zoneId: number;
-
-  /**
-   * AppId of this Context
-   * @requires appId
-   */
-  appId: number;
-
-  /** 
-   * PageId of this Context (optional)
-   * @optional
-   */
-  pageId?: number;
-
-  /**
-   * ModuleId of this Context (optional)
-   * @optional
-   */
-  moduleId?: number;
-
-  /**
-   * Exclude pageId and moduleId headers in web requests
-   * @internal
-   */
-  _ignoreHeaders?: boolean;
-
-  /**
-   * Marks the context as complete, so it won't merge in anything else 
-   * WIP #CustomContext ATM for the updated edit-ui
-   * @internal
-   */
-  complete?: boolean;
-
-  /**
-   * WIP #CustomContext not really used yet
-   * @internal
-   */
-  blockId?: number;
-
-  /**
-   * Type Guard to determine if an object is a ContextIdentifier
-   * @param original 
-   * @returns 
-   * @internal
-   */
-  static is(original: unknown): original is ContextIdentifier {
-    const origAsContextId = original as ContextIdentifier;
-    return origAsContextId.zoneId !== undefined && origAsContextId.appId !== undefined;
-  }
-
-  /**
-   * Internal
-   * @param ctx 
-   * @internal
-   */
-  static ensureCompleteOrThrow(ctx: ContextIdentifier): ContextIdentifier {
-    // if it's fulfills the minimum requirements
-    if (ctx.zoneId && ctx.appId) return ctx; 
-  
-    const msg = `It looks like the id given is a ContextIdentifier, but it's missing either zoneId or appId.`;
-    console.error(msg, ctx);
-    throw msg;
-  }
-  
-}
diff --git a/projects/$2sxc/src/sxc-root/debug.ts b/projects/$2sxc/src/sxc-root/debug.ts
deleted file mode 100644
index 92ba22c3a..000000000
--- a/projects/$2sxc/src/sxc-root/debug.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { UrlParams } from '..';
-
-const urlManager = new UrlParams();
-const urlDebugState = urlManager.isDebug() === true;
-
-/** @internal */
-export class Debug {
-    /**
-     * The load-debug state (provided by the url with debug=true)
-     */
-    load: boolean;
-
-    /**
-     * Cache breaker string, contans the version number of 2sxc if one is provided with sxcver=...
-     */
-    uncache: string;
-
-    constructor() {
-        this.load = urlDebugState;
-        this.uncache = urlManager.get('sxcver');
-    }
-}
diff --git a/projects/$2sxc/src/sxc-root/http-global.ts b/projects/$2sxc/src/sxc-root/http-global.ts
deleted file mode 100644
index 701bfd1f7..000000000
--- a/projects/$2sxc/src/sxc-root/http-global.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { ApiExtensionPlaceholder } from '../constants';
-import { AppApiMarker, HasLog, HeaderNames, ToSxcName } from '../../../core';
-import { ContextIdentifier, Environment } from '..';
-
-/**
- * Global HTTP Service for information and helpers on `$2sxc.http`
- */
-export class HttpGlobal extends HasLog {
-    /** @internal */
-    constructor(private env: Environment) {
-        super('Sxc.Http');
-    }
-
-    /**
-     * All the headers which are needed in an ajax call.
-     * @returns Dictionary / Record of headers
-     */
-    headers(): Record<string, string>;
-
-    /**
-     * All the headers which are needed in an ajax call - within a module context.
-     * @param id _optional_ module ID
-     * @returns Dictionary / Record of headers
-     */
-    headers(id: number): Record<string, string>;
-
-    /**
-     * All the headers which are needed in an ajax call - within a module and content-block context.
-     * @param id _optional_ module ID
-     * @param cbid _optional_ content block ID
-     * @returns Dictionary / Record of headers
-     */
-    headers(id: number, cbid: number): Record<string, string>;
-
-    /**
-     * All the headers which are needed in an ajax call.
-     * Uses a module and content-block context (but these could also be null) 
-     * and a full context identifier for advanced operations.
-     * @param id _optional_ module ID
-     * @param cbid _optional_ content block ID
-     * @param ctx _optional_ context information to include in the header
-     * @returns Dictionary / Record of headers
-     */
-    headers(id: number, cbid: number, ctx: ContextIdentifier): Record<string, string>;
-
-    /**
-     * All the headers which are needed in an ajax call.
-     * Uses a module and content-block context (but these could also be null) 
-     * and a full context identifier for advanced operations.
-     * @param id _optional_ module ID
-     * @param cbid _optional_ content block ID
-     * @param ctx _optional_ context information to include in the header
-     * @returns Dictionary / Record of headers
-     */
-    headers(id?: number, cbid?: number, ctx?: ContextIdentifier): Record<string, string> {
-        const cl = this.log.call('headers', `${id}, ${cbid}`);
-        const fHeaders: Record<string, string> = {};
-        const pageId = this.env.page().toString();
-        if (!ctx?._ignoreHeaders) {
-            if (id) fHeaders[HeaderNames.ModuleId] = id.toString();
-            if (cbid) fHeaders[HeaderNames.ContentBlockId] = cbid.toString();
-            fHeaders[HeaderNames.TabId] = pageId;
-            fHeaders[HeaderNames.PageId] = pageId;
-        }
-        fHeaders[this.env.rvtHeader()] = this.env.rvt();
-        return cl.return(fHeaders, `headers(id:${id}, cbid:${cbid})`);
-    }
-
-    /**
-     * Get the API-Root path for a specific extension/endpoint
-     * @param endpointName 
-     * @returns {string}
-     * @memberof Http
-     * @internal Not relevant for 2sxc, only used if calling platform endpoints
-     */
-    apiRoot(endpointName: string): string {
-        const cl = this.log.call('apiRoot');
-        var result = this.env.api().replace(ApiExtensionPlaceholder, endpointName);
-        return cl.return(result, `apiRoot('${endpointName}')`);
-    }
-
-    /**
-     * Get the API-Root path for Apps
-     * new in v12
-     * @param {string} endpointName
-     * @returns {string}
-     * @memberof SxcHttp
-     * @internal
-     */
-     appApiRoot(): string {
-        const cl = this.log.call('appApiRoot');
-        // try to get it, or fall back to the previous / old convention
-        var result = this.env.appApi() ?? this.apiRoot(ToSxcName);
-        return cl.return(result, `appApiRoot()`);
-    }
-
-    /**
-     * Convert short urls like `app/auto/api/Posts/All` to the full URL needed.
-     * Will ignore urls which clearly already are the full url.
-     * @param url short URL like `app/auto/api/Posts/All`
-     * @returns the converted, long url with the full endpoint
-     */
-    apiUrl(url: string): string;
-
-    /**
-     * Convert short urls like `app/auto/api/Posts/All` to the full URL needed.
-     * Will ignore urls which clearly already are the full url.
-     * @param url short URL like `app/auto/api/Posts/All`
-     * @param endpointName _optional_ endpoint name if accessing a different exotic endpoint
-     * @returns the converted, long url with the full endpoint
-     */
-    apiUrl(url: string, endpointName: string): string;
-
-    /**
-     * Convert short urls like `app/auto/api/Posts/All` to the full URL needed.
-     * Will ignore urls which clearly already are the full url.
-     * @param url short URL like `app/auto/api/Posts/All`
-     * @param endpointName _optional_ endpoint name if accessing a different exotic endpoint
-     * @returns the converted, long url with the full endpoint
-     */
-    apiUrl(url: string, endpointName?: string): string
-    {
-        const cl = this.log.call('apiUrl');
-        this.log.add(`apiUrl(url:'${url}', endpointName:'${endpointName}')`);
-
-        // null/undefined check
-        if(url == null) return url;
-
-        // if starts with http: or https: then ignore
-        if(!url || url.indexOf('http:') == 0 || url.indexOf('https:') == 0 || url.indexOf('//') == 0)
-            return cl.return(url);
-
-        // if no endpoint specified, then also skip absolute and relative urls
-        if(!endpointName && (url.indexOf('/') == 0 || url.indexOf('.') == 0))
-            return cl.return(url);
-
-        var baseUrl = url.toLocaleLowerCase().startsWith(AppApiMarker)
-            ? this.appApiRoot()
-            : this.apiRoot(endpointName || ToSxcName);
-
-
-        // ensure base ends with slash
-        if(baseUrl[baseUrl.length-1] != '/') baseUrl += '/';
-        // ensure url doesn't start with slash
-        if(url[0] == '/') url = url.slice(1);
-        return cl.return(baseUrl + url);
-    }
-}
diff --git a/projects/$2sxc/src/sxc-root/index.ts b/projects/$2sxc/src/sxc-root/index.ts
deleted file mode 100644
index 8219ab2b6..000000000
--- a/projects/$2sxc/src/sxc-root/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-
-export * from './context-identifier';
-export * from './sxc-global';
-export * from './debug';
-export * from './sxc-global-bootstrap';
\ No newline at end of file
diff --git a/projects/$2sxc/src/sxc-root/sxc-global-bootstrap.ts b/projects/$2sxc/src/sxc-root/sxc-global-bootstrap.ts
deleted file mode 100644
index e4000efdc..000000000
--- a/projects/$2sxc/src/sxc-root/sxc-global-bootstrap.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-﻿import { TotalPopup } from '../tools/total-popup';
-import { UrlParams } from '../tools/url-params';
-import { Stats } from '../Stats';
-import { Debug, SxcGlobal, Environment } from '..';
-import { Insights, Log, SxcVersion } from '../../../core';
-import { $2sxcGet } from './sxc-global-get';
-import { HttpGlobal } from './http-global';
-
-
-/**
- * Build a SXC Controller for the page. Should only ever be executed once
- * @internal
- */
-export function buildSxcRoot(): SxcGlobal {
-    const rootApiV2 = getRootPartsV2();
-
-    const urlManager = new UrlParams();
-    const debug = new Debug();
-    const stats = new Stats();
-
-
-    const addOn: Partial<SxcGlobal> = {
-        get: $2sxcGet,
-        _controllers: {} as any,
-        beta: {},
-        // 2022-06-01 2dm disabled, believe this is for the old .data
-        // _data: {},
-        // this creates a full-screen iframe-popup and provides a close-command to finish the dialog as needed
-        totalPopup: new TotalPopup(),
-        urlParams: urlManager,
-        // note: I would like to remove this from $2sxc, but it's currently
-        // used both in the inpage-edit and in the dialogs
-        // debug state which is needed in various places
-        debug,
-        stats: stats,
-        insights: (partName: string, index?: number, start?: number, length?: number) => Insights.show(partName, index, start, length),
-        _insights: Insights,
-
-        // 2022-06-01 2dm removed, don't think this is used anywhere
-        // mini-helpers to manage 2sxc parts, a bit like a dependency loader
-        // which will optimize to load min/max depending on debug state
-        // parts: {
-        //     getUrl(url: string, preventUnmin: boolean) {
-        //         // let r = url;// (preventUnmin || !debug.load) ? url : url.replace('.min', ''); // use min or not
-        //         if (debug.uncache && url.indexOf('sxcver') === -1)
-        //             return url + ((url.indexOf('?') === -1) ? '?' : '&') + 'sxcver=' + debug.uncache;
-        //         return url;
-        //     },
-        // },
-    };
-
-    const merged = Object.assign($2sxcGet, addOn, rootApiV2) as SxcGlobal;
-    merged.log.add('sxc controller built');
-
-    console.log(`$2sxc ${SxcVersion} with insights-logging - see https://r.2sxc.org/insights`)
-
-    return merged;
-}
-
-/** @internal */
-function getRootPartsV2(): Partial<SxcGlobal> {
-    const log = new Log('$2sxc', null, 'building');
-    var env = new Environment();
-    return {
-        sysinfo: {
-            version: SxcVersion,
-            description: 'The 2sxc Controller - read more about it on docs.2sxc.org',
-        },
-        env: env,
-        http: new HttpGlobal(env),
-        log: log,
-    };
-}
diff --git a/projects/$2sxc/src/sxc-root/sxc-global-get.ts b/projects/$2sxc/src/sxc-root/sxc-global-get.ts
deleted file mode 100644
index 84faa6f7b..000000000
--- a/projects/$2sxc/src/sxc-root/sxc-global-get.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-﻿import { Sxc, SxcGlobal } from '..';
-import { ContextIdentifier } from './context-identifier';
-
-declare const window: Window;
-// TODO: copied from selectors in inpage project. Probably best to move selectors from inpage to core
-const toolbarSelector = `.sc-menu[toolbar],.sc-menu[data-toolbar],[sxc-toolbar]`;
-const sxcDivsSelector = 'div[data-edit-context]';
-
-/**
- * returns a 2sxc-instance of the id or html-tag passed in
- * @param id
- * @param cbid
- * @returns {}
- * @internal
- */
-export function $2sxcGet(id: number | ContextIdentifier | HTMLElement | Sxc, cbid?: number): Sxc {
-    const $2sxc = window.$2sxc as SxcGlobal;
-    $2sxc.log.add('FindSxcInstance(' + id + ',' + cbid);
-    if (!$2sxc._controllers)
-        throw new Error('$2sxc not initialized yet');
-
-    // Test if it already is such an instance, in which case we just preserve it and return it
-    // Used in cases where the $2sxc(something) is just used to ensure it really is this
-    if (Sxc.is(id)) return id;
-
-    // check if it's a context identifier
-    let ctxId: ContextIdentifier = null;
-    if (ContextIdentifier.is(id)) {
-        id = ContextIdentifier.ensureCompleteOrThrow(id);
-        ctxId = id;
-        // create a fake id, based on zone and app because this is used to identify the object in the cache
-        id = id.zoneId * 100000 + id.appId;
-    } else if (id instanceof HTMLElement && id.matches(toolbarSelector) && !id.closest(sxcDivsSelector)) {
-        // for toolbars that are not inside 2sxc modules (e.g. in skin)
-        const contextAttribute = id.getAttribute('sxc-context');
-        ctxId = JSON.parse(contextAttribute);
-        return $2sxcGet(ctxId);
-    } else if (typeof id === 'object') {
-        // if it's a dom-element, use auto-find
-        const idTuple = autoFind(id);
-        id = idTuple[0];
-        cbid = idTuple[1];
-    }
-
-    // if content-block is unknown, use id of module, and create an ID in the cache
-    if (!cbid) cbid = id;
-    const cacheKey = id + ':' + cbid;
-
-    // either get the cached controller from previous calls, or create a new one
-    if ($2sxc._controllers[cacheKey]) {
-        $2sxc.log.add('Cache found for: ' + cacheKey);
-        return $2sxc._controllers[cacheKey];
-    }
-
-    // 2022-06-01 2dm disabled, believe this is for the old .data
-    // not found, so also init the data-cache in case it's ever needed
-    // if (!$2sxc._data[cacheKey]) $2sxc._data[cacheKey] = {};
-
-    return ($2sxc._controllers[cacheKey]
-        = new Sxc(id, cbid, cacheKey, $2sxc, ctxId));
-}
-
-function autoFind(domElement: HTMLElement): [number, number] {
-    const containerTag = domElement.closest('.sc-content-block');
-    if (!containerTag) return null;
-    const iid = containerTag.getAttribute('data-cb-instance');
-    const cbid = containerTag.getAttribute('data-cb-id');
-    if (!iid || !cbid) return null;
-    return [parseInt(iid, 10), parseInt(cbid, 10)];
-}
diff --git a/projects/$2sxc/src/sxc-root/sxc-global.ts b/projects/$2sxc/src/sxc-root/sxc-global.ts
deleted file mode 100644
index b133b6f08..000000000
--- a/projects/$2sxc/src/sxc-root/sxc-global.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import { UrlParams } from '../tools';
-import { Environment } from '../environment';
-import { Insights, Log } from '../../../core';
-import { ContextIdentifier, Debug, Stats, Sxc, TotalPopup } from '..';
-import { HttpGlobal } from './http-global';
-
-/**
- * This is the root global `window.$2sxc` function / object. 
- * 
- * It is both a function `window.$2sxc(...)` and object `window.$2sxc.insights...`
- * 
- */
-// **Documentation notes**
-// Because of limitations in the documentation, the main function isn't documented here as it wouldn't show in docFx
-// So additional information is in the docs-project
-export interface SxcGlobal {
-    /**
-     * Get an SxcInstance
-     * @param id number: moduleId | HTMLElement: tag in the page | Sxc: an existing sxc - will just be returned | ContextIdentifier: an identifier in complex scenarios without a moduleId/context
-     * @param cbid number
-     * @returns SxcInstance
-     */
-    (id: number | HTMLElement | ContextIdentifier | Sxc, cbid?: number): Sxc;
-
-    
-    /**
-     * Get an SxcInstance
-     * @param id number: moduleId | HTMLElement: tag in the page | Sxc: an existing sxc - will just be returned | ContextIdentifier: an identifier in complex scenarios without a moduleId/context
-     * @param cbid number
-     * @returns SxcInstance
-     * @since v14.01
-     */
-    get(id: number | HTMLElement | ContextIdentifier | Sxc, cbid?: number): Sxc;
-
-    /** @internal */
-    _controllers: { [id: string]: Sxc };
-
-    /** @internal */
-    beta: any;
-
-    // 2022-06-01 2dm disabled, believe this is for the old .data
-    // _data: any;
-
-    /** @internal */
-    _manage: any;
-
-    /** @internal */
-    _translateInit: any;
-
-    /**
-     * 2022-06-01 2dm - I believe this is not used, probably remove
-     * @internal */
-    debug: Debug;
-
-    /** @internal */
-    stats: Stats;
-
-
-    /**
-     * system information, mainly for checking which version of 2sxc is running
-     * note: it's not always updated reliably, but it helps when debugging
-     */
-    sysinfo: {
-        /** the version using the ##.##.## syntax */
-        version: string;
-
-        /** a short text description, for people who have no idea what this is */
-        description: string;
-    };
-
-    /**
-     * Environment information
-     * @type {Environment}
-     */
-    env: Environment;
-
-    /**
-     * Http helper for API calls and such
-     */
-    http: HttpGlobal;
-
-    /**
-     * The debugging / insights system. 
-     * Call the `$2sxc.insights()` without parameters to get instructions what the parameters could be.
-     * @param partName optional name of a part of the system for which we want to see the logs
-     * @param index optional index on that part for which log we want to see
-     * @param start log start index - this is to skip the first few lines if there are too many
-     * @param length amount of lines to show - in some cases will default to 25
-     */
-    insights(partName: string, index?: number, start?: number, length?: number): void;
-
-    /** @internal */
-    _insights: typeof Insights;
-    
-
-    /**
-     * Internal logger to better see what's happening
-     */
-    log: Log;
-
-
-    /**
-     * Helper to work with url parameters behind ? or #
-     * @type {UrlParams}
-     * @memberof SxcRoot
-     */
-    urlParams: UrlParams;
-
-    /**
-     * A helper to create full-screen popups
-     * @internal
-     */
-    totalPopup: TotalPopup;
-}
diff --git a/projects/inpage/src/logging/index.ts b/projects/inpage/src/logging/index.ts
deleted file mode 100644
index 364fc9b35..000000000
--- a/projects/inpage/src/logging/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// Logging system is used from $2sxc API
-/**
- * @internal
- */
-export * from '../../../core';
diff --git a/projects/sxc-typings/dist/$2sxc/src/_/window.d.ts b/projects/sxc-typings/dist/$2sxc/src/_/window.d.ts
index 65dcfe311..b0c432ca4 100644
--- a/projects/sxc-typings/dist/$2sxc/src/_/window.d.ts
+++ b/projects/sxc-typings/dist/$2sxc/src/_/window.d.ts
@@ -1,11 +1,8 @@
 import { SxcGlobal } from '../sxc-global';
 /**
- * Expand the global namespace to ensure Window has $2sxc
+ * export interface WindowInternal extends
  */
 declare global {
-    /**
-     * Window is extended with a `$2sxc` property, which is a reference to the global $2sxc object.
-     */
     interface Window {
         /**
          * The global $2sxc object / function to generate Sxc instances
diff --git a/projects/sxc-typings/dist/$2sxc/src/environment/root-environment.d.ts b/projects/sxc-typings/dist/$2sxc/src/environment/root-environment.d.ts
deleted file mode 100644
index 7b26ca5a4..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/environment/root-environment.d.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { EnvironmentSpecs } from '..';
-import { HasLog } from '../../../core';
-/**
- * Provides environment information to $2sxc - usually page-id, api-root and stuff like that
- */
-export declare class Environment extends HasLog {
-    ready: boolean;
-    source: string;
-    /**
-     * Manually load a new EnvironmentSpecs in cases where the page cannot provide them.
-     * This is only used in scenarios outside of Dnn / Oqtane, you will usually not need this.
-     * @param envSpecs new info to load
-     * @param source _optional_ name where the data came from
-     */
-    load(envSpecs: EnvironmentSpecs, source?: string): void;
-    /**
-     * The API endpoint url from the environment
-     */
-    api(): string;
-    /**
-     * The current page ID - often needed in API calls
-     */
-    page(): number;
-    /**
-     * The request verification token header name for internal WebAPI calls
-     */
-    rvtHeader(): string;
-    /**
-     * The request-verification token for internal WebAPI calls
-     */
-    rvt(): string;
-    /**
-     * The platform code like 'oqt' or 'dnn' in case the JS needs to know the difference
-     */
-    platform(): string;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data-service-base.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data-service-base.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data-service-base.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data.d.ts
deleted file mode 100644
index e10903789..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-data.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { MetadataFor } from '../../data/metadata-for';
-import { SxcDataServiceBase } from './sxc-data-service-base';
-/**
-* Data Service for an App / Sxc-Instance to get/create data of a specific Content-Type
-*/
-export declare class SxcData<T = unknown> extends SxcDataServiceBase {
-    readonly name: string;
-    /**
-     * Get all items of this type.
-     */
-    getAll(): Promise<T[]>;
-    /**
-     * Get the specific item with the ID. It will return null if not found
-     */
-    getOne(id: number): Promise<T> | null;
-    /**
-     * Create a new entity with the values supplied
-     * @param values a simple object containing the values to create
-     */
-    create(values: Record<string, unknown>): Promise<Record<string, unknown>>;
-    /**
-     * Create a new entity with the values supplied and also a metadata-for reference
-     * @param values a simple object containing the values to create
-     */
-    create(values: Record<string, unknown>, metadataFor: MetadataFor | string): Promise<Record<string, unknown>>;
-    /**
-     * Update an existing entity with the values supplied
-     */
-    update(id: number, values: Record<string, unknown>): Promise<Record<string, unknown>>;
-    /**
-     * Delete an entity
-     * @param id id of the item to delete
-     */
-    delete(id: number): Promise<null>;
-    /**
-     * Delete an entity
-     * @param guid GUID of the item to delete
-     */
-    delete(guid: string): Promise<null>;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-query.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-query.d.ts
deleted file mode 100644
index 460b389c4..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/data/sxc-query.d.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { SxcDataServiceBase } from './sxc-data-service-base';
-/**
- * Instance Query Service
- */
-export declare class SxcQuery extends SxcDataServiceBase {
-    readonly name: string;
-    getAll<T = unknown>(): Promise<T>;
-    getAll<T = unknown>(urlParams: string | Record<string, unknown>): Promise<T>;
-    getAll<T = unknown>(urlParams: string | Record<string, unknown>, data: string | Record<string, unknown>): Promise<T>;
-    /**
-     * Get just one stream, returning an array of items in that stream
-     *
-     * @template T
-     * @param {string} stream
-     * @returns {Promise<T[]>} containing an array of items - or empty if stream not found or nothing returned
-     * @memberof SxcQuery
-     */
-    getStream<T = unknown>(stream: string): Promise<T[]>;
-    getStream<T = unknown>(stream: string, urlParams: string | Record<string, unknown>): Promise<T[]>;
-    getStream<T = unknown>(stream: string, urlParams: string | Record<string, unknown>, data: string | Record<string, unknown>): Promise<T[]>;
-    getStreams<T = unknown>(streams: string): Promise<T>;
-    getStreams<T = unknown>(streams: string, urlParams: string | Record<string, unknown>): Promise<T>;
-    getStreams<T = unknown>(streams: string, urlParams: string | Record<string, unknown>, data: string | Record<string, unknown>): Promise<T>;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/index.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/index.d.ts
deleted file mode 100644
index 5d480078b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './sxc';
-export * from './sxc-manage';
-export * from './web-api/sxc-web-api';
-export * from './web-api/ajax-promise';
-export * from './web-api/ajax-settings';
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-cms.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-cms.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-cms.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-manage.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-manage.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-manage.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-part.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-part.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc-part.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc.d.ts
deleted file mode 100644
index f256f4413..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/sxc.d.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { SxcWebApi } from './web-api/sxc-web-api';
-import { HasLog } from '../../../core';
-import { SxcData } from './data/sxc-data';
-import { SxcQuery } from './data/sxc-query';
-import { SxcCms } from './sxc-cms';
-/**
-* The typical sxc-instance object for a specific DNN module or content-block
-*/
-export declare class Sxc extends HasLog {
-    /** the sxc-instance ID, which is usually the DNN Module Id */
-    id: number;
-    /**
-     * content-block ID, which is either the module ID, or the content-block definition entity ID
-     * this is an advanced concept you usually don't care about, otherwise you should research it
-     */
-    cbid: number;
-    webApi: SxcWebApi;
-    /**
-     * CMS operations on this sxc-instance.
-     */
-    cms: SxcCms;
-    /**
-     * TypeGuard for TypeScript to verify this is a SxcInstance
-     * @param thing
-     * @returns
-     */
-    static is(thing: unknown): thing is Sxc;
-    /**
-     * Get a data service for a specific content-type.
-     *
-     * @param {string} contentType name of the content type which this service will get
-     * @returns SxcData<T>
-     * @memberof SxcInstance
-     */
-    data<T = unknown>(contentType: string): SxcData<T>;
-    /**
-     *
-     * @param query
-     * @returns SxcQuery
-     * @memberof SxcInstance
-     */
-    query(query: string): SxcQuery;
-    /**
-     * Test if the current code is in edit-mode and additional javascripts have been loaded to make it work
-     * @returns true if we are in edit-mode
-     */
-    isEditMode(): boolean;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-promise.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-promise.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-promise.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-settings.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-settings.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/ajax-settings.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/sxc-web-api.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/sxc-web-api.d.ts
deleted file mode 100644
index 38c697c43..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-instance/web-api/sxc-web-api.d.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/// <reference types="jquery" />
-import { AjaxSettings } from './ajax-settings';
-/**
- * helper API to run ajax / REST calls to the server
- * it will ensure that the headers etc. are set correctly
- * and that urls are rewritten
- */
-export declare class SxcWebApi {
-    private readonly sxc;
-    /**
-     * **Deprecated**
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson)
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     *
-     * Returns an http-get promise using jQuery
-     * @param settingsOrUrl the url to get
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    get(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any>;
-    /**
-     * **Deprecated**
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson)
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     *
-     * Returns an http-post promise using jQuery
-     * @param settingsOrUrl the url to get
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    post(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any>;
-    /**
-     * **Deprecated**
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson)
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     *
-     * Returns an http-delete promise using jQuery
-     * @param settingsOrUrl the url to talk to
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    delete(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any>;
-    /**
-     * **Deprecated**
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson)
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     *
-     * Returns an http-put promise using jQuery
-     * @param settingsOrUrl the url to put
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    put(settingsOrUrl: string | AjaxSettings, params?: any, data?: any, preventAutoFail?: boolean): JQueryPromise<any>;
-    /**
-     * **Deprecated**
-     * Please use [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchJson)
-     * or [fetchJson()](xref:Api.Js.SxcJs.SxcWebApi.fetchRaw) instead.
-     *
-     * Generic http request using jQuery
-     * @param settingsOrUrl the url to get
-     * @param params jQuery style ajax parameters
-     * @param data jQuery style data for post/put requests
-     * @param preventAutoFail
-     * @param method the http verb name
-     * @returns jQuery ajax promise object
-     * @deprecated use fetchJson instead
-     */
-    request(settings: string | AjaxSettings, params: any, data: any, preventAutoFail: boolean, method: string): JQueryPromise<any>;
-    /**
-     * Will retrieve data from the backend using a standard fetch.
-     * @param url a full url or short-hand like `controller/method?params` `app/auto/api/controller/method?params`. Note that params would also be specified on the url.
-     * @param data optional POST data
-     * @param method optional method, defaults to `GET` unless it has data, in which case it defaults to `POST`
-     * @returns a Promise containing a Response object, just like a normal fetch would.
-     * example: webApi.fetchRaw('Rss/Feed');
-     * example: webApi.fetchRaw(webApi.url('Rss/Feed', { id: 47 })); // url params
-     * example: webApi.fetchRaw('Rss/Feed', { id: 47 }); // post params
-     * example: webApi.fetchRaw(webApi.url('Rss/Feed', { id: 47 }), { something: 'this is a test' }); // url & post params
-     * maybe: webApi.fetchRaw({url: 'Rss/Feed', params: { id: 47 }})
-     * maybe: webApi.fetchRaw({url: ..., params: { ...}, body: { ...}, method: 'GET' })
-     */
-    fetchRaw(url: string, data?: string | Record<string, any>, method?: string): Promise<Response>;
-    /**
-     * Will retrieve data from the backend using a standard fetch and give you an object.
-     * @param url a full url or short-hand like `controller/method?params` `app/auto/api/controller/method?params`. Note that params would also be specified on the url.
-     * @param data optional POST data
-     * @param method optional method, defaults to `GET` unless it has data, in which case it defaults to `POST`
-     * @returns a Promise containing any object.
-     */
-    fetchJson<T = any>(url: string, data?: string | Record<string, any>, method?: string): Promise<T>;
-    /**
-     * All the headers which are needed in an ajax call for this to work reliably.
-     * Use this if you need to get a list of headers in another system
-     */
-    headers(method?: string): Record<string, string>;
-    /**
-     *
-     * @param url A short, medium or long url.
-     * Short like `controller/method`,
-     * medium like `app/auto/api/controller/method`
-     * long like `https://xyz.
-     * In all cases it can also have ?params etc.
-     * @param params Optional parameters as string or object, will be added to url-params.
-     * @returns In the cases of a short/medium url,
-     * it will auto-expand to have the full url as needed for an API call.
-     */
-    url(url: string, params?: string | Record<string, any>): string;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/context-identifier.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/context-identifier.d.ts
deleted file mode 100644
index 235dc4b16..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/context-identifier.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * ContextIdentifier is used to initialize a Sxc object outside of the default context.
- */
-export declare class ContextIdentifier {
-    /**
-     * ZoneId of this Context
-     * @requires zoneId
-     */
-    zoneId: number;
-    /**
-     * AppId of this Context
-     * @requires appId
-     */
-    appId: number;
-    /**
-     * PageId of this Context (optional)
-     * @optional
-     */
-    pageId?: number;
-    /**
-     * ModuleId of this Context (optional)
-     * @optional
-     */
-    moduleId?: number;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/debug.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/debug.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/debug.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/http-global.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/http-global.d.ts
deleted file mode 100644
index 50e39e023..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/http-global.d.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { HasLog } from '../../../core';
-import { ContextIdentifier } from '..';
-/**
- * Global HTTP Service for information and helpers on `$2sxc.http`
- */
-export declare class HttpGlobal extends HasLog {
-    private env;
-    /**
-     * All the headers which are needed in an ajax call.
-     * @returns Dictionary / Record of headers
-     */
-    headers(): Record<string, string>;
-    /**
-     * All the headers which are needed in an ajax call - within a module context.
-     * @param id _optional_ module ID
-     * @returns Dictionary / Record of headers
-     */
-    headers(id: number): Record<string, string>;
-    /**
-     * All the headers which are needed in an ajax call - within a module and content-block context.
-     * @param id _optional_ module ID
-     * @param cbid _optional_ content block ID
-     * @returns Dictionary / Record of headers
-     */
-    headers(id: number, cbid: number): Record<string, string>;
-    /**
-     * All the headers which are needed in an ajax call.
-     * Uses a module and content-block context (but these could also be null)
-     * and a full context identifier for advanced operations.
-     * @param id _optional_ module ID
-     * @param cbid _optional_ content block ID
-     * @param ctx _optional_ context information to include in the header
-     * @returns Dictionary / Record of headers
-     */
-    headers(id: number, cbid: number, ctx: ContextIdentifier): Record<string, string>;
-    /**
-     * Convert short urls like `app/auto/api/Posts/All` to the full URL needed.
-     * Will ignore urls which clearly already are the full url.
-     * @param url short URL like `app/auto/api/Posts/All`
-     * @returns the converted, long url with the full endpoint
-     */
-    apiUrl(url: string): string;
-    /**
-     * Convert short urls like `app/auto/api/Posts/All` to the full URL needed.
-     * Will ignore urls which clearly already are the full url.
-     * @param url short URL like `app/auto/api/Posts/All`
-     * @param endpointName _optional_ endpoint name if accessing a different exotic endpoint
-     * @returns the converted, long url with the full endpoint
-     */
-    apiUrl(url: string, endpointName: string): string;
-}
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/index.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/index.d.ts
deleted file mode 100644
index cde64ee15..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/index.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './context-identifier';
-export * from './sxc-global';
-export * from './debug';
-export * from './sxc-global-bootstrap';
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-bootstrap.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-bootstrap.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-bootstrap.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-get.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-get.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global-get.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global.d.ts b/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global.d.ts
deleted file mode 100644
index 9e96159b3..000000000
--- a/projects/sxc-typings/dist/$2sxc/src/sxc-root/sxc-global.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import { UrlParams } from '../tools';
-import { Environment } from '../environment';
-import { Log } from '../../../core';
-import { ContextIdentifier, Sxc } from '..';
-import { HttpGlobal } from './http-global';
-/**
- * This is the root global `window.$2sxc` function / object.
- *
- * It is both a function `window.$2sxc(...)` and object `window.$2sxc.insights...`
- *
- */
-export interface SxcGlobal {
-    /**
-     * Get an SxcInstance
-     * @param id number: moduleId | HTMLElement: tag in the page | Sxc: an existing sxc - will just be returned | ContextIdentifier: an identifier in complex scenarios without a moduleId/context
-     * @param cbid number
-     * @returns SxcInstance
-     */
-    (id: number | HTMLElement | ContextIdentifier | Sxc, cbid?: number): Sxc;
-    /**
-     * Get an SxcInstance
-     * @param id number: moduleId | HTMLElement: tag in the page | Sxc: an existing sxc - will just be returned | ContextIdentifier: an identifier in complex scenarios without a moduleId/context
-     * @param cbid number
-     * @returns SxcInstance
-     * @since v14.01
-     */
-    get(id: number | HTMLElement | ContextIdentifier | Sxc, cbid?: number): Sxc;
-    /**
-     * system information, mainly for checking which version of 2sxc is running
-     * note: it's not always updated reliably, but it helps when debugging
-     */
-    sysinfo: {
-        /** the version using the ##.##.## syntax */
-        version: string;
-        /** a short text description, for people who have no idea what this is */
-        description: string;
-    };
-    /**
-     * Environment information
-     * @type {Environment}
-     */
-    env: Environment;
-    /**
-     * Http helper for API calls and such
-     */
-    http: HttpGlobal;
-    /**
-     * The debugging / insights system.
-     * Call the `$2sxc.insights()` without parameters to get instructions what the parameters could be.
-     * @param partName optional name of a part of the system for which we want to see the logs
-     * @param index optional index on that part for which log we want to see
-     * @param start log start index - this is to skip the first few lines if there are too many
-     * @param length amount of lines to show - in some cases will default to 25
-     */
-    insights(partName: string, index?: number, start?: number, length?: number): void;
-    /**
-     * Internal logger to better see what's happening
-     */
-    log: Log;
-    /**
-     * Helper to work with url parameters behind ? or #
-     * @type {UrlParams}
-     * @memberof SxcRoot
-     */
-    urlParams: UrlParams;
-}
diff --git a/projects/sxc-typings/dist/core/plumbing/dictionary-value.d.ts b/projects/sxc-typings/dist/core/plumbing/dictionary-value.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/core/plumbing/dictionary-value.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/cms/Cms.d.ts b/projects/sxc-typings/dist/inpage/src/cms/Cms.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/cms/Cms.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts
index 7e408e801..67211cdd6 100644
--- a/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts
@@ -15,6 +15,31 @@ export declare enum CommandNames {
      * `app-import` command will open the dialog to import an App
      */
     appImport = "app-import",
+    /**
+     * `app-resources` will open the edit for app-resources (multi-language texts, labels etc.). It's disabled if the app doesn't have resource-values to configure
+     */
+    appResources = "app-resources",
+    /**
+     * `app-settings` will open the edit dialog for the app-settings. It's disabled if the app doesn't have setting-values to configure
+     */
+    appSettings = "app-settings",
+    /**
+     * `app` will open the app-admin dialog
+     */
+    app = "app",
+    /**
+     * `apps` will open the manage all apps dialog
+     */
+    apps = "apps",
+    /**
+     * `contentitems` will open the dialog to manage content-items for the current template. Will use the settings of the current template to open.
+     *  contentType (optional) - name of data-type to manage/open
+     */
+    contentItems = "contentitems",
+    /**
+     * `contenttype` will open the dialog to view or change the current content-type, meaning you can change what fields it has, their types etc
+     */
+    contentType = "contenttype",
     /**
      * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item
      *
@@ -22,9 +47,104 @@ export declare enum CommandNames {
      * WIP v14.02
      */
     copy = "copy",
+    /**
+     * `custom` will execute custom javascript
+     * customCode - some JS like "alert('hello');"
+     */
+    custom = "custom",
+    /**
+     * `delete` will delete (not just remove) a content-item. Needs:
+     * entityId
+     * entityGuid
+     * entityTitle
+     */
+    delete = "delete",
     /**
      * `edit` command will open the edit-dialog for the current item.
      * In scenarios where we have a list of items and it's currently showing the demo, this will have the same effect as `add`
      */
-    edit = "edit"
+    edit = "edit",
+    /**
+     * `insights-server` command will open the insights logs page
+     */
+    insightsServer = "insights-server",
+    /**
+     * `instance-list` command will open a dialog to manually re-order items in a list. (note: in older versions was called "sort"
+     */
+    instanceList = "instance-list",
+    /**
+     * `layout` command will open the in-page dialog to change the layout of the current content.
+     * [no parameters needed]
+     */
+    layout = "layout",
+    /**
+     * `metadata` command will open the edit-dialog for the current metadata item
+     */
+    metadata = "metadata",
+    /**
+     * `image` command will open the edit-dialog for the metadata of the current image
+     */
+    image = "image",
+    /**
+     * `more` command create a "…" button which flips through the menu-buttons of toolbars
+     */
+    more = "more",
+    /**
+     * `movedown` command moves a content-item down one position in the list
+     * useModuleList: true (required to be true for it to work)
+     * sortOrder: [number] (important so it knows the position)
+     */
+    moveDown = "movedown",
+    /**
+     * `moveup` command moves a content-item up one position in the list
+     * useModuleList: true (required to be true for it to work)
+     * sortOrder: [number] (important so it knows the position)
+     */
+    moveUp = "moveup",
+    /**
+     * `new` command opens the edit-dialog for a new content-item.
+     * contentType
+     *
+     * Then it needs either the ID...:
+     * entityId
+     *
+     * ...or it needs the position within the list:
+     * useModuleList: true
+     * sortOrder: [number] (important so it knows the position
+     */
+    new = "new",
+    /**
+     * `new` command sets new mode used in parameters
+     */
+    newMode = "new",
+    /**
+     * `publish` command tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
+     */
+    publish = "publish",
+    /**
+     * `remove` command removes an item from a list of items.
+     * useModuleList: true (required to be true for it to work)
+     * sortOrder: [number] (important so it knows the position)
+     */
+    remove = "remove",
+    /**
+     * `replace` command will open the dialog to assign a different content-item in this slot on module-assigned content items
+     */
+    replace = "replace",
+    /**
+     * `template-develop` will open the template-editor dialog in a new window. (note: in older versions was called "develop")
+     */
+    templateDevelop = "replace",
+    /**
+     * `template-query` will open the pipeline/query-designer in a new window. It's invisible on content, and disabled if no pipeline is configured
+     */
+    templateQuery = "template-query",
+    /**
+     * `template-settings` will change settings on the template currently used
+     */
+    templateSettings = "template-settings",
+    /**
+     * `zone` will open the manage all apps dialog
+     */
+    zone = "zone"
 }
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command-params.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command-params.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command-params.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/special-commands.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/special-commands.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/special-commands.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/engine/run-parameters.d.ts b/projects/sxc-typings/dist/inpage/src/commands/engine/run-parameters.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/engine/run-parameters.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/engine/run-params.d.ts b/projects/sxc-typings/dist/inpage/src/commands/engine/run-params.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/engine/run-params.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/metadata-for.d.ts b/projects/sxc-typings/dist/inpage/src/commands/metadata-for.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/metadata-for.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/interfaces/hashtable.d.ts b/projects/sxc-typings/dist/inpage/src/interfaces/hashtable.d.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/projects/sxc-typings/dist/inpage/src/interfaces/item-identifiers.d.ts b/projects/sxc-typings/dist/inpage/src/interfaces/item-identifiers.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/interfaces/item-identifiers.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/interfaces/jquery.d.ts b/projects/sxc-typings/dist/inpage/src/interfaces/jquery.d.ts
deleted file mode 100644
index e69de29bb..000000000
diff --git a/projects/sxc-typings/dist/inpage/src/interfaces/sxc-controller-in-page.d.ts b/projects/sxc-typings/dist/inpage/src/interfaces/sxc-controller-in-page.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/interfaces/sxc-controller-in-page.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/interfaces/sxc-instance-editable.d.ts b/projects/sxc-typings/dist/inpage/src/interfaces/sxc-instance-editable.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/interfaces/sxc-instance-editable.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/logging/index.d.ts b/projects/sxc-typings/dist/inpage/src/logging/index.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/logging/index.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/manage/manage.d.ts b/projects/sxc-typings/dist/inpage/src/manage/manage.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/manage/manage.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/sxc/sxc.d.ts b/projects/sxc-typings/dist/inpage/src/sxc/sxc.d.ts
deleted file mode 100644
index 27959d343..000000000
--- a/projects/sxc-typings/dist/inpage/src/sxc/sxc.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { Sxc } from '../../../$2sxc/src';
diff --git a/projects/sxc-typings/dist/inpage/src/toolbar/rules/operators.d.ts b/projects/sxc-typings/dist/inpage/src/toolbar/rules/operators.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/toolbar/rules/operators.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/workflow/workflow-arguments.d.ts b/projects/sxc-typings/dist/inpage/src/workflow/workflow-arguments.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/workflow/workflow-arguments.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/package.json b/projects/sxc-typings/package.json
index 0402f45f9..b7760f973 100644
--- a/projects/sxc-typings/package.json
+++ b/projects/sxc-typings/package.json
@@ -1,5 +1,7 @@
 {
-  "version": "14.02.00",
+  // The version is used in the final NPM.
+  // For beta releases, use pattern "14.02.0-beta.0"
+  "version": "14.02.01-beta.0",
   "types": "./index.d.ts",
   "scripts": {
     "generate": "typings.cmd \".\\dist\"",

From 78ce78af47b1d121e67df285040db3630a99ea50 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 21:56:19 +0200
Subject: [PATCH 12/41] create special $2sxc api to carry objects in url

---
 projects/$2sxc/src/index.ts            |   2 +
 projects/$2sxc/src/tools/obj2url.ts    | 115 +++++++++++++++++++++++++
 projects/$2sxc/src/tools/url-params.ts |  25 +++++-
 3 files changed, 141 insertions(+), 1 deletion(-)
 create mode 100644 projects/$2sxc/src/tools/obj2url.ts

diff --git a/projects/$2sxc/src/index.ts b/projects/$2sxc/src/index.ts
index eddd275fa..20a420da7 100644
--- a/projects/$2sxc/src/index.ts
+++ b/projects/$2sxc/src/index.ts
@@ -1,3 +1,4 @@
+import { ToolUrlObjects } from './tools/obj2url';
 /* 
     This is just a type-index entry point.
     The purpose is that other 2sxc projects in this repo can access all the types
@@ -20,3 +21,4 @@ export * from './sxc';
 
 export * from './sxc-global';
 
+(window as any).beta = new ToolUrlObjects();
\ No newline at end of file
diff --git a/projects/$2sxc/src/tools/obj2url.ts b/projects/$2sxc/src/tools/obj2url.ts
new file mode 100644
index 000000000..b0fc45d4b
--- /dev/null
+++ b/projects/$2sxc/src/tools/obj2url.ts
@@ -0,0 +1,115 @@
+
+// Test code
+// window.beta.toUrl({ hello: 7, name: "daniel", sub: { subname: "mettler", subage: 27, subsub: { and: "like"} }, final: 42, null: null}, "test")
+
+// $2sxc.urlParams.toObj($2sxc.urlParams.toUrl({ v1: 1, v2: 2, v3: { v31: 0, v32: { v321: "daniel" } }, v4: 4}));
+
+/**
+ * Custom converter to pass objects into a URL and back.
+ * @internal
+ */
+export class ToolUrlObjects {
+
+  toUrl(obj: any, encode: boolean = true): string {
+    if (!obj) return '';
+    if (Array.isArray(obj)) throw new Error("only objects can be toUrl(), arrays don't work. Put the array in an object property.");
+    var result = this
+      .toUrlRecursive(obj, null, 0, encode)
+      .filter(x => x != null && x.length > 0);
+    return result.join('&');
+  }
+
+  toObj(value: string, decode: boolean = true, debug: boolean = false): unknown {
+    const parts = this.back(value, decode);
+    if (debug) return parts;
+    return unflatStringsToObj(parts);
+  }
+
+
+  /**
+   * Converts an object to a compact notation with dots.
+   * Recursive, as it needs to also handle sub-objects
+   * @param obj 
+   * @param key 
+   * @param depth 
+   * @returns 
+   */
+  private toUrlRecursive(obj: any, key: string, depth: number, encode: boolean): string[] {
+    if (obj == null) return [];
+    const prefix = depth > 0 ? '.'.repeat(depth - 1) : '';
+
+    if (typeof obj !== 'object') 
+      return [`${prefix}${key}=${encode ? encodeURIComponent(obj) : obj}`];
+
+    const subItem: string[][] = Object.keys(obj)
+      .map(key => this.toUrlRecursive(obj[key], key, depth + 1, encode));
+    if (subItem.length === 0) return [];
+
+    var all = subItem.reduce(function (acc, val) {
+      return acc.concat(Array.isArray(val) ? arrayFlat(val, 2) : val);
+    }, []);
+
+    // Add header entry so the object structure is complete
+    const header = depth > 0 ? [`${prefix}${key}`, null] : [];
+    return header.concat(all);
+  }
+
+  public back(val: string, decode: boolean): Record<string, any> {
+    if (!val || val.length === 0) return [];
+    const parts = val.split('&').filter(x => x.length > 0);
+
+    let result: Record<string, string> = {};
+    let stack: string[] = [];
+
+    for (let i = 0; i < parts.length; i++) {
+      const element = parts[i];
+      const pair = element.split('=');
+      const key = pair[0];
+
+      // count initial dots
+      const dotCount = !key.startsWith('.') ? 0 : key.match(/^\.*/g)[0].length
+
+      // Reset stack?
+      if (dotCount === 0) {
+        stack = key.split('.'); // could have multiple components
+      } else {
+        if (dotCount > stack.length)
+          throw new Error(`Invalid key: ${key} when current stack is ${stack.join('.')}`);
+        const subKey = key.substring(dotCount);
+        stack = stack.slice(0, dotCount);
+        stack.push(subKey);
+        pair[0] = stack.join('.');
+      }
+      result[pair[0]] = pair.length > 1 
+        ? (decode ? decodeURIComponent(pair[1]) : pair[1])
+        : null;
+    }
+    return result;
+  }
+
+}
+
+
+// Recursively reduce sub-arrays to the specified depth
+function arrayFlat(arr: any[], depth: number): any[] {
+
+  // If depth is 0, return the array as-is
+  if (depth < 1) return arr.slice();
+
+  // Otherwise, concatenate into the parent array
+  return arr.reduce(function (acc, val) {
+    return acc.concat(Array.isArray(val) ? arrayFlat(val, depth - 1) : val);
+  }, []);
+};
+
+// https://stackoverflow.com/questions/42694980/how-to-unflatten-a-javascript-object-in-a-daisy-chain-dot-notation-into-an-objec
+function unflatStringsToObj(data: Record<string, any>): any {
+  var result: any = {};
+  for (var rec in data) {
+    var keys = rec.split('.');
+    keys.reduce(function(list, key, j) {
+      return list[key] || (list[key] = isNaN(Number(keys[j + 1])) ? (keys.length - 1 == j ? data[rec] : {}) : [])
+    }, result)
+  }
+  return result
+}
\ No newline at end of file
diff --git a/projects/$2sxc/src/tools/url-params.ts b/projects/$2sxc/src/tools/url-params.ts
index a7a76b8b6..4855b2709 100644
--- a/projects/$2sxc/src/tools/url-params.ts
+++ b/projects/$2sxc/src/tools/url-params.ts
@@ -1,4 +1,5 @@
-﻿/**
+﻿import { ToolUrlObjects } from './obj2url';
+/**
  * Helper object to read url params. 
  * Available on `$2sxc.urlParams`
  */
@@ -62,4 +63,26 @@ export class UrlParams {
     isDebug(): boolean {
         return this.get('debug')?.toLocaleLowerCase() === 'true'
     }
+
+    /**
+     * Convert an object to be used in a URL.
+     * Uses a custom, brief syntax which can change at any time. 
+     * So to unwrap, always use the toObj method.
+     * @param obj 
+     * @returns 
+     * @internal
+     */
+    toUrl(obj: any): string {
+      return new ToolUrlObjects().toUrl(obj, true);
+    }
+
+    /**
+     * Convert a url which was created by toUrl back to an object.
+     * @param url 
+     * @returns
+     * @internal
+     */
+    toObj(url: string): unknown {
+      return new ToolUrlObjects().toObj(url, true);
+    }
 }

From 12d4bdb78f5d61a94d1331fa6a724a47b345bac0 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 22:03:08 +0200
Subject: [PATCH 13/41] minor

---
 projects/$2sxc/src/tools/url-params.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/$2sxc/src/tools/url-params.ts b/projects/$2sxc/src/tools/url-params.ts
index 4855b2709..ed8e923df 100644
--- a/projects/$2sxc/src/tools/url-params.ts
+++ b/projects/$2sxc/src/tools/url-params.ts
@@ -26,7 +26,7 @@ export class UrlParams {
         // if nothing found, try normal URL because DNN places parameters in /key/value notation
         if (results === null) {
             // Otherwise try parts of the URL
-            const matches = window.location.pathname.match(new RegExp('/' + name + '/([^/]+)', 'i'));
+            const matches = location.pathname.match(new RegExp('/' + name + '/([^/]+)', 'i'));
 
             // Check if we found anything, if we do find it, we must reverse the
             // results so we get the "last" one in case there are multiple hits
@@ -35,7 +35,7 @@ export class UrlParams {
         } else
             strResult = results[1];
 
-        return strResult === null || strResult === undefined
+        return strResult == null
             ? ''
             : decodeURIComponent(strResult.replace(/\+/g, ' '));
     }

From b73be0ad318590eec5999abdc54dfdbc960af411 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 22:29:03 +0200
Subject: [PATCH 14/41] fix mistakes

---
 projects/inpage/src/commands/command-names.ts         | 3 ++-
 projects/inpage/src/commands/command/app-resources.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/inpage/src/commands/command-names.ts b/projects/inpage/src/commands/command-names.ts
index 1c4a10110..b009dbbdd 100644
--- a/projects/inpage/src/commands/command-names.ts
+++ b/projects/inpage/src/commands/command-names.ts
@@ -138,6 +138,7 @@ export enum CommandNames {
 
     /**
      * `new` command sets new mode used in parameters
+     * @internal - must move, this shouldn't be here as it's not a command!
      */
     newMode = 'new',
 
@@ -161,7 +162,7 @@ export enum CommandNames {
     /**
      * `template-develop` will open the template-editor dialog in a new window. (note: in older versions was called "develop")
      */
-    templateDevelop = 'replace',
+    templateDevelop = 'template-develop',
 
     /**
      * `template-query` will open the pipeline/query-designer in a new window. It's invisible on content, and disabled if no pipeline is configured
diff --git a/projects/inpage/src/commands/command/app-resources.ts b/projects/inpage/src/commands/command/app-resources.ts
index bad481376..bd8ddfb8b 100644
--- a/projects/inpage/src/commands/command/app-resources.ts
+++ b/projects/inpage/src/commands/command/app-resources.ts
@@ -4,7 +4,7 @@
  * import this module to commands.ts
  * @internal
  */
-Commands.add(CommandNames.appImport, 'AppResources', 'translate', true, false, {
+Commands.add(CommandNames.appResources, 'AppResources', 'translate', true, false, {
     dialog: (_) => CommandNames.edit,
 
     disabled: (context) => context.app.resourcesId === null,

From 3283fa6eafe5662cd65fdf758523b3034bbb3181 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 16 Jun 2022 22:43:48 +0200
Subject: [PATCH 15/41] minor / experimental

---
 .../src/commands/command-link-generator.ts      | 17 +++++++++++++++--
 .../config-loaders/group-config-loader.ts       |  1 -
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/projects/inpage/src/commands/command-link-generator.ts b/projects/inpage/src/commands/command-link-generator.ts
index 66eedee65..956da45dd 100644
--- a/projects/inpage/src/commands/command-link-generator.ts
+++ b/projects/inpage/src/commands/command-link-generator.ts
@@ -1,4 +1,4 @@
-﻿import { ItemIdentifierCopy, ItemIdentifierGroup, ItemIdentifierSimple, ItemIdentifierInField, TemplateIdentifier } from '../../../$2sxc/src/cms';
+﻿import { ItemIdentifierCopy, ItemIdentifierGroup, ItemIdentifierInField, ItemIdentifierSimple, TemplateIdentifier } from '../../../$2sxc/src/cms';
 import { C } from '../constants';
 import { ContextComplete } from '../context/bundles/context-bundle-button';
 import { HasLog, Log } from '../core';
@@ -6,6 +6,9 @@ import { NgUrlValuesWithoutParams } from '../manage/ng-dialog-params';
 import { NoJQ, TypeUnsafe, TypeValue, urlClean } from '../plumbing';
 import { ButtonSafe } from '../toolbar/config';
 
+// 2022-06-16 2dm experimental
+const urlMode2 = false;
+
 /**
  * This is responsible for taking a context with command and everything
  * then building the link for opening the correct dialogs
@@ -80,7 +83,17 @@ export class CommandLinkGenerator extends HasLog {
 
         // initialize root url to dialog
         const rootUrl = this.getDialogUrl(context);
-        return `${rootUrl}#${NoJQ.param(ngDialogParams).replace(/%2F/g, '/')}&${NoJQ.param(urlItems)}${this.debugUrlParam}`;
+
+        let items2 = '';
+        if (urlMode2 && this.items) {
+          try {
+            items2 = '&' + window.$2sxc.urlParams.toUrl({ i2: this.items } );
+            console.log('items2', items2);
+          } catch (e) { /* ignore */ }
+        }
+
+        return `${rootUrl}#${NoJQ.param(ngDialogParams).replace(/%2F/g, '/')}&${NoJQ.param(urlItems)}${this.debugUrlParam}`
+          + items2;
     }
 
     /**
diff --git a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
index 204120786..c944e43ac 100644
--- a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
+++ b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
@@ -70,7 +70,6 @@ export class ButtonGroupConfigLoader extends HasLog {
         const name = Button.splitName(identifier).name;
 
         if (!(Commands.singleton().get(name))) {
-debugger;
             this.log.add(`couldn't find action ${name} - show warning`);
             console.warn('warning: toolbar-button with unknown action-name:', name);
         }

From 274fec691ae23f58de530cad3984c674491ffcff Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 08:55:33 +0200
Subject: [PATCH 16/41] docs

---
 projects/inpage/src/commands/command-names.ts | 124 +++++++++++++-----
 projects/sxc-typings/package.json             |   3 +-
 2 files changed, 90 insertions(+), 37 deletions(-)

diff --git a/projects/inpage/src/commands/command-names.ts b/projects/inpage/src/commands/command-names.ts
index b009dbbdd..a0d2b4c48 100644
--- a/projects/inpage/src/commands/command-names.ts
+++ b/projects/inpage/src/commands/command-names.ts
@@ -4,68 +4,101 @@
  */
 export enum CommandNames {
     /**
-     * `add` command open a `new` dialog to add a new item to a list of items
-     * Note that this is similar to `new` but still not the same
+     * `add` command opens a `new` dialog to create and add a new item to a **list of items**.
+     * <br> The new item is placed after the item the (+) was clicked on.
+     * <br>💡
+     * This is similar to `new` but also adds the item to the existing list of items shown on the page.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
      */
     add = 'add',
 
     /**
-     * `add-existing` command to open a dialog allowing the user to select something to add to a list of items
+     * `add-existing` command opens a dialog allowing the user to select an existing item to add to a **list of items**.
+     * <br> The new item is placed after the item the (+) was clicked on.
+     * <br> 🔘
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
      */
     addExisting = 'add-existing',
 
     /**
-     * `app-import` command will open the dialog to import an App
+     * `app` will open the app-admin dialog
+     * <br> 🔘
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
-    appImport = 'app-import',
+    app = 'app',
 
     /**
-     * `app-resources` will open the edit for app-resources (multi-language texts, labels etc.). It's disabled if the app doesn't have resource-values to configure
+     * `app-import` command will open the dialog to import an App.
+     * <br> 🔘
+     * This is not available on the toolbar.
      */
-    appResources = 'app-resources',
+    appImport = 'app-import',
 
     /**
-     * `app-settings` will open the edit dialog for the app-settings. It's disabled if the app doesn't have setting-values to configure
+     * `app-resources` will open the edit dialog for app-resources (multi-language texts, labels etc.).
+     * <br> 🔘
+     * It's disabled on the toolbar if the app doesn't have resource-values to configure.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
-    appSettings = 'app-settings',
+    appResources = 'app-resources',
 
     /**
-     * `app` will open the app-admin dialog
+     * `app-settings` will open the edit dialog for the app-settings.
+     * <br> 🔘
+     * It's disabled on the toolbar if the app doesn't have setting-values to configure
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
-    app = 'app',
+    appSettings = 'app-settings',
 
     /**
-     * `apps` will open the manage all apps dialog
+     * `apps` will open the manage all apps dialog.
+     * <br> 🔘
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     apps = 'apps',
 
     /**
-     * `contentitems` will open the dialog to manage content-items for the current template. Will use the settings of the current template to open.
-     *  contentType (optional) - name of data-type to manage/open
+     * `contentitems` will open the list to manage all items of a specific content-type.
+     * <br> 🔘
+     * Will use the settings of the current template to open.
+     * It is only shown to elevated admins.
+     * <br>
+     * Parameters
+     * contentType (optional) - name of data-type to manage/open
      */
     contentItems = 'contentitems',
 
     /**
-     * `contenttype` will open the dialog to view or change the current content-type, meaning you can change what fields it has, their types etc
+     * `contenttype` will open the dialog to view or modify fields of a content-type.
+     * <br> 🔘
+     * On a toolbar it will use the content-type of the current item.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     contentType = 'contenttype',
 
     /**
-     * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item
+     * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item.
      *
-     * To work, it also needs `contentTypeName`
-     * WIP v14.02
+     * To work, it also needs `contentType` ...Name?
+     * ⚠️ WIP v14.02
      */
     copy = 'copy',
 
     /**
-     * `custom` will execute custom javascript
-     * customCode - some JS like "alert('hello');"
+     * `custom` will execute custom javascript.
+     * <br> 🔘
+     * This is mainly for toolbars, to add buttons with custom code.
      */
     custom = 'custom',
 
     /**
-     * `delete` will delete (not just remove) a content-item. Needs:
+     * `delete` will delete (not just remove) a content-item.
+     * <br>
+     * 💡 This is similar to `remove` but really deletes the data from the DB.
+     * <br> 🔘
+     * It only appears if the toolbar explicitly asks for it.
+     * <br>
+     * Needs:
      * entityId
      * entityGuid
      * entityTitle
@@ -73,53 +106,65 @@ export enum CommandNames {
     delete = 'delete',
 
     /**
-     * `edit` command will open the edit-dialog for the current item.
-     * In scenarios where we have a list of items and it's currently showing the demo, this will have the same effect as `add`
+     * `edit` command will open an edit-dialog.
+     * <br>
+     * In scenarios where the page is currently showing a demo item, this will have the same effect as `add`
      */
     edit = 'edit',
 
+    /**
+     * `image` command will open the edit-dialog for the metadata of the current image
+     * @internal - may be removed soon
+     */
+     image = 'image',
+
     /**
      * `insights-server` command will open the insights logs page
+     * <br> 🔘
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     insightsServer = 'insights-server',
 
     /**
-     * `instance-list` command will open a dialog to manually re-order items in a list. (note: in older versions was called "sort"
+     * `instance-list` command will open a dialog to manually re-order **items in a list**.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
      */
     instanceList = 'instance-list',
 
     /**
      * `layout` command will open the in-page dialog to change the layout of the current content.
+     * <br>
      * [no parameters needed]
      */
     layout = 'layout',
 
     /**
-     * `metadata` command will open the edit-dialog for the current metadata item
+     * `metadata` command will open the edit-dialog for the current metadata item.
+     * <br> 🔘
+     * It only appears if the toolbar explicitly asks for it.
      */
     metadata = 'metadata',
 
-    /**
-     * `image` command will open the edit-dialog for the metadata of the current image
-     */
-    image = 'image',
-
     /**
      * `more` command create a "…" button which flips through the menu-buttons of toolbars
      */
     more = 'more',
 
     /**
-     * `movedown` command moves a content-item down one position in the list
+     * `movedown` command moves a content-item down one position in a **list of items**.
      * useModuleList: true (required to be true for it to work)
      * sortOrder: [number] (important so it knows the position)
+     * ⚠️ do not use this yet, we plan to change the parameters
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
      */
     moveDown = 'movedown',
 
     /**
-     * `moveup` command moves a content-item up one position in the list
+     * `moveup` command moves a content-item up one position in a **list of items**.
      * useModuleList: true (required to be true for it to work)
      * sortOrder: [number] (important so it knows the position)
+     * ⚠️ do not use this yet, we plan to change the parameters
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
      */
     moveUp = 'moveup',
 
@@ -144,6 +189,8 @@ export enum CommandNames {
 
     /**
      * `publish` command tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
+     * <br> 🔘
+     * Only appears on the toolbar if the item is not published.
      */
     publish = 'publish',
 
@@ -151,6 +198,7 @@ export enum CommandNames {
      * `remove` command removes an item from a list of items.
      * useModuleList: true (required to be true for it to work)
      * sortOrder: [number] (important so it knows the position)
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
      */
     remove = 'remove',
 
@@ -160,22 +208,28 @@ export enum CommandNames {
     replace = 'replace',
 
     /**
-     * `template-develop` will open the template-editor dialog in a new window. (note: in older versions was called "develop")
+     * `template-develop` will open the template-editor dialog in a new window.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     templateDevelop = 'template-develop',
 
     /**
-     * `template-query` will open the pipeline/query-designer in a new window. It's invisible on content, and disabled if no pipeline is configured
+     * `template-query` will open the pipeline/query-designer in a new window.
+     * <br> 🔘It's not available on the simple Content App, only on full Apps.
+     * It is disabled if no query is configured. 
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     templateQuery = 'template-query',
 
     /**
      * `template-settings` will change settings on the template currently used
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     templateSettings = 'template-settings',
 
     /**
-     * `zone` will open the manage all apps dialog
+     * `zone` will open the system dialog for this zone/site.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     zone = 'zone',
 }
diff --git a/projects/sxc-typings/package.json b/projects/sxc-typings/package.json
index b7760f973..c30cb4170 100644
--- a/projects/sxc-typings/package.json
+++ b/projects/sxc-typings/package.json
@@ -1,6 +1,5 @@
 {
-  // The version is used in the final NPM.
-  // For beta releases, use pattern "14.02.0-beta.0"
+  "// notes": "The version is used in the final NPM. For beta releases, use pattern '14.02.0-beta.0'",
   "version": "14.02.01-beta.0",
   "types": "./index.d.ts",
   "scripts": {

From b650b7cb3c26c5f46baf574908031d047a9a2161 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 08:57:22 +0200
Subject: [PATCH 17/41] file renames

---
 ...dd-existing.ts => command-add-existing.ts} |  0
 .../command/{add.ts => command-add.ts}        |  0
 .../{app-import.ts => command-app-import.ts}  |  0
 ...-resources.ts => command-app-resources.ts} |  0
 ...pp-settings.ts => command-app-settings.ts} |  0
 .../command/{app.ts => command-app.ts}        |  0
 .../command/{apps.ts => command-apps.ts}      |  0
 ...tent-items.ts => command-content-items.ts} |  0
 ...ontent-type.ts => command-content-type.ts} |  0
 .../command/{copy.ts => command-copy.ts}      |  0
 .../command/{custom.ts => command-custom.ts}  |  0
 .../command/{delete.ts => command-delete.ts}  |  0
 .../command/{edit.ts => command-edit.ts}      |  0
 .../src/commands/command/command-index.ts     | 40 +++++++++++++++++++
 ...s-server.ts => command-insights-server.ts} |  0
 ...tance-list.ts => command-instance-list.ts} |  0
 .../command/{layout.ts => command-layout.ts}  |  0
 .../{metadata.ts => command-metadata.ts}      |  0
 .../command/{more.ts => command-more.ts}      |  0
 .../{movedown.ts => command-movedown.ts}      |  0
 .../command/{moveup.ts => command-moveup.ts}  |  0
 .../command/{new.ts => command-new.ts}        |  0
 .../{publish.ts => command-publish.ts}        |  0
 .../command/{remove.ts => command-remove.ts}  |  0
 .../{replace.ts => command-replace.ts}        |  0
 ...develop.ts => command-template-develop.ts} |  0
 ...ate-query.ts => command-template-query.ts} |  0
 ...ttings.ts => command-template-settings.ts} |  0
 .../command/{zone.ts => command-zone.ts}      |  0
 projects/inpage/src/commands/command/index.ts | 40 -------------------
 projects/inpage/src/commands/index.ts         |  2 +-
 31 files changed, 41 insertions(+), 41 deletions(-)
 rename projects/inpage/src/commands/command/{add-existing.ts => command-add-existing.ts} (100%)
 rename projects/inpage/src/commands/command/{add.ts => command-add.ts} (100%)
 rename projects/inpage/src/commands/command/{app-import.ts => command-app-import.ts} (100%)
 rename projects/inpage/src/commands/command/{app-resources.ts => command-app-resources.ts} (100%)
 rename projects/inpage/src/commands/command/{app-settings.ts => command-app-settings.ts} (100%)
 rename projects/inpage/src/commands/command/{app.ts => command-app.ts} (100%)
 rename projects/inpage/src/commands/command/{apps.ts => command-apps.ts} (100%)
 rename projects/inpage/src/commands/command/{content-items.ts => command-content-items.ts} (100%)
 rename projects/inpage/src/commands/command/{content-type.ts => command-content-type.ts} (100%)
 rename projects/inpage/src/commands/command/{copy.ts => command-copy.ts} (100%)
 rename projects/inpage/src/commands/command/{custom.ts => command-custom.ts} (100%)
 rename projects/inpage/src/commands/command/{delete.ts => command-delete.ts} (100%)
 rename projects/inpage/src/commands/command/{edit.ts => command-edit.ts} (100%)
 create mode 100644 projects/inpage/src/commands/command/command-index.ts
 rename projects/inpage/src/commands/command/{insights-server.ts => command-insights-server.ts} (100%)
 rename projects/inpage/src/commands/command/{instance-list.ts => command-instance-list.ts} (100%)
 rename projects/inpage/src/commands/command/{layout.ts => command-layout.ts} (100%)
 rename projects/inpage/src/commands/command/{metadata.ts => command-metadata.ts} (100%)
 rename projects/inpage/src/commands/command/{more.ts => command-more.ts} (100%)
 rename projects/inpage/src/commands/command/{movedown.ts => command-movedown.ts} (100%)
 rename projects/inpage/src/commands/command/{moveup.ts => command-moveup.ts} (100%)
 rename projects/inpage/src/commands/command/{new.ts => command-new.ts} (100%)
 rename projects/inpage/src/commands/command/{publish.ts => command-publish.ts} (100%)
 rename projects/inpage/src/commands/command/{remove.ts => command-remove.ts} (100%)
 rename projects/inpage/src/commands/command/{replace.ts => command-replace.ts} (100%)
 rename projects/inpage/src/commands/command/{template-develop.ts => command-template-develop.ts} (100%)
 rename projects/inpage/src/commands/command/{template-query.ts => command-template-query.ts} (100%)
 rename projects/inpage/src/commands/command/{template-settings.ts => command-template-settings.ts} (100%)
 rename projects/inpage/src/commands/command/{zone.ts => command-zone.ts} (100%)
 delete mode 100644 projects/inpage/src/commands/command/index.ts

diff --git a/projects/inpage/src/commands/command/add-existing.ts b/projects/inpage/src/commands/command/command-add-existing.ts
similarity index 100%
rename from projects/inpage/src/commands/command/add-existing.ts
rename to projects/inpage/src/commands/command/command-add-existing.ts
diff --git a/projects/inpage/src/commands/command/add.ts b/projects/inpage/src/commands/command/command-add.ts
similarity index 100%
rename from projects/inpage/src/commands/command/add.ts
rename to projects/inpage/src/commands/command/command-add.ts
diff --git a/projects/inpage/src/commands/command/app-import.ts b/projects/inpage/src/commands/command/command-app-import.ts
similarity index 100%
rename from projects/inpage/src/commands/command/app-import.ts
rename to projects/inpage/src/commands/command/command-app-import.ts
diff --git a/projects/inpage/src/commands/command/app-resources.ts b/projects/inpage/src/commands/command/command-app-resources.ts
similarity index 100%
rename from projects/inpage/src/commands/command/app-resources.ts
rename to projects/inpage/src/commands/command/command-app-resources.ts
diff --git a/projects/inpage/src/commands/command/app-settings.ts b/projects/inpage/src/commands/command/command-app-settings.ts
similarity index 100%
rename from projects/inpage/src/commands/command/app-settings.ts
rename to projects/inpage/src/commands/command/command-app-settings.ts
diff --git a/projects/inpage/src/commands/command/app.ts b/projects/inpage/src/commands/command/command-app.ts
similarity index 100%
rename from projects/inpage/src/commands/command/app.ts
rename to projects/inpage/src/commands/command/command-app.ts
diff --git a/projects/inpage/src/commands/command/apps.ts b/projects/inpage/src/commands/command/command-apps.ts
similarity index 100%
rename from projects/inpage/src/commands/command/apps.ts
rename to projects/inpage/src/commands/command/command-apps.ts
diff --git a/projects/inpage/src/commands/command/content-items.ts b/projects/inpage/src/commands/command/command-content-items.ts
similarity index 100%
rename from projects/inpage/src/commands/command/content-items.ts
rename to projects/inpage/src/commands/command/command-content-items.ts
diff --git a/projects/inpage/src/commands/command/content-type.ts b/projects/inpage/src/commands/command/command-content-type.ts
similarity index 100%
rename from projects/inpage/src/commands/command/content-type.ts
rename to projects/inpage/src/commands/command/command-content-type.ts
diff --git a/projects/inpage/src/commands/command/copy.ts b/projects/inpage/src/commands/command/command-copy.ts
similarity index 100%
rename from projects/inpage/src/commands/command/copy.ts
rename to projects/inpage/src/commands/command/command-copy.ts
diff --git a/projects/inpage/src/commands/command/custom.ts b/projects/inpage/src/commands/command/command-custom.ts
similarity index 100%
rename from projects/inpage/src/commands/command/custom.ts
rename to projects/inpage/src/commands/command/command-custom.ts
diff --git a/projects/inpage/src/commands/command/delete.ts b/projects/inpage/src/commands/command/command-delete.ts
similarity index 100%
rename from projects/inpage/src/commands/command/delete.ts
rename to projects/inpage/src/commands/command/command-delete.ts
diff --git a/projects/inpage/src/commands/command/edit.ts b/projects/inpage/src/commands/command/command-edit.ts
similarity index 100%
rename from projects/inpage/src/commands/command/edit.ts
rename to projects/inpage/src/commands/command/command-edit.ts
diff --git a/projects/inpage/src/commands/command/command-index.ts b/projects/inpage/src/commands/command/command-index.ts
new file mode 100644
index 000000000..574d6b535
--- /dev/null
+++ b/projects/inpage/src/commands/command/command-index.ts
@@ -0,0 +1,40 @@
+// TODO
+
+// tslint:disable: align
+
+/** @internal */ export * from './shared-logic';
+/** @internal */ import './command-add';
+/** @internal */ import './command-add-existing';
+/** @internal */ import './command-app';
+/** @internal */ import './command-app-import';
+/** @internal */ import './command-app-resources';
+/** @internal */ import './command-app-settings';
+/** @internal */ import './command-apps';
+/** @internal */ import './command-content-items';
+/** @internal */ import './command-content-type';
+/** @internal */ import './command-copy';
+/** @internal */ import './command-custom';
+/** @internal */ import './command-delete';
+/** @internal */ import './command-edit';
+/** @internal */ import './command-insights-server';
+/** @internal */ import './command-instance-list';
+/** @internal */ import './command-layout';
+/** @internal */ import './command-metadata';
+/** @internal */ import './command-more';
+/** @internal */ import './command-movedown';
+/** @internal */ import './command-moveup';
+/** @internal */ import './command-new';
+/** @internal */ import './command-publish';
+/** @internal */ import './command-remove';
+/** @internal */ import './command-replace';
+/** @internal */ import './command-template-develop';
+/** @internal */ import './command-template-query';
+/** @internal */ import './command-template-settings';
+/** @internal */ import './command-zone';
+
+
+/** @internal */ export * from './content-list-action-params';
+/** @internal */ export * from './content-list-actions';
+
+// Workflow
+/** @internal */ export * from './workflow-commands';
diff --git a/projects/inpage/src/commands/command/insights-server.ts b/projects/inpage/src/commands/command/command-insights-server.ts
similarity index 100%
rename from projects/inpage/src/commands/command/insights-server.ts
rename to projects/inpage/src/commands/command/command-insights-server.ts
diff --git a/projects/inpage/src/commands/command/instance-list.ts b/projects/inpage/src/commands/command/command-instance-list.ts
similarity index 100%
rename from projects/inpage/src/commands/command/instance-list.ts
rename to projects/inpage/src/commands/command/command-instance-list.ts
diff --git a/projects/inpage/src/commands/command/layout.ts b/projects/inpage/src/commands/command/command-layout.ts
similarity index 100%
rename from projects/inpage/src/commands/command/layout.ts
rename to projects/inpage/src/commands/command/command-layout.ts
diff --git a/projects/inpage/src/commands/command/metadata.ts b/projects/inpage/src/commands/command/command-metadata.ts
similarity index 100%
rename from projects/inpage/src/commands/command/metadata.ts
rename to projects/inpage/src/commands/command/command-metadata.ts
diff --git a/projects/inpage/src/commands/command/more.ts b/projects/inpage/src/commands/command/command-more.ts
similarity index 100%
rename from projects/inpage/src/commands/command/more.ts
rename to projects/inpage/src/commands/command/command-more.ts
diff --git a/projects/inpage/src/commands/command/movedown.ts b/projects/inpage/src/commands/command/command-movedown.ts
similarity index 100%
rename from projects/inpage/src/commands/command/movedown.ts
rename to projects/inpage/src/commands/command/command-movedown.ts
diff --git a/projects/inpage/src/commands/command/moveup.ts b/projects/inpage/src/commands/command/command-moveup.ts
similarity index 100%
rename from projects/inpage/src/commands/command/moveup.ts
rename to projects/inpage/src/commands/command/command-moveup.ts
diff --git a/projects/inpage/src/commands/command/new.ts b/projects/inpage/src/commands/command/command-new.ts
similarity index 100%
rename from projects/inpage/src/commands/command/new.ts
rename to projects/inpage/src/commands/command/command-new.ts
diff --git a/projects/inpage/src/commands/command/publish.ts b/projects/inpage/src/commands/command/command-publish.ts
similarity index 100%
rename from projects/inpage/src/commands/command/publish.ts
rename to projects/inpage/src/commands/command/command-publish.ts
diff --git a/projects/inpage/src/commands/command/remove.ts b/projects/inpage/src/commands/command/command-remove.ts
similarity index 100%
rename from projects/inpage/src/commands/command/remove.ts
rename to projects/inpage/src/commands/command/command-remove.ts
diff --git a/projects/inpage/src/commands/command/replace.ts b/projects/inpage/src/commands/command/command-replace.ts
similarity index 100%
rename from projects/inpage/src/commands/command/replace.ts
rename to projects/inpage/src/commands/command/command-replace.ts
diff --git a/projects/inpage/src/commands/command/template-develop.ts b/projects/inpage/src/commands/command/command-template-develop.ts
similarity index 100%
rename from projects/inpage/src/commands/command/template-develop.ts
rename to projects/inpage/src/commands/command/command-template-develop.ts
diff --git a/projects/inpage/src/commands/command/template-query.ts b/projects/inpage/src/commands/command/command-template-query.ts
similarity index 100%
rename from projects/inpage/src/commands/command/template-query.ts
rename to projects/inpage/src/commands/command/command-template-query.ts
diff --git a/projects/inpage/src/commands/command/template-settings.ts b/projects/inpage/src/commands/command/command-template-settings.ts
similarity index 100%
rename from projects/inpage/src/commands/command/template-settings.ts
rename to projects/inpage/src/commands/command/command-template-settings.ts
diff --git a/projects/inpage/src/commands/command/zone.ts b/projects/inpage/src/commands/command/command-zone.ts
similarity index 100%
rename from projects/inpage/src/commands/command/zone.ts
rename to projects/inpage/src/commands/command/command-zone.ts
diff --git a/projects/inpage/src/commands/command/index.ts b/projects/inpage/src/commands/command/index.ts
deleted file mode 100644
index 15ba19d57..000000000
--- a/projects/inpage/src/commands/command/index.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// TODO
-
-// tslint:disable: align
-
-/** @internal */ export * from './shared-logic';
-/** @internal */ import './add';
-/** @internal */ import './add-existing';
-/** @internal */ import './app';
-/** @internal */ import './app-import';
-/** @internal */ import './app-resources';
-/** @internal */ import './app-settings';
-/** @internal */ import './apps';
-/** @internal */ import './content-items';
-/** @internal */ import './content-type';
-/** @internal */ import './copy';
-/** @internal */ import './custom';
-/** @internal */ import './delete';
-/** @internal */ import './edit';
-/** @internal */ import './insights-server';
-/** @internal */ import './instance-list';
-/** @internal */ import './layout';
-/** @internal */ import './metadata';
-/** @internal */ import './more';
-/** @internal */ import './movedown';
-/** @internal */ import './moveup';
-/** @internal */ import './new';
-/** @internal */ import './publish';
-/** @internal */ import './remove';
-/** @internal */ import './replace';
-/** @internal */ import './template-develop';
-/** @internal */ import './template-query';
-/** @internal */ import './template-settings';
-/** @internal */ import './zone';
-
-
-/** @internal */ export * from './content-list-action-params';
-/** @internal */ export * from './content-list-actions';
-
-// Workflow
-/** @internal */ export * from './workflow-commands';
diff --git a/projects/inpage/src/commands/index.ts b/projects/inpage/src/commands/index.ts
index 5a7c4c840..a9fd71a05 100644
--- a/projects/inpage/src/commands/index.ts
+++ b/projects/inpage/src/commands/index.ts
@@ -3,7 +3,7 @@ export * from './command-names';
 export * from './command-code';
 export * from './command';
 export * from './commands';
-export * from './command/index';
+export * from './command/command-index';
 export * from '../../../$2sxc/src/cms/command-params';
 export * from './engine/cms-engine';
 export * from './command-code';

From 707c770c4c2e6c5acf5a7f502b0983c0c6560d41 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 09:58:42 +0200
Subject: [PATCH 18/41] ongoing docs

---
 projects/inpage/src/commands/command-names.ts | 18 ++++--
 .../commands/command/command-content-items.ts | 61 ++++++++++---------
 .../commands/command/command-content-type.ts  | 41 +++++++++----
 .../src/commands/command/command-copy.ts      | 26 +++++---
 .../src/commands/command/command-movedown.ts  |  2 +-
 .../src/commands/command/command-publish.ts   |  4 +-
 .../command/{command-index.ts => index.ts}    |  0
 projects/inpage/src/commands/index.ts         |  2 +-
 8 files changed, 94 insertions(+), 60 deletions(-)
 rename projects/inpage/src/commands/command/{command-index.ts => index.ts} (100%)

diff --git a/projects/inpage/src/commands/command-names.ts b/projects/inpage/src/commands/command-names.ts
index a0d2b4c48..fd8ffeee8 100644
--- a/projects/inpage/src/commands/command-names.ts
+++ b/projects/inpage/src/commands/command-names.ts
@@ -1,3 +1,11 @@
+// Documentation notes
+//
+// You cannot use @see in the docs, it doesn't work with docFx
+// Instead, always use [text](xref:Api.Js.SxcJs.CommandNames)
+// or similar
+//
+// End documentation notes
+
 
 /**
  * Names of commands known to 2sxc CMS - for use in toolbars and calling commands directly from code
@@ -62,9 +70,7 @@ export enum CommandNames {
      * <br> 🔘
      * Will use the settings of the current template to open.
      * It is only shown to elevated admins.
-     * <br>
-     * Parameters
-     * contentType (optional) - name of data-type to manage/open
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentItemsParams)
      */
     contentItems = 'contentitems',
 
@@ -73,14 +79,14 @@ export enum CommandNames {
      * <br> 🔘
      * On a toolbar it will use the content-type of the current item.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentTypeParams)
      */
     contentType = 'contenttype',
 
     /**
      * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item.
-     *
-     * To work, it also needs `contentType` ...Name?
-     * ⚠️ WIP v14.02
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandCopyParams)
+     * <br> 🆕 in v14.03
      */
     copy = 'copy',
 
diff --git a/projects/inpage/src/commands/command/command-content-items.ts b/projects/inpage/src/commands/command/command-content-items.ts
index 2bb1ab71b..8a89d2d79 100644
--- a/projects/inpage/src/commands/command/command-content-items.ts
+++ b/projects/inpage/src/commands/command/command-content-items.ts
@@ -1,40 +1,43 @@
 ﻿import { CommandNames, Commands } from '..';
+import { CommandContentTypeParams, createContentTypeParams } from './command-content-type';
+
 
 /**
  * import this module to commands.ts
  * @internal
  */
 Commands.add(CommandNames.contentItems, 'ContentItems', 'table', true, false, {
-    addParamsToLink: (context) => {
-        const typeName = context.button.command.params.contentType
-            || context.contentBlock.contentTypeId;
-        return {
-            // old name for the previous UI
-            // 2021-11-29 2dm - believe this is obsolete, will turn off and see if everything works
-            // #cleanUp EOY 2021
-            // contentTypeName: typeName,
-
-            // new name for the new UI
-            contentType: typeName,
-        };
-    },
+  addParamsToLink: createContentTypeParams,
 
-    // only show to admin-users and in cases where we know the content-type
-    showCondition: (context) => {
-        return !!context.user.CanAdmin &&
-            (!!context.button.command.params.contentType ||
-                !!context.contentBlock.contentTypeId);
-    },
+  // only show to admin-users and in cases where we know the content-type
+  showCondition: (context) => {
+    return !!context.user.CanAdmin && !!createContentTypeParams(context).contentType;
+  },
 
-    configureLinkGenerator: (context, linkGenerator) => {
-        if (context.button.command.params.filters) {
-            let enc = JSON.stringify(context.button.command.params.filters);
+  configureLinkGenerator: (context, linkGenerator) => {
+    if (context.button.command.params.filters) {
+      let enc = JSON.stringify(context.button.command.params.filters);
 
-            // special case - if it contains a "+" character, this won't survive
-            // encoding through the hash as it's always replaced with a space, even if it would be pre converted to %2b
-            // so we're base64 encoding it - see https://github.com/2sic/2sxc/issues/1061
-            if (enc.indexOf('+') > -1) enc = btoa(enc);
-            linkGenerator.urlParams.filters = enc;
-        }
-    },
+      // special case - if it contains a "+" character, this won't survive
+      // encoding through the hash as it's always replaced with a space, even if it would be pre converted to %2b
+      // so we're base64 encoding it - see https://github.com/2sic/2sxc/issues/1061
+      if (enc.indexOf('+') > -1) enc = btoa(enc);
+      linkGenerator.urlParams.filters = enc;
+    }
+  },
 });
+
+/**
+ * Parameters used for the command `contentitems`
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandContentItemsParams extends CommandContentTypeParams {
+  /**
+   * Filters to apply to the list of items.
+   * <br>
+   * Each property targets a field.
+   * The value is a string, number or array for filtering EntityIds or EntityGuids
+   */
+  filters?: Record<string, string | number | string[] | number[]>;
+}
diff --git a/projects/inpage/src/commands/command/command-content-type.ts b/projects/inpage/src/commands/command/command-content-type.ts
index 872b9358e..1a3023f91 100644
--- a/projects/inpage/src/commands/command/command-content-type.ts
+++ b/projects/inpage/src/commands/command/command-content-type.ts
@@ -1,20 +1,39 @@
 ﻿import { CommandNames, Commands } from '..';
+import { ContextComplete } from '../../context';
 
 /**
  * import this module to commands.ts
  * @internal
  */
 Commands.add(CommandNames.contentType, 'ContentType', 'fields', true, false, {
-    addParamsToLink: (context) => ({
-        // added in 10.27 to help with the new edit ui
-        contentType: context.button.command.params.contentType
-            || context.contentBlock.contentTypeId,
-    }),
+  addParamsToLink: createContentTypeParams,
 
-    // only show to admin-users and in cases where we know the content-type
-    showCondition: (context) => {
-        return !!context.user.CanDevelop &&
-            (!!context.button.command.params.contentType ||
-                !!context.contentBlock.contentTypeId);
-    },
+  // only show to admin-users and in cases where we know the content-type
+  showCondition: (context) => {
+    return !!context.user.CanDevelop && !!createContentTypeParams(context).contentType;
+  },
 });
+
+
+/**
+ * Parameters used for the command `contenttype`.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandContentTypeParams {
+  /**
+   * The content-type name determines what items will be managed.
+   */
+  contentType: string;
+}
+
+/**
+ * @internal
+ */
+export function createContentTypeParams(context: ContextComplete) {
+  const result: CommandContentTypeParams = {
+    contentType: context.button.command.params.contentType
+    || context.contentBlock.contentTypeId,
+  };
+  return result;
+}
diff --git a/projects/inpage/src/commands/command/command-copy.ts b/projects/inpage/src/commands/command/command-copy.ts
index 3e068c393..99c9f3752 100644
--- a/projects/inpage/src/commands/command/command-copy.ts
+++ b/projects/inpage/src/commands/command/command-copy.ts
@@ -1,4 +1,5 @@
 ﻿import { CommandNames, Commands } from '..';
+import { CommandContentTypeParams, createContentTypeParams } from './command-content-type';
 
 /**
  * open an edit-item dialog
@@ -14,18 +15,23 @@ Commands.add(CommandNames.copy, 'Copy', 'copy', false, true, {
     return !!ctx.button.command.params.entityId;
   },
 
-  // TODO: MAKE IT DISABLED IF DATA IS MISSING
-  // disabled(context) {
-  //     return !context.instance.allowPublish;
-  // },
-
   configureLinkGenerator: (ctx, linkGenerator) => {
-    // console.warn('debug link generator, ', ctx);
-    // console.warn('items, ', linkGenerator.items);
     const originalId = ctx.button.command.params.entityId;
-    const typeName = ctx.button.command.params.contentTypeName;
-    if (!typeName) throw new Error("can't copy: missing contentTypeName");
+    // TODO: DROP USE OF contentTypeName as soon as we fixed the events-app
+    const typeName = createContentTypeParams(ctx).contentType;
+    if (!typeName) throw new Error("can't copy: missing contentType");
     linkGenerator.items = [{ DuplicateEntity: originalId, ContentTypeName: typeName }];
-    // console.warn('items, ', linkGenerator.items);
   },
 });
+
+/**
+ * Parameters used for the command `copy`
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandCopyParams extends CommandContentTypeParams {
+  /**
+   * Entity to copy, required or the button won't even appear.
+   */
+  entityId: number;
+}
diff --git a/projects/inpage/src/commands/command/command-movedown.ts b/projects/inpage/src/commands/command/command-movedown.ts
index f22c0fa27..5f43f716c 100644
--- a/projects/inpage/src/commands/command/command-movedown.ts
+++ b/projects/inpage/src/commands/command/command-movedown.ts
@@ -1,4 +1,4 @@
-﻿import { Commands, SharedLogic, CommandNames } from '..';
+﻿import { CommandNames, Commands, SharedLogic } from '..';
 import { Actions } from './content-list-actions';
 
 /**
diff --git a/projects/inpage/src/commands/command/command-publish.ts b/projects/inpage/src/commands/command/command-publish.ts
index d4608ce34..7f22946c8 100644
--- a/projects/inpage/src/commands/command/command-publish.ts
+++ b/projects/inpage/src/commands/command/command-publish.ts
@@ -1,6 +1,6 @@
-﻿import { Actions } from './content-list-actions';
-import { CommandNames, Commands } from '..';
+﻿import { CommandNames, Commands } from '..';
 import { translate } from '../../i18n';
+import { Actions } from './content-list-actions';
 
 /**
  * todo: shouldn't be available if changes are not allowed
diff --git a/projects/inpage/src/commands/command/command-index.ts b/projects/inpage/src/commands/command/index.ts
similarity index 100%
rename from projects/inpage/src/commands/command/command-index.ts
rename to projects/inpage/src/commands/command/index.ts
diff --git a/projects/inpage/src/commands/index.ts b/projects/inpage/src/commands/index.ts
index a9fd71a05..a8ea52541 100644
--- a/projects/inpage/src/commands/index.ts
+++ b/projects/inpage/src/commands/index.ts
@@ -3,7 +3,7 @@ export * from './command-names';
 export * from './command-code';
 export * from './command';
 export * from './commands';
-export * from './command/command-index';
+export * from './command/';
 export * from '../../../$2sxc/src/cms/command-params';
 export * from './engine/cms-engine';
 export * from './command-code';

From f44bddc75481d5e9582d4f2472c3e799abbb157f Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 12:06:23 +0200
Subject: [PATCH 19/41] fix bug dnn menu of 14.02 and clean up
 https://github.com/2sic/2sxc/issues/2789

---
 projects/$2sxc/src/cms/run-params.ts          |  3 +-
 .../dnn/{dnn-workarounds => }/dnn-08.00.04.ts |  0
 .../dnn/dnn-menu-helper/dnn-inpage-edit.ts    | 35 -----------------
 projects/inpage/src/dnn/index.ts              |  3 +-
 .../src/dnn/{dnn-workarounds => }/readme.md   |  0
 projects/inpage/src/index.ts                  | 12 ++----
 .../inpage/src/interfaces/window-in-page.ts   |  4 +-
 projects/inpage/src/manage/edit-manager.ts    |  1 -
 .../inpage/src/manage/sxc-global-manage.ts    | 21 ++--------
 projects/inpage/src/sxc/sxc-cms-real.ts       | 38 +++++++++++++++++++
 10 files changed, 49 insertions(+), 68 deletions(-)
 rename projects/inpage/src/dnn/{dnn-workarounds => }/dnn-08.00.04.ts (100%)
 delete mode 100644 projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts
 rename projects/inpage/src/dnn/{dnn-workarounds => }/readme.md (100%)
 create mode 100644 projects/inpage/src/sxc/sxc-cms-real.ts

diff --git a/projects/$2sxc/src/cms/run-params.ts b/projects/$2sxc/src/cms/run-params.ts
index 2818cbfa3..59bf6a91a 100644
--- a/projects/$2sxc/src/cms/run-params.ts
+++ b/projects/$2sxc/src/cms/run-params.ts
@@ -8,8 +8,9 @@ import { CommandParams } from './command-params';
 export interface RunParams {
   /**
    * The action to perform.
-   * Required if you don't have params which themselves have the action
+   * Required.
    */
+  // ATM actually required if you don't have params which themselves have the action, but we plan to change that it's always on this
   action?: string;
 
   /**
diff --git a/projects/inpage/src/dnn/dnn-workarounds/dnn-08.00.04.ts b/projects/inpage/src/dnn/dnn-08.00.04.ts
similarity index 100%
rename from projects/inpage/src/dnn/dnn-workarounds/dnn-08.00.04.ts
rename to projects/inpage/src/dnn/dnn-08.00.04.ts
diff --git a/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts b/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts
deleted file mode 100644
index e7be5842b..000000000
--- a/projects/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿import { Sxc } from '../../../../$2sxc/src';
-import { CommandNames } from '../../commands';
-import { HasLog, Insights } from '../../core';
-import { EditManager } from '../../manage/edit-manager';
-
-
-/**
- * Maps actions of the module menu to JS actions - needed because onclick event can't be set (actually, a bug in DNN)
- * @internal
- */
-export class DnnActionMenu extends HasLog {
-    private run: typeof EditManager.prototype.run;
-    private sxc: Sxc;
-
-    constructor(moduleId: number) {
-        super('Dnn.Menu', null, `modId: ${moduleId}`);
-        Insights.add('dnn-menu', `mod: ${moduleId}`, this.log);
-        this.sxc = window.$2sxc(moduleId);
-        this.run = (this.sxc.manage as EditManager).run;
-    }
-
-    changeLayoutOrContent = () => { this.run(CommandNames.layout); };
-
-    // 2020-04-21 2dm disabled this, as it doesn't make sense to have this in the DNN menu - since add can be used in each position
-    // addItem = () => { this.run('new', { useModuleList: true, sortOrder: 0 }); };
-
-    edit = () => { this.run('edit', { useModuleList: true, sortOrder: 0 }); };
-
-    adminApp = () => { this.run('app'); };
-
-    adminZone = () => { this.run('zone'); };
-
-    develop = () => { this.run('template-develop'); };
-}
-
diff --git a/projects/inpage/src/dnn/index.ts b/projects/inpage/src/dnn/index.ts
index cc96ed9d1..8ef0a2fe3 100644
--- a/projects/inpage/src/dnn/index.ts
+++ b/projects/inpage/src/dnn/index.ts
@@ -1,3 +1,2 @@
-export * from './dnn-menu-helper/dnn-inpage-edit';
 // tslint:disable-next-line: no-var-requires
-const autorun = require('./dnn-workarounds/dnn-08.00.04');
\ No newline at end of file
+import './dnn-08.00.04';
diff --git a/projects/inpage/src/dnn/dnn-workarounds/readme.md b/projects/inpage/src/dnn/readme.md
similarity index 100%
rename from projects/inpage/src/dnn/dnn-workarounds/readme.md
rename to projects/inpage/src/dnn/readme.md
diff --git a/projects/inpage/src/index.ts b/projects/inpage/src/index.ts
index 36ea990ee..48ea52c01 100644
--- a/projects/inpage/src/index.ts
+++ b/projects/inpage/src/index.ts
@@ -1,20 +1,19 @@
-﻿import { BootstrapInPage } from './bootstrap/bootstrap';
+﻿import { SxcGlobal } from '../../$2sxc/src/sxc-global/sxc-global';
+import { BootstrapInPage } from './bootstrap/bootstrap';
 import { SxcGlobalCms } from './cms/sxc-global-cms';
 import { ContextComplete } from './context/bundles/context-bundle-button';
-import { DnnActionMenu } from './dnn';
 import { translate, Translator } from './i18n';
-import { SxcGlobalWithCms } from './sxc/sxc-global-with-cms';
 import { EditManager } from './manage/edit-manager';
 import { SxcGlobalManage } from './manage/sxc-global-manage';
 import { NoJQ } from './plumbing';
 import { QuickE } from './quick-edit/quick-e';
+import { SxcGlobalWithCms } from './sxc/sxc-global-with-cms';
 import { SystemUpgrader } from './system';
 
 /**
  * @internal
  */
 import './toolbar/toolbar-global-enable-shake';
-import { SxcGlobal } from '../../$2sxc/src/sxc-global/sxc-global';
 
 // #1 Note that $2sxc must always exist, the server ensures the load order
 const $2sxc = window.$2sxc as SxcGlobal & SxcGlobalWithCms;
@@ -36,11 +35,6 @@ function loadInpage() {
 
     /** this enhances the $2sxc client controller with stuff only needed when logged in */
     if (!$2sxc.system) $2sxc.system = new SystemUpgrader();
-
-    /** Connect DNN action mapper to this module instance */
-    window.$2sxcActionMenuMapper = (moduleId: number) => {
-        return new DnnActionMenu(moduleId);
-    };
 }
 
 NoJQ.ready(loadInpage);
diff --git a/projects/inpage/src/interfaces/window-in-page.ts b/projects/inpage/src/interfaces/window-in-page.ts
index 0ec3443b2..520ff9fa0 100644
--- a/projects/inpage/src/interfaces/window-in-page.ts
+++ b/projects/inpage/src/interfaces/window-in-page.ts
@@ -1,5 +1,4 @@
-﻿import { DnnActionMenu } from '../dnn/dnn-menu-helper/dnn-inpage-edit';
-import { TypeWeDontCare } from '../plumbing';
+﻿import { TypeWeDontCare } from '../plumbing';
 import { QuickE } from '../quick-edit/quick-e';
 
 /**
@@ -12,6 +11,5 @@ declare global {
     dnn_tabVersioningEnabled: boolean;
     dnn: TypeWeDontCare;
     $quickE: QuickE ;
-    $2sxcActionMenuMapper: (moduleId: number) => DnnActionMenu;
   }
 }
diff --git a/projects/inpage/src/manage/edit-manager.ts b/projects/inpage/src/manage/edit-manager.ts
index 40064982b..40389c7f9 100644
--- a/projects/inpage/src/manage/edit-manager.ts
+++ b/projects/inpage/src/manage/edit-manager.ts
@@ -18,7 +18,6 @@ export class EditManager implements SxcManage {
 
     constructor(
         public editContext: AttrJsonEditContext,
-        // _cmdEngine: SxcInstanceEngine,
         public context: ContextComplete,
     ) {
     }
diff --git a/projects/inpage/src/manage/sxc-global-manage.ts b/projects/inpage/src/manage/sxc-global-manage.ts
index d7fdbc968..54c663640 100644
--- a/projects/inpage/src/manage/sxc-global-manage.ts
+++ b/projects/inpage/src/manage/sxc-global-manage.ts
@@ -1,8 +1,6 @@
 ﻿import { Sxc, SxcGlobalManage as ISxcGlobalManage } from '../../../$2sxc/src';
-import { RunParams } from '../../../$2sxc/src/cms';
-import { SxcGlobalCms } from '../cms/sxc-global-cms';
-import { RunParamsHelpers } from '../cms/run-params-helpers';
 import { ContextComplete } from '../context';
+import { SxcCmsReal } from '../sxc/sxc-cms-real';
 import { SxcTools } from '../sxc/sxc-tools';
 import { ToolbarManager } from '../toolbar';
 import { EditManager } from './edit-manager';
@@ -27,23 +25,12 @@ export class SxcGlobalManage implements ISxcGlobalManage {
   initInstance(sxc: Sxc) {
     try {
       const myContext = ContextComplete.findContext(sxc);
-      const editContext = SxcTools.getEditContext(myContext.sxc);
+      const editContext = SxcTools.getEditContext(sxc);
 
-      // const cmdEngine = new SxcInstanceEngine(myContext.sxc);
-
-      const editManager = new EditManager(editContext, /* cmdEngine, */ myContext);
-      sxc.manage = editManager;
+      sxc.manage = new EditManager(editContext, myContext);
 
       // add code for the cms.run command, which doesn't exist until editing is enabled
-      sxc.cms.run = <T>(runParams: RunParams): Promise<void | T> => {
-          RunParamsHelpers.ensureRunParamsInstanceOrError(runParams);
-          return new SxcGlobalCms().run({ ...runParams, context: sxc });
-      };
-
-      // Init to handle special errors
-      // 2022-05-02 2dm disabled, don't think we need it any more
-      // editManager.init();
-      return editManager;
+      sxc.cms = new SxcCmsReal(sxc);
     } catch (e) {
       console.error('error in 2sxc - will log but not throw', e);
     }
diff --git a/projects/inpage/src/sxc/sxc-cms-real.ts b/projects/inpage/src/sxc/sxc-cms-real.ts
new file mode 100644
index 000000000..6d318d92c
--- /dev/null
+++ b/projects/inpage/src/sxc/sxc-cms-real.ts
@@ -0,0 +1,38 @@
+import { Sxc } from '../../../$2sxc/src';
+import { RunParams } from '../../../$2sxc/src/cms';
+import { SxcCms } from '../../../$2sxc/src/sxc/sxc-cms';
+import { RunParamsHelpers } from '../cms/run-params-helpers';
+import { SxcGlobalCms } from '../cms/sxc-global-cms';
+
+/**
+ * This is in charge of sxc.cms on the instance level.
+ * ATM it just has the run command.
+ * In future, it may also have dedicated command like `layout` etc.
+ * @internal
+ */
+export class SxcCmsReal extends SxcCms {
+
+  /** @internal */
+  constructor(sxc: Sxc) {
+    super(sxc);
+  }
+
+  /**
+   * Run a command on this sxc-instance.
+   * Requires edit mode to be on, which would enable the edit-JS parts.
+   * To use, remember to activate `2sxc.JsCms` on the page
+   * @param runParams - real type is actually RunParams
+   */
+  run<T>(runParams: RunParams): Promise<void | T> {
+    RunParamsHelpers.ensureRunParamsInstanceOrError(runParams);
+    return new SxcGlobalCms().run({ ...runParams, context: this.sxc });
+  }
+
+  // runTemplateDevelop() {
+  //   this.runVerb(CommandNames.templateDevelop);
+  // }
+
+  // private runVerb(action: CommandNames, params?: CommandParams) {
+  //   this.run({ action: action, params: params });
+  // }
+}

From 89bbe693dd29ea39d80d8893a4ed38605f92c364 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 12:11:42 +0200
Subject: [PATCH 20/41] make sure dnn bugfixes are applied

---
 projects/inpage/src/dnn/index.ts | 2 +-
 projects/inpage/src/index.ts     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/inpage/src/dnn/index.ts b/projects/inpage/src/dnn/index.ts
index 8ef0a2fe3..c990f6fc1 100644
--- a/projects/inpage/src/dnn/index.ts
+++ b/projects/inpage/src/dnn/index.ts
@@ -1,2 +1,2 @@
-// tslint:disable-next-line: no-var-requires
+// Apply DNN Bugfixes
 import './dnn-08.00.04';
diff --git a/projects/inpage/src/index.ts b/projects/inpage/src/index.ts
index 48ea52c01..751421a24 100644
--- a/projects/inpage/src/index.ts
+++ b/projects/inpage/src/index.ts
@@ -39,6 +39,8 @@ function loadInpage() {
 
 NoJQ.ready(loadInpage);
 
+import './dnn/index';
+
 // Tell Webpack to load CSS
 const cssEdit = require('./inpage.css');
 const cssIcons = require('../icons/inpage-icons-codes.css');

From 373a84d663c3db66b1acae2feb6cbfd0fcf7c922 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 12:12:16 +0200
Subject: [PATCH 21/41] minor

---
 projects/inpage/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/inpage/src/index.ts b/projects/inpage/src/index.ts
index 751421a24..cddc791ce 100644
--- a/projects/inpage/src/index.ts
+++ b/projects/inpage/src/index.ts
@@ -39,6 +39,7 @@ function loadInpage() {
 
 NoJQ.ready(loadInpage);
 
+// Apply Dnn Bugfixes
 import './dnn/index';
 
 // Tell Webpack to load CSS

From bf165622e4e0bf318119c89ffb0713970f8831d7 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 12:33:14 +0200
Subject: [PATCH 22/41] refactor - move command-names for better typing

---
 .../src/commands => $2sxc/src/cms}/command-names.ts       | 0
 projects/$2sxc/src/cms/command-params.ts                  | 4 ++--
 projects/$2sxc/src/cms/index.ts                           | 5 +++--
 projects/$2sxc/src/cms/run-params.ts                      | 3 ++-
 projects/inpage/src/commands/index.ts                     | 2 +-
 .../src/toolbar/config-loaders/button-config-loader.ts    | 8 ++++----
 .../config-loaders/config-formats/in-page-command.ts      | 3 ++-
 .../src/toolbar/config-loaders/group-config-loader.ts     | 5 ++---
 projects/inpage/src/toolbar/config/button-command.ts      | 6 ++----
 projects/inpage/src/toolbar/config/button.ts              | 7 +++----
 10 files changed, 21 insertions(+), 22 deletions(-)
 rename projects/{inpage/src/commands => $2sxc/src/cms}/command-names.ts (100%)

diff --git a/projects/inpage/src/commands/command-names.ts b/projects/$2sxc/src/cms/command-names.ts
similarity index 100%
rename from projects/inpage/src/commands/command-names.ts
rename to projects/$2sxc/src/cms/command-names.ts
diff --git a/projects/$2sxc/src/cms/command-params.ts b/projects/$2sxc/src/cms/command-params.ts
index 99854c488..fa8eb3105 100644
--- a/projects/$2sxc/src/cms/command-params.ts
+++ b/projects/$2sxc/src/cms/command-params.ts
@@ -1,4 +1,4 @@
-﻿import { ItemIdentifierGroup, ItemIdentifierSimple, MetadataForBasic } from '.';
+﻿import { CommandNames, ItemIdentifierGroup, ItemIdentifierSimple, MetadataForBasic } from '.';
 import { TypeValue } from '../../../inpage/src/plumbing';
 
 /**
@@ -7,7 +7,7 @@ import { TypeValue } from '../../../inpage/src/plumbing';
  */
 export interface CommandParams {
     /** The action is used in scenarios where the command name must be included */
-    action?: string;
+    action?: CommandNames;
     items?: Array<ItemIdentifierSimple | ItemIdentifierGroup>;
     mode?: string;
 
diff --git a/projects/$2sxc/src/cms/index.ts b/projects/$2sxc/src/cms/index.ts
index 1ad52965f..0fe250272 100644
--- a/projects/$2sxc/src/cms/index.ts
+++ b/projects/$2sxc/src/cms/index.ts
@@ -1,5 +1,6 @@
 
-export * from './metadata-for';
-export * from './item-identifiers';
 export * from './command-params';
+export * from './command-names';
+export * from './item-identifiers';
+export * from './metadata-for';
 export * from './run-params';
diff --git a/projects/$2sxc/src/cms/run-params.ts b/projects/$2sxc/src/cms/run-params.ts
index 59bf6a91a..bf0da2aee 100644
--- a/projects/$2sxc/src/cms/run-params.ts
+++ b/projects/$2sxc/src/cms/run-params.ts
@@ -1,4 +1,5 @@
 import { ContextIdentifier, Sxc } from '..';
+import { CommandNames } from './command-names';
 import { CommandParams } from './command-params';
 
 /**
@@ -11,7 +12,7 @@ export interface RunParams {
    * Required.
    */
   // ATM actually required if you don't have params which themselves have the action, but we plan to change that it's always on this
-  action?: string;
+  action?: CommandNames;
 
   /**
    * The command params, like contentType, entityId etc.
diff --git a/projects/inpage/src/commands/index.ts b/projects/inpage/src/commands/index.ts
index a8ea52541..6b8a2a6c4 100644
--- a/projects/inpage/src/commands/index.ts
+++ b/projects/inpage/src/commands/index.ts
@@ -1,5 +1,5 @@
 
-export * from './command-names';
+export * from '../../../$2sxc/src/cms/command-names';
 export * from './command-code';
 export * from './command';
 export * from './commands';
diff --git a/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts b/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts
index 97d436e09..658f1e219 100644
--- a/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts
+++ b/projects/inpage/src/toolbar/config-loaders/button-config-loader.ts
@@ -1,5 +1,4 @@
-﻿import { CommandNames } from './../../commands/command-names';
-import { InPageCommandJson } from '.';
+﻿import { InPageCommandJson } from '.';
 import { InPageButtonJson } from '.';
 import { ToolbarConfigLoader } from '.';
 import { Commands } from '../../commands';
@@ -8,6 +7,7 @@ import { HasLog } from '../../core';
 import { TypeValue } from '../../plumbing';
 import { Button, Toolbar } from '../config';
 import { ButtonSafe } from '../config/button-safe';
+import { CommandNames } from './../../commands/';
 
 /**
  * This is a system to build button configurations
@@ -40,7 +40,7 @@ export class ButtonConfigLoader extends HasLog {
         // if it's a command w/action, wrap into command + trim
         if (InPageCommandJson.hasActions(original)) {
             cl.add('action found, will move down to .command', original);
-            if (original.action) original.action = original.action.trim();
+            if (original.action) original.action = original.action.trim() as CommandNames;
             return cl.return({
                 command: original,
                 _expanded: true,
@@ -54,7 +54,7 @@ export class ButtonConfigLoader extends HasLog {
         const wrapLog = this.log.call('getFromName', name);
         return wrapLog.return({
             command: {
-                action: name.trim(),
+                action: name.trim() as CommandNames,
                 params: params,
             },
             _expanded: true,
diff --git a/projects/inpage/src/toolbar/config-loaders/config-formats/in-page-command.ts b/projects/inpage/src/toolbar/config-loaders/config-formats/in-page-command.ts
index 569c90c86..251e5c58d 100644
--- a/projects/inpage/src/toolbar/config-loaders/config-formats/in-page-command.ts
+++ b/projects/inpage/src/toolbar/config-loaders/config-formats/in-page-command.ts
@@ -1,3 +1,4 @@
+import { CommandNames } from '../../../commands';
 import { TypeTbD } from '../../../plumbing/TypeTbD';
 
 /**
@@ -17,7 +18,7 @@ export interface InPageCommandJsonWithTooMuchInfo extends InPageCommandJson {
  */
 export class InPageCommandJson  {
     /** List of buttons to show */
-    action?: string;
+    action?: CommandNames;
 
     /** The entity id to edit */
     entityId?: number;
diff --git a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
index c944e43ac..4b06e081b 100644
--- a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
+++ b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
@@ -1,8 +1,7 @@
-﻿import { CommandNames } from './../../commands/command-names';
-import { ToolbarWip } from '.';
+﻿import { ToolbarWip } from '.';
 import { InPageButtonJson, InPageCommandJson } from '.';
 import { ButtonGroupWip } from '.';
-import { CommandParams, Commands } from '../../commands';
+import { CommandNames, CommandParams, Commands } from '../../commands';
 import { HasLog } from '../../core';
 import { TypeValue } from '../../plumbing';
 import { Button, ButtonCommand, Toolbar, ToolbarSettings } from '../config';
diff --git a/projects/inpage/src/toolbar/config/button-command.ts b/projects/inpage/src/toolbar/config/button-command.ts
index 169ab36bc..530ad999e 100644
--- a/projects/inpage/src/toolbar/config/button-command.ts
+++ b/projects/inpage/src/toolbar/config/button-command.ts
@@ -1,6 +1,4 @@
-﻿import { Command } from '../../commands/command';
-import { CommandParams } from '../../../../$2sxc/src/cms/command-params';
-import { Commands } from '../../commands/commands';
+﻿import { Command, CommandNames, CommandParams, Commands } from '../../commands';
 import { TypeValue } from '../../plumbing';
 
 /**
@@ -11,7 +9,7 @@ export class ButtonCommand {
 
     // customCode: string;
 
-    constructor(public name: string, contentType?: string, public params?: CommandParams) {
+    constructor(public name: CommandNames, contentType?: string, public params?: CommandParams) {
         if (!params) this.params = {};
         if (contentType) this.params.contentType = contentType;
         this.command = Commands.singleton().get(name); // activate command for this
diff --git a/projects/inpage/src/toolbar/config/button.ts b/projects/inpage/src/toolbar/config/button.ts
index 02e09e3aa..e8fc4a8bc 100644
--- a/projects/inpage/src/toolbar/config/button.ts
+++ b/projects/inpage/src/toolbar/config/button.ts
@@ -1,10 +1,9 @@
 ﻿import { ButtonCommand } from '.';
+import { CommandNames, CommandParams } from '../../commands';
 import { CommandCode } from '../../commands/command-code';
 import { CommandLinkGenerator } from '../../commands/command-link-generator';
-import { CommandParams } from '../../../../$2sxc/src/cms/command-params';
 import { ContextComplete } from '../../context/bundles/context-bundle-button';
 import { Obj, TypeTbD } from '../../plumbing';
-import { BuildRule } from '../rules';
 
 /**
  * This is the most common call signature on most ButtonConfig properties
@@ -39,9 +38,9 @@ export class Button {
             Obj.TypeSafeAssign(this, command.command.buttonDefaults);
     }
 
-    static splitName(identifier: string): { id: string, name: string} {
+    static splitName(identifier: string): { id: string, name: CommandNames } {
         const parts = identifier.split('=');
-        return { id: parts[0], name: parts[1] || identifier};
+        return { id: parts[0], name: (parts[1] || identifier) as CommandNames};
     }
 
     /** Configure the link generator before it creates the link */

From 366aa33a9854810a636a2dda2432792450cf9ebe Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 12:48:11 +0200
Subject: [PATCH 23/41] minor cleanup

---
 projects/$2sxc/src/sxc/web-api/ajax-promise.ts            | 8 --------
 .../src/toolbar/config-loaders/group-config-loader.ts     | 2 --
 projects/inpage/test/t200-commands.ts                     | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/projects/$2sxc/src/sxc/web-api/ajax-promise.ts b/projects/$2sxc/src/sxc/web-api/ajax-promise.ts
index 0e3e597d9..5e797826b 100644
--- a/projects/$2sxc/src/sxc/web-api/ajax-promise.ts
+++ b/projects/$2sxc/src/sxc/web-api/ajax-promise.ts
@@ -51,14 +51,6 @@ export class AjaxPromise {
     // 2020-03-13 stop adding 2sxc endpoint-name, it's already happening in apiUrl so with this it happens 2x
     // var endpoint = settings.endpoint || ToSxcName;
     var base = this.sxc.root.http.apiUrl(url, settings.endpoint);
-    // let base = (settings.url)
-    //   ? this.sxc.root.http.apiUrl(settings.url) // this.sxc.resolveServiceUrl(settings.url)  // use url -> TODO: change this to use the new root.http.apiUrl
-    //   : env.apiRoot('2sxc')               // use controller/action
-    //     + 'app/auto/api/' + settings.controller + '/' + settings.action;
-
-    // if(settings.endpoint)
-    //     base = base.replace(env.apiRoot('2sxc'), 
-    //         env.apiRoot(settings.endpoint));
 
     return base + (!settings.params ? '' : ('?' + NoJQ.param(settings.params)));
   }
diff --git a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
index 4b06e081b..08ba2f1b0 100644
--- a/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
+++ b/projects/inpage/src/toolbar/config-loaders/group-config-loader.ts
@@ -60,8 +60,6 @@ export class ButtonGroupConfigLoader extends HasLog {
     convertToButton(btn: InPageButtonJson,
                     sharedParams: CommandParams | Record<string, TypeValue>,
                     sharedDefaults: Record<string, TypeValue>,
-                    // fullToolbar: ToolbarWip,
-                    // group: ButtonGroupWip
                     groupDefaults: Record<string, TypeValue>,
                     ): Button {
         let btnCommand = (btn as unknown as { command: CommandParams; }).command;
diff --git a/projects/inpage/test/t200-commands.ts b/projects/inpage/test/t200-commands.ts
index 43e00d4d6..e4b86ad04 100644
--- a/projects/inpage/test/t200-commands.ts
+++ b/projects/inpage/test/t200-commands.ts
@@ -25,7 +25,7 @@ describe('Commands test suite', function() {
       if (!(first instanceof Command)) return false;
       if (!(second instanceof Command)) return false;
       if (first.name !== second.name) return false;
-      // if (first.buttonConfig.action !== second.buttonConfig.action) return false;
+      // if (first.buttonConfig.name !== second.buttonConfig.name) return false;
     //   if (first.buttonConfig.icon(this.context) !== second.buttonConfig.icon(this.context)) return false;
       if (first.buttonDefaults.title(this.context) !== second.buttonDefaults.title(this.context)) return false;
       if (first.buttonDefaults.uiActionOnly(this.context) !== second.buttonDefaults.uiActionOnly(this.context)) return false;

From a25b197bde8faab8acfd6b58d98718669c982664 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 14:05:55 +0200
Subject: [PATCH 24/41] renames

---
 projects/inpage/src/commands/engine/cms-engine.ts    |  6 +++---
 .../src/context/bundles/context-bundle-button.ts     |  4 ++--
 .../inpage/src/toolbar/toolbar-event-arguments.ts    |  4 ++--
 projects/inpage/src/toolbar/toolbar-lifecycle.ts     |  4 ++--
 .../inpage/src/workflow/toolbar-with-workflow.ts     |  4 ++--
 projects/inpage/src/workflow/workflow-helper.ts      | 12 ++++++------
 projects/inpage/src/workflow/workflow-manager.ts     |  6 +++---
 projects/inpage/src/workflow/workflow-step.ts        |  1 -
 8 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/projects/inpage/src/commands/engine/cms-engine.ts b/projects/inpage/src/commands/engine/cms-engine.ts
index feb286bf0..bc2b45171 100644
--- a/projects/inpage/src/commands/engine/cms-engine.ts
+++ b/projects/inpage/src/commands/engine/cms-engine.ts
@@ -10,7 +10,7 @@ import { Button, ButtonSafe } from '../../toolbar/config';
 import { ButtonCommand } from '../../toolbar/config';
 import { InPageButtonJson } from '../../toolbar/config-loaders/config-formats/in-page-button';
 import { WorkflowHelper, WorkflowPhases, WorkflowStepCodeArguments } from '../../workflow';
-import { WorkflowManager } from '../../workflow/workflow-manager';
+import { ToolbarWorkflowManager } from '../../workflow/workflow-manager';
 import { CommandLinkGenerator } from '../command-link-generator';
 import { CommandParams } from '../../../../$2sxc/src/cms';
 import { WorkflowStep } from '../../workflow/workflow-step';
@@ -96,9 +96,9 @@ export class CmsEngine extends HasLog {
         // note: in cases where the click comes from elsewhere (like from the quick-dialog) there is no event
 
         // New in 12.10 - Workflow can be provided by run-call
-        let wf: WorkflowManager;
+        let wf: ToolbarWorkflowManager;
         if (wipParamsWithWorkflow?.workflows) {
-            wf = new WorkflowManager(this.log);
+            wf = new ToolbarWorkflowManager(this.log);
             wf.add(wipParamsWithWorkflow.workflows as WorkflowStep | WorkflowStep[]);
         } else
             wf = WorkflowHelper.getWorkflow(origEvent?.target as HTMLElement);
diff --git a/projects/inpage/src/context/bundles/context-bundle-button.ts b/projects/inpage/src/context/bundles/context-bundle-button.ts
index db6e7ac43..07b98fef3 100644
--- a/projects/inpage/src/context/bundles/context-bundle-button.ts
+++ b/projects/inpage/src/context/bundles/context-bundle-button.ts
@@ -2,7 +2,7 @@
 import { Obj } from '../../plumbing';
 import { SxcTools } from '../../sxc/sxc-tools';
 import { Button } from '../../toolbar/config/button';
-import { WorkflowManager } from '../../workflow';
+import { ToolbarWorkflowManager } from '../../workflow';
 import { AttrJsonEditContext } from '../html-attribute';
 import { ContextBundleToolbar } from './context-bundle-toolbar';
 
@@ -12,7 +12,7 @@ import { ContextBundleToolbar } from './context-bundle-toolbar';
 export class ContextComplete extends ContextBundleToolbar {
     button?: Button;
 
-    commandWorkflow?: WorkflowManager;
+    commandWorkflow?: ToolbarWorkflowManager;
 
     constructor(editCtx: AttrJsonEditContext, sxc?: Sxc) {
         super(editCtx, sxc);
diff --git a/projects/inpage/src/toolbar/toolbar-event-arguments.ts b/projects/inpage/src/toolbar/toolbar-event-arguments.ts
index 5fb3e7581..b3a653c0d 100644
--- a/projects/inpage/src/toolbar/toolbar-event-arguments.ts
+++ b/projects/inpage/src/toolbar/toolbar-event-arguments.ts
@@ -1,4 +1,4 @@
-import { WorkflowManager } from '../workflow';
+import { ToolbarWorkflowManager } from '../workflow';
 
 /**
  * Event arguments for toolbar events.
@@ -18,5 +18,5 @@ export interface ToolbarEventArguments {
 
     identifier: string;
 
-    workflow: WorkflowManager;
+    workflow: ToolbarWorkflowManager;
 }
diff --git a/projects/inpage/src/toolbar/toolbar-lifecycle.ts b/projects/inpage/src/toolbar/toolbar-lifecycle.ts
index aa488ffa4..88830d6b3 100644
--- a/projects/inpage/src/toolbar/toolbar-lifecycle.ts
+++ b/projects/inpage/src/toolbar/toolbar-lifecycle.ts
@@ -1,7 +1,7 @@
 import { ToolbarEventArguments } from '.';
 import { C } from '../constants';
 import { ContextComplete } from '../context';
-import { WorkflowManager } from '../workflow';
+import { ToolbarWorkflowManager } from '../workflow';
 
 /**
  * @internal
@@ -18,7 +18,7 @@ export class ToolbarLifecycle {
      * @memberof ToolbarLifecycle
      */
     static raiseToolbarInitEvent(toolbarElement: HTMLElement, anchoredElement: HTMLElement, context: ContextComplete) {
-        const commandWorkflow = new WorkflowManager(null);
+        const commandWorkflow = new ToolbarWorkflowManager(null);
         commandWorkflow.attach(toolbarElement, context);
 
         const event = new CustomEvent(C.Toolbar.eventNames.onInit, {
diff --git a/projects/inpage/src/workflow/toolbar-with-workflow.ts b/projects/inpage/src/workflow/toolbar-with-workflow.ts
index 6c66dbb43..0abcd8293 100644
--- a/projects/inpage/src/workflow/toolbar-with-workflow.ts
+++ b/projects/inpage/src/workflow/toolbar-with-workflow.ts
@@ -1,4 +1,4 @@
-import { WorkflowManager } from '.';
+import { ToolbarWorkflowManager } from '.';
 
 /**
  * Simple interface to extend a HtmlElement with Workflow Manager
@@ -9,5 +9,5 @@ import { WorkflowManager } from '.';
  * @internal
  */
 export interface ToolbarWithWorkflow extends HTMLElement {
-    commandWorkflow: WorkflowManager;
+    commandWorkflow: ToolbarWorkflowManager;
 }
diff --git a/projects/inpage/src/workflow/workflow-helper.ts b/projects/inpage/src/workflow/workflow-helper.ts
index a439e16f4..6bb43559e 100644
--- a/projects/inpage/src/workflow/workflow-helper.ts
+++ b/projects/inpage/src/workflow/workflow-helper.ts
@@ -1,6 +1,6 @@
-import { ToolbarWithWorkflow, WorkflowStepCodeArguments, WorkflowManager } from '.';
+import { ToolbarWithWorkflow, WorkflowStepCodeArguments, ToolbarWorkflowManager } from '.';
 
-let dummyWorkflowManager: WorkflowManager;
+let dummyWorkflowManager: ToolbarWorkflowManager;
 const debug = false;
 
 /**
@@ -16,7 +16,7 @@ export class WorkflowHelper {
      * Find the command workflow on a toolbar (or return null).
      * Will go upwards in the DOM to find the toolbar node which has the configuration stored
      */
-    static getWorkflow(node: HTMLElement): WorkflowManager {
+    static getWorkflow(node: HTMLElement): ToolbarWorkflowManager {
         if (!node) return WorkflowHelper.getDummyManager();
 
         if (debug) console.log('try to find command workflow on ', node);
@@ -36,11 +36,11 @@ export class WorkflowHelper {
      * Get a dummy workflow manager
      *
      * @static
-     * @returns {WorkflowManager}
+     * @returns {ToolbarWorkflowManager}
      * @memberof WorkflowHelper
      */
-    static getDummyManager(): WorkflowManager {
-        if (!dummyWorkflowManager) dummyWorkflowManager = new WorkflowManager(null, true);
+    static getDummyManager(): ToolbarWorkflowManager {
+        if (!dummyWorkflowManager) dummyWorkflowManager = new ToolbarWorkflowManager(null, true);
         return dummyWorkflowManager;
     }
 
diff --git a/projects/inpage/src/workflow/workflow-manager.ts b/projects/inpage/src/workflow/workflow-manager.ts
index b131649e3..a9223ffbf 100644
--- a/projects/inpage/src/workflow/workflow-manager.ts
+++ b/projects/inpage/src/workflow/workflow-manager.ts
@@ -8,10 +8,10 @@ import { WorkflowHelper } from './workflow-helper';
 
 /**
  * A workflow manager _of a Toolbar_ which will run stuff before / after commands.
- * When toolbars are created, they will add a Manager and then raise an event for in-page code to add workflow steps. 
+ * When toolbars are created, they will add a Manager and then raise an event for in-page code to add workflow steps.
  * Normally the toolbar with raise a `toolbar-init` event where you can then add steps.
  */
-export class WorkflowManager extends HasLog {
+export class ToolbarWorkflowManager extends HasLog {
 
     /** 
      * The workflow steps registered on this toolbar
@@ -27,7 +27,7 @@ export class WorkflowManager extends HasLog {
     }
 
     /**
-     * Add one or many steps to the workflow
+     * Register one or many [workflow-steps](xref:Api.Js.SxcJs.WorkflowStep) to the toolbar, to use if toolbar commands are executed.
      */
     // @publicApi("Used publicly on the Workflow-object in toolbar-init")
     add(steps: WorkflowStep | WorkflowStep[]) {
diff --git a/projects/inpage/src/workflow/workflow-step.ts b/projects/inpage/src/workflow/workflow-step.ts
index 5379a0ea1..86ea54884 100644
--- a/projects/inpage/src/workflow/workflow-step.ts
+++ b/projects/inpage/src/workflow/workflow-step.ts
@@ -2,7 +2,6 @@ import { WorkflowPhases, WorkflowStepCode } from '.';
 
 /**
  * A workflow step (code-sequence) to run before/after specific events.
- * @internal
  */
 export interface WorkflowStep {
   /**

From 29f3ae020f41e90b1f777e80f45f51a879b7d5ce Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 14:06:18 +0200
Subject: [PATCH 25/41] renames for docs

---
 projects/inpage/src/commands/engine/cms-engine.ts               | 2 +-
 projects/inpage/src/workflow/index.ts                           | 2 +-
 .../{workflow-manager.ts => toolbar-workflow-manager.ts}        | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename projects/inpage/src/workflow/{workflow-manager.ts => toolbar-workflow-manager.ts} (100%)

diff --git a/projects/inpage/src/commands/engine/cms-engine.ts b/projects/inpage/src/commands/engine/cms-engine.ts
index bc2b45171..7a491f16a 100644
--- a/projects/inpage/src/commands/engine/cms-engine.ts
+++ b/projects/inpage/src/commands/engine/cms-engine.ts
@@ -10,7 +10,7 @@ import { Button, ButtonSafe } from '../../toolbar/config';
 import { ButtonCommand } from '../../toolbar/config';
 import { InPageButtonJson } from '../../toolbar/config-loaders/config-formats/in-page-button';
 import { WorkflowHelper, WorkflowPhases, WorkflowStepCodeArguments } from '../../workflow';
-import { ToolbarWorkflowManager } from '../../workflow/workflow-manager';
+import { ToolbarWorkflowManager } from '../../workflow/toolbar-workflow-manager';
 import { CommandLinkGenerator } from '../command-link-generator';
 import { CommandParams } from '../../../../$2sxc/src/cms';
 import { WorkflowStep } from '../../workflow/workflow-step';
diff --git a/projects/inpage/src/workflow/index.ts b/projects/inpage/src/workflow/index.ts
index d701380ec..b8ab041bf 100644
--- a/projects/inpage/src/workflow/index.ts
+++ b/projects/inpage/src/workflow/index.ts
@@ -1,5 +1,5 @@
 
-export * from './workflow-manager';
+export * from './toolbar-workflow-manager';
 export * from './workflow-step-code-arguments';
 export * from './workflow-phases';
 export * from './workflow-step';
diff --git a/projects/inpage/src/workflow/workflow-manager.ts b/projects/inpage/src/workflow/toolbar-workflow-manager.ts
similarity index 100%
rename from projects/inpage/src/workflow/workflow-manager.ts
rename to projects/inpage/src/workflow/toolbar-workflow-manager.ts

From 47c365be61b45dd141f284935d619863d484340d Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 17 Jun 2022 14:42:53 +0200
Subject: [PATCH 26/41] docs

---
 projects/$2sxc/src/cms/command-names.ts       |  28 ++-
 .../commands/command/command-add-existing.ts  |  13 +
 .../src/commands/command/command-add.ts       |  15 ++
 .../commands/command/command-content-items.ts |   4 +-
 .../commands/command/command-content-type.ts  |   4 +-
 .../src/commands/command/command-new.ts       |  13 +
 .../src/workflow/toolbar-workflow-manager.ts  | 228 +++++++++---------
 7 files changed, 176 insertions(+), 129 deletions(-)

diff --git a/projects/$2sxc/src/cms/command-names.ts b/projects/$2sxc/src/cms/command-names.ts
index fd8ffeee8..f1fe989da 100644
--- a/projects/$2sxc/src/cms/command-names.ts
+++ b/projects/$2sxc/src/cms/command-names.ts
@@ -17,28 +17,28 @@ export enum CommandNames {
      * <br>💡
      * This is similar to `new` but also adds the item to the existing list of items shown on the page.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandAddParams)
      */
     add = 'add',
 
     /**
      * `add-existing` command opens a dialog allowing the user to select an existing item to add to a **list of items**.
      * <br> The new item is placed after the item the (+) was clicked on.
-     * <br> 🔘
      * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandAddExistingParams)
+     * <br> 🆕 in v11.01
      */
     addExisting = 'add-existing',
 
     /**
      * `app` will open the app-admin dialog
-     * <br> 🔘
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
      */
     app = 'app',
 
     /**
      * `app-import` command will open the dialog to import an App.
-     * <br> 🔘
-     * This is not available on the toolbar.
+     * <br> 🔘 This is not available on the toolbar.
      */
     appImport = 'app-import',
 
@@ -176,14 +176,10 @@ export enum CommandNames {
 
     /**
      * `new` command opens the edit-dialog for a new content-item.
-     * contentType
-     *
-     * Then it needs either the ID...:
-     * entityId
-     *
-     * ...or it needs the position within the list:
-     * useModuleList: true
-     * sortOrder: [number] (important so it knows the position
+     * <br>
+     * It will only create an item, not add it to a list. 
+     * For that you would need to use `add`
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentTypeParams)
      */
     new = 'new',
 
@@ -195,7 +191,7 @@ export enum CommandNames {
 
     /**
      * `publish` command tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
-     * <br> 🔘
+     * <br> 🔘 Appears automatically if the item is in draft mode.
      * Only appears on the toolbar if the item is not published.
      */
     publish = 'publish',
@@ -239,3 +235,9 @@ export enum CommandNames {
      */
     zone = 'zone',
 }
+
+
+// Experimental
+// Goal is to probably split the command names
+// and then make a new CommandNames which merges all the previous ones
+// type All = CommandNames | CommandNamesEdit;
\ No newline at end of file
diff --git a/projects/inpage/src/commands/command/command-add-existing.ts b/projects/inpage/src/commands/command/command-add-existing.ts
index 1a11563c7..ad622a8ed 100644
--- a/projects/inpage/src/commands/command/command-add-existing.ts
+++ b/projects/inpage/src/commands/command/command-add-existing.ts
@@ -1,5 +1,7 @@
 ﻿import { CommandNames, Commands } from '..';
 import { ItemIdentifierGroup } from '../../../../$2sxc/src/cms';
+import { CommandAddParams } from './command-add';
+import { CommandContentTypeParams } from './command-content-type';
 import { SharedLogic } from './shared-logic';
 
 /**
@@ -30,3 +32,14 @@ Commands.add(CommandNames.addExisting, 'AddExisting', 'add-existing', false, tru
         }
     },
 });
+
+/**
+ * Parameters used for the command `add-existing`.
+ * <br>
+ * The contentType name determines what items will be shown in the dialog.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+// tslint:disable-next-line: no-empty-interface
+export interface CommandAddExistingParams extends CommandAddParams {
+}
diff --git a/projects/inpage/src/commands/command/command-add.ts b/projects/inpage/src/commands/command/command-add.ts
index 96199fedb..c86031344 100644
--- a/projects/inpage/src/commands/command/command-add.ts
+++ b/projects/inpage/src/commands/command/command-add.ts
@@ -1,4 +1,5 @@
 ﻿import { CommandNames, Commands } from '..';
+import { CommandContentTypeParams } from './command-content-type';
 import { Actions } from './content-list-actions';
 import { SharedLogic } from './shared-logic';
 
@@ -21,3 +22,17 @@ Commands.add(
         },
     },
 );
+
+/**
+ * Parameters used for the command `add`.
+ * <br>
+ * The contentType name determines what items will be created.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandAddParams extends CommandContentTypeParams {
+  /**
+   * Determins the position where a new item will be added to.
+   */
+  sortOrder: number;
+}
diff --git a/projects/inpage/src/commands/command/command-content-items.ts b/projects/inpage/src/commands/command/command-content-items.ts
index 8a89d2d79..235f31a88 100644
--- a/projects/inpage/src/commands/command/command-content-items.ts
+++ b/projects/inpage/src/commands/command/command-content-items.ts
@@ -28,7 +28,9 @@ Commands.add(CommandNames.contentItems, 'ContentItems', 'table', true, false, {
 });
 
 /**
- * Parameters used for the command `contentitems`
+ * Parameters used for the command `contentitems`.
+ * <br>
+ * The content-type name determines what items will be managed.
  * <br>
  * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
  */
diff --git a/projects/inpage/src/commands/command/command-content-type.ts b/projects/inpage/src/commands/command/command-content-type.ts
index 1a3023f91..685e4dc0f 100644
--- a/projects/inpage/src/commands/command/command-content-type.ts
+++ b/projects/inpage/src/commands/command/command-content-type.ts
@@ -18,11 +18,13 @@ Commands.add(CommandNames.contentType, 'ContentType', 'fields', true, false, {
 /**
  * Parameters used for the command `contenttype`.
  * <br>
+ * The content-type name determines what items will be loaded to manage the fields.
+ * <br>
  * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
  */
 export interface CommandContentTypeParams {
   /**
-   * The content-type name determines what items will be managed.
+   * The content-type name
    */
   contentType: string;
 }
diff --git a/projects/inpage/src/commands/command/command-new.ts b/projects/inpage/src/commands/command/command-new.ts
index 915f8ab65..7031c1f7a 100644
--- a/projects/inpage/src/commands/command/command-new.ts
+++ b/projects/inpage/src/commands/command/command-new.ts
@@ -1,4 +1,5 @@
 ﻿import { CmsEngine, CommandNames, Commands } from '..';
+import { CommandContentTypeParams } from './command-content-type';
 import { SharedLogic } from './shared-logic';
 
 /**
@@ -43,3 +44,15 @@ Commands.add(CommandNames.new, 'New', 'plus', false, true, {
         return CmsEngine.openDialog(context, event);
     },
 });
+
+/**
+ * Parameters used for the command `new`
+ * <br>
+ * The ContentType name determines what kind of item will be created.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+// tslint:disable-next-line: no-empty-interface
+export interface CommandNewParams extends CommandContentTypeParams {
+
+}
diff --git a/projects/inpage/src/workflow/toolbar-workflow-manager.ts b/projects/inpage/src/workflow/toolbar-workflow-manager.ts
index a9223ffbf..a6a42787f 100644
--- a/projects/inpage/src/workflow/toolbar-workflow-manager.ts
+++ b/projects/inpage/src/workflow/toolbar-workflow-manager.ts
@@ -13,128 +13,128 @@ import { WorkflowHelper } from './workflow-helper';
  */
 export class ToolbarWorkflowManager extends HasLog {
 
-    /** 
-     * The workflow steps registered on this toolbar
-     * @internal
-     */
-    steps: WorkflowStep[] = [];
-
-    /**
-     * @internal
-     */
-    constructor(parentLog: Log, private isDummy = false) {
-        super('Cmd.Wrkflw', parentLog, 'constructor');
+  /**
+   * The workflow steps registered on this toolbar
+   * @internal
+   */
+  steps: WorkflowStep[] = [];
+
+  /**
+   * @internal
+   */
+  constructor(parentLog: Log, private isDummy = false) {
+    super('Cmd.Wrkflw', parentLog, 'constructor');
+  }
+
+  /**
+   * Register one or many [workflow-steps](xref:Api.Js.SxcJs.WorkflowStep) to the toolbar, to use if toolbar commands are executed.
+   */
+  // @publicApi("Used publicly on the Workflow-object in toolbar-init")
+  add(steps: WorkflowStep | WorkflowStep[]) {
+    if (!steps) return;
+    if (Array.isArray(steps)) {
+      steps.forEach((s) => this.addOne(s));
+    } else
+      this.addOne(steps);
+  }
+
+  /**
+   * Add a single workflow step to this manager
+   * @internal
+   */
+  private addOne(step: WorkflowStep) {
+    step = WorkflowStepHelper.initDefaults(step);
+    const cl = this.log.call('add', `'${step.name}' for '${step.command}'-'${step.phase}'`);
+    if (!step) {
+      const errorMsg = "Trying to add workflow step but didn't get anything";
+      cl.add(errorMsg);
+      throw errorMsg;
     }
-
-    /**
-     * Register one or many [workflow-steps](xref:Api.Js.SxcJs.WorkflowStep) to the toolbar, to use if toolbar commands are executed.
-     */
-    // @publicApi("Used publicly on the Workflow-object in toolbar-init")
-    add(steps: WorkflowStep | WorkflowStep[]) {
-        if (!steps) return;
-        if (Array.isArray(steps)) {
-            steps.forEach((s) => this.addOne(s));
-        } else
-            this.addOne(steps);
+    this.steps.push(step);
+    cl.done();
+  }
+
+
+  /**
+   * Run a workflow.
+   * @internal
+   * @returns {Promise<WorkflowStepCodeArguments>} This will let you chain what happens. The arguments contain a status if it should be cancelled.
+   */
+  run(wfArgs: WorkflowStepCodeArguments): Promise<WorkflowStepCodeArguments> {
+    const cl = this.log.call('run', `'${wfArgs.command}' for '${wfArgs.phase}'`);
+
+    // if this is just a temporary / dummy workflow manager, just return a success-promise
+    if (this.isDummy) {
+      cl.done('Dummy workflow, nothing to run, will return a resolved promise');
+      return emptyWorkflow(wfArgs);
     }
 
-    /**
-     * Add a single workflow step to this manager
-     * @internal
-     */
-    private addOne(step: WorkflowStep) {
-        step = WorkflowStepHelper.initDefaults(step);
-        const cl = this.log.call('add', `'${step.name}' for '${step.command}'-'${step.phase}'`);
-        if (!step) {
-            const errorMsg = "Trying to add workflow step but didn't get anything";
-            cl.add(errorMsg);
-            throw errorMsg;
-        }
-        this.steps.push(step);
-        cl.done();
+    // Find all steps to run
+    const stepsForCommand = this.steps
+      // only those of this command or all
+      .filter((s) => s.command === wfArgs.command || s.command === WorkflowCommands.all)
+      .filter((s) => s.phase === wfArgs.phase || s.phase === WorkflowPhases.all)
+      // only those having real code
+      .filter((s) => s.code)
+      .sort((s) => s.priority);
+
+    if (stepsForCommand.length === 0) {
+      cl.done('no steps found for this command / phase, will return a resolved promise');
+      return emptyWorkflow(wfArgs);
     }
 
-
-    /**
-     * Run a workflow.
-     * @internal
-     * @returns {Promise<WorkflowStepCodeArguments>} This will let you chain what happens. The arguments contain a status if it should be cancelled.
-     */
-    run(wfArgs: WorkflowStepCodeArguments): Promise<WorkflowStepCodeArguments> {
-        const cl = this.log.call('run', `'${wfArgs.command}' for '${wfArgs.phase}'`);
-
-        // if this is just a temporary / dummy workflow manager, just return a success-promise
-        if (this.isDummy) {
-            cl.done('Dummy workflow, nothing to run, will return a resolved promise');
-            return emptyWorkflow(wfArgs);
-        }
-
-        // Find all steps to run
-        const stepsForCommand = this.steps
-            // only those of this command or all
-            .filter((s) => s.command === wfArgs.command || s.command === WorkflowCommands.all)
-            .filter((s) => s.phase === wfArgs.phase || s.phase === WorkflowPhases.all)
-            // only those having real code
-            .filter((s) => s.code)
-            .sort((s) => s.priority);
-
-        if (stepsForCommand.length === 0) {
-            cl.done('no steps found for this command / phase, will return a resolved promise');
-            return emptyWorkflow(wfArgs);
-        }
-
-        // run in sequence but cancel at any time if necessary
-        const promise = new Promise<WorkflowStepCodeArguments>((resolve, reject) => {
-            let promiseChain = Promise.resolve(wfArgs);
-            // let previousArgs = wfArgs;
-            // let interruptChain = false;
-            for (let stepCount = 0; stepCount < stepsForCommand.length; stepCount++) {
-                const nextStep = stepsForCommand[stepCount];
-                promiseChain = promiseChain.then((resultingArgs) => {
-                    return this.runNextPromiseIfNotCancelled(resultingArgs, wfArgs, nextStep.code);
-                });
-            }
-
-            promiseChain.then((finalArgs) => { resolve(finalArgs); });
-            promiseChain.catch(reject);
+    // run in sequence but cancel at any time if necessary
+    const promise = new Promise<WorkflowStepCodeArguments>((resolve, reject) => {
+      let promiseChain = Promise.resolve(wfArgs);
+      // let previousArgs = wfArgs;
+      // let interruptChain = false;
+      for (let stepCount = 0; stepCount < stepsForCommand.length; stepCount++) {
+        const nextStep = stepsForCommand[stepCount];
+        promiseChain = promiseChain.then((resultingArgs) => {
+          return this.runNextPromiseIfNotCancelled(resultingArgs, wfArgs, nextStep.code);
         });
-        return promise;
-    }
-
-    /**
-     * Attach a workflow to a toolbar.
-     * Will be used at start to hook this manager to the toolbar.
-     * Then the init-event will be called to allow adding steps.
-     * @internal
-     */
-    attach(node: HTMLElement, context: ContextComplete) {
-        const cl = this.log.call('attach');
-        if (!node) return;
-        (node as ToolbarWithWorkflow).commandWorkflow = this;
-        Insights.add('workflow', context.toolbar?.identifier, this.log);
-        cl.done();
-    }
-
-    /**
-     * 
-     * @param currentArgs 
-     * @param prevArgs 
-     * @param nextFactory 
-     * @returns 
-     * @internal
-     */
-    private runNextPromiseIfNotCancelled(currentArgs: WorkflowStepCodeArguments | boolean, prevArgs: WorkflowStepCodeArguments, nextFactory: WorkflowStepCode) {
-        // determine cancel based on either a boolean result or a real WorkflowArguments with cancel.
-        const cancel = WorkflowHelper.isCancelled(currentArgs);
-        // make sure we have real arguments no matter what came in - assuming we have prevArgs
-        currentArgs = (currentArgs && typeof(currentArgs) !== 'boolean') ? currentArgs : { ...prevArgs };
-        // in case the cancel came as boolean, we must now set it on the currentArgs
-        currentArgs.cancel = cancel;
-        return cancel ? emptyWorkflow(currentArgs) : nextFactory(currentArgs);
-    }
+      }
+
+      promiseChain.then((finalArgs) => { resolve(finalArgs); });
+      promiseChain.catch(reject);
+    });
+    return promise;
+  }
+
+  /**
+   * Attach a workflow to a toolbar.
+   * Will be used at start to hook this manager to the toolbar.
+   * Then the init-event will be called to allow adding steps.
+   * @internal
+   */
+  attach(node: HTMLElement, context: ContextComplete) {
+    const cl = this.log.call('attach');
+    if (!node) return;
+    (node as ToolbarWithWorkflow).commandWorkflow = this;
+    Insights.add('workflow', context.toolbar?.identifier, this.log);
+    cl.done();
+  }
+
+  /**
+   *
+   * @param currentArgs
+   * @param prevArgs
+   * @param nextFactory
+   * @returns
+   * @internal
+   */
+  private runNextPromiseIfNotCancelled(currentArgs: WorkflowStepCodeArguments | boolean, prevArgs: WorkflowStepCodeArguments, nextFactory: WorkflowStepCode) {
+    // determine cancel based on either a boolean result or a real WorkflowArguments with cancel.
+    const cancel = WorkflowHelper.isCancelled(currentArgs);
+    // make sure we have real arguments no matter what came in - assuming we have prevArgs
+    currentArgs = (currentArgs && typeof(currentArgs) !== 'boolean') ? currentArgs : { ...prevArgs };
+    // in case the cancel came as boolean, we must now set it on the currentArgs
+    currentArgs.cancel = cancel;
+    return cancel ? emptyWorkflow(currentArgs) : nextFactory(currentArgs);
+  }
 
 }
 
 function emptyWorkflow(wfArgs: WorkflowStepCodeArguments) {
-    return Promise.resolve<WorkflowStepCodeArguments>(wfArgs);
+  return Promise.resolve<WorkflowStepCodeArguments>(wfArgs);
 }

From 6fa7804ccd8cca4b596d7a9c1698006d7fe14651 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 09:20:46 +0200
Subject: [PATCH 27/41] docs enhancements

---
 projects/$2sxc/src/cms/command-names.ts       | 109 +++++++++---------
 projects/inpage/src/commands/command.ts       |  33 +++++-
 .../commands/command/command-add-existing.ts  |   1 -
 .../src/commands/command/command-custom.ts    |  76 +++++++-----
 .../src/commands/command/command-delete.ts    |  23 ++++
 .../src/commands/command/command-movedown.ts  |  23 ++++
 .../src/commands/command/command-publish.ts   |  60 +++++-----
 .../src/commands/command/command-remove.ts    |  25 ++++
 .../src/commands/command/command-replace.ts   |  12 ++
 .../inpage/src/dnn/dnn-menu-helper/readme.md  |   4 -
 .../src/toolbar/templates/template-default.ts |  16 ++-
 11 files changed, 256 insertions(+), 126 deletions(-)
 delete mode 100644 projects/inpage/src/dnn/dnn-menu-helper/readme.md

diff --git a/projects/$2sxc/src/cms/command-names.ts b/projects/$2sxc/src/cms/command-names.ts
index f1fe989da..f10ccaeb6 100644
--- a/projects/$2sxc/src/cms/command-names.ts
+++ b/projects/$2sxc/src/cms/command-names.ts
@@ -12,7 +12,7 @@
  */
 export enum CommandNames {
     /**
-     * `add` command opens a `new` dialog to create and add a new item to a **list of items**.
+     * `add` opens a `new` dialog to create and add a new item to a **list of items**.
      * <br> The new item is placed after the item the (+) was clicked on.
      * <br>💡
      * This is similar to `new` but also adds the item to the existing list of items shown on the page.
@@ -22,7 +22,7 @@ export enum CommandNames {
     add = 'add',
 
     /**
-     * `add-existing` command opens a dialog allowing the user to select an existing item to add to a **list of items**.
+     * `add-existing` opens a dialog allowing the user to select an existing item to add to a **list of items**.
      * <br> The new item is placed after the item the (+) was clicked on.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
      * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandAddExistingParams)
@@ -31,42 +31,46 @@ export enum CommandNames {
     addExisting = 'add-existing',
 
     /**
-     * `app` will open the app-admin dialog
+     * `app` opens the app-admin dialog
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     app = 'app',
 
     /**
-     * `app-import` command will open the dialog to import an App.
+     * `app-import` opens the dialog to import an App.
      * <br> 🔘 This is not available on the toolbar.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     appImport = 'app-import',
 
     /**
-     * `app-resources` will open the edit dialog for app-resources (multi-language texts, labels etc.).
+     * `app-resources` opens the edit dialog for app-resources (multi-language texts, labels etc.).
      * <br> 🔘
      * It's disabled on the toolbar if the app doesn't have resource-values to configure.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     appResources = 'app-resources',
 
     /**
-     * `app-settings` will open the edit dialog for the app-settings.
+     * `app-settings` opens the edit dialog for the app-settings.
      * <br> 🔘
      * It's disabled on the toolbar if the app doesn't have setting-values to configure
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     appSettings = 'app-settings',
 
     /**
-     * `apps` will open the manage all apps dialog.
-     * <br> 🔘
+     * `apps` opens the manage all apps dialog.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects based on the groups in the toolbar.
      */
     apps = 'apps',
 
     /**
-     * `contentitems` will open the list to manage all items of a specific content-type.
+     * `contentitems` opens the list to manage all items of a specific content-type.
      * <br> 🔘
      * Will use the settings of the current template to open.
      * It is only shown to elevated admins.
@@ -75,7 +79,7 @@ export enum CommandNames {
     contentItems = 'contentitems',
 
     /**
-     * `contenttype` will open the dialog to view or modify fields of a content-type.
+     * `contenttype` opens the dialog to view or modify fields of a content-type.
      * <br> 🔘
      * On a toolbar it will use the content-type of the current item.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
@@ -84,7 +88,7 @@ export enum CommandNames {
     contentType = 'contenttype',
 
     /**
-     * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item.
+     * `copy` opens the edit-dialog for the current item in copy-mode, so when saving it will be a new item.
      * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandCopyParams)
      * <br> 🆕 in v14.03
      */
@@ -92,90 +96,83 @@ export enum CommandNames {
 
     /**
      * `custom` will execute custom javascript.
-     * <br> 🔘
-     * This is mainly for toolbars, to add buttons with custom code.
+     * <br> 🔘 This is mainly for toolbars, to add buttons with custom code.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandCustomParams)
      */
     custom = 'custom',
 
     /**
      * `delete` will delete (not just remove) a content-item.
-     * <br>
-     * 💡 This is similar to `remove` but really deletes the data from the DB.
-     * <br> 🔘
-     * It only appears if the toolbar explicitly asks for it.
-     * <br>
-     * Needs:
-     * entityId
-     * entityGuid
-     * entityTitle
+     * <br> 💡 This is similar to `remove` but really deletes the data from the DB.
+     * <br> 🔘 It only appears if the toolbar explicitly asks for it.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandDeleteParams) - will auto-detect from context
      */
     delete = 'delete',
 
     /**
-     * `edit` command will open an edit-dialog.
+     * `edit` opens an edit-dialog.
      * <br>
      * In scenarios where the page is currently showing a demo item, this will have the same effect as `add`
      */
     edit = 'edit',
 
     /**
-     * `image` command will open the edit-dialog for the metadata of the current image
+     * `image` opens the edit-dialog for the metadata of the current image
      * @internal - may be removed soon
      */
      image = 'image',
 
     /**
-     * `insights-server` command will open the insights logs page
-     * <br> 🔘
+     * `insights-server` opens the insights logs page
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required.
      */
     insightsServer = 'insights-server',
 
     /**
-     * `instance-list` command will open a dialog to manually re-order **items in a list**.
+     * `instance-list` opens a dialog to manually re-order **items in a list**.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     instanceList = 'instance-list',
 
     /**
-     * `layout` command will open the in-page dialog to change the layout of the current content.
-     * <br>
-     * [no parameters needed]
+     * `layout` opens the in-page dialog to change the layout of the current content.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     layout = 'layout',
 
     /**
-     * `metadata` command will open the edit-dialog for the current metadata item.
-     * <br> 🔘
-     * It only appears if the toolbar explicitly asks for it.
+     * `metadata` opens the edit-dialog for the current metadata item.
+     * <br> 🔘 It only appears if the toolbar explicitly asks for it.
      */
     metadata = 'metadata',
 
     /**
-     * `more` command create a "…" button which flips through the menu-buttons of toolbars
+     * `more` create a "…" (ellipsis) button which flips through the button groups of toolbars
+     * <br> 🔘 It only appears if the toolbar has `more`=`auto` and has multiple groups.
+     * <br> 📩 No params required, auto-detects based on the groups in the toolbar.
      */
     more = 'more',
 
     /**
-     * `movedown` command moves a content-item down one position in a **list of items**.
-     * useModuleList: true (required to be true for it to work)
-     * sortOrder: [number] (important so it knows the position)
-     * ⚠️ do not use this yet, we plan to change the parameters
+     * `movedown` moves a content-item down one position in a **list of items**.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMoveParams) - will auto-detect from context
+     * <br> ⚠️ do not use parameters custom code, we plan to change the signature
      */
     moveDown = 'movedown',
 
     /**
-     * `moveup` command moves a content-item up one position in a **list of items**.
-     * useModuleList: true (required to be true for it to work)
-     * sortOrder: [number] (important so it knows the position)
-     * ⚠️ do not use this yet, we plan to change the parameters
+     * `moveup` moves a content-item up one position in a **list of items**.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMoveParams) - will auto-detect from context
+     * <br> ⚠️ do not use parameters code, we plan to change the signature
      */
     moveUp = 'moveup',
 
     /**
-     * `new` command opens the edit-dialog for a new content-item.
+     * `new` opens the edit-dialog for a new content-item.
      * <br>
      * It will only create an item, not add it to a list. 
      * For that you would need to use `add`
@@ -184,42 +181,45 @@ export enum CommandNames {
     new = 'new',
 
     /**
-     * `new` command sets new mode used in parameters
+     * `new` sets new mode used in parameters
      * @internal - must move, this shouldn't be here as it's not a command!
      */
     newMode = 'new',
 
     /**
-     * `publish` command tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
-     * <br> 🔘 Appears automatically if the item is in draft mode.
-     * Only appears on the toolbar if the item is not published.
+     * `publish` tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
+     * <br> 🔘 Appears automatically if the item is in draft mode / not published.
      */
     publish = 'publish',
 
     /**
-     * `remove` command removes an item from a list of items.
-     * useModuleList: true (required to be true for it to work)
-     * sortOrder: [number] (important so it knows the position)
+     * `remove` removes an item from a list of items.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMoveParams) - will auto-detect from context
+     * <br> ⚠️ do not use parameters custom code, we plan to change the signature
      */
     remove = 'remove',
 
     /**
-     * `replace` command will open the dialog to assign a different content-item in this slot on module-assigned content items
+     * `replace` opens the dialog to assign a different content-item in this slot on module-assigned content items
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandReplaceParams) - will auto-detect from context
+     * <br> ⚠️ do not use parameters custom code, we plan to change the signature
      */
     replace = 'replace',
 
     /**
-     * `template-develop` will open the template-editor dialog in a new window.
+     * `template-develop` opens the template-editor dialog in a new window.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     templateDevelop = 'template-develop',
 
     /**
-     * `template-query` will open the pipeline/query-designer in a new window.
+     * `template-query` opens the pipeline/query-designer in a new window.
      * <br> 🔘It's not available on the simple Content App, only on full Apps.
      * It is disabled if no query is configured. 
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     templateQuery = 'template-query',
 
@@ -230,8 +230,9 @@ export enum CommandNames {
     templateSettings = 'template-settings',
 
     /**
-     * `zone` will open the system dialog for this zone/site.
+     * `zone` opens the system dialog for this zone/site.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required, auto-detects all from context.
      */
     zone = 'zone',
 }
diff --git a/projects/inpage/src/commands/command.ts b/projects/inpage/src/commands/command.ts
index 76b1d3945..7a69dbbc6 100644
--- a/projects/inpage/src/commands/command.ts
+++ b/projects/inpage/src/commands/command.ts
@@ -10,8 +10,21 @@ export class Command {
     /** the defaults are important for new buttons that just know this command */
     buttonDefaults: Partial<Button>;
 
-    protected merge(icon: string, translateKey: string, uiOnly: boolean, partOfPage: boolean, more: Partial<Button>): void {
-        this.buttonDefaults = {
+    /**
+     * 
+     * @param icon 
+     * @param translateKey 
+     * @param uiOnly 
+     * @param partOfPage 
+     * @param more 
+     * @internal
+     */
+    mergeDefaults(translateKey: string, icon: string, uiOnly: boolean, partOfPage: boolean, more: Partial<Button>): void {
+      if (typeof (partOfPage) !== 'boolean')
+        throw 'partOfPage in commands not provided, order will be wrong!';
+
+
+      this.buttonDefaults = {
             icon: (_) => `icon-sxc-${icon}`,
             title: (_) => `Toolbar.${translateKey}`,
             uiActionOnly: (_) => uiOnly,
@@ -20,6 +33,17 @@ export class Command {
         };
     }
 
+    /**
+     * 
+     * @param name 
+     * @param translateKey 
+     * @param icon 
+     * @param uiOnly 
+     * @param partOfPage 
+     * @param more 
+     * @returns 
+     * @internal
+     */
     static build(name: string,
                  translateKey: string,
                  icon: string,
@@ -28,13 +52,10 @@ export class Command {
                  more: Partial<Button>,
                  ): Command {
 
-        if (typeof (partOfPage) !== 'boolean')
-            throw 'partOfPage in commands not provided, order will be wrong!';
-
         const commandDefinition = new Command(name);
 
         // Toolbar API v2
-        commandDefinition.merge(icon, translateKey, uiOnly, partOfPage, more);
+        commandDefinition.mergeDefaults(translateKey, icon, uiOnly, partOfPage, more);
 
         return commandDefinition;
     }
diff --git a/projects/inpage/src/commands/command/command-add-existing.ts b/projects/inpage/src/commands/command/command-add-existing.ts
index ad622a8ed..618ec1d2c 100644
--- a/projects/inpage/src/commands/command/command-add-existing.ts
+++ b/projects/inpage/src/commands/command/command-add-existing.ts
@@ -1,7 +1,6 @@
 ﻿import { CommandNames, Commands } from '..';
 import { ItemIdentifierGroup } from '../../../../$2sxc/src/cms';
 import { CommandAddParams } from './command-add';
-import { CommandContentTypeParams } from './command-content-type';
 import { SharedLogic } from './shared-logic';
 
 /**
diff --git a/projects/inpage/src/commands/command/command-custom.ts b/projects/inpage/src/commands/command/command-custom.ts
index 1e208dd52..bc1bcfa3a 100644
--- a/projects/inpage/src/commands/command/command-custom.ts
+++ b/projects/inpage/src/commands/command/command-custom.ts
@@ -6,36 +6,60 @@
 const ctxName = 'context';
 const evtName = 'event';
 
-const errNoCode = "Trying to run Custom-Code action, but no 'customCode' (v9) or 'call' (v10) found to run - see console for debug info.";
+const errNoCode = "Trying to run Custom-Code action, but no 'call' (v10+, recommended) or 'customCode' (v9, old) found to run - see console for debug info.";
 
 /**
  * import this module to commands.ts
  * @internal
  */
 Commands.add(CommandNames.custom, 'Custom', 'bomb', true, false, {
-    code(context, event) {
-        return new Promise((resolve, reject) => {
-            const actPar = context.button.command.params;
-            // the old V9 name
-            let code = actPar.customCode;
-            // also try the V10 edition
-            if (!code) {
-                code = actPar.call;
-                if (typeof code === 'string' && code.indexOf(' ') === -1 && code.indexOf('(') === -1)
-                    code += `(${ctxName}, ${evtName})`;
-            }
-            if (!code) {
-                console.warn(errNoCode, actPar);
-                alert(errNoCode);
-                resolve();
-            }
-            try {
-                const fn = new Function(ctxName, evtName, code);
-                resolve(fn(context, event));
-            } catch (err) {
-                console.error('error in custom button-code: ', actPar);
-                reject(err);
-            }
-        });
-    },
+  code(context, event) {
+    return new Promise((resolve, reject) => {
+      const actPar = context.button.command.params;
+      // the old V9 name
+      let code = actPar.customCode;
+      // also try the V10 edition - uses `call`
+      if (!code) {
+        code = actPar.call;
+        if (typeof code === 'string' && code.indexOf(' ') === -1 && code.indexOf('(') === -1)
+        code += `(${ctxName}, ${evtName})`;
+      }
+      if (!code) {
+        console.warn(errNoCode, actPar);
+        alert(errNoCode);
+        resolve();
+      }
+      try {
+        const fn = new Function(ctxName, evtName, code);
+        resolve(fn(context, event));
+      } catch (err) {
+        console.error('error in custom button-code: ', actPar);
+        reject(err);
+      }
+    });
+  },
 });
+
+
+/**
+ * Parameters used for the command `custom` on toolbars.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandCustomParams {
+  /**
+   * Name of the function to call - must be available in the context.
+   * This is usually as a function window. Example:
+   * <br>
+   * If `call` is `sayHello` you need a `window.sayHello(context, event)`.
+   */
+  call: string;
+
+  /**
+   * **OBSOLETE - avoid using**
+   * <br>
+   * JavaScript as string containing the code to execute. 
+   * This is the old V9 name.
+   */
+  customCode: string;
+}
diff --git a/projects/inpage/src/commands/command/command-delete.ts b/projects/inpage/src/commands/command/command-delete.ts
index c794c148a..cc1bf2d02 100644
--- a/projects/inpage/src/commands/command/command-delete.ts
+++ b/projects/inpage/src/commands/command/command-delete.ts
@@ -28,3 +28,26 @@ Commands.add(CommandNames.delete, 'Delete', 'cancel', true, false, {
         return contentItems.delete(context, p.entityId, p.entityGuid, title);
     },
 });
+
+/**
+ * Parameters used for the command `delete`.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandDeleteParams {
+  /**
+   * ID of item to delete, usually detected from context.
+   */
+  entityId: number;
+
+  /**
+   * Guid of item to delete, usually detected from context.
+   */
+  entityGuid: string;
+
+  /**
+   * Title of item to delete, usually detected from context.
+   * This is important to show the "Are you sure?" dialog.
+   */
+  entityTitle: string;
+}
diff --git a/projects/inpage/src/commands/command/command-movedown.ts b/projects/inpage/src/commands/command/command-movedown.ts
index 5f43f716c..479e376c1 100644
--- a/projects/inpage/src/commands/command/command-movedown.ts
+++ b/projects/inpage/src/commands/command/command-movedown.ts
@@ -17,3 +17,26 @@ Commands.add(CommandNames.moveDown, 'MoveDown', 'move-down', false, true, {
         );
     },
 });
+
+/**
+ * Parameters used for the command `moveup` and `movedown`.
+ * <br>
+ * ⚠️ do not use parameters in custom code, we plan to change the signature.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandMoveParams {
+  /**
+   * Determins the position where a new item will be added to.
+   * <br>
+   * ⚠️ This parameter will change soon, don't use it in code. 
+   */
+  sortOrder: number;
+
+  /**
+   * Must be true, to work on the module list. 
+   * <br>
+   * ⚠️ This parameter will change soon, don't use it in code. 
+   */
+  useModuleList: true;
+}
diff --git a/projects/inpage/src/commands/command/command-publish.ts b/projects/inpage/src/commands/command/command-publish.ts
index 7f22946c8..c0edbcf77 100644
--- a/projects/inpage/src/commands/command/command-publish.ts
+++ b/projects/inpage/src/commands/command/command-publish.ts
@@ -9,36 +9,36 @@ import { Actions } from './content-list-actions';
  * @internal
  */
 Commands.add(CommandNames.publish, 'Unpublished', 'eye-off', false, false, {
-    showCondition(context) {
-        return context.button.command.params.isPublished === false;
-    },
-    disabled(context) {
-        return !context.instance.allowPublish;
-    },
-    code(context, event): Promise<void> {
-        return new Promise((resolve, reject) => {
-            if (context.button.command.params.isPublished) {
-                alert(translate('Toolbar.AlreadyPublished'));
-                return resolve();
-            }
+  showCondition(context) {
+      return context.button.command.params.isPublished === false;
+  },
+  disabled(context) {
+      return !context.instance.allowPublish;
+  },
+  code(context, event): Promise<void> {
+    return new Promise((resolve, reject) => {
+      if (context.button.command.params.isPublished) {
+        alert(translate('Toolbar.AlreadyPublished'));
+        return resolve();
+      }
 
-            // if we have an entity-id, publish based on that
-            if (context.button.command.params.entityId) {
-                return Actions.publishId(
-                    context,
-                    context.button.command.params.entityId,
-                );
-            }
+      // if we have an entity-id, publish based on that
+      if (context.button.command.params.entityId) {
+        return Actions.publishId(
+          context,
+          context.button.command.params.entityId,
+        );
+      }
 
-            const part: string =
-                context.button.command.params.sortOrder === -1
-                    ? 'listcontent'
-                    : 'content';
-            const index =
-                context.button.command.params.sortOrder === -1
-                    ? 0
-                    : context.button.command.params.sortOrder;
-            return Actions.publish(context, part, index);
-        });
-    },
+      const part: string =
+        context.button.command.params.sortOrder === -1
+          ? 'listcontent'
+          : 'content';
+      const index =
+        context.button.command.params.sortOrder === -1
+          ? 0
+          : context.button.command.params.sortOrder;
+      return Actions.publish(context, part, index);
+    });
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-remove.ts b/projects/inpage/src/commands/command/command-remove.ts
index 44a4d6978..14a42863a 100644
--- a/projects/inpage/src/commands/command/command-remove.ts
+++ b/projects/inpage/src/commands/command/command-remove.ts
@@ -18,3 +18,28 @@ Commands.add(CommandNames.remove, 'Remove', 'minus-circled', false, true, {
         });
     },
 });
+
+
+
+/**
+ * Parameters used for the command `moveup` and `movedown`.
+ * <br>
+ * ⚠️ do not use parameters in custom code, we plan to change the signature.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandMoveParams {
+  /**
+   * Determins the position where a new item will be added to.
+   * <br>
+   * ⚠️ This parameter will change soon, don't use it in code. 
+   */
+  sortOrder: number;
+
+  /**
+   * Must be true, to work on the module list. 
+   * <br>
+   * ⚠️ This parameter will change soon, don't use it in code. 
+   */
+  useModuleList: true;
+}
diff --git a/projects/inpage/src/commands/command/command-replace.ts b/projects/inpage/src/commands/command/command-replace.ts
index ef187a9ba..ea9f88934 100644
--- a/projects/inpage/src/commands/command/command-replace.ts
+++ b/projects/inpage/src/commands/command/command-replace.ts
@@ -1,4 +1,5 @@
 ﻿import { CommandNames, Commands } from '..';
+import { CommandMoveParams } from './command-movedown';
 import { SharedLogic } from './shared-logic';
 
 /**
@@ -25,3 +26,14 @@ Commands.add(CommandNames.replace, 'Replace', 'replace', false, true, {
         }}];
     },
 });
+
+
+/**
+ * Parameters used for the command `replace`.
+ * <br>
+ * ⚠️ do not use parameters in custom code, we plan to change the signature.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandReplaceParams extends CommandMoveParams {
+}
diff --git a/projects/inpage/src/dnn/dnn-menu-helper/readme.md b/projects/inpage/src/dnn/dnn-menu-helper/readme.md
deleted file mode 100644
index d501b4ed2..000000000
--- a/projects/inpage/src/dnn/dnn-menu-helper/readme.md
+++ /dev/null
@@ -1,4 +0,0 @@
-﻿
-# DNN Menu Helper
-
-This contains code which connects 2sxc-commands to the DNN-actions menu which appears in edit-mode
\ No newline at end of file
diff --git a/projects/inpage/src/toolbar/templates/template-default.ts b/projects/inpage/src/toolbar/templates/template-default.ts
index a0e80eea0..878ec6c0c 100644
--- a/projects/inpage/src/toolbar/templates/template-default.ts
+++ b/projects/inpage/src/toolbar/templates/template-default.ts
@@ -1,4 +1,5 @@
 ﻿import { TemplateConstants as TC, ToolbarTemplate } from '.';
+import { CommandNames as CN } from '../../commands';
 
 /**
  * @internal
@@ -9,22 +10,27 @@ export const ToolbarTemplateDefault: ToolbarTemplate = {
   groups: [
     {
       name: TC.GroupDefault,
-      buttons: 'edit,new,metadata,publish,layout',
+      buttons: [CN.edit, CN.new, CN.metadata, CN.publish, CN.layout].join(','),
+      // 'edit,new,metadata,publish,layout',
     }, {
       name: TC.GroupList,
-      buttons: 'add,add-existing,replace,remove,moveup,movedown,instance-list',
+      buttons: [CN.add, CN.addExisting, CN.replace, CN.remove, CN.moveUp, CN.moveDown, CN.instanceList].join(','),
+      // 'add,add-existing,replace,remove,moveup,movedown,instance-list',
     }, {
       name: TC.GroupEditAdvanced,
-      buttons: 'delete',
+      buttons: [CN.delete].join(','),
+      // 'delete',
     }, {
       name: TC.GroupView,
-      buttons: 'template-develop,template-settings,contentitems,template-query,contenttype',
+      buttons: [CN.templateDevelop, CN.templateSettings, CN.contentItems, CN.templateQuery, CN.contentType].join(','),
+      // 'template-develop,template-settings,contentitems,template-query,contenttype',
       defaults: {
         classes: 'group-pro',
       },
     }, {
       name: TC.GroupApp,
-      buttons: 'app,app-settings,app-resources,zone,insights-server',
+      buttons: [CN.app, CN.appSettings, CN.appResources, CN.zone, CN.insightsServer].join(','),
+      // 'app,app-settings,app-resources,zone,insights-server',
       defaults: {
         classes: 'group-pro',
       },

From e76f9178ea41b400d8d370a08bd9e28ad3897af5 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 10:55:41 +0200
Subject: [PATCH 28/41] wip docs js/ts

---
 projects/$2sxc/src/cms/command-names.ts       | 85 ++++++++++++-------
 .../$2sxc/src/cms/command-params-metadata.ts  | 19 +++++
 projects/$2sxc/src/cms/command-params.ts      |  4 +-
 projects/$2sxc/src/cms/index.ts               |  2 +-
 projects/$2sxc/src/cms/item-identifiers.ts    |  4 +-
 projects/$2sxc/src/cms/metadata-for.ts        | 18 ----
 projects/$2sxc/src/data/metadata-for.ts       |  4 +-
 projects/$2sxc/src/data/target-types.ts       |  2 +-
 projects/$2sxc/src/sxc/data/sxc-data.ts       |  4 +-
 .../src/commands/command/command-copy.ts      | 11 +--
 .../src/commands/command/command-metadata.ts  | 23 ++++-
 .../src/commands/command/command-movedown.ts  | 23 -----
 .../commands/command/command-params-entity.ts | 62 ++++++++++++++
 .../src/commands/command/command-remove.ts    | 25 ------
 .../src/commands/command/command-replace.ts   | 12 ---
 projects/inpage/src/commands/command/index.ts |  2 +-
 .../src/toolbar/rules/rule-params-helper.ts   |  4 +-
 .../inpage/src/toolbar/rules/rule-params.ts   |  4 +-
 18 files changed, 176 insertions(+), 132 deletions(-)
 create mode 100644 projects/$2sxc/src/cms/command-params-metadata.ts
 delete mode 100644 projects/$2sxc/src/cms/metadata-for.ts
 create mode 100644 projects/inpage/src/commands/command/command-params-entity.ts

diff --git a/projects/$2sxc/src/cms/command-names.ts b/projects/$2sxc/src/cms/command-names.ts
index f10ccaeb6..2f4c4d2d4 100644
--- a/projects/$2sxc/src/cms/command-names.ts
+++ b/projects/$2sxc/src/cms/command-names.ts
@@ -33,46 +33,48 @@ export enum CommandNames {
     /**
      * `app` opens the app-admin dialog
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     app = 'app',
 
     /**
      * `app-import` opens the dialog to import an App.
      * <br> 🔘 This is not available on the toolbar.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     appImport = 'app-import',
 
     /**
      * `app-resources` opens the edit dialog for app-resources (multi-language texts, labels etc.).
-     * <br> 🔘
-     * It's disabled on the toolbar if the app doesn't have resource-values to configure.
+     * <br> 🔘 It's disabled on the toolbar if the app doesn't have resource-values to configure.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     appResources = 'app-resources',
 
     /**
      * `app-settings` opens the edit dialog for the app-settings.
-     * <br> 🔘
-     * It's disabled on the toolbar if the app doesn't have setting-values to configure
+     * <br> 🔘 It's disabled on the toolbar if the app doesn't have setting-values to configure
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     appSettings = 'app-settings',
 
     /**
      * `apps` opens the manage all apps dialog.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects based on the groups in the toolbar.
+     * <br> 📩 No params required,
+     * (auto-detected based on toolbar)
      */
     apps = 'apps',
 
     /**
      * `contentitems` opens the list to manage all items of a specific content-type.
-     * <br> 🔘
-     * Will use the settings of the current template to open.
+     * <br> 🔘 Will use the settings of the current template to open.
      * It is only shown to elevated admins.
      * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentItemsParams)
      */
@@ -80,8 +82,7 @@ export enum CommandNames {
 
     /**
      * `contenttype` opens the dialog to view or modify fields of a content-type.
-     * <br> 🔘
-     * On a toolbar it will use the content-type of the current item.
+     * <br> 🔘 On a toolbar it will use the content-type of the current item.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
      * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentTypeParams)
      */
@@ -105,7 +106,8 @@ export enum CommandNames {
      * `delete` will delete (not just remove) a content-item.
      * <br> 💡 This is similar to `remove` but really deletes the data from the DB.
      * <br> 🔘 It only appears if the toolbar explicitly asks for it.
-     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandDeleteParams) - will auto-detect from context
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandDeleteParams)
+     * (auto-detected from context)
      */
     delete = 'delete',
 
@@ -113,6 +115,12 @@ export enum CommandNames {
      * `edit` opens an edit-dialog.
      * <br>
      * In scenarios where the page is currently showing a demo item, this will have the same effect as `add`
+     * <br> 🔘 Only appears if `entityId` is known or item is in a list.
+     * <br> 📩 Parameters either one of these: 
+     * [Id](xref:Api.Js.SxcJs.CommandParamsEntityById),
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
      */
     edit = 'edit',
 
@@ -120,7 +128,7 @@ export enum CommandNames {
      * `image` opens the edit-dialog for the metadata of the current image
      * @internal - may be removed soon
      */
-     image = 'image',
+    image = 'image',
 
     /**
      * `insights-server` opens the insights logs page
@@ -132,42 +140,50 @@ export enum CommandNames {
     /**
      * `instance-list` opens a dialog to manually re-order **items in a list**.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     instanceList = 'instance-list',
 
     /**
      * `layout` opens the in-page dialog to change the layout of the current content.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     layout = 'layout',
 
     /**
      * `metadata` opens the edit-dialog for the current metadata item.
      * <br> 🔘 It only appears if the toolbar explicitly asks for it.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMetadataParams)
      */
     metadata = 'metadata',
 
     /**
      * `more` create a "…" (ellipsis) button which flips through the button groups of toolbars
      * <br> 🔘 It only appears if the toolbar has `more`=`auto` and has multiple groups.
-     * <br> 📩 No params required, auto-detects based on the groups in the toolbar.
+     * <br> 📩 No params required, 
+     * (auto-detected based on toolbar)
      */
     more = 'more',
 
     /**
      * `movedown` moves a content-item down one position in a **list of items**.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
-     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMoveParams) - will auto-detect from context
-     * <br> ⚠️ do not use parameters custom code, we plan to change the signature
+     * <br> 📩 Parameters either one of these: 
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
      */
     moveDown = 'movedown',
 
     /**
      * `moveup` moves a content-item up one position in a **list of items**.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
-     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMoveParams) - will auto-detect from context
-     * <br> ⚠️ do not use parameters code, we plan to change the signature
+     * <br> 📩 Parameters either one of these: 
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
      */
     moveUp = 'moveup',
 
@@ -177,6 +193,7 @@ export enum CommandNames {
      * It will only create an item, not add it to a list. 
      * For that you would need to use `add`
      * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentTypeParams)
+     * (auto-detected from context)
      */
     new = 'new',
 
@@ -189,37 +206,44 @@ export enum CommandNames {
     /**
      * `publish` tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
      * <br> 🔘 Appears automatically if the item is in draft mode / not published.
+     * <br> 📩 Parameters either one of these: 
+     * [Id](xref:Api.Js.SxcJs.CommandParamsEntityById),
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
      */
     publish = 'publish',
 
     /**
      * `remove` removes an item from a list of items.
      * <br> 🪜 Only appears on toolbars of items which are in a list.
-     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMoveParams) - will auto-detect from context
-     * <br> ⚠️ do not use parameters custom code, we plan to change the signature
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
      */
     remove = 'remove',
 
     /**
      * `replace` opens the dialog to assign a different content-item in this slot on module-assigned content items
-     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandReplaceParams) - will auto-detect from context
-     * <br> ⚠️ do not use parameters custom code, we plan to change the signature
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
      */
     replace = 'replace',
 
     /**
      * `template-develop` opens the template-editor dialog in a new window.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     templateDevelop = 'template-develop',
 
     /**
      * `template-query` opens the pipeline/query-designer in a new window.
-     * <br> 🔘It's not available on the simple Content App, only on full Apps.
+     * <br> 🔘 It's not available on the simple Content App, only on full Apps.
      * It is disabled if no query is configured. 
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     templateQuery = 'template-query',
 
@@ -232,7 +256,8 @@ export enum CommandNames {
     /**
      * `zone` opens the system dialog for this zone/site.
      * <br> 🔐 Toolbar shows this automatically to elevated admins.
-     * <br> 📩 No params required, auto-detects all from context.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
      */
     zone = 'zone',
 }
diff --git a/projects/$2sxc/src/cms/command-params-metadata.ts b/projects/$2sxc/src/cms/command-params-metadata.ts
new file mode 100644
index 000000000..79a37d936
--- /dev/null
+++ b/projects/$2sxc/src/cms/command-params-metadata.ts
@@ -0,0 +1,19 @@
+/**
+ * Parameters on `metadata` for commands which have a metadata-target. 
+ */
+export interface CommandParamsMetadata {
+    /** 
+     * The key which identifies the target of this metadata item
+     */
+    key: string;
+
+    /**
+     * the key type, will default to 'string'
+     */
+    keyType?: string;
+
+    /**
+     * The target type, will default to 10 = CMS-Item
+     */
+    targetType?: number;
+}
diff --git a/projects/$2sxc/src/cms/command-params.ts b/projects/$2sxc/src/cms/command-params.ts
index fa8eb3105..d8be253bb 100644
--- a/projects/$2sxc/src/cms/command-params.ts
+++ b/projects/$2sxc/src/cms/command-params.ts
@@ -1,4 +1,4 @@
-﻿import { CommandNames, ItemIdentifierGroup, ItemIdentifierSimple, MetadataForBasic } from '.';
+﻿import { CommandNames, ItemIdentifierGroup, ItemIdentifierSimple, CommandParamsMetadata } from '.';
 import { TypeValue } from '../../../inpage/src/plumbing';
 
 /**
@@ -30,7 +30,7 @@ export interface CommandParams {
     title?: string;
 
     useModuleList?: boolean;
-    metadata?: MetadataForBasic;
+    metadata?: CommandParamsMetadata;
 
     isPublished?: boolean;
     prefill?: Record<string, TypeValue>;
diff --git a/projects/$2sxc/src/cms/index.ts b/projects/$2sxc/src/cms/index.ts
index 0fe250272..7eadef719 100644
--- a/projects/$2sxc/src/cms/index.ts
+++ b/projects/$2sxc/src/cms/index.ts
@@ -2,5 +2,5 @@
 export * from './command-params';
 export * from './command-names';
 export * from './item-identifiers';
-export * from './metadata-for';
+export * from './command-params-metadata';
 export * from './run-params';
diff --git a/projects/$2sxc/src/cms/item-identifiers.ts b/projects/$2sxc/src/cms/item-identifiers.ts
index 0f864466e..7f871f47a 100644
--- a/projects/$2sxc/src/cms/item-identifiers.ts
+++ b/projects/$2sxc/src/cms/item-identifiers.ts
@@ -1,4 +1,4 @@
-import { MetadataForBasic } from '.';
+import { CommandParamsMetadata } from '.';
 import { TypeValue } from '../../../inpage/src/plumbing';
 
 // NOTE: THESE ITEM IDENTIFIERS SHOULD PROBABLY ALWAYS REMAIN INTERNAL
@@ -20,7 +20,7 @@ interface ItemIdentifierShared {
 export interface ItemIdentifierSimple {
   EntityId: number;
   ContentTypeName?: string;
-  Metadata?: MetadataForBasic;
+  Metadata?: CommandParamsMetadata;
   Prefill?: Record<string, TypeValue>;
 }
 
diff --git a/projects/$2sxc/src/cms/metadata-for.ts b/projects/$2sxc/src/cms/metadata-for.ts
deleted file mode 100644
index 11bf1e480..000000000
--- a/projects/$2sxc/src/cms/metadata-for.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-
-/**
- * This is attached as json for various dialogs
- * which will edit/create items and assign them as metadata for something
- * @export
- * @internal
- * TODO: NAMING NOT CLEAR, AND IT CAN ONLY HOLD ONE key, so we must consider deprecating this / moving away
- */
-export interface MetadataForBasic {
-    /** The key which identifies the target of this metadata item */
-    key: string;
-
-    /** the key type, will default to 'string' */
-    keyType?: string;
-
-    /** The target type, will default to 10 = CMS-Item */
-    targetType?: number;
-}
diff --git a/projects/$2sxc/src/data/metadata-for.ts b/projects/$2sxc/src/data/metadata-for.ts
index 48ace95c0..125ee4713 100644
--- a/projects/$2sxc/src/data/metadata-for.ts
+++ b/projects/$2sxc/src/data/metadata-for.ts
@@ -1,4 +1,4 @@
-import { TargetTypes } from './target-types';
+import { MetadataTargetTypes } from './target-types';
 /** 
  * A Metadata-Target identifier to tell an entity that it describes something else.
  * 
@@ -12,7 +12,7 @@ export interface MetadataFor {
    * The target type identifier 
    * - TODO: @2dm - THIS SHOULD probably be number only
    */
-  Target: string | TargetTypes;
+  Target: string | MetadataTargetTypes;
 
   /**
    * The number of the target, if it's identified by a number.
diff --git a/projects/$2sxc/src/data/target-types.ts b/projects/$2sxc/src/data/target-types.ts
index e10ad589b..5f53a4c2a 100644
--- a/projects/$2sxc/src/data/target-types.ts
+++ b/projects/$2sxc/src/data/target-types.ts
@@ -5,7 +5,7 @@
  * 
  * Use it for the @see MetadataFor objects
  */
-export enum TargetTypes {
+export enum MetadataTargetTypes {
   /** 
    * Undefined Type (0) - included for completeness.
    * Not usually used, actually None (1) is the default
diff --git a/projects/$2sxc/src/sxc/data/sxc-data.ts b/projects/$2sxc/src/sxc/data/sxc-data.ts
index db6ee2f06..40bc57746 100644
--- a/projects/$2sxc/src/sxc/data/sxc-data.ts
+++ b/projects/$2sxc/src/sxc/data/sxc-data.ts
@@ -1,5 +1,5 @@
 import { Sxc } from '..';
-import { TargetTypes } from '../../data';
+import { MetadataTargetTypes } from '../../data';
 import { MetadataFor } from '../../data/metadata-for';
 import { SxcDataServiceBase } from './sxc-data-service-base';
 
@@ -72,7 +72,7 @@ export class SxcData<T = unknown> extends SxcDataServiceBase {
     const path = `${ContentApiRoot}/${this.name}`;
     if (metadataFor != null) {
       if (typeof(metadataFor) === 'string')
-        metadataFor = { Target: TargetTypes.Entity, Guid: metadataFor } as MetadataFor;
+        metadataFor = { Target: MetadataTargetTypes.Entity, Guid: metadataFor } as MetadataFor;
       try {
         values.For = metadataFor;
       } catch { }
diff --git a/projects/inpage/src/commands/command/command-copy.ts b/projects/inpage/src/commands/command/command-copy.ts
index 99c9f3752..8ced1170e 100644
--- a/projects/inpage/src/commands/command/command-copy.ts
+++ b/projects/inpage/src/commands/command/command-copy.ts
@@ -1,5 +1,6 @@
 ﻿import { CommandNames, Commands } from '..';
 import { CommandContentTypeParams, createContentTypeParams } from './command-content-type';
+import { CommandParamsEntityById } from './command-params-entity';
 
 /**
  * open an edit-item dialog
@@ -17,7 +18,6 @@ Commands.add(CommandNames.copy, 'Copy', 'copy', false, true, {
 
   configureLinkGenerator: (ctx, linkGenerator) => {
     const originalId = ctx.button.command.params.entityId;
-    // TODO: DROP USE OF contentTypeName as soon as we fixed the events-app
     const typeName = createContentTypeParams(ctx).contentType;
     if (!typeName) throw new Error("can't copy: missing contentType");
     linkGenerator.items = [{ DuplicateEntity: originalId, ContentTypeName: typeName }];
@@ -25,13 +25,10 @@ Commands.add(CommandNames.copy, 'Copy', 'copy', false, true, {
 });
 
 /**
- * Parameters used for the command `copy`
+ * Parameters used for the command `copy`.
+ * Will copy the entity on `entityId`.
  * <br>
  * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
  */
-export interface CommandCopyParams extends CommandContentTypeParams {
-  /**
-   * Entity to copy, required or the button won't even appear.
-   */
-  entityId: number;
+export interface CommandCopyParams extends CommandContentTypeParams, CommandParamsEntityById {
 }
diff --git a/projects/inpage/src/commands/command/command-metadata.ts b/projects/inpage/src/commands/command/command-metadata.ts
index 3e5b90072..7d9a01409 100644
--- a/projects/inpage/src/commands/command/command-metadata.ts
+++ b/projects/inpage/src/commands/command/command-metadata.ts
@@ -1,5 +1,6 @@
-﻿import { Command, CommandNames, Commands } from '..';
-import { ItemIdentifierSimple } from '../../../../$2sxc/src/cms';
+﻿import { Command, CommandNames, CommandParamsEntityById, Commands } from '..';
+import { ItemIdentifierSimple, CommandParamsMetadata } from '../../../../$2sxc/src/cms';
+import { CommandContentTypeParams } from './command-content-type';
 
 const MetadataDefaultKeyType = 'string';
 const MetadataDefaultTargetType = 10; // cms-item
@@ -45,3 +46,21 @@ export const ImageMetadataCommand = Command.build(CommandNames.image, 'Image', '
 
 Commands.addCommand(MetadataCommand);
 Commands.addCommand(ImageMetadataCommand);
+
+
+/**
+ * Parameters used for the command `metadata`.
+ * <br>
+ * Will do either one of these:
+ * - if it has an `entityId`, will just open `edit` for that Entity
+ * - if it has no `entityId`, will open `new` for the current `contentType` 
+ * and assign to the target specified by TODO:
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandMetadataParams extends CommandContentTypeParams, CommandParamsEntityById {
+  /**
+   * Target to assign the metadata to.
+   */
+  metadata: CommandParamsMetadata;
+}
diff --git a/projects/inpage/src/commands/command/command-movedown.ts b/projects/inpage/src/commands/command/command-movedown.ts
index 479e376c1..5f43f716c 100644
--- a/projects/inpage/src/commands/command/command-movedown.ts
+++ b/projects/inpage/src/commands/command/command-movedown.ts
@@ -17,26 +17,3 @@ Commands.add(CommandNames.moveDown, 'MoveDown', 'move-down', false, true, {
         );
     },
 });
-
-/**
- * Parameters used for the command `moveup` and `movedown`.
- * <br>
- * ⚠️ do not use parameters in custom code, we plan to change the signature.
- * <br>
- * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
- */
- export interface CommandMoveParams {
-  /**
-   * Determins the position where a new item will be added to.
-   * <br>
-   * ⚠️ This parameter will change soon, don't use it in code. 
-   */
-  sortOrder: number;
-
-  /**
-   * Must be true, to work on the module list. 
-   * <br>
-   * ⚠️ This parameter will change soon, don't use it in code. 
-   */
-  useModuleList: true;
-}
diff --git a/projects/inpage/src/commands/command/command-params-entity.ts b/projects/inpage/src/commands/command/command-params-entity.ts
new file mode 100644
index 000000000..2408f449c
--- /dev/null
+++ b/projects/inpage/src/commands/command/command-params-entity.ts
@@ -0,0 +1,62 @@
+﻿
+/**
+ * Parameters used for commands which address a specificy entity.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandParamsEntityById {
+  /**
+   * ID of item to edit. 
+   */
+  entityId: number;
+}
+
+/**
+ * Parameters used for command which expect an item from a list of a ContentBlock.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandParamsEntityInContentBlock {
+  /**
+   * Determins the position of the item in the list that will be edited. 
+   */
+  sortOrder: number;
+
+  /**
+   * Must be true, to work on the module list. 
+   */
+  useModuleList: true;
+}
+
+/**
+ * Parameters used for command which expect an item in a list (field) of a parent.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+ export interface CommandParamsEntityInList {
+  /**
+   * Determins the position of the item in the list that will be edited. 
+   */
+  sortOrder: number;
+
+
+  /**
+   * Parent entity GUID.
+   */
+  parent: string;
+
+
+  /**
+   * Parent Entity field(s) name(s).
+   */
+  fields: string;
+}
+
+/**
+ * Parameters used for commands which need an entity ID or a list-reference.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandParamsEntity extends CommandParamsEntityById, CommandParamsEntityInContentBlock {
+
+}
\ No newline at end of file
diff --git a/projects/inpage/src/commands/command/command-remove.ts b/projects/inpage/src/commands/command/command-remove.ts
index 14a42863a..44a4d6978 100644
--- a/projects/inpage/src/commands/command/command-remove.ts
+++ b/projects/inpage/src/commands/command/command-remove.ts
@@ -18,28 +18,3 @@ Commands.add(CommandNames.remove, 'Remove', 'minus-circled', false, true, {
         });
     },
 });
-
-
-
-/**
- * Parameters used for the command `moveup` and `movedown`.
- * <br>
- * ⚠️ do not use parameters in custom code, we plan to change the signature.
- * <br>
- * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
- */
- export interface CommandMoveParams {
-  /**
-   * Determins the position where a new item will be added to.
-   * <br>
-   * ⚠️ This parameter will change soon, don't use it in code. 
-   */
-  sortOrder: number;
-
-  /**
-   * Must be true, to work on the module list. 
-   * <br>
-   * ⚠️ This parameter will change soon, don't use it in code. 
-   */
-  useModuleList: true;
-}
diff --git a/projects/inpage/src/commands/command/command-replace.ts b/projects/inpage/src/commands/command/command-replace.ts
index ea9f88934..ef187a9ba 100644
--- a/projects/inpage/src/commands/command/command-replace.ts
+++ b/projects/inpage/src/commands/command/command-replace.ts
@@ -1,5 +1,4 @@
 ﻿import { CommandNames, Commands } from '..';
-import { CommandMoveParams } from './command-movedown';
 import { SharedLogic } from './shared-logic';
 
 /**
@@ -26,14 +25,3 @@ Commands.add(CommandNames.replace, 'Replace', 'replace', false, true, {
         }}];
     },
 });
-
-
-/**
- * Parameters used for the command `replace`.
- * <br>
- * ⚠️ do not use parameters in custom code, we plan to change the signature.
- * <br>
- * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
- */
-export interface CommandReplaceParams extends CommandMoveParams {
-}
diff --git a/projects/inpage/src/commands/command/index.ts b/projects/inpage/src/commands/command/index.ts
index 574d6b535..4906e8e3f 100644
--- a/projects/inpage/src/commands/command/index.ts
+++ b/projects/inpage/src/commands/command/index.ts
@@ -32,7 +32,7 @@
 /** @internal */ import './command-template-settings';
 /** @internal */ import './command-zone';
 
-
+/** @internal */ export * from './command-params-entity';
 /** @internal */ export * from './content-list-action-params';
 /** @internal */ export * from './content-list-actions';
 
diff --git a/projects/inpage/src/toolbar/rules/rule-params-helper.ts b/projects/inpage/src/toolbar/rules/rule-params-helper.ts
index ac2a12ce1..6ec0a4538 100644
--- a/projects/inpage/src/toolbar/rules/rule-params-helper.ts
+++ b/projects/inpage/src/toolbar/rules/rule-params-helper.ts
@@ -1,5 +1,5 @@
 import { RuleParams } from '.';
-import { MetadataForBasic } from '../../../../$2sxc/src/cms';
+import { CommandParamsMetadata } from '../../../../$2sxc/src/cms';
 import { Log, LogEntryOptions as LEO } from '../../core';
 import { TypeValue } from '../../plumbing';
 
@@ -38,7 +38,7 @@ export class RuleParamsHelper {
         return cl.return({ params, context });
     }
 
-    private static processMetadata(params: RuleParams, log: Log): MetadataForBasic {
+    private static processMetadata(params: RuleParams, log: Log): CommandParamsMetadata {
         const cl = log.call('processMetadata');
 
         // get the for-target and if exists, delete from params
diff --git a/projects/inpage/src/toolbar/rules/rule-params.ts b/projects/inpage/src/toolbar/rules/rule-params.ts
index d4a3a03d2..76df3e27f 100644
--- a/projects/inpage/src/toolbar/rules/rule-params.ts
+++ b/projects/inpage/src/toolbar/rules/rule-params.ts
@@ -1,4 +1,4 @@
-import { MetadataForBasic } from '../../../../$2sxc/src/cms';
+import { CommandParamsMetadata } from '../../../../$2sxc/src/cms';
 import { TypeValue } from '../../plumbing';
 
 /**
@@ -17,5 +17,5 @@ export type RuleParams = Record<string, string> & {
     for?: string;
 
     /** This is the metadata node as it will be used as a real parameter */
-    metadata?: MetadataForBasic;
+    metadata?: CommandParamsMetadata;
 };

From 0a8163072098b60b7adea077fc91f5d8df252577 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 11:05:54 +0200
Subject: [PATCH 29/41] wip docs

---
 projects/$2sxc/src/cms/command-params-metadata.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/$2sxc/src/cms/command-params-metadata.ts b/projects/$2sxc/src/cms/command-params-metadata.ts
index 79a37d936..c8dad8bf9 100644
--- a/projects/$2sxc/src/cms/command-params-metadata.ts
+++ b/projects/$2sxc/src/cms/command-params-metadata.ts
@@ -1,3 +1,5 @@
+import { MetadataTargetTypes } from '../data';
+
 /**
  * Parameters on `metadata` for commands which have a metadata-target. 
  */
@@ -15,5 +17,5 @@ export interface CommandParamsMetadata {
     /**
      * The target type, will default to 10 = CMS-Item
      */
-    targetType?: number;
+    targetType?: MetadataTargetTypes;
 }

From 547c3e65c3a3d6790bfa43dab6f151f8d381e853 Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Mon, 20 Jun 2022 13:47:50 +0200
Subject: [PATCH 30/41] quick dialog - removed configure app, search input
 width, minor translations

---
 projects/quick-dialog/angular.json            |   1 +
 .../template-picker.component.html            |  10 -
 .../template-picker.component.scss            | 498 +++++++++---------
 projects/quick-dialog/src/i18n/de.json        |   2 +-
 projects/quick-dialog/src/i18n/en.json        |   2 +-
 5 files changed, 252 insertions(+), 261 deletions(-)

diff --git a/projects/quick-dialog/angular.json b/projects/quick-dialog/angular.json
index c4615aacc..1982d316d 100644
--- a/projects/quick-dialog/angular.json
+++ b/projects/quick-dialog/angular.json
@@ -2,6 +2,7 @@
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "version": 1,
   "cli": {
+    "analytics": false,
     "cache": {
       "enabled": false
     }
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.html b/projects/quick-dialog/src/app/template-picker/template-picker.component.html
index 36b3589b5..9fdc150a8 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.html
+++ b/projects/quick-dialog/src/app/template-picker/template-picker.component.html
@@ -105,16 +105,6 @@ <h4>Debug 2sxc 11 / ng 11</h4>
               <span>{{t.Name}}</span>
             </div>
           </div>
-          <div class="tile config" *ngIf="showAdvanced && !isContent && app?.AppId !== null" (click)="run('app')" [attr.title]="'TemplatePicker.App' | translate">
-            <div class="bg">
-              <div class="bg-icon">
-                <mat-icon>settings</mat-icon>
-              </div>
-            </div>
-            <div class="title show">
-              <span>{{"TemplatePicker.App" | translate}}</span>
-            </div>
-          </div>
         </div>
       </mat-tab>
 
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.scss b/projects/quick-dialog/src/app/template-picker/template-picker.component.scss
index 53e271d9f..62f0d6b88 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.scss
+++ b/projects/quick-dialog/src/app/template-picker/template-picker.component.scss
@@ -1,258 +1,258 @@
 :host {
-    display: block;
-    padding-top: 56px;
-    .content {
-        background: #fafafa;
-        box-shadow: 0 -1px 2px rgba(0, 0, 0, .3);
-        position: relative;
-        .card {
-            max-width: 1200px;
-            margin: 0 auto;
-            min-height: 164px;
-            .top-controls {
-                position: absolute;
-                height: 56px;
-                right: 4px;
-                top: -56px;
-                width: 100%;
-                text-align: center;
-                z-index: 2;
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                button {
-                    display: inline-block;
-                    float: none;
-                    position: relative;
-                    top: 28px;
-                }
-                button.secondary {
-                    background: #fafafa !important;
-                    color: rgba(0, 0, 0, .8);
-                }
-            }
-            .tiles {
-                white-space: nowrap;
-                overflow-x: auto;
-                &:not(.show-installer) {
-                  height: 132px;
-                  overflow-y: hidden;
-                }
-                .tile {
-                    box-sizing: border-box;
-                    background: #fff;
-                    display: inline-block;
-                    margin: 12px 0 12px 12px;
-                    position: relative;
-                    font-size: 12px;
-                    border-radius: 22px 0 22px 0;
-                    height: 88px;
-                    width: 88px;
-                    line-height: 88px;
-                    text-align: center;
-                    overflow: hidden;
-                    cursor: pointer;
-                    color: #00275388; // rgba(0, 0, 0, .8);
-                    transition: all 0.3s cubic-bezier(.25, .8, .25, 1);
-                    box-shadow: 0 1px 3px rgba(0, 0, 0, .12), 0 1px 2px rgba(0, 0, 0, .24);
-                    &:hover {
-                        box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
-                        .title {
-                            opacity: 1;
-                            text-overflow: initial;
-                            height: auto;
-                            min-height: 24px;
-                            padding: 4px;
-                            white-space: pre-wrap;
-                            line-height: normal;
-                            span {
-                                transform: translate(0, 0);
-                            }
-                        }
-                        .version {
-                            opacity: 1;
-                        }
-                    }
-                    &.blocked {
-                        cursor: not-allowed;
-                        opacity: 0.5;
-                    }
-                    &:active,
-                    &.active {
-                        cursor: pointer;
-                        box-shadow: 0 14px 28px #00275344 /*rgba(0, 120, 220, 0.25)*/, 0 10px 10px rgba(0, 120, 220, 0.22);
-                        opacity: 1;
-                    }
-                    &.active,
-                    &:focus {
-                        // color: #fff;
-                        // color: rgb(0, 120, 220);
-                        color: #002753;
-                    }
-                    &.config {
-                        box-shadow: none;
-                        border: 1px dashed rgba(0, 0, 0, .2);
-                        background: transparent;
-                    }
-                    .bg {
-                        position: absolute;
-                        left: 0;
-                        top: 0;
-                        width: 100%;
-                        height: 100%;
-                        img {
-                            width: 100%;
-                            height: 100%;
-                        }
-                    }
-                    .title {
-                        display: inline-block;
-                        position: absolute;
-                        box-sizing: border-box;
-                        padding: 0 4px;
-                        left: 0;
-                        bottom: 0;
-                        width: 100%;
-                        height: 24px;
-                        line-height: 24px;
-                        background: rgba(255, 255, 255, 1);
-                        color: rgba(0, 0, 0, .8);
-                        letter-spacing: .1pt;
-                        font-size: 11px;
-                        text-overflow: ellipsis;
-                        overflow: hidden;
-                        white-space: nowrap;
-                        opacity: 0;
-                        font-weight: bold;
-                        transition: opacity .4s ease;
-                        &.show {
-                            opacity: 1;
-                            span {
-                                transform: translate(0, 0);
-                            }
-                        }
-                        span {
-                            display: inline-block;
-                            transform: translate(0, 24px);
-                            transition: transform .4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
-                        }
-                    }
-                    .version {
-                        display: inline-block;
-                        position: absolute;
-                        box-sizing: border-box;
-                        padding: 0 4px;
-                        right: 0;
-                        top: 0;
-                        width: 24px;
-                        height: 24px;
-                        line-height: 24px;
-                        // background: rgba(255, 255, 255, 1);
-                        color: #fff;
-                        letter-spacing: .1pt;
-                        font-size: 11px;
-                        font-weight: bold;
-                        white-space: nowrap;
-                        opacity: 0;
-                        transition: opacity .4s ease;
-                        span {
-                            // display: inline-block;
-                            transform: translate(0, 24px);
-                            transition: transform .4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
-                            text-shadow: 0px 0px 5px #000
-                        }
+  display: block;
+  padding-top: 56px;
+  .content {
+      background: #fafafa;
+      box-shadow: 0 -1px 2px rgba(0, 0, 0, .3);
+      position: relative;
+      .card {
+          max-width: 1200px;
+          margin: 0 auto;
+          min-height: 164px;
+          .top-controls {
+              position: absolute;
+              height: 56px;
+              right: 4px;
+              top: -56px;
+              width: 100%;
+              text-align: center;
+              z-index: 2;
+              display: flex;
+              flex-direction: row;
+              align-items: center;
+              button {
+                  display: inline-block;
+                  float: none;
+                  position: relative;
+                  top: 28px;
+              }
+              button.secondary {
+                  background: #fafafa !important;
+                  color: rgba(0, 0, 0, .8);
+              }
+          }
+          .tiles {
+              white-space: nowrap;
+              overflow-x: auto;
+              &:not(.show-installer) {
+                height: 132px;
+                overflow-y: hidden;
+              }
+              .tile {
+                  box-sizing: border-box;
+                  background: #fff;
+                  display: inline-block;
+                  margin: 12px 0 12px 12px;
+                  position: relative;
+                  font-size: 12px;
+                  border-radius: 22px 0 22px 0;
+                  height: 88px;
+                  width: 88px;
+                  line-height: 88px;
+                  text-align: center;
+                  overflow: hidden;
+                  cursor: pointer;
+                  color: #00275388; // rgba(0, 0, 0, .8);
+                  transition: all 0.3s cubic-bezier(.25, .8, .25, 1);
+                  box-shadow: 0 1px 3px rgba(0, 0, 0, .12), 0 1px 2px rgba(0, 0, 0, .24);
+                  &:hover {
+                      box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+                      .title {
+                          opacity: 1;
+                          text-overflow: initial;
+                          height: auto;
+                          min-height: 24px;
+                          padding: 4px;
+                          white-space: pre-wrap;
+                          line-height: normal;
+                          span {
+                              transform: translate(0, 0);
+                          }
+                      }
+                      .version {
+                          opacity: 1;
+                      }
+                  }
+                  &.blocked {
+                      cursor: not-allowed;
+                      opacity: 0.5;
+                  }
+                  &:active,
+                  &.active {
+                      cursor: pointer;
+                      box-shadow: 0 14px 28px #00275344 /*rgba(0, 120, 220, 0.25)*/, 0 10px 10px rgba(0, 120, 220, 0.22);
+                      opacity: 1;
+                  }
+                  &.active,
+                  &:focus {
+                      // color: #fff;
+                      // color: rgb(0, 120, 220);
+                      color: #002753;
+                  }
+                  &.config {
+                      box-shadow: none;
+                      border: 1px dashed rgba(0, 0, 0, .2);
+                      background: transparent;
+                  }
+                  .bg {
+                      position: absolute;
+                      left: 0;
+                      top: 0;
+                      width: 100%;
+                      height: 100%;
+                      img {
+                          width: 100%;
+                          height: 100%;
+                      }
+                  }
+                  .title {
+                      display: inline-block;
+                      position: absolute;
+                      box-sizing: border-box;
+                      padding: 0 4px;
+                      left: 0;
+                      bottom: 0;
+                      width: 100%;
+                      height: 24px;
+                      line-height: 24px;
+                      background: rgba(255, 255, 255, 1);
+                      color: rgba(0, 0, 0, .8);
+                      letter-spacing: .1pt;
+                      font-size: 11px;
+                      text-overflow: ellipsis;
+                      overflow: hidden;
+                      white-space: nowrap;
+                      opacity: 0;
+                      font-weight: bold;
+                      transition: opacity .4s ease;
+                      &.show {
+                          opacity: 1;
+                          span {
+                              transform: translate(0, 0);
+                          }
+                      }
+                      span {
+                          display: inline-block;
+                          transform: translate(0, 24px);
+                          transition: transform .4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+                      }
+                  }
+                  .version {
+                      display: inline-block;
+                      position: absolute;
+                      box-sizing: border-box;
+                      padding: 0 4px;
+                      right: 0;
+                      top: 0;
+                      width: 24px;
+                      height: 24px;
+                      line-height: 24px;
+                      // background: rgba(255, 255, 255, 1);
+                      color: #fff;
+                      letter-spacing: .1pt;
+                      font-size: 11px;
+                      font-weight: bold;
+                      white-space: nowrap;
+                      opacity: 0;
+                      transition: opacity .4s ease;
+                      span {
+                          // display: inline-block;
+                          transform: translate(0, 24px);
+                          transition: transform .4s cubic-bezier(0.68, -0.55, 0.265, 1.55);
+                          text-shadow: 0px 0px 5px #000
+                      }
 
-                    }
-                }
-            }
-            .templates-spinner {
-                width: 48px;
-                margin: 12px 0 12px 12px;
-                height: 88px;
-                display: inline-block;
-            }
-            mat-select {
-                width: 320px;
-            }
-            .row {
-                margin: 8px 0;
-            }
-            button {
-                margin: 0 0 0 8px;
-                float: left;
-                background: #002753; // #0088f4;
-            }
-            .fr-getting-started {
-                border: none;
-            }
-        }
+                  }
+              }
+          }
+          .templates-spinner {
+              width: 48px;
+              margin: 12px 0 12px 12px;
+              height: 88px;
+              display: inline-block;
+          }
+          mat-select {
+              width: 320px;
+          }
+          .row {
+              margin: 8px 0;
+          }
+          button {
+              margin: 0 0 0 8px;
+              float: left;
+              background: #002753; // #0088f4;
+          }
+          .fr-getting-started {
+              border: none;
+          }
+      }
 
-        .no-install-allowed {
-            background: #F44336;
-            display: block;
-            padding: 16px;
-            border-radius: 2px;
-            color: #fff;
-            line-height: 24px;
-            box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
-            text-align: center;
-        }
-    }
+      .no-install-allowed {
+          background: #F44336;
+          display: block;
+          padding: 16px;
+          border-radius: 2px;
+          color: #fff;
+          line-height: 24px;
+          box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
+          text-align: center;
+      }
+  }
 
-    .mat-tab-group {
-        ::ng-deep .mat-tab-label.mat-tab-disabled {
-            opacity: initial;
-            color: initial;
-            margin-left: auto;
-        }
-    }
+  .mat-tab-group {
+      ::ng-deep .mat-tab-label.mat-tab-disabled {
+          opacity: initial;
+          color: initial;
+          margin-left: auto;
+      }
+  }
 
-    .search-field {
-        position: relative;
-        input {
-            border: none;
-            outline: none;
-            border-bottom: 1px solid grey;
-            background: transparent;
-            padding-right: 20px;
-            width: 180px;
-            box-sizing: border-box;
-            &:focus {
-                border-color: black;
-            }
-        }
-        &::after {
-            position: absolute;
-            right: 0px;
-            top: 0;
-            padding: 2px;
-            font-family: "Material Icons";
-            content: "search";
-        }
-    }
-    .config-btn {
-        float: initial !important;
-        background: initial !important;
-        .mat-icon {
-            color: #00275388;
-        }
-    }
+  .search-field {
+      position: relative;
+      input {
+          border: none;
+          outline: none;
+          border-bottom: 1px solid grey;
+          background: transparent;
+          padding-right: 20px;
+          width: 60px;
+          box-sizing: border-box;
+          &:focus {
+              border-color: black;
+          }
+      }
+      &::after {
+          position: absolute;
+          right: 0px;
+          top: 0;
+          padding: 2px;
+          font-family: "Material Icons";
+          content: "search";
+      }
+  }
+  .config-btn {
+      float: initial !important;
+      background: initial !important;
+      .mat-icon {
+          color: #00275388;
+      }
+  }
 }
 
 ::ng-deep mat-tab-group {
-    mat-tab-header {
-        border-bottom: none !important;
-        mat-ink-bar {
-            display: none !important;
-        }
-        .mat-tab-labels {
-            // display: block;
-            .mat-tab-label {
-                min-width: 0 !important;
-                &.mat-tab-label-active {
-                    opacity: 1;
-                }
-            }
-        }
-    }
+  mat-tab-header {
+      border-bottom: none !important;
+      mat-ink-bar {
+          display: none !important;
+      }
+      .mat-tab-labels {
+          // display: block;
+          .mat-tab-label {
+              min-width: 0 !important;
+              &.mat-tab-label-active {
+                  opacity: 1;
+              }
+          }
+      }
+  }
 }
diff --git a/projects/quick-dialog/src/i18n/de.json b/projects/quick-dialog/src/i18n/de.json
index 651802422..fc08820ca 100644
--- a/projects/quick-dialog/src/i18n/de.json
+++ b/projects/quick-dialog/src/i18n/de.json
@@ -13,7 +13,7 @@
     "Catalog": "App Katalog durchsuchen",
 
     "App": "App Konfigurieren",
-    "Zone": "Apps verwalten"
+    "Zone": "Alle Apps"
 
   }
 }
diff --git a/projects/quick-dialog/src/i18n/en.json b/projects/quick-dialog/src/i18n/en.json
index 6eeece8aa..479e41c3b 100644
--- a/projects/quick-dialog/src/i18n/en.json
+++ b/projects/quick-dialog/src/i18n/en.json
@@ -13,6 +13,6 @@
 		"Catalog": "browse app catalog",
 
 		"App": "configure app",
-		"Zone": "manage all apps"
+		"Zone": "all apps"
   }
 }

From 472c9bdcec10f54fb4b4ac6bf297bfd5e11cb53e Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Mon, 20 Jun 2022 14:03:03 +0200
Subject: [PATCH 31/41] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 3d3f22083cf599ffce432bddee55a099eec738bd
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Fri Mar 11 17:12:17 2022 +0100

    dnn-sxc-angular changes dependencies

commit 42286e8c58e668af0298ef160148e27855f4596d
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Fri Mar 11 10:59:45 2022 +0100

    minor

commit ae9bb03c8aaed06970b3cdba736611578f5be56a
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Fri Mar 11 10:31:13 2022 +0100

    dnn-sxc-angular improvements api, query, sxc -> sxcApp, added utils

commit 3e9cd2462b4adfe42300d995d19f264013b5d7b5
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Thu Mar 10 10:19:46 2022 +0100

    dnn-sxc-angular improvements docs

commit 5dff085779231251e66e48ff85eef629bd55a8e0
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Thu Mar 10 10:14:21 2022 +0100

    dnn-sxc-angular bug fix and minor

commit 893f73efe7371018fb93800d2ac7b867a8269a81
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Wed Mar 9 17:29:12 2022 +0100

    minor

commit d67d2060294f11cb944e0ad90c3ee4b1ddabf5bf
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Wed Mar 9 17:25:22 2022 +0100

    dnn-sxc-angular improvements

commit ca4f36e06d030479458461598d64c4be20d0fc70
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Wed Mar 9 15:25:36 2022 +0100

    dnn-sxc-angular bugfixes

commit d7dd95ef4e216887348fa554c71db7070e346c4d
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Wed Mar 9 10:45:59 2022 +0100

    minors

commit 8b3aa3372950ff7abdd1d29bec87abc03a416f3a
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Wed Mar 9 10:34:06 2022 +0100

    dnn-sxc-angular changes tslint, changes query, minors

commit 9934c20547d2f684234b795f55bcaf9c709567d7
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Wed Mar 9 09:26:17 2022 +0100

    dnn-sxc-angular added metadata-for interface and improvements data

commit de9e18b8fd343d9b9758d83d9d8a985afeabd4ff
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Tue Mar 8 17:52:21 2022 +0100

    dnn-sxc-angular improvements data, changes api

commit bd2548a682c7da9402c38c0e4c5326095371a715
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Tue Mar 8 17:02:53 2022 +0100

    dnn-sxc-angular bug fix and docs

commit fea82d986eba1d86b1b29cb099fb6e503a233d79
Author: Maxim Hüsler <maxim.huesler@2sic.com>
Date:   Mon Mar 7 18:05:11 2022 +0100

    dnn-sxc-angular changes data api, minor paths
---
 projects/dnn-sxc-angular/package.json         |  30 ++---
 .../projects/dnn-sxc-angular/README.md        |   6 +-
 .../projects/dnn-sxc-angular/package.json     |   8 +-
 .../src/lib/content-manager.module.ts         |   4 +-
 .../src/lib/dnn-app.component.ts              |  13 +--
 .../src/lib/dnn-sxc-root.module.ts            |   4 +-
 .../dnn-sxc-angular/src/lib/sxc/api.ts        |  40 +++++--
 .../dnn-sxc-angular/src/lib/sxc/content.ts    |  46 --------
 .../dnn-sxc-angular/src/lib/sxc/data.ts       | 104 ++++++------------
 .../dnn-sxc-angular/src/lib/sxc/index.ts      |   4 +-
 .../src/lib/sxc/metadata-for.ts               |   6 +
 .../src/lib/sxc/query-construction.ts         |   7 --
 .../dnn-sxc-angular/src/lib/sxc/query.ts      |  97 +++++++++++-----
 .../dnn-sxc-angular/src/lib/sxc/sxc-app.ts    |  49 +++++++++
 .../dnn-sxc-angular/src/utils/params.ts       |   5 +
 .../projects/dnn-sxc-angular/tslint.json      |   1 +
 16 files changed, 232 insertions(+), 192 deletions(-)
 delete mode 100644 projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/content.ts
 create mode 100644 projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
 delete mode 100644 projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query-construction.ts
 create mode 100644 projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
 create mode 100644 projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts

diff --git a/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/package.json
index bd7489079..b0b5a6b2c 100644
--- a/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/package.json
@@ -12,24 +12,24 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~11.2.1",
-    "@angular/common": "~11.2.1",
-    "@angular/compiler": "~11.2.1",
-    "@angular/core": "~11.2.1",
-    "@angular/forms": "~11.2.1",
-    "@angular/platform-browser": "~11.2.1",
-    "@angular/platform-browser-dynamic": "~11.2.1",
-    "@angular/router": "~11.2.1",
-    "rxjs": "~6.6.3",
-    "tslib": "^2.0.0",
-    "zone.js": "~0.10.2",
+    "@angular/animations": "~13.2.6",
+    "@angular/common": "~13.2.6",
+    "@angular/compiler": "~13.2.6",
+    "@angular/core": "~13.2.6",
+    "@angular/forms": "~13.2.6",
+    "@angular/platform-browser": "~13.2.6",
+    "@angular/platform-browser-dynamic": "~13.2.6",
+    "@angular/router": "~13.2.6",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.1.0",
+    "zone.js": "~0.10.4",
     "@2sic.com/2sxc-typings": "^10.24.4"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1102.1",
-    "@angular/cli": "~11.2.1",
-    "@angular/compiler-cli": "~11.2.1",
-    "@angular/language-service": "~11.2.1",
+    "@angular-devkit/build-angular": "~13.2.6",
+    "@angular/cli": "~13.2.6",
+    "@angular/compiler-cli": "~13.2.6",
+    "@angular/language-service": "~13.2.6",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md
index 0e4e5e7f0..44296b76d 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md
@@ -75,10 +75,10 @@ export class AppComponent extends DnnAppComponent {
 
 ### Using 2sxc Content-Items, Queries and APIs
 
-This package is fully documented with intellisense. Once configured it ensures that all HTTP requests in angular include DNN headers. It also contains a `Data` and `Api` object, which provides 3 observable streams
+This package is fully documented with intellisense. Once configured it ensures that all HTTP requests in angular include DNN headers. It also contains a `SxcData` and `Api` object, which provides 3 observable streams
 
-* `data.content$<T>(contentTypeName)`
-* `data.query$<T>(queryName)`
+* `SxcData.data$<T>(contentTypeName)`
+* `SxcData.query$<T>(queryName)`
 * `api.get$<T>(apiNameAndParams)`
 * `api.post$<T>(apiNameAndParams)`
 * plus various overloads
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
index 951452113..52f4f7c39 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
@@ -10,10 +10,10 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=6.1.3",
-    "@angular/core": ">=6.1.3",
-    "@angular/platform-browser": ">=6.1.3",
-    "rxjs": ">=6.5.0"
+    "@angular/common": ">=11.0.0",
+    "@angular/core": ">=11.0.0",
+    "@angular/platform-browser": ">=11.0.0",
+    "rxjs": ">=6.6.0"
   },
   "homepage": "https://github.com/2sic/2sxc-ui/tree/master/projects/dnn-sxc-angular#readme",
   "license": "MIT",
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/content-manager.module.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/content-manager.module.ts
index 783b59ea5..5a3c79525 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/content-manager.module.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/content-manager.module.ts
@@ -1,4 +1,4 @@
-import { Data } from './sxc/data';
+import { SxcApp } from './sxc/sxc-app';
 import { NgModule } from '@angular/core';
 import { SxcToolbarDirective } from './beta/edit';
 // important: for funny reasons this must really got to the real path - if you get it from '.' index it will fail building
@@ -18,7 +18,7 @@ import { SxcTagToolbarDirective } from './toolbar/tag-toolbar';
     SxcTagToolbarDirective,
   ],
   providers: [
-    Data,
+    SxcApp,
   ],
   exports: [
     SxcToolbarDirective,
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
index 08d3a5cf4..27b920761 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
@@ -23,12 +23,11 @@ export class DnnAppComponent {
     // auto-config to pick up tab-id, module id, etc.
     context.autoConfigure(element);
     // prevent asp.net submit action caused by enter-keys inside our app
-    if(!enableDefaultSubmit){
-      element.nativeElement.addEventListener('keydown', function(e: any) {
-        if(e.target.tagName.toLowerCase() == "input" && e.keyCode==13)
-          e.preventDefault();
-      });
-
-    }
+    if (!enableDefaultSubmit)
+      element.nativeElement.addEventListener('keydown', (e: any) => {
+          if (e.target.tagName.toLowerCase() === 'input' && e.keyCode === 13)
+            e.preventDefault();
+        }
+      );
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
index 51a71af93..b3e97ccab 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
@@ -1,5 +1,5 @@
 import { Context } from './context/context.service';
-import { Data } from './sxc/data';
+import { SxcApp } from './sxc/sxc-app';
 import { DnnInterceptor } from './http/dnn.interceptor';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 
@@ -17,7 +17,7 @@ import { NgModule, Optional, SkipSelf } from '@angular/core';
     // HttpClientModule,
   ],
   providers: [
-    Data,
+    SxcApp,
     Context,
     DnnInterceptor,
   ]
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
index d9c80070f..db8d40543 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
@@ -1,5 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { getHttpParams } from '../../utils/params';
 import { routeApi } from '../contants';
 
 /**
@@ -15,18 +16,41 @@ export class Api {
   ) {  }
 
   /**
-   * Do a GET request a 2sxc api controller method
+   * Get the request URL of the api
    */
-  get<T>(method: string, params?: HttpParams): Observable<T> {
-    const url = `${routeApi}/${this.controller}/${method}`;
-    return this.http.get<T>(url, { params });
+  url(method: string): string {
+    return `${routeApi}/${this.controller}/${method}`;
   }
 
   /**
-   * Do a POST request to a 2sxc api controller method
+   * Do a GET request to the specified 2sxc api controller
    */
-  post<T>(method: string, body: any, params?: HttpParams): Observable<T> {
-    const url = `${routeApi}/${this.controller}/${method}`;
-    return this.http.post<T>(url, body, { params });
+  get<T>(method: string, params: HttpParams | string): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(params);
+    return this.http.get<T>(this.url(method), { params: requestParams });
+  }
+
+  /**
+   * Do a POST request to the specified 2sxc api controller
+   */
+  post<T>(method: string, params: HttpParams | string, body: T): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(params);
+    return this.http.post<T>(this.url(method), body, { params: requestParams });
+  }
+
+  /**
+   * Do a PUT request to the specified 2sxc api controller
+   */
+  put<T>(method: string, params: HttpParams | string, body: T): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(params);
+    return this.http.put<T>(this.url(method), body, { params: requestParams });
+  }
+
+  /**
+   * Do a DELETE request to the specified 2sxc api controller
+   */
+  delete<T>(method: string, params: HttpParams | string): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(params);
+    return this.http.put<T>(this.url(method), { params: requestParams });
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/content.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/content.ts
deleted file mode 100644
index 9ba8631ad..000000000
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/content.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { routeContent } from '../contants';
-
-/**
- * A helper to access content from 2sxc
- *
- * @class Content
- * @template T Type which the system will return
- */
-export class Content<T> {
-  constructor(
-    private http: HttpClient,
-    private contentType: string,
-  ) { }
-
-  /**
-   * Get all items of this type
-   */
-  get(): Observable<T[]>;
-
-  /**
-   * get the specific item with the ID
-   */
-  get(id: number): Observable<T>;
-
-  /**
-   * internal implementation with/without ID
-   */
-  get(id: number = null): Observable<T[]> | Observable<T> {
-    let url = `${routeContent}/${this.contentType}`;
-    if (id) {
-      url += `/${id}`;
-      return this.http.get<T>(url);
-    }
-
-    return this.http.get<T[]>(url);
-  }
-
-  /**
-   * This method doesn't exist yet - maybe one day we'll enhance for creating data-items
-   */
-  post(): Observable<T> {
-    throw new Error('not implemented yet');
-  }
-}
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
index f7989d11f..dcac9a03c 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
@@ -1,104 +1,68 @@
-import { Api } from './api';
-import { Content } from './content';
 import { HttpClient } from '@angular/common/http';
-import { HttpParams } from '@angular/common/http';
-import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { Query } from './query';
-import { QueryConstruction } from './query-construction';
+import { routeContent } from '../contants';
+import { MetaDataFor } from './metadata-for';
 
 /**
- * 2sxc data provider
- * gives you access to content and query streams using the content$ and query$ commands
- * you can also use the content and query managers, but these are currently not so useful.
+ * A helper to access data from 2sxc
  *
- * @export
  * @class Data
+ * @template T Type which the system will return
  */
-@Injectable({
-  providedIn: 'root',
-})
-export class Data {
+export class Data<T> {
   constructor(
     private http: HttpClient,
+    private contentType: string,
   ) { }
 
   /**
-   * Cet a content manager object for a specific ContentType
-   * usually you will prefer the the observable stream content$
-   * this manager is currently included for consistency, and will later also offer write commands
-   * @param contentType name of the content-type
+   * Get all items of this type
    */
-  public content<T>(contentType: string): Content<T> {
-    return new Content<T>(this.http, contentType);
+  getAll(): Observable<T[]> {
+    const url = `${routeContent}/${this.contentType}`;
+    return this.http.get<T[]>(url);
   }
 
   /**
-   * get a stream of content items or (if ID is provided) a stream containing one item
-   * @param contentType name of the content-type
-   * @param id optional id of a single item
-   * @returns an observable containing a single item (if ID is provided) or an array of these items
+   * get the specific item with the ID
    */
-  content$<T>(contentType: string, id?: number): Observable<T> {
-    // When id is undefined, we would get back an Observable<T[]> instead of Observable<T>.
-    // Typescript does not take care of this; however we ignore it because we want the data
-    // service to always return an Observable of T.
-    return new Content<T>(this.http, contentType).get(id);
+  getOne(id: number): Observable<T> {
+    const url = `${routeContent}/${this.contentType}/${id}`;
+    return this.http.get<T>(url);
   }
 
   /**
-   * get a query object to then start queries
-   * usually you'll be better off using the observable stream query$, this is included primarily for consistency in the api
-   * @param name the query name
-   * @returns a query object with a .get()
+   * Create new item
    */
-  public query<T>(name: string) {
-    return new Query<T>(this.http, name);
-  }
+  create(item: T): Observable<T>;
 
   /**
-   * retrieve a query stream from the server
-   * @param name the query name
-   * @param params optional parameters-object
-   * @returns a typed observable which will give you the query
+   * Create new item as metadata for something
    */
-  public query$<T>(name: string, params?: HttpParams): Observable<T>;
-  public query$<T>({ name, params, streams }: QueryConstruction): Observable<T>;
-  public query$<T>(param1: any, param2?: HttpParams) {
-    if (typeof param1 === 'object') {
-      const { name, params, streams } = <QueryConstruction>param1;
-      return new Query<T>(this.http, name).get(params, streams);
-    } else {
-      return new Query<T>(this.http, param1).get(param2);
-    }
-  }
-
+  create(item: T | any, metadataFor: MetaDataFor): Observable<T>;
 
   /**
-   * get an api object to then start api-calls
-   * usually you'll be better off using the quick observable stream api$, this is included primarily for consistency in the api
-   * @param controller the api controller
-   * @returns an API object with a .get<T>() method
+   * Internal implementation of create
    */
-  public api(controller: string): Api {
-    return new Api(this.http, controller);
+  create(item: T | any, metadataFor?: MetaDataFor): Observable<T> {
+    const url = `${routeContent}/${this.contentType}`;
+    item = (metadataFor != null ? { ...item, For: metadataFor } : item);
+    return this.http.post<T>(url, item);
   }
 
   /**
-   * retrieve a api stream from the server
-   * @param apiName controller/method
-   * @param params optional parameters-object
-   * @returns a typed observable which will give you the query
+   * Update the specific item with the ID to the item
    */
-  public api$<T>(apiName: string, params?: HttpParams): Observable<T> {
-    const separator = apiName.indexOf('/');
-    if (separator === -1) {
-      throw new Error(`Trying to get api$ but only got '${apiName}' - expected something in the format of 'controller/method'`);
-    }
-
-    const method = apiName.substr(separator + 1);
-    apiName = apiName.substr(0, separator);
+  update(id: number, item: T): Observable<T> {
+    const url = `${routeContent}/${this.contentType}/${id}`;
+    return this.http.post<T>(url, item);
+  }
 
-    return new Api(this.http, apiName).get<T>(method, params);
+  /**
+   * Delete the specific item with ID/with GUID
+   */
+  delete(id: number | string): Observable<T> {
+    const url = `${routeContent}/${this.contentType}/${id}`;
+    return this.http.delete<T>(url);
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
index b1a3b9543..3555ff09c 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
@@ -1,5 +1,5 @@
 export * from './api';
-export * from './content';
 export * from './data';
+export * from './sxc-app';
 export * from './query';
-export * from './query-construction';
+export * from './metadata-for';
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
new file mode 100644
index 000000000..020a030a8
--- /dev/null
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
@@ -0,0 +1,6 @@
+export interface MetaDataFor {
+  Target: number;
+  Number?: number;
+  String?: string;
+  Guid?: string;
+}
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query-construction.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query-construction.ts
deleted file mode 100644
index 51812d725..000000000
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query-construction.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { HttpParams } from '@angular/common/http';
-
-export interface QueryConstruction {
-    name: string;
-    params?: HttpParams;
-    streams?: string | string[]
-}
\ No newline at end of file
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
index ed018600d..8d2cbf957 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
@@ -1,6 +1,7 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { getHttpParams } from '../../utils/params';
 import { routeQuery } from '../contants';
 
 /**
@@ -16,44 +17,88 @@ export class Query<T> {
   ) { }
 
   readonly streamParamKey = 'stream';
-  readonly defaultStreamName = 'Default';
-  readonly allStreams = `*`;
 
   /**
-   * will retrieve a 2sxc query
-   * remember to set the permissions on the query, so it can be accessed by the group you want
+   * Get an object with all the streams, each containing an array of all the data in that stream
    */
-  get(params?: HttpParams, streams?: string | string[]): Observable<T> {
-    if (streams === undefined) streams = [this.defaultStreamName];
+  getAll(): Observable<T>;
 
-    if (typeof streams === 'string') {
-      // the backend has trouble with `*` and it will take time to fix
-      // so if it's *, just assume it's empty
-      if(streams === this.allStreams) streams = '';
-      streams = streams.split(',');
-    }
+  /**
+   * Get an object with all the streams, each containing an array of all the data in that stream
+   * with url-parameters as HttpParams or string
+   */
+  getAll(params: HttpParams | string): Observable<T>;
 
-    if (streams) params = this.setStreamParam(params, streams);
+  /**
+   * Get an object with all the streams, each containing an array of all the data in that stream
+   * with url-parameters as HttpParams or string using post data
+   */
+  getAll(params: HttpParams | string, data: T): Observable<T>;
 
+  /**
+   * Internal implementation of getAll
+   */
+  getAll(params?: HttpParams | string, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}`;
-    let observable = this.http.get<any>(url, { params });
+    const streamParams: HttpParams = getHttpParams(params);
 
-    // If only one stream is requested, directly return the stream in the returned observable
-    if (streams && streams.length === 1 && streams[0].length && streams[0] !== this.allStreams)
-      return observable.pipe(map(queryResult => queryResult[streams[0]]))
-    else
-      return observable;
+    if (data) return this.http.post<T>(url, data, { params: streamParams });
+    return this.http.get<T>(url, { params: streamParams });
   }
 
   /**
-   * Returns either the existing or a new HttpParams object, with the stream parameter appended.
-   * @param params the HttpParams which might be undefined or null
-   * @param streams the array of streams which will be appended to the HttpParams object
+   * Get an object with the specified stream, containing an array of all the data in that stream
+   */
+  getStream(stream: string): Observable<T>;
+
+  /**
+   * Get an object with the specified stream, containing an array of all the data in that stream
+   * with url-parameters as HttpParams or string
+   */
+  getStream(stream: string, params: HttpParams | string): Observable<T>;
+
+  /**
+   * Get an object with the specified stream, containing an array of all the data in that stream
+   * with url-parameters as HttpParams or string using post data
+   */
+  getStream(stream: string, params: HttpParams | string, data: T): Observable<T>;
+
+  /**
+   * Internal implementation of getStream
    */
-  private setStreamParam(params: HttpParams, streams: string[]): HttpParams {
-    params = params || new HttpParams();
-    params = params.set(this.streamParamKey, streams.join(','));
-    return params;
+  getStream(stream: string, params?: HttpParams | string, data?: T): Observable<T> {
+    const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${stream}`;
+    const streamParams: HttpParams = getHttpParams(params);
+
+    if (data) return this.http.post<T>(url, data, { params: streamParams }).pipe(map(res => res[stream]));
+    return this.http.get<T>(url, { params: streamParams }).pipe(map(res => res[stream]));
   }
 
+  /**
+   * Get an object with the specified streams, each containing an array of all the data in that stream
+   */
+  getStreams(streams: string[]): Observable<T>;
+
+  /**
+   * Get an object with the specified streams, each containing an array of all the data in that stream
+   * with url-parameters as HttpParams or string
+   */
+  getStreams(streams: string[], params: HttpParams | string): Observable<T>;
+
+  /**
+   * Get an object with the specified streams, each containing an array of all the data in that stream
+   * with url-parameters as HttpParams or string using post data
+   */
+  getStreams(streams: string[], params: HttpParams | string, data: T): Observable<T>;
+
+  /**
+   * Internal implementation of getStreams
+   */
+  getStreams(streams: string[], params?: HttpParams | string, data?: T): Observable<T> {
+    const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${streams.join(',')}`;
+    const streamParams: HttpParams = getHttpParams(params);
+
+    if (data) return this.http.post<T>(url, data, { params: streamParams });
+    return this.http.get<T>(url, { params: streamParams });
+  }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
new file mode 100644
index 000000000..83f72c7ef
--- /dev/null
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
@@ -0,0 +1,49 @@
+import { Api } from './api';
+import { Data } from './data';
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Query } from './query';
+
+/**
+ * 2sxc data provider
+ * gives you access to content and query streams using the content$ and query$ commands
+ * you can also use the content and query managers, but these are currently not so useful.
+ *
+ * @export
+ * @class SxcData
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class SxcApp {
+  constructor(
+    private http: HttpClient,
+  ) { }
+
+  /**
+   * Cet a content manager object for a specific ContentType
+   * @param contentType name of the content-type
+   * @returns a query object with .getAll(), .getOne(), .create(), .update(), .delete()
+   */
+  public data<T>(contentType: string): Data<T> {
+    return new Data<T>(this.http, contentType);
+  }
+
+  /**
+   * get a query object to then start queries
+   * @param name the query name
+   * @returns a query object with .getAll(), .getStreams(), .getStream()
+   */
+  public query<T>(name: string) {
+    return new Query<T>(this.http, name);
+  }
+
+  /**
+   * get an api object to then start api-calls
+   * @param controller the api controller
+   * @returns an API object with .url(), .get<T>(), .post<T>(), .put<T>(), .delete<T>() method
+   */
+  public api(controller: string): Api {
+    return new Api(this.http, controller);
+  }
+}
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
new file mode 100644
index 000000000..04a70e85d
--- /dev/null
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
@@ -0,0 +1,5 @@
+import { HttpParams } from '@angular/common/http';
+
+export function getHttpParams(params: HttpParams | string) {
+  return typeof(params) !== 'string' ? params : new HttpParams({fromString: params});
+}
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/tslint.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/tslint.json
index 124133f84..26a6d7c2a 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/tslint.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/tslint.json
@@ -1,6 +1,7 @@
 {
   "extends": "../../tslint.json",
   "rules": {
+    "curly": [true, "as-needed"],
     "directive-selector": [
       true,
       "attribute",

From 63cb32279cee6e57b2de6228e26344b15881429a Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 14:36:19 +0200
Subject: [PATCH 32/41] new todos

---
 .../projects/dnn-sxc-angular/package.json     |  1 +
 .../dnn-sxc-angular/src/lib/sxc/api.ts        | 19 ++++++++++---------
 .../src/lib/sxc/metadata-for.ts               |  1 +
 .../dnn-sxc-angular/src/lib/sxc/query.ts      | 16 ++++++++--------
 .../dnn-sxc-angular/src/utils/params.ts       | 11 +++++++++--
 5 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
index 52f4f7c39..c63d3dcd8 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
@@ -6,6 +6,7 @@
     "url": "https://github.com/2sic/2sxc-ui/issues"
   },
   "dependencies": {
+    "//todo:": "@2mh - get latest 14.x types, sync code",
     "@2sic.com/2sxc-typings": ">=11.0.0",
     "tslib": "^2.0.0"
   },
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
index db8d40543..978d2181a 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
@@ -1,8 +1,9 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { getHttpParams } from '../../utils/params';
+import { getHttpParams, UrlParams } from '../../utils/params';
 import { routeApi } from '../contants';
 
+
 /**
  * Quickly call WebApis on the current App
  *
@@ -25,32 +26,32 @@ export class Api {
   /**
    * Do a GET request to the specified 2sxc api controller
    */
-  get<T>(method: string, params: HttpParams | string): Observable<T> {
-    const requestParams: HttpParams = getHttpParams(params);
+  get<T>(method: string, urlParams: UrlParams): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(urlParams);
     return this.http.get<T>(this.url(method), { params: requestParams });
   }
 
   /**
    * Do a POST request to the specified 2sxc api controller
    */
-  post<T>(method: string, params: HttpParams | string, body: T): Observable<T> {
-    const requestParams: HttpParams = getHttpParams(params);
+  post<T>(method: string, urlParams: UrlParams, body: T): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(urlParams);
     return this.http.post<T>(this.url(method), body, { params: requestParams });
   }
 
   /**
    * Do a PUT request to the specified 2sxc api controller
    */
-  put<T>(method: string, params: HttpParams | string, body: T): Observable<T> {
-    const requestParams: HttpParams = getHttpParams(params);
+  put<T>(method: string, urlParams: UrlParams, body: T): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(urlParams);
     return this.http.put<T>(this.url(method), body, { params: requestParams });
   }
 
   /**
    * Do a DELETE request to the specified 2sxc api controller
    */
-  delete<T>(method: string, params: HttpParams | string): Observable<T> {
-    const requestParams: HttpParams = getHttpParams(params);
+  delete<T>(method: string, urlParams: UrlParams): Observable<T> {
+    const requestParams: HttpParams = getHttpParams(urlParams);
     return this.http.put<T>(this.url(method), { params: requestParams });
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
index 020a030a8..e8b3dfc5b 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
@@ -1,3 +1,4 @@
+// TODO: GET FROM GLOBAL MetadataFor
 export interface MetaDataFor {
   Target: number;
   Number?: number;
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
index 8d2cbf957..7b0c7c50c 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
@@ -55,20 +55,20 @@ export class Query<T> {
    * Get an object with the specified stream, containing an array of all the data in that stream
    * with url-parameters as HttpParams or string
    */
-  getStream(stream: string, params: HttpParams | string): Observable<T>;
+  getStream(stream: string, urlParams: HttpParams | string): Observable<T>;
 
   /**
    * Get an object with the specified stream, containing an array of all the data in that stream
    * with url-parameters as HttpParams or string using post data
    */
-  getStream(stream: string, params: HttpParams | string, data: T): Observable<T>;
+  getStream(stream: string, urlParams: HttpParams | string, data: T): Observable<T>;
 
   /**
    * Internal implementation of getStream
    */
-  getStream(stream: string, params?: HttpParams | string, data?: T): Observable<T> {
+  getStream(stream: string, urlParams?: HttpParams | string, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${stream}`;
-    const streamParams: HttpParams = getHttpParams(params);
+    const streamParams: HttpParams = getHttpParams(urlParams);
 
     if (data) return this.http.post<T>(url, data, { params: streamParams }).pipe(map(res => res[stream]));
     return this.http.get<T>(url, { params: streamParams }).pipe(map(res => res[stream]));
@@ -83,20 +83,20 @@ export class Query<T> {
    * Get an object with the specified streams, each containing an array of all the data in that stream
    * with url-parameters as HttpParams or string
    */
-  getStreams(streams: string[], params: HttpParams | string): Observable<T>;
+  getStreams(streams: string[], urlParams: HttpParams | string): Observable<T>;
 
   /**
    * Get an object with the specified streams, each containing an array of all the data in that stream
    * with url-parameters as HttpParams or string using post data
    */
-  getStreams(streams: string[], params: HttpParams | string, data: T): Observable<T>;
+  getStreams(streams: string[], urlParams: HttpParams | string, data: T): Observable<T>;
 
   /**
    * Internal implementation of getStreams
    */
-  getStreams(streams: string[], params?: HttpParams | string, data?: T): Observable<T> {
+  getStreams(streams: string[], urlParams?: HttpParams | string, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${streams.join(',')}`;
-    const streamParams: HttpParams = getHttpParams(params);
+    const streamParams: HttpParams = getHttpParams(urlParams);
 
     if (data) return this.http.post<T>(url, data, { params: streamParams });
     return this.http.get<T>(url, { params: streamParams });
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
index 04a70e85d..1b45cf911 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
@@ -1,5 +1,12 @@
 import { HttpParams } from '@angular/common/http';
 
-export function getHttpParams(params: HttpParams | string) {
-  return typeof(params) !== 'string' ? params : new HttpParams({fromString: params});
+export type UrlParams = HttpParams | string | Record<string, unknown | undefined>;
+
+
+export function getHttpParams(params: UrlParams): HttpParams {
+  return typeof(params) !== 'string'
+  ? params as HttpParams
+  : new HttpParams({fromString: params});
+
+  // TODO: @2mh - also handle from-object case (Record<>)
 }

From 3184ba3bcfe6ebe3534f916b4d9d9582019742fc Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 14:58:58 +0200
Subject: [PATCH 33/41] typedoc config for docs

---
 projects/dnn-sxc-angular/tsconfig.typedoc.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 projects/dnn-sxc-angular/tsconfig.typedoc.json

diff --git a/projects/dnn-sxc-angular/tsconfig.typedoc.json b/projects/dnn-sxc-angular/tsconfig.typedoc.json
new file mode 100644
index 000000000..4e2187d37
--- /dev/null
+++ b/projects/dnn-sxc-angular/tsconfig.typedoc.json
@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "typedocOptions": {
+    "entryPoints": [
+      "./src/index.ts"
+    ],
+    // don't create out - "out": "./docs/typedoc",
+    "json": "./docs/typedoc/typedoc.json",
+    "name": "Api.Js.DnnSxcAngular",
+    "includeVersion": false,
+    "excludePrivate": true,
+    "excludeProtected": true,
+    "excludeExternals": false,
+  }
+}

From a06f6f765623d5d4ab9a8a92709a7dc1c37cb66f Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 15:21:41 +0200
Subject: [PATCH 34/41] docs and notes for renames

---
 .../dnn-sxc-angular/src/lib/contants.ts       | 15 +++++-----
 .../src/lib/context/apptag.service.ts         | 29 ++++++++++++++-----
 .../lib/context/context-info-preconfigure.ts  |  1 +
 .../src/lib/context/context.service.ts        |  1 -
 .../dnn-sxc-angular/src/lib/context/index.ts  |  8 ++---
 .../src/lib/dnn-app.component.ts              |  2 ++
 .../src/lib/dnn-sxc-root.module.ts            |  1 +
 .../src/lib/http/dnn.interceptor.ts           |  6 ++++
 .../src/lib/http/interceptor.ts               |  1 +
 .../projects/dnn-sxc-angular/src/lib/index.ts | 16 +++++-----
 .../projects/dnn-sxc-angular/src/lib/names.ts |  3 ++
 .../dnn-sxc-angular/src/lib/sxc/api.ts        |  1 +
 .../dnn-sxc-angular/src/lib/sxc/data.ts       |  2 ++
 .../dnn-sxc-angular/src/lib/sxc/index.ts      | 10 +++----
 .../dnn-sxc-angular/src/lib/sxc/query.ts      |  2 ++
 .../dnn-sxc-angular/src/lib/sxc/sxc-app.ts    |  3 +-
 .../dnn-sxc-angular/src/utils/params.ts       |  2 +-
 .../dnn-sxc-angular/tsconfig.typedoc.json     |  7 ++++-
 18 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/contants.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/contants.ts
index c1697affb..dd93028fb 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/contants.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/contants.ts
@@ -1,9 +1,10 @@
-export const apiRouteName = 'api';
-export const contentRouteName = 'content';
-export const queryRouteName = 'query';
 
-export const routeRoot = 'app/auto/';
+/** @internal */ export const apiRouteName = 'api';
+/** @internal */ export const contentRouteName = 'content';
+/** @internal */ export const queryRouteName = 'query';
 
-export const routeApi = `${routeRoot}${apiRouteName}`;
-export const routeQuery = `${routeRoot}${queryRouteName}`;
-export const routeContent = `${routeRoot}${contentRouteName}`;
+/** @internal */ export const routeRoot = 'app/auto/';
+
+/** @internal */ export const routeApi = `${routeRoot}${apiRouteName}`;
+/** @internal */ export const routeQuery = `${routeRoot}${queryRouteName}`;
+/** @internal */ export const routeContent = `${routeRoot}${contentRouteName}`;
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/apptag.service.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/apptag.service.ts
index 2a5e4b567..97c9e3e52 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/apptag.service.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/apptag.service.ts
@@ -1,13 +1,26 @@
 import { ElementRef } from '@angular/core';
 
+/**
+ * Special service to inject in the root of the app.
+ * Allows you to pass configuration on the app-tag in HTML to configure the application.
+ * @internal
+ */
 export class AppTagService {
-    constructor(
-        private el: ElementRef
+  constructor(
+    /**
+     * The app-tag on the HTML page.
+     */
+    private appElement: ElementRef
     ) {
-    }
-    
-    public getAttribute(attribute: string): string {
-        // todo: after upgrading to NG8, probably use el.GetAttribute
-        return this.el.nativeElement.getAttribute(attribute);
-    }
+  }
+
+  /**
+   * Get the value of an attribute on the main app-tag
+   * @param attributeName
+   * @returns
+   */
+  public getAttribute(attributeName: string): string {
+    // todo: after upgrading to NG8, probably use el.GetAttribute
+    return this.appElement.nativeElement.getAttribute(attributeName);
+  }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info-preconfigure.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info-preconfigure.ts
index a7cb49449..15411d572 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info-preconfigure.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info-preconfigure.ts
@@ -7,6 +7,7 @@ import { ContextInfo} from './context-info'
  * The context in which the current app is running.
  * Important to interact with the server
  * or with the DNN around it.
+ * @internal
  */
 export interface ContextInfoPreconfigure extends ContextInfo {
 
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts
index 30dabb0f8..984a9d986 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts
@@ -23,7 +23,6 @@ declare let __webpack_public_path__: any;
  *
  * Note: some properties like moduleId are probably not actually in use any more and will probably be empty
  *
- * @export
  * @class Context
  * @implements {ContextInfo}
  */
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/index.ts
index 571294e5a..b04c6b0a7 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/index.ts
@@ -1,5 +1,5 @@
 
-export * from './apptag.service';
-export * from './context-info';
-export * from './context-info-preconfigure';
-export * from './context.service';
+/** @internal */ export * from './apptag.service';
+/** @internal */ export * from './context-info';
+/** @internal */ export * from './context-info-preconfigure';
+/** @internal */ export * from './context.service';
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
index 27b920761..bf8239acc 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
@@ -1,6 +1,8 @@
 import { Context } from './context/context.service';
 import { ElementRef } from '@angular/core';
 
+// TODO: @2mh RENAME TO SxcAppComponent
+
 /**
  * A root app component which initializes the context-providers once the app is loaded
  * This is the earliest moment we can access the ElementRef, because before that
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
index b3e97ccab..fc7274430 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
@@ -23,6 +23,7 @@ import { NgModule, Optional, SkipSelf } from '@angular/core';
   ]
 })
 
+// TODO: @2mh RENAME TO SxcRootModule
 
 export class DnnSxcRootModule {
 
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts
index 96845c98b..0311f7095 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts
@@ -2,6 +2,12 @@ import { Provider } from '@angular/core';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { Interceptor } from './interceptor';
 
+// TODO: @2mh RENAME TO SxcHttpInterceptorProvider
+
+/**
+ * Register the `SxcInterceptor` in a Module.
+ * Happens automatically when you import the SxcRootModule.
+ */
 export const DnnInterceptor: Provider = {
   provide: HTTP_INTERCEPTORS,
   useClass: Interceptor,
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts
index d2a5b746e..c117c9697 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts
@@ -4,6 +4,7 @@ import { Observable } from 'rxjs';
 import { apiRouteName, routeApi, routeRoot } from '../contants';
 import { Context } from '../context/context.service';
 
+// TODO: @2mh RENAME TO SxcHttpInterceptor
 @Injectable()
 export class Interceptor implements HttpInterceptor {
   constructor(private context: Context) { }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts
index 01ee3dd09..c04acc9d3 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts
@@ -6,21 +6,21 @@
 // ------------------------- Modules -------------------------
 
 // The root module which should be in the application root
-export { DnnSxcRootModule } from "./dnn-sxc-root.module";
+/** @internal */ export { DnnSxcRootModule } from "./dnn-sxc-root.module";
 
 // The data module
 // export { SxcDataModule} from './sxc-data.module';
 
 // The content-manager module with toolbars and content-management functionality
-export { ContentManagerModule } from "./content-manager.module";
+/** @internal */ export { ContentManagerModule } from "./content-manager.module";
 
 
 // ------------------------- Modules -------------------------
 
-export { DnnAppComponent } from './dnn-app.component'
-export * from './context';
-export * from './sxc';
-export { DnnInterceptor } from './http/dnn.interceptor';
+/** @internal */ export { DnnAppComponent } from './dnn-app.component'
+/** @internal */ export * from './context';
+/** @internal */ export * from './sxc';
+/** @internal */ export { DnnInterceptor } from './http/dnn.interceptor';
 
-export { SxcToolbarDirective } from "./beta/edit"
-export { SxcTagToolbarDirective } from "./toolbar/tag-toolbar"
+/** @internal */ export { SxcToolbarDirective } from "./beta/edit"
+/** @internal */ export { SxcTagToolbarDirective } from "./toolbar/tag-toolbar"
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/names.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/names.ts
index 64000abf8..12d60e5f9 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/names.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/names.ts
@@ -1,3 +1,6 @@
+/**
+ * @internal
+ */
 export const appTag = {
   edition: 'edition',
   apiEdition: 'api-edition',
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
index 978d2181a..f516493f3 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
@@ -3,6 +3,7 @@ import { Observable } from 'rxjs';
 import { getHttpParams, UrlParams } from '../../utils/params';
 import { routeApi } from '../contants';
 
+// TODO: @2mh RENAME TO SxcApiService
 
 /**
  * Quickly call WebApis on the current App
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
index dcac9a03c..22c5b1a1d 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
@@ -3,6 +3,8 @@ import { Observable } from 'rxjs';
 import { routeContent } from '../contants';
 import { MetaDataFor } from './metadata-for';
 
+// TODO: @2mh RENAME TO SxcDataService
+
 /**
  * A helper to access data from 2sxc
  *
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
index 3555ff09c..cb885b9fd 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
@@ -1,5 +1,5 @@
-export * from './api';
-export * from './data';
-export * from './sxc-app';
-export * from './query';
-export * from './metadata-for';
+/** @internal */ export * from './api';
+/** @internal */ export * from './data';
+/** @internal */ export * from './sxc-app';
+/** @internal */ export * from './query';
+/** @internal */ export * from './metadata-for';
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
index 7b0c7c50c..d2c54eb9b 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
@@ -4,6 +4,8 @@ import { map } from 'rxjs/operators';
 import { getHttpParams } from '../../utils/params';
 import { routeQuery } from '../contants';
 
+// TODO: @2mh RENAME TO SxcQueryService
+
 /**
  * Query object for getting typed data.
  * @export
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
index 83f72c7ef..63b8a0838 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
@@ -5,7 +5,8 @@ import { Injectable } from '@angular/core';
 import { Query } from './query';
 
 /**
- * 2sxc data provider
+ * 2sxc App Instance Object
+ * <br>
  * gives you access to content and query streams using the content$ and query$ commands
  * you can also use the content and query managers, but these are currently not so useful.
  *
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
index 1b45cf911..f06fba493 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
@@ -2,7 +2,7 @@ import { HttpParams } from '@angular/common/http';
 
 export type UrlParams = HttpParams | string | Record<string, unknown | undefined>;
 
-
+/** @internal */
 export function getHttpParams(params: UrlParams): HttpParams {
   return typeof(params) !== 'string'
   ? params as HttpParams
diff --git a/projects/dnn-sxc-angular/tsconfig.typedoc.json b/projects/dnn-sxc-angular/tsconfig.typedoc.json
index 4e2187d37..80fc9f719 100644
--- a/projects/dnn-sxc-angular/tsconfig.typedoc.json
+++ b/projects/dnn-sxc-angular/tsconfig.typedoc.json
@@ -11,5 +11,10 @@
     "excludePrivate": true,
     "excludeProtected": true,
     "excludeExternals": false,
-  }
+  },
+  "exclude": [
+    "src/test.ts",
+    "**/*.spec.ts",
+    "**/node_modules/**",
+  ]
 }

From fdf858a0e10fb980f0bbe86ea54da32f4cb29357 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 15:32:55 +0200
Subject: [PATCH 35/41] minor docs

---
 projects/dnn-sxc-angular/tsconfig.typedoc.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/dnn-sxc-angular/tsconfig.typedoc.json b/projects/dnn-sxc-angular/tsconfig.typedoc.json
index 80fc9f719..f2ef0c9d0 100644
--- a/projects/dnn-sxc-angular/tsconfig.typedoc.json
+++ b/projects/dnn-sxc-angular/tsconfig.typedoc.json
@@ -10,7 +10,7 @@
     "includeVersion": false,
     "excludePrivate": true,
     "excludeProtected": true,
-    "excludeExternals": false,
+    "excludeExternals": true,
   },
   "exclude": [
     "src/test.ts",

From 472b8d168e96e041d01152087efda34862cbd81d Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Mon, 20 Jun 2022 16:21:56 +0200
Subject: [PATCH 36/41] dnn-sxc-angular - updated dependencies

---
 projects/$2sxc/src/_/Window.ts                |     2 +-
 projects/dnn-sxc-angular/package-lock.json    | 11584 ++++++----------
 projects/dnn-sxc-angular/package.json         |     2 +-
 .../dnn-sxc-angular/package-lock.json         |    24 +-
 .../projects/dnn-sxc-angular/package.json     |     9 +-
 .../dnn-sxc-angular/src/lib/beta/edit.ts      |     3 +-
 .../src/lib/context/context-info.ts           |     6 +-
 .../src/lib/context/context.service.ts        |     8 +-
 .../dnn-sxc-angular/src/lib/sxc/data.ts       |     6 +-
 .../dnn-sxc-angular/src/lib/sxc/index.ts      |     1 -
 .../src/lib/sxc/metadata-for.ts               |     7 -
 .../dnn-sxc-angular/src/lib/sxc/query.ts      |    20 +-
 .../dnn-sxc-angular/src/utils/params.ts       |    13 +-
 13 files changed, 4620 insertions(+), 7065 deletions(-)
 delete mode 100644 projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts

diff --git a/projects/$2sxc/src/_/Window.ts b/projects/$2sxc/src/_/Window.ts
index eb878fa71..a8c7704eb 100644
--- a/projects/$2sxc/src/_/Window.ts
+++ b/projects/$2sxc/src/_/Window.ts
@@ -21,4 +21,4 @@ interface DnnJQueryExtensions {
     dnnSF: (id?: number) => any;
     /** The DNN Services Framework */
     ServicesFramework: (id: number) => any;
-}
+}
\ No newline at end of file
diff --git a/projects/dnn-sxc-angular/package-lock.json b/projects/dnn-sxc-angular/package-lock.json
index 252b7f7c8..95b465437 100644
--- a/projects/dnn-sxc-angular/package-lock.json
+++ b/projects/dnn-sxc-angular/package-lock.json
@@ -12,561 +12,593 @@
         "@types/jquery": "^3.3.31"
       }
     },
+    "@ampproject/remapping": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-1.1.1.tgz",
+      "integrity": "sha512-YVAcA4DKLOj296CF5SrQ8cYiMRiUGc2sqFpLxsDGWE34suHqhGP/5yMsDHKsrh8hs8I5TiRVXNwKPWQpX3iGjw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "sourcemap-codec": "1.4.8"
+      }
+    },
+    "@angular-devkit/architect": {
+      "version": "0.1302.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.6.tgz",
+      "integrity": "sha512-NztzorUMfwJeRaT7SY00Y8WSqc2lQYuF11yNoyEm7Dae3V7VZ28rW2Z9RwibP27rYQL0RjSMaz2wKITHX2vOAw==",
+      "dev": true,
+      "requires": {
+        "@angular-devkit/core": "13.2.6",
+        "rxjs": "6.6.7"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
+        }
+      }
+    },
     "@angular-devkit/build-angular": {
-      "version": "0.1102.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-0.1102.1.tgz",
-      "integrity": "sha512-1kCLKGVtq20UEPWHzaAF/HDPE4wTzaqIvV29+Bdv8t7QfBtuabZfcpB/9mY14Yh7Z1rHBlKz/OVGff09NUK0Ww==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.1102.1",
-        "@angular-devkit/build-optimizer": "0.1102.1",
-        "@angular-devkit/build-webpack": "0.1102.1",
-        "@angular-devkit/core": "11.2.1",
-        "@babel/core": "7.12.10",
-        "@babel/generator": "7.12.11",
-        "@babel/plugin-transform-async-to-generator": "7.12.1",
-        "@babel/plugin-transform-runtime": "7.12.10",
-        "@babel/preset-env": "7.12.11",
-        "@babel/runtime": "7.12.5",
-        "@babel/template": "7.12.7",
-        "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-        "@ngtools/webpack": "11.2.1",
+      "version": "13.2.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-13.2.6.tgz",
+      "integrity": "sha512-Y2ojy6xbZ0kwScppcutLHBP8eW0qNOjburTISSBU/L5l/9FOeZ1E7yAreKuVu/qibZiLbSJfAhk+SLwhRHFSSQ==",
+      "dev": true,
+      "requires": {
+        "@ampproject/remapping": "1.1.1",
+        "@angular-devkit/architect": "0.1302.6",
+        "@angular-devkit/build-webpack": "0.1302.6",
+        "@angular-devkit/core": "13.2.6",
+        "@babel/core": "7.16.12",
+        "@babel/generator": "7.16.8",
+        "@babel/helper-annotate-as-pure": "7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "7.16.8",
+        "@babel/plugin-transform-async-to-generator": "7.16.8",
+        "@babel/plugin-transform-runtime": "7.16.10",
+        "@babel/preset-env": "7.16.11",
+        "@babel/runtime": "7.16.7",
+        "@babel/template": "7.16.7",
+        "@discoveryjs/json-ext": "0.5.6",
+        "@ngtools/webpack": "13.2.6",
         "ansi-colors": "4.1.1",
-        "autoprefixer": "10.2.4",
-        "babel-loader": "8.2.2",
+        "babel-loader": "8.2.3",
+        "babel-plugin-istanbul": "6.1.1",
         "browserslist": "^4.9.1",
-        "cacache": "15.0.5",
-        "caniuse-lite": "^1.0.30001032",
+        "cacache": "15.3.0",
         "circular-dependency-plugin": "5.2.2",
-        "copy-webpack-plugin": "6.3.2",
-        "core-js": "3.8.3",
-        "critters": "0.0.7",
-        "css-loader": "5.0.1",
-        "cssnano": "4.1.10",
-        "file-loader": "6.2.0",
-        "find-cache-dir": "3.3.1",
-        "glob": "7.1.6",
+        "copy-webpack-plugin": "10.2.1",
+        "core-js": "3.20.3",
+        "critters": "0.0.16",
+        "css-loader": "6.5.1",
+        "esbuild": "0.14.22",
+        "esbuild-wasm": "0.14.22",
+        "glob": "7.2.0",
         "https-proxy-agent": "5.0.0",
-        "inquirer": "7.3.3",
-        "jest-worker": "26.6.2",
+        "inquirer": "8.2.0",
+        "jsonc-parser": "3.0.0",
         "karma-source-map-support": "1.4.0",
-        "less": "4.1.1",
-        "less-loader": "7.3.0",
-        "license-webpack-plugin": "2.3.11",
-        "loader-utils": "2.0.0",
-        "mini-css-extract-plugin": "1.3.5",
+        "less": "4.1.2",
+        "less-loader": "10.2.0",
+        "license-webpack-plugin": "4.0.2",
+        "loader-utils": "3.2.0",
+        "mini-css-extract-plugin": "2.5.3",
         "minimatch": "3.0.4",
-        "open": "7.4.0",
-        "ora": "5.3.0",
+        "open": "8.4.0",
+        "ora": "5.4.1",
         "parse5-html-rewriting-stream": "6.0.1",
-        "pnp-webpack-plugin": "1.6.4",
-        "postcss": "8.2.4",
-        "postcss-import": "14.0.0",
-        "postcss-loader": "4.2.0",
-        "raw-loader": "4.0.2",
-        "regenerator-runtime": "0.13.7",
-        "resolve-url-loader": "3.1.2",
-        "rimraf": "3.0.2",
-        "rollup": "2.38.4",
-        "rxjs": "6.6.3",
-        "sass": "1.32.6",
-        "sass-loader": "10.1.1",
-        "semver": "7.3.4",
-        "source-map": "0.7.3",
-        "source-map-loader": "1.1.3",
-        "source-map-support": "0.5.19",
-        "speed-measure-webpack-plugin": "1.4.2",
-        "style-loader": "2.0.0",
-        "stylus": "0.54.8",
-        "stylus-loader": "4.3.3",
-        "terser": "5.5.1",
-        "terser-webpack-plugin": "4.2.3",
+        "piscina": "3.2.0",
+        "postcss": "8.4.5",
+        "postcss-import": "14.0.2",
+        "postcss-loader": "6.2.1",
+        "postcss-preset-env": "7.2.3",
+        "regenerator-runtime": "0.13.9",
+        "resolve-url-loader": "5.0.0",
+        "rxjs": "6.6.7",
+        "sass": "1.49.0",
+        "sass-loader": "12.4.0",
+        "semver": "7.3.5",
+        "source-map-loader": "3.0.1",
+        "source-map-support": "0.5.21",
+        "stylus": "0.56.0",
+        "stylus-loader": "6.2.0",
+        "terser": "5.11.0",
         "text-table": "0.2.0",
         "tree-kill": "1.2.2",
-        "webpack": "4.44.2",
-        "webpack-dev-middleware": "3.7.2",
-        "webpack-dev-server": "3.11.2",
-        "webpack-merge": "5.7.3",
-        "webpack-sources": "2.2.0",
-        "webpack-subresource-integrity": "1.5.2",
-        "worker-plugin": "5.0.0"
+        "tslib": "2.3.1",
+        "webpack": "5.67.0",
+        "webpack-dev-middleware": "5.3.0",
+        "webpack-dev-server": "4.7.3",
+        "webpack-merge": "5.8.0",
+        "webpack-subresource-integrity": "5.1.0"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1102.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.1.tgz",
-          "integrity": "sha512-s7CxUANGssLYL0KNdNUjXKjtzPjxnAMW9s7H/wzYuFqXVq/DbHvIMAEQW4x7XD5sD8zTqcVR8QAL6ZVSYHppVw==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "11.2.1",
-            "rxjs": "6.6.3"
+            "color-convert": "^2.0.1"
           }
         },
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+        "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,
           "requires": {
-            "@babel/highlight": "^7.12.13"
+            "color-name": "~1.1.4"
           }
         },
-        "@babel/generator": {
-          "version": "7.12.11",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.11.tgz",
-          "integrity": "sha512-Ggg6WPOJtSi8yYQvLVjG8F/TlpWDlKx0OpS4Kt+xMQPs5OaGYWy+v1A+1TvxI6sAMGZpKWWoAQ1DaeQbImlItA==",
+        "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
+        },
+        "debug": {
+          "version": "4.3.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.12.11",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
+            "ms": "2.1.2"
           }
         },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
+        "esbuild": {
+          "version": "0.14.22",
+          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.22.tgz",
+          "integrity": "sha512-CjFCFGgYtbFOPrwZNJf7wsuzesx8kqwAffOlbYcFDLFuUtP8xloK1GH+Ai13Qr0RZQf9tE7LMTHJ2iVGJ1SKZA==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
+            "esbuild-android-arm64": "0.14.22",
+            "esbuild-darwin-64": "0.14.22",
+            "esbuild-darwin-arm64": "0.14.22",
+            "esbuild-freebsd-64": "0.14.22",
+            "esbuild-freebsd-arm64": "0.14.22",
+            "esbuild-linux-32": "0.14.22",
+            "esbuild-linux-64": "0.14.22",
+            "esbuild-linux-arm": "0.14.22",
+            "esbuild-linux-arm64": "0.14.22",
+            "esbuild-linux-mips64le": "0.14.22",
+            "esbuild-linux-ppc64le": "0.14.22",
+            "esbuild-linux-riscv64": "0.14.22",
+            "esbuild-linux-s390x": "0.14.22",
+            "esbuild-netbsd-64": "0.14.22",
+            "esbuild-openbsd-64": "0.14.22",
+            "esbuild-sunos-64": "0.14.22",
+            "esbuild-windows-32": "0.14.22",
+            "esbuild-windows-64": "0.14.22",
+            "esbuild-windows-arm64": "0.14.22"
+          }
+        },
+        "glob": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+          "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+          "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"
           }
         },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
+        "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
         },
-        "@babel/template": {
-          "version": "7.12.7",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.7.tgz",
-          "integrity": "sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==",
+        "less": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/less/-/less-4.1.2.tgz",
+          "integrity": "sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.12.7",
-            "@babel/types": "^7.12.7"
+            "copy-anything": "^2.0.1",
+            "errno": "^0.1.1",
+            "graceful-fs": "^4.1.2",
+            "image-size": "~0.5.0",
+            "make-dir": "^2.1.0",
+            "mime": "^1.4.1",
+            "needle": "^2.5.2",
+            "parse-node-version": "^1.0.1",
+            "source-map": "~0.6.0",
+            "tslib": "^2.3.0"
           }
         },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
           "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"
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
           }
         },
-        "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
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
+        "postcss": {
+          "version": "8.4.5",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
+          "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
+          "dev": true,
+          "requires": {
+            "nanoid": "^3.1.30",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.1"
+          }
         },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+          "dev": true,
+          "requires": {
+            "tslib": "^1.9.0"
+          },
+          "dependencies": {
+            "tslib": {
+              "version": "1.14.1",
+              "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+              "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+              "dev": true
+            }
+          }
         },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+        "sass": {
+          "version": "1.49.0",
+          "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
+          "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
           "dev": true,
           "requires": {
-            "sourcemap-codec": "^1.4.4"
+            "chokidar": ">=3.0.0 <4.0.0",
+            "immutable": "^4.0.0",
+            "source-map-js": ">=0.6.2 <2.0.0"
           }
         },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "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"
           }
-        }
-      }
-    },
-    "@angular-devkit/build-optimizer": {
-      "version": "0.1102.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.1102.1.tgz",
-      "integrity": "sha512-/VXu76P5LWKxT7+x3P/xsRr1P22y+7erpKX1V6Y07b6KwMoButH/hch8cBPsLPc9QWoVxSuyBzouXQPbXlT/LA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "2.0.0",
-        "source-map": "0.7.3",
-        "tslib": "2.1.0",
-        "typescript": "4.1.3",
-        "webpack-sources": "2.2.0"
-      },
-      "dependencies": {
-        "typescript": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
-          "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        }
-      }
-    },
-    "@angular-devkit/build-webpack": {
-      "version": "0.1102.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1102.1.tgz",
-      "integrity": "sha512-KaC1z0zL7gBjEfxVKMJQ0fCIDwn1wy3fYm/0V9MNEyeDyV8JfxWVy4RgkIyn8+aHBdYdZYF2mFrxpB1/IahJMw==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.1102.1",
-        "@angular-devkit/core": "11.2.1",
-        "rxjs": "6.6.3"
-      },
-      "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1102.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.1.tgz",
-          "integrity": "sha512-s7CxUANGssLYL0KNdNUjXKjtzPjxnAMW9s7H/wzYuFqXVq/DbHvIMAEQW4x7XD5sD8zTqcVR8QAL6ZVSYHppVw==",
+        },
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
           "dev": true,
           "requires": {
-            "@angular-devkit/core": "11.2.1",
-            "rxjs": "6.6.3"
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
           }
         },
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
+        "stylus": {
+          "version": "0.56.0",
+          "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.56.0.tgz",
+          "integrity": "sha512-Ev3fOb4bUElwWu4F9P9WjnnaSpc8XB9OFHSFZSKMFL1CE1oM+oFXWEgAqPmmZIyhBihuqIQlFsVTypiiS9RxeA==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
+            "css": "^3.0.0",
+            "debug": "^4.3.2",
+            "glob": "^7.1.6",
+            "safer-buffer": "^2.1.2",
+            "sax": "~1.2.4",
+            "source-map": "^0.7.3"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.4",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+              "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+              "dev": true
+            }
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "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,
           "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"
+            "has-flag": "^4.0.0"
           }
         },
-        "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
-        },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+        "terser": {
+          "version": "5.11.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz",
+          "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==",
           "dev": true,
           "requires": {
-            "sourcemap-codec": "^1.4.4"
+            "acorn": "^8.5.0",
+            "commander": "^2.20.0",
+            "source-map": "~0.7.2",
+            "source-map-support": "~0.5.20"
+          },
+          "dependencies": {
+            "source-map": {
+              "version": "0.7.4",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+              "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+              "dev": true
+            }
           }
+        },
+        "tslib": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+          "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==",
+          "dev": true
         }
       }
     },
-    "@angular-devkit/schematics": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.1.tgz",
-      "integrity": "sha512-y2tzJq+MMwLdQ6Li+AxjozI51miN5CjK9x9jtFHi+njqJr595WTNQi39RjyHxAue1VFMr8gu1VBnKGKJ1J3vNA==",
+    "@angular-devkit/build-webpack": {
+      "version": "0.1302.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1302.6.tgz",
+      "integrity": "sha512-TYEh2n9tPe932rEIgdiSpojOqtDppW2jzb/empVqCkLF7WUZsXKvTanttZC34L6R2VD6SAGWhb6JDg75ghUVYA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "11.2.1",
-        "ora": "5.3.0",
-        "rxjs": "6.6.3"
+        "@angular-devkit/architect": "0.1302.6",
+        "rxjs": "6.6.7"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "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"
+            "tslib": "^1.9.0"
           }
         },
-        "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==",
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
-        },
+        }
+      }
+    },
+    "@angular-devkit/core": {
+      "version": "13.2.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.6.tgz",
+      "integrity": "sha512-8h2mWdBTN/dYwZuzKMg2IODlOWMdbJcpQG4XVrkk9ejCPP+3aX5Aa3glCe/voN6eBNiRfs8YDM0jxmpN2aWVtg==",
+      "dev": true,
+      "requires": {
+        "ajv": "8.9.0",
+        "ajv-formats": "2.1.1",
+        "fast-json-stable-stringify": "2.1.0",
+        "magic-string": "0.25.7",
+        "rxjs": "6.6.7",
+        "source-map": "0.7.3"
+      },
+      "dependencies": {
         "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
         },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
           "requires": {
-            "sourcemap-codec": "^1.4.4"
+            "tslib": "^1.9.0"
           }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "dev": true
         }
       }
     },
-    "@angular/animations": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.2.1.tgz",
-      "integrity": "sha512-U2gtMaiVfTNMn0FPpSDTgOgtYc45QUnQcc2Po40rCmgH7BGyJAOgmaXY9uv319Jjl+vNrX+bbXaZix73Zpjfyg==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "@angular/cli": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-11.2.1.tgz",
-      "integrity": "sha512-FVwJQyPTMTTikrsKYqaP44/23UqTQ6txNt6xGoWPyI/v8VQ1afyjswcw4Z/zHWIoscmltjPuV00IYJ+NZLYPBQ==",
+    "@angular-devkit/schematics": {
+      "version": "13.2.6",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.6.tgz",
+      "integrity": "sha512-mPgSqdnZRuPSMeUA+T+mwVCrq2yhXpcYm1/Rjbhy09CyHs4wSrFv21WHCrE6shlvXpcmwr0n+I0DIeagAPmjUA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1102.1",
-        "@angular-devkit/core": "11.2.1",
-        "@angular-devkit/schematics": "11.2.1",
-        "@schematics/angular": "11.2.1",
-        "@schematics/update": "0.1102.1",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ansi-colors": "4.1.1",
-        "debug": "4.3.1",
-        "ini": "2.0.0",
-        "inquirer": "7.3.3",
+        "@angular-devkit/core": "13.2.6",
         "jsonc-parser": "3.0.0",
-        "npm-package-arg": "8.1.0",
-        "npm-pick-manifest": "6.1.0",
-        "open": "7.4.0",
-        "ora": "5.3.0",
-        "pacote": "11.2.4",
-        "resolve": "1.19.0",
-        "rimraf": "3.0.2",
-        "semver": "7.3.4",
-        "symbol-observable": "3.0.0",
-        "universal-analytics": "0.4.23",
-        "uuid": "8.3.2"
+        "magic-string": "0.25.7",
+        "ora": "5.4.1",
+        "rxjs": "6.6.7"
       },
       "dependencies": {
-        "@angular-devkit/architect": {
-          "version": "0.1102.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.1.tgz",
-          "integrity": "sha512-s7CxUANGssLYL0KNdNUjXKjtzPjxnAMW9s7H/wzYuFqXVq/DbHvIMAEQW4x7XD5sD8zTqcVR8QAL6ZVSYHppVw==",
-          "dev": true,
-          "requires": {
-            "@angular-devkit/core": "11.2.1",
-            "rxjs": "6.6.3"
-          }
-        },
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
+            "color-convert": "^2.0.1"
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "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-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
-        "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+        "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,
           "requires": {
-            "ms": "2.1.2"
+            "color-name": "~1.1.4"
           }
         },
-        "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==",
+        "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
         },
-        "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==",
+        "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
         },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
           "dev": true,
           "requires": {
-            "sourcemap-codec": "^1.4.4"
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
           }
         },
-        "resolve": {
-          "version": "1.19.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-          "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
           "dev": true,
           "requires": {
-            "is-core-module": "^2.1.0",
-            "path-parse": "^1.0.6"
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
           }
         },
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+        "rxjs": {
+          "version": "6.6.7",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+          "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
           "dev": true,
           "requires": {
-            "lru-cache": "^6.0.0"
+            "tslib": "^1.9.0"
           }
         },
-        "uuid": {
-          "version": "8.3.2",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+        "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,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "tslib": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
           "dev": true
         }
       }
     },
-    "@angular/common": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-11.2.1.tgz",
-      "integrity": "sha512-6FuZvJkYq8ZD4Bi6n7zaok1BMe5ve3EZDXLM7cDl2Hktpc+z0/mIZtVYMR0zvf7VX48E4zUU039779ixy0zDMw==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "@angular/compiler": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-11.2.1.tgz",
-      "integrity": "sha512-dejydNtCGMs06zP6aTJ4fYi3cyrXZ9GSS88DT/pZUC1ay9eZUTfm1tLH6NlCDPUwlDSUWKOWAIHwSBzHEkDJ6w==",
+    "@angular/animations": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-13.2.7.tgz",
+      "integrity": "sha512-FthGqRPQ1AOcOx/NIW65xeFYkQZJ7PpXcX59Kt+qkoUzngAQEY+UUpOteG52tmL0iZSVwOCjtxRFi9w4heVgEg==",
       "requires": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
       }
     },
-    "@angular/compiler-cli": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-11.2.1.tgz",
-      "integrity": "sha512-btbCM+KrAmQnikwldBr5P7I5yQBBZqyGBhs/ANjcCcBkE1cMVMFlRUvD4jp0uHjcdGshcFi71s2DSOcPukh59A==",
+    "@angular/cli": {
+      "version": "13.2.6",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-13.2.6.tgz",
+      "integrity": "sha512-xIjEaQI5sWemXXc7GXLm4u9UL5sjtrQL/y1PJvvk/Jsa8+kIT+MutOfZfC7zcdAh9fqHd8mokH3guFV8BJdFxA==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.8.6",
-        "@babel/types": "^7.8.6",
-        "canonical-path": "1.0.0",
-        "chokidar": "^3.0.0",
-        "convert-source-map": "^1.5.1",
-        "dependency-graph": "^0.7.2",
-        "fs-extra": "4.0.2",
-        "magic-string": "^0.25.0",
-        "minimist": "^1.2.0",
-        "reflect-metadata": "^0.1.2",
-        "semver": "^6.3.0",
-        "source-map": "^0.6.1",
-        "sourcemap-codec": "^1.4.8",
-        "tslib": "^2.0.0",
-        "yargs": "^16.1.1"
+        "@angular-devkit/architect": "0.1302.6",
+        "@angular-devkit/core": "13.2.6",
+        "@angular-devkit/schematics": "13.2.6",
+        "@schematics/angular": "13.2.6",
+        "@yarnpkg/lockfile": "1.1.0",
+        "ansi-colors": "4.1.1",
+        "debug": "4.3.3",
+        "ini": "2.0.0",
+        "inquirer": "8.2.0",
+        "jsonc-parser": "3.0.0",
+        "npm-package-arg": "8.1.5",
+        "npm-pick-manifest": "6.1.1",
+        "open": "8.4.0",
+        "ora": "5.4.1",
+        "pacote": "12.0.3",
+        "resolve": "1.22.0",
+        "semver": "7.3.5",
+        "symbol-observable": "4.0.0",
+        "uuid": "8.3.2"
       },
       "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -576,15 +608,14 @@
             "color-convert": "^2.0.1"
           }
         },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
           }
         },
         "color-convert": {
@@ -602,1283 +633,713 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "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"
+          }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "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
         },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+        "is-core-module": {
+          "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": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
+            "has": "^1.0.3"
           }
         },
-        "y18n": {
-          "version": "5.0.5",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz",
-          "integrity": "sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==",
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
+          }
+        },
+        "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
         },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+        "resolve": {
+          "version": "1.22.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+          "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
           "dev": true,
           "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
+            "is-core-module": "^2.8.1",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
           }
         },
-        "yargs-parser": {
-          "version": "20.2.5",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.5.tgz",
-          "integrity": "sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg==",
+        "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"
+          }
+        },
+        "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,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
           "dev": true
         }
       }
     },
-    "@angular/core": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-11.2.1.tgz",
-      "integrity": "sha512-FfMMG9yWW1xfZmHp8NtXJlNbLrgZ5Fm7FguRfTAuH007gDoknm+V3INKGyQfYOsIlxuJCSzyEeM3270lmbzYaQ==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "@angular/forms": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-11.2.1.tgz",
-      "integrity": "sha512-/Xy1DQCZkCs1qWudmxooscPmVDkOEsgy9YJIoAYzsrRNINOpggBxBYRO9dztRmp2yDvRSAFTylmfQyTOrWrK7Q==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "@angular/language-service": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-11.2.1.tgz",
-      "integrity": "sha512-xJ6UNn3bWWDDfjf7C3F2DXAv8m2LQznxQgsPKdtHbypw5wWDbUVEqFk5sSt81g2TRiFrGYbDa9mChaKx3rttUA==",
-      "dev": true
-    },
-    "@angular/platform-browser": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-11.2.1.tgz",
-      "integrity": "sha512-wu1B6AY0Om1Pj3U7woLGNbuAgajKEg+B6IKIaCwXv03lID53hpMagyBiNJLLEL6PIRO33G3rPbRKW9gGEr52vg==",
-      "requires": {
-        "tslib": "^2.0.0"
-      }
-    },
-    "@angular/platform-browser-dynamic": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-11.2.1.tgz",
-      "integrity": "sha512-7DEAwy3w2GqhVDe9e5AZoFFEd6e/cnACkz39R4VWY8YiSz/HFtOQ7lQPmjzkmXMEKuGVnQzFwD4aAQWXd/myQg==",
+    "@angular/common": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-13.2.7.tgz",
+      "integrity": "sha512-gSkv9aMz5q2ynIqSwgp5HEVVwlmpMYGVZFNZnEnezGY96Hza0eXlb/AYdqO7S3VQVvx+FXpvXP/eq/SsCw7rFA==",
       "requires": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
       }
     },
-    "@angular/router": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-11.2.1.tgz",
-      "integrity": "sha512-YAq3zO8xdfjqEZ8Ur3go+5JXGIwpSTDj86dzZUMhTIsUuSVluBNdG1A+BQV2X5QNLh7VtdwfW5Npbjkn0Go/Cw==",
+    "@angular/compiler": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-13.2.7.tgz",
+      "integrity": "sha512-auRMo+k+xCQmIBkZ5UgkAAmhbpcoOUWQrJN2PQnPl88DPquui3tXC4R6RANpWCu59oT8m29FQMviHcN3ZTFl6Q==",
       "requires": {
-        "tslib": "^2.0.0"
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
       }
     },
-    "@babel/code-frame": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+    "@angular/compiler-cli": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-13.2.7.tgz",
+      "integrity": "sha512-EZFWHyC2PO3ECEgX/WTMaTEvH4isvtw8E/l+48YHvINeHoxPGF7Or8qEeu/lvGlXMzBd89QH1ohutfz93vNz+g==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.8.3"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.13.tgz",
-      "integrity": "sha512-U/hshG5R+SIoW7HVWIdmy1cB7s3ki+r3FpyEZiCgpi4tFgPnX/vynY80ZGSASOIrUM6O7VxOgCZgdt7h97bUGg==",
-      "dev": true
-    },
-    "@babel/core": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.10.tgz",
-      "integrity": "sha512-eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.12.10",
-        "@babel/helper-module-transforms": "^7.12.1",
-        "@babel/helpers": "^7.12.5",
-        "@babel/parser": "^7.12.10",
-        "@babel/template": "^7.12.7",
-        "@babel/traverse": "^7.12.10",
-        "@babel/types": "^7.12.10",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.2",
-        "lodash": "^4.17.19",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
+        "@babel/core": "^7.17.2",
+        "chokidar": "^3.0.0",
+        "convert-source-map": "^1.5.1",
+        "dependency-graph": "^0.11.0",
+        "magic-string": "^0.26.0",
+        "reflect-metadata": "^0.1.2",
+        "semver": "^7.0.0",
+        "sourcemap-codec": "^1.4.8",
+        "tslib": "^2.3.0",
+        "yargs": "^17.2.1"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz",
-          "integrity": "sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==",
+        "@ampproject/remapping": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
+          "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.12.17",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
+            "@jridgewell/gen-mapping": "^0.1.0",
+            "@jridgewell/trace-mapping": "^0.3.9"
           }
         },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+        "@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/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
+            "@babel/highlight": "^7.16.7"
           }
         },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
+        "@babel/core": {
+          "version": "7.18.5",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz",
+          "integrity": "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.12.13"
+            "@ampproject/remapping": "^2.1.0",
+            "@babel/code-frame": "^7.16.7",
+            "@babel/generator": "^7.18.2",
+            "@babel/helper-compilation-targets": "^7.18.2",
+            "@babel/helper-module-transforms": "^7.18.0",
+            "@babel/helpers": "^7.18.2",
+            "@babel/parser": "^7.18.5",
+            "@babel/template": "^7.16.7",
+            "@babel/traverse": "^7.18.5",
+            "@babel/types": "^7.18.4",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.2",
+            "json5": "^2.2.1",
+            "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-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+        "@babel/generator": {
+          "version": "7.18.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
+          "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.12.13"
+            "@babel/types": "^7.18.2",
+            "@jridgewell/gen-mapping": "^0.3.0",
+            "jsesc": "^2.5.1"
+          },
+          "dependencies": {
+            "@jridgewell/gen-mapping": {
+              "version": "0.3.1",
+              "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
+              "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+              "dev": true,
+              "requires": {
+                "@jridgewell/set-array": "^1.0.0",
+                "@jridgewell/sourcemap-codec": "^1.4.10",
+                "@jridgewell/trace-mapping": "^0.3.9"
+              }
+            }
           }
         },
         "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
           "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"
           }
         },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
+        "@jridgewell/gen-mapping": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
+          "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
+            "@jridgewell/set-array": "^1.0.0",
+            "@jridgewell/sourcemap-codec": "^1.4.10"
           }
         },
-        "@babel/traverse": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz",
-          "integrity": "sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==",
+        "magic-string": {
+          "version": "0.26.2",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz",
+          "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==",
           "dev": true,
           "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.12.17",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.12.17",
-            "@babel/types": "^7.12.17",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
+            "sourcemap-codec": "^1.4.8"
           }
         },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
+            "lru-cache": "^6.0.0"
           }
         },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
           "dev": true
         }
       }
     },
-    "@babel/helper-annotate-as-pure": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
-      "dev": true,
+    "@angular/core": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-13.2.7.tgz",
+      "integrity": "sha512-6J6C2ymIy+cZudock25BLEZFckhqFfXOSZw5YBIoAJuntV4hckLNfRTn/dxn5qmWF/Vw60NKdhV367YYejz6Gg==",
       "requires": {
-        "@babel/types": "^7.12.13"
+        "tslib": "^2.3.0"
       },
       "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
         }
       }
     },
-    "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
-      "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
-      "dev": true,
+    "@angular/forms": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-13.2.7.tgz",
+      "integrity": "sha512-Did5ShmHTu52cljmNtMxUBUGEYHJ/FV5ZpKhbI7sd/VSFhXp9KWYUbfma0m7+CUJMGmpt6bmDaN0G2WS8Es1LQ==",
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "tslib": "^2.3.0"
       },
       "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
         }
       }
     },
-    "@babel/helper-compilation-targets": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.17.tgz",
-      "integrity": "sha512-5EkibqLVYOuZ89BSg2lv+GG8feywLuvMXNYgf0Im4MssE0mFWPztSpJbildNnUgw0bLI2EsIN4MpSHC2iUJkQA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.12.13",
-        "@babel/helper-validator-option": "^7.12.17",
-        "browserslist": "^4.14.5",
-        "semver": "^5.5.0"
+    "@angular/language-service": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-13.2.7.tgz",
+      "integrity": "sha512-hkZ1du/XxG6efri3FSOPc7JBwWHgHUAwI8dAUC+xFL3ZcVhFMPwrouMo8y4w/P5RctCO0ls4dDxThn/uDEZBQA==",
+      "dev": true
+    },
+    "@angular/platform-browser": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-13.2.7.tgz",
+      "integrity": "sha512-3rpeS2n+mfey9FqJg/NQKPiyHC47vgldWXmuz5FmOCHrOY54AaFfoiwQcdxzh6Lxx/CUVm0TlOS8S/xI9iEqXw==",
+      "requires": {
+        "tslib": "^2.3.0"
       },
       "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
         }
       }
     },
-    "@babel/helper-create-class-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-I/nurmTxIxHV0M+rIpfQBF1oN342+yvl2kwZUrQuOClMamHF1w5tknfZubgNOLRoA73SzBFAdFcpb4M9HwOeWQ==",
+    "@angular/platform-browser-dynamic": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.2.7.tgz",
+      "integrity": "sha512-3tKiUohQ8wl4hp1zYLKvMJ7GVYpg2K5dRrihtUKkJk8xUv3iuTUI0wbNCrUDZkrWc0GMhnQNXwE22gd+hKjfKg==",
+      "requires": {
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
+      }
+    },
+    "@angular/router": {
+      "version": "13.2.7",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-13.2.7.tgz",
+      "integrity": "sha512-VzEFKyUE8CR23IbmAjmcSFY6pa4NsjaaTqT4mDYhzFeYc7R0s58Ow9d4Fy+0sWX6rzys01rcVNCg+ifJAnwYZA==",
+      "requires": {
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
+      }
+    },
+    "@assemblyscript/loader": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@assemblyscript/loader/-/loader-0.10.1.tgz",
+      "integrity": "sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==",
+      "dev": true
+    },
+    "@babel/code-frame": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+      "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.12.17",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13"
+        "@babel/highlight": "^7.8.3"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.18.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz",
+      "integrity": "sha512-BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg==",
+      "dev": true
+    },
+    "@babel/core": {
+      "version": "7.16.12",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
+      "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.16.7",
+        "@babel/helpers": "^7.16.7",
+        "@babel/parser": "^7.16.12",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.10",
+        "@babel/types": "^7.16.8",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
         "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
+          "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/types": "^7.12.13"
+            "@babel/highlight": "^7.16.7"
           }
         },
         "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
           "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"
           }
         },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
           "dev": true
         }
       }
     },
-    "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
+    "@babel/generator": {
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
+      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "regexpu-core": "^4.7.1"
+        "@babel/types": "^7.16.8",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
       },
       "dependencies": {
-        "regexpu-core": {
-          "version": "4.7.1",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
-          "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.4.0",
-            "regenerate-unicode-properties": "^8.2.0",
-            "regjsgen": "^0.5.1",
-            "regjsparser": "^0.6.4",
-            "unicode-match-property-ecmascript": "^1.0.4",
-            "unicode-match-property-value-ecmascript": "^1.2.0"
-          }
-        },
-        "regjsgen": {
-          "version": "0.5.2",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
-          "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
           "dev": true
-        },
-        "regjsparser": {
-          "version": "0.6.7",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz",
-          "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
         }
       }
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz",
-      "integrity": "sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw==",
+    "@babel/helper-annotate-as-pure": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz",
+      "integrity": "sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-explode-assignable-expression": "^7.16.7",
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz",
+      "integrity": "sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-validator-option": "^7.16.7",
+        "browserslist": "^4.20.2",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
+        "browserslist": {
+          "version": "4.20.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
+          "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
           "dev": true,
           "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
+            "caniuse-lite": "^1.0.30001349",
+            "electron-to-chromium": "^1.4.147",
+            "escalade": "^3.1.1",
+            "node-releases": "^2.0.5",
+            "picocolors": "^1.0.0"
           }
         },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
+        "caniuse-lite": {
+          "version": "1.0.30001357",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",
+          "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.4.161",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz",
+          "integrity": "sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
+          "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==",
           "dev": true
         }
       }
     },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz",
+      "integrity": "sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7"
+      }
+    },
+    "@babel/helper-create-regexp-features-plugin": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz",
+      "integrity": "sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "regexpu-core": "^5.0.1"
+      }
+    },
+    "@babel/helper-define-polyfill-provider": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
+      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      }
+    },
+    "@babel/helper-environment-visitor": {
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz",
+      "integrity": "sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==",
+      "dev": true
+    },
+    "@babel/helper-explode-assignable-expression": {
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz",
+      "integrity": "sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==",
+      "dev": true,
+      "requires": {
+        "@babel/types": "^7.16.7"
+      }
+    },
+    "@babel/helper-function-name": {
+      "version": "7.17.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz",
+      "integrity": "sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.16.7",
+        "@babel/types": "^7.17.0"
+      }
+    },
     "@babel/helper-hoist-variables": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.12.13.tgz",
-      "integrity": "sha512-KSC5XSj5HreRhYQtZ3cnSnQwDzgnbdUDEFsxkN0m6Q3WrCRt72xrnZ8+h+pX7YxM7hr87zIO3a/v5p/H3TrnVw==",
+      "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.12.13"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.17.tgz",
-      "integrity": "sha512-Bzv4p3ODgS/qpBE0DiJ9qf5WxSmrQ8gVTe8ClMfwwsY2x/rhykxxy3bXzG7AGTnPB2ij37zGJ/Q/6FruxHxsxg==",
+      "version": "7.17.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz",
+      "integrity": "sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.17"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/types": "^7.17.0"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz",
-      "integrity": "sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==",
+      "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.12.13"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.17.tgz",
-      "integrity": "sha512-sFL+p6zOCQMm9vilo06M4VHuTxUAwa6IxgL56Tq1DVtA0ziAGTH1ThmJq7xwPqdQlgAbKX3fb0oZNbtRIyA5KQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz",
+      "integrity": "sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13",
-        "@babel/helper-simple-access": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.12.17",
-        "@babel/types": "^7.12.17",
-        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz",
-          "integrity": "sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.17",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz",
-          "integrity": "sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.12.17",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.12.17",
-            "@babel/types": "^7.12.17",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "@babel/helper-environment-visitor": "^7.16.7",
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-simple-access": "^7.17.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.0",
+        "@babel/types": "^7.18.0"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz",
+      "integrity": "sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/types": "^7.16.7"
       }
     },
     "@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==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz",
+      "integrity": "sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==",
       "dev": true
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.13.tgz",
-      "integrity": "sha512-Qa6PU9vNcj1NZacZZI1Mvwt+gXDH6CTfgAkSjeRMLE8HxtDK76+YDId6NQR+z7Rgd5arhD2cIbS74r0SxD6PDA==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-wrap-function": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-wrap-function": "^7.16.8",
+        "@babel/types": "^7.16.8"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz",
-      "integrity": "sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz",
+      "integrity": "sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz",
-          "integrity": "sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.17",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz",
-          "integrity": "sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.12.17",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.12.17",
-            "@babel/types": "^7.12.17",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-member-expression-to-functions": "^7.17.7",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz",
-      "integrity": "sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz",
+      "integrity": "sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/types": "^7.18.2"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
-      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
+      "version": "7.16.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz",
+      "integrity": "sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.1"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/types": "^7.16.0"
+      }
+    },
+    "@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.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+      "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/helper-wrap-function": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.13.tgz",
-      "integrity": "sha512-t0aZFEmBJ1LojdtJnhOaQEVejnzYhyjWHSsNSNo8vOYRbAJNh6r6GQF7pd36SqG7OKGbn+AewVQ/0IfYfIuGdw==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz",
+      "integrity": "sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.12.13",
-        "@babel/types": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz",
-          "integrity": "sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.17",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz",
-          "integrity": "sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.12.17",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.12.17",
-            "@babel/types": "^7.12.17",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.16.8",
+        "@babel/types": "^7.16.8"
       }
     },
     "@babel/helpers": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.17.tgz",
-      "integrity": "sha512-tEpjqSBGt/SFEsFikKds1sLNChKKGGR17flIgQKXH4fG6m9gTgl3gnOC1giHNyaBCSKuTfxaSzHi7UnvqiVKxg==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz",
+      "integrity": "sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.12.17",
-        "@babel/types": "^7.12.17"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/generator": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.17.tgz",
-          "integrity": "sha512-DSA7ruZrY4WI8VxuS1jWSRezFnghEoYEFrZcw9BizQRmOZiUsiHl59+qEARGPqPikwA/GPTyRCi7isuCK/oyqg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.17",
-            "jsesc": "^2.5.1",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/traverse": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.17.tgz",
-          "integrity": "sha512-LGkTqDqdiwC6Q7fWSwQoas/oyiEYw6Hqjve5KOSykXkmFJFqzvGMb9niaUEag3Rlve492Mkye3gLw9FTv94fdQ==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/generator": "^7.12.17",
-            "@babel/helper-function-name": "^7.12.13",
-            "@babel/helper-split-export-declaration": "^7.12.13",
-            "@babel/parser": "^7.12.17",
-            "@babel/types": "^7.12.17",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.19"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "jsesc": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-          "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-          "dev": true
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
+        "@babel/template": "^7.16.7",
+        "@babel/traverse": "^7.18.2",
+        "@babel/types": "^7.18.2"
       }
     },
     "@babel/highlight": {
@@ -1892,137 +1353,188 @@
         "js-tokens": "^4.0.0"
       }
     },
+    "@babel/parser": {
+      "version": "7.18.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz",
+      "integrity": "sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==",
+      "dev": true
+    },
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
+      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.17.12"
+      }
+    },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.13.tgz",
-      "integrity": "sha512-1KH46Hx4WqP77f978+5Ye/VUbuwQld2hph70yaw2hXS2v7ER2f3nlpNMu909HO2rbvP0NKLlMVDPh9KXklVMhA==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
+      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-remap-async-to-generator": "^7.12.13",
-        "@babel/plugin-syntax-async-generators": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.13.tgz",
-      "integrity": "sha512-8SCJ0Ddrpwv4T7Gwb33EmW1V9PY5lggTO+A8WjyIwxrSHDUyBw4MtF96ifn1n8H806YlxbVCoKXbbmzD6RD+cA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz",
+      "integrity": "sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz",
+      "integrity": "sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.17.tgz",
-      "integrity": "sha512-ZNGoFZqrnuy9H2izB2jLlnNDAfVPlGl5NhFEiFe4D84ix9GQGygF+CWMGHKuE+bpyS/AOuDQCnkiRNqW2IzS1Q==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz",
+      "integrity": "sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
-      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz",
+      "integrity": "sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.13.tgz",
-      "integrity": "sha512-v9eEi4GiORDg8x+Dmi5r8ibOe0VXoKDeNPYcTTxdGN4eOWikrJfDJCJrr1l5gKGvsNyGJbrfMftC2dTL6oz7pg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz",
+      "integrity": "sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-json-strings": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.13.tgz",
-      "integrity": "sha512-fqmiD3Lz7jVdK6kabeSr1PZlWSUVqSitmHEe3Z00dtGTKieWnX9beafvavc32kjORa5Bai4QNHgFDwWJP+WtSQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz",
+      "integrity": "sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.13.tgz",
-      "integrity": "sha512-Qoxpy+OxhDBI5kRqliJFAl4uWXk3Bn24WeFstPH0iLymFehSAUR8MHpqU7njyXv/qbo7oN6yTy5bfCmXdKpo1Q==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz",
+      "integrity": "sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
-      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz",
+      "integrity": "sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.16.7",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.13.tgz",
-      "integrity": "sha512-WvA1okB/0OS/N3Ldb3sziSrXg6sRphsBgqiccfcQq7woEn5wQLNX82Oc4PlaFcdwcWHuQXAtb8ftbS8Fbsg/sg==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz",
+      "integrity": "sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.12.13"
+        "@babel/compat-data": "^7.17.10",
+        "@babel/helper-compilation-targets": "^7.17.10",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.17.12"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.13.tgz",
-      "integrity": "sha512-9+MIm6msl9sHWg58NvqpNpLtuFbmpFYk37x8kgnGzAHvX35E1FyAwSUt5hIkSoWJFSAH+iwU8bJ4fcD1zKXOzg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz",
+      "integrity": "sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.17.tgz",
-      "integrity": "sha512-TvxwI80pWftrGPKHNfkvX/HnoeSTR7gC4ezWnAL39PuktYUe6r8kEpOLTYnkBTsaoeazXm2jHJ22EQ81sdgfcA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz",
+      "integrity": "sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.13.tgz",
-      "integrity": "sha512-sV0V57uUwpauixvR7s2o75LmwJI6JECwm5oPUY5beZB1nBl2i37hc7CJGqB5G+58fur5Y6ugvl3LRONk5x34rg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz",
+      "integrity": "sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz",
+      "integrity": "sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
-      "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz",
+      "integrity": "sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -2043,6 +1555,15 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
     "@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
@@ -2124,610 +1645,440 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
-      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.13.tgz",
-      "integrity": "sha512-tBtuN6qtCTd+iHzVZVOMNp+L04iIJBpqkdY42tWbmjIT5wvR2kx7gxMBsyhQtFzHwBbyGi9h8J8r9HgnOpQHxg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz",
+      "integrity": "sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
-      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
+      "version": "7.16.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
+      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.1",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.12.1"
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-remap-async-to-generator": "^7.16.8"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
-      "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz",
+      "integrity": "sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz",
-      "integrity": "sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==",
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz",
+      "integrity": "sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.13.tgz",
-      "integrity": "sha512-cqZlMlhCC1rVnxE5ZGMtIb896ijL90xppMiuWXcwcOAuFczynpd3KYemb91XFFPi3wJSe/OcrX9lXoowatkkxA==",
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz",
+      "integrity": "sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.16.7",
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-optimise-call-expression": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-replace-supers": "^7.18.2",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "globals": "^11.1.0"
+      }
+    },
+    "@babel/plugin-transform-computed-properties": {
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz",
+      "integrity": "sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-split-export-declaration": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-          "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/plugin-transform-computed-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.13.tgz",
-      "integrity": "sha512-dDfuROUPGK1mTtLKyDPUavmj2b6kFu82SmgpztBFEO974KMjJT+Ytj3/oWsTUMBmgPcp9J5Pc1SlcAYRpJ2hRA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.13.tgz",
-      "integrity": "sha512-Dn83KykIFzjhA3FDPA1z4N+yfF3btDGhjnJwxIj0T43tP0flCujnU8fKgEkf0C1biIpSv9NZegPBQ1J6jYkwvQ==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz",
+      "integrity": "sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
-      "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz",
+      "integrity": "sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
-      "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz",
+      "integrity": "sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
-      "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz",
+      "integrity": "sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.13.tgz",
-      "integrity": "sha512-xCbdgSzXYmHGyVX3+BsQjcd4hv4vA/FDy7Kc8eOpzKmBBPEOTurt0w5fCRQaGl+GSBORKgJdstQ1rHl4jbNseQ==",
+      "version": "7.18.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz",
+      "integrity": "sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
-      "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz",
+      "integrity": "sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
-      },
-      "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-          "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.12.13"
-          }
-        },
-        "@babel/helper-function-name": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-          "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-get-function-arity": "^7.12.13",
-            "@babel/template": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/helper-get-function-arity": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-          "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.12.13.tgz",
-          "integrity": "sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.17.tgz",
-          "integrity": "sha512-r1yKkiUTYMQ8LiEI0UcQx5ETw5dpTLn9wijn9hk6KkTtOK95FndDN10M+8/s6k/Ymlbivw0Av9q4SlgF80PtHg==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.12.13",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-          "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.12.13",
-            "@babel/parser": "^7.12.13",
-            "@babel/types": "^7.12.13"
-          }
-        },
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-function-name": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
-      "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz",
+      "integrity": "sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
-      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz",
+      "integrity": "sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.13.tgz",
-      "integrity": "sha512-JHLOU0o81m5UqG0Ulz/fPC68/v+UTuGTWaZBUwpEk1fYQ1D9LfKV6MPn4ttJKqRo5Lm460fkzjLTL4EHvCprvA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz",
+      "integrity": "sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.13.tgz",
-      "integrity": "sha512-OGQoeVXVi1259HjuoDnsQMlMkT9UkZT9TpXAsqWplS/M0N1g3TJAn/ByOCeQu7mfjc5WpSsRU+jV1Hd89ts0kQ==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz",
+      "integrity": "sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-simple-access": "^7.18.2",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.13.tgz",
-      "integrity": "sha512-aHfVjhZ8QekaNF/5aNdStCGzwTbU7SI5hUybBKlMzqIMC7w7Ho8hx5a4R/DkTHfRfLwHGGxSpFt9BfxKCoXKoA==",
+      "version": "7.18.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz",
+      "integrity": "sha512-SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.12.13",
-        "@babel/helper-module-transforms": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-validator-identifier": "^7.16.7",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.13.tgz",
-      "integrity": "sha512-BgZndyABRML4z6ibpi7Z98m4EVLFI9tVsZDADC14AElFaNHHBcJIovflJ6wtCqFxwy2YJ1tJhGRsr0yLPKoN+w==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz",
+      "integrity": "sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-module-transforms": "^7.18.0",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
-      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz",
+      "integrity": "sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.17.12",
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
-      "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
+      "version": "7.18.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz",
+      "integrity": "sha512-TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
-      "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz",
+      "integrity": "sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-replace-supers": "^7.16.7"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.13.tgz",
-      "integrity": "sha512-e7QqwZalNiBRHCpJg/P8s/VJeSRYgmtWySs1JwvfwPqhBbiWfOcHDKdeAi6oAyIimoKWBlwc8oTgbZHdhCoVZA==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz",
+      "integrity": "sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
-      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz",
+      "integrity": "sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
-      "integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz",
+      "integrity": "sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.2"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "regenerator-transform": "^0.15.0"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
-      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz",
+      "integrity": "sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.12.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.12.10.tgz",
-      "integrity": "sha512-xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA==",
+      "version": "7.16.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz",
+      "integrity": "sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "semver": "^5.5.1"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
+        "@babel/helper-module-imports": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "semver": "^6.3.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
-      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz",
+      "integrity": "sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.13.tgz",
-      "integrity": "sha512-dUCrqPIowjqk5pXsx1zPftSq4sT0aCeZVAxhdgs3AMgyaDmoUT0G+5h3Dzja27t76aUEIJWlFgPJqJ/d4dbTtg==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz",
+      "integrity": "sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
+        "@babel/helper-plugin-utils": "^7.17.12",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.16.0"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
-      "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz",
+      "integrity": "sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.13.tgz",
-      "integrity": "sha512-arIKlWYUgmNsF28EyfmiQHJLJFlAJNYkuQO10jL46ggjBpeb2re1P9K9YGxNJB45BqTbaslVysXDYm/g3sN/Qg==",
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz",
+      "integrity": "sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
-      "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
+      "version": "7.17.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz",
+      "integrity": "sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.17.12"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
-      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz",
+      "integrity": "sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
-      "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz",
+      "integrity": "sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
     "@babel/preset-env": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.11.tgz",
-      "integrity": "sha512-j8Tb+KKIXKYlDBQyIOy4BLxzv1NUOwlHfZ74rvW+Z0Gp4/cI2IMDPBWAgWceGcE7aep9oL/0K9mlzlMGxA8yNw==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.12.7",
-        "@babel/helper-compilation-targets": "^7.12.5",
-        "@babel/helper-module-imports": "^7.12.5",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-validator-option": "^7.12.11",
-        "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
-        "@babel/plugin-proposal-class-properties": "^7.12.1",
-        "@babel/plugin-proposal-dynamic-import": "^7.12.1",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
-        "@babel/plugin-proposal-json-strings": "^7.12.1",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.12.7",
-        "@babel/plugin-proposal-private-methods": "^7.12.1",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
-        "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.12.1",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.16.8",
+        "@babel/helper-compilation-targets": "^7.16.7",
+        "@babel/helper-plugin-utils": "^7.16.7",
+        "@babel/helper-validator-option": "^7.16.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
+        "@babel/plugin-proposal-class-properties": "^7.16.7",
+        "@babel/plugin-proposal-class-static-block": "^7.16.7",
+        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
+        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
+        "@babel/plugin-proposal-json-strings": "^7.16.7",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
+        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
+        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
+        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.12.1",
-        "@babel/plugin-transform-arrow-functions": "^7.12.1",
-        "@babel/plugin-transform-async-to-generator": "^7.12.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
-        "@babel/plugin-transform-block-scoping": "^7.12.11",
-        "@babel/plugin-transform-classes": "^7.12.1",
-        "@babel/plugin-transform-computed-properties": "^7.12.1",
-        "@babel/plugin-transform-destructuring": "^7.12.1",
-        "@babel/plugin-transform-dotall-regex": "^7.12.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
-        "@babel/plugin-transform-for-of": "^7.12.1",
-        "@babel/plugin-transform-function-name": "^7.12.1",
-        "@babel/plugin-transform-literals": "^7.12.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.1",
-        "@babel/plugin-transform-modules-amd": "^7.12.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.12.1",
-        "@babel/plugin-transform-modules-umd": "^7.12.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
-        "@babel/plugin-transform-new-target": "^7.12.1",
-        "@babel/plugin-transform-object-super": "^7.12.1",
-        "@babel/plugin-transform-parameters": "^7.12.1",
-        "@babel/plugin-transform-property-literals": "^7.12.1",
-        "@babel/plugin-transform-regenerator": "^7.12.1",
-        "@babel/plugin-transform-reserved-words": "^7.12.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
-        "@babel/plugin-transform-spread": "^7.12.1",
-        "@babel/plugin-transform-sticky-regex": "^7.12.7",
-        "@babel/plugin-transform-template-literals": "^7.12.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.10",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.1",
-        "@babel/plugin-transform-unicode-regex": "^7.12.1",
-        "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.12.11",
-        "core-js-compat": "^3.8.0",
-        "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "@babel/types": {
-          "version": "7.12.17",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.17.tgz",
-          "integrity": "sha512-tNMDjcv/4DIcHxErTgwB9q2ZcYyN0sUfgGKUK/mm1FJK7Wz+KstoEekxrl/tBiNDgLK1HGi+sppj1An/1DR4fQ==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.12.11",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.16.7",
+        "@babel/plugin-transform-async-to-generator": "^7.16.8",
+        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
+        "@babel/plugin-transform-block-scoping": "^7.16.7",
+        "@babel/plugin-transform-classes": "^7.16.7",
+        "@babel/plugin-transform-computed-properties": "^7.16.7",
+        "@babel/plugin-transform-destructuring": "^7.16.7",
+        "@babel/plugin-transform-dotall-regex": "^7.16.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
+        "@babel/plugin-transform-for-of": "^7.16.7",
+        "@babel/plugin-transform-function-name": "^7.16.7",
+        "@babel/plugin-transform-literals": "^7.16.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
+        "@babel/plugin-transform-modules-amd": "^7.16.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
+        "@babel/plugin-transform-modules-umd": "^7.16.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
+        "@babel/plugin-transform-new-target": "^7.16.7",
+        "@babel/plugin-transform-object-super": "^7.16.7",
+        "@babel/plugin-transform-parameters": "^7.16.7",
+        "@babel/plugin-transform-property-literals": "^7.16.7",
+        "@babel/plugin-transform-regenerator": "^7.16.7",
+        "@babel/plugin-transform-reserved-words": "^7.16.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
+        "@babel/plugin-transform-spread": "^7.16.7",
+        "@babel/plugin-transform-sticky-regex": "^7.16.7",
+        "@babel/plugin-transform-template-literals": "^7.16.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
+        "@babel/plugin-transform-unicode-regex": "^7.16.7",
+        "@babel/preset-modules": "^0.1.5",
+        "@babel/types": "^7.16.8",
+        "babel-plugin-polyfill-corejs2": "^0.3.0",
+        "babel-plugin-polyfill-corejs3": "^0.5.0",
+        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "core-js-compat": "^3.20.2",
+        "semver": "^6.3.0"
       }
     },
     "@babel/preset-modules": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
-      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -2738,203 +2089,309 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.12.5",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
-      "integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
+      "version": "7.16.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
+      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
-    "@babel/types": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
-      "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
-      "dev": true
-    },
-    "@jsdevtools/coverage-istanbul-loader": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.5.tgz",
-      "integrity": "sha512-EUCPEkaRPvmHjWAAZkWMT7JDzpw7FKB00WTISaiXsbNOd5hCHg77XLA8sLYLFDo1zepYLo2w7GstN8YBqRXZfA==",
+    "@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": {
-        "convert-source-map": "^1.7.0",
-        "istanbul-lib-instrument": "^4.0.3",
-        "loader-utils": "^2.0.0",
-        "merge-source-map": "^1.1.0",
-        "schema-utils": "^2.7.0"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/parser": "^7.16.7",
+        "@babel/types": "^7.16.7"
       },
       "dependencies": {
-        "istanbul-lib-coverage": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
-          "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
-          "dev": true
+        "@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"
+          }
         },
-        "istanbul-lib-instrument": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
-          "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+        "@babel/highlight": {
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
           "dev": true,
           "requires": {
-            "@babel/core": "^7.7.5",
-            "@istanbuljs/schema": "^0.1.2",
-            "istanbul-lib-coverage": "^3.0.0",
-            "semver": "^6.3.0"
+            "@babel/helper-validator-identifier": "^7.16.7",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
           }
         }
       }
     },
-    "@ngtools/webpack": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-11.2.1.tgz",
-      "integrity": "sha512-Waz+ktPO9DkS++xt/JNLubkzz3iSgbwxGkeu1rymaD95zpMw9EPxe0FJ2dmMWr2VoSHTbap/W9qczsvfQxBFTg==",
+    "@babel/traverse": {
+      "version": "7.18.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz",
+      "integrity": "sha512-aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "11.2.1",
-        "enhanced-resolve": "5.7.0",
-        "webpack-sources": "2.2.0"
+        "@babel/code-frame": "^7.16.7",
+        "@babel/generator": "^7.18.2",
+        "@babel/helper-environment-visitor": "^7.18.2",
+        "@babel/helper-function-name": "^7.17.9",
+        "@babel/helper-hoist-variables": "^7.16.7",
+        "@babel/helper-split-export-declaration": "^7.16.7",
+        "@babel/parser": "^7.18.5",
+        "@babel/types": "^7.18.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
       },
       "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
+        "@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": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
+            "@babel/highlight": "^7.16.7"
           }
         },
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "@babel/generator": {
+          "version": "7.18.2",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
+          "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
           "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"
+            "@babel/types": "^7.18.2",
+            "@jridgewell/gen-mapping": "^0.3.0",
+            "jsesc": "^2.5.1"
           }
         },
-        "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
-        },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
+        "@babel/highlight": {
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
           "dev": true,
           "requires": {
-            "sourcemap-codec": "^1.4.4"
+            "@babel/helper-validator-identifier": "^7.16.7",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
           }
         }
       }
     },
-    "@nodelib/fs.scandir": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
-      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
+    "@babel/types": {
+      "version": "7.18.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz",
+      "integrity": "sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.stat": "2.0.4",
-        "run-parallel": "^1.1.9"
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
       }
     },
-    "@nodelib/fs.stat": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
-      "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
-      "dev": true
-    },
-    "@nodelib/fs.walk": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
-      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
+    "@csstools/postcss-progressive-custom-properties": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
+      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
       "dev": true,
       "requires": {
-        "@nodelib/fs.scandir": "2.1.4",
-        "fastq": "^1.6.0"
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
       }
     },
-    "@npmcli/ci-detect": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz",
-      "integrity": "sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q==",
+    "@csstools/selector-specificity": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz",
+      "integrity": "sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==",
       "dev": true
     },
-    "@npmcli/git": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.0.6.tgz",
-      "integrity": "sha512-a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg==",
+    "@discoveryjs/json-ext": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz",
+      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
+      "dev": true
+    },
+    "@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "dev": true
+    },
+    "@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
       "requires": {
-        "@npmcli/promise-spawn": "^1.1.0",
-        "lru-cache": "^6.0.0",
-        "mkdirp": "^1.0.3",
-        "npm-pick-manifest": "^6.0.0",
-        "promise-inflight": "^1.0.1",
-        "promise-retry": "^2.0.1",
-        "semver": "^7.3.2",
-        "unique-filename": "^1.1.1",
-        "which": "^2.0.2"
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
       },
       "dependencies": {
-        "promise-retry": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-          "dev": true,
-          "requires": {
-            "err-code": "^2.0.2",
-            "retry": "^0.12.0"
-          }
-        },
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "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"
-          }
+        "resolve-from": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+          "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+          "dev": true
         }
       }
     },
-    "@npmcli/installed-package-contents": {
+    "@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
+      "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.0",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
+      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz",
+      "integrity": "sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==",
+      "dev": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
+      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.0",
+        "@jridgewell/trace-mapping": "^0.3.9"
+      }
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz",
+      "integrity": "sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==",
+      "dev": true
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz",
+      "integrity": "sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
+    "@ngtools/webpack": {
+      "version": "13.2.6",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.2.6.tgz",
+      "integrity": "sha512-N8SvRV91+/57TcAfbghc0k0tKCukw/7KqbDaLPAQTGFekJ4xMGT3elMzOyBXTH3Hvp5HL8/hiBt2tG04qiMf+w==",
+      "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"
+      }
+    },
+    "@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "dev": true,
+      "requires": {
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "@npmcli/git": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-2.1.0.tgz",
+      "integrity": "sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==",
+      "dev": true,
+      "requires": {
+        "@npmcli/promise-spawn": "^1.3.2",
+        "lru-cache": "^6.0.0",
+        "mkdirp": "^1.0.4",
+        "npm-pick-manifest": "^6.1.1",
+        "promise-inflight": "^1.0.1",
+        "promise-retry": "^2.0.1",
+        "semver": "^7.3.5",
+        "which": "^2.0.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "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"
+          }
+        }
+      }
+    },
+    "@npmcli/installed-package-contents": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz",
       "integrity": "sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==",
@@ -2955,9 +2412,9 @@
       }
     },
     "@npmcli/node-gyp": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz",
-      "integrity": "sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz",
+      "integrity": "sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==",
       "dev": true
     },
     "@npmcli/promise-spawn": {
@@ -2970,29 +2427,15 @@
       }
     },
     "@npmcli/run-script": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.3.tgz",
-      "integrity": "sha512-ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-2.0.0.tgz",
+      "integrity": "sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==",
       "dev": true,
       "requires": {
         "@npmcli/node-gyp": "^1.0.2",
         "@npmcli/promise-spawn": "^1.3.2",
-        "infer-owner": "^1.0.4",
-        "node-gyp": "^7.1.0",
-        "puka": "^1.0.1",
+        "node-gyp": "^8.2.0",
         "read-package-json-fast": "^2.0.1"
-      },
-      "dependencies": {
-        "read-package-json-fast": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz",
-          "integrity": "sha512-bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug==",
-          "dev": true,
-          "requires": {
-            "json-parse-even-better-errors": "^2.3.0",
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        }
       }
     },
     "@rollup/plugin-commonjs": {
@@ -3064,135 +2507,14 @@
       }
     },
     "@schematics/angular": {
-      "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.1.tgz",
-      "integrity": "sha512-CnN4bkRwhCp7jc4HGJ9qp/xqLwmnkn/zRf/EEb5tHFC0Bz2WvoNuAoqPRSkgIis3L+Ozahmeb8JxTIdazK1Hog==",
+      "version": "13.2.6",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.6.tgz",
+      "integrity": "sha512-8NzHMX9+FSgaB0lJYxlTJv9OcBuolwZJqo9M/yX3RPSqSHghA33jWwgVbV551hBJOpbVEePerG1DQkIC99DXKA==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "11.2.1",
-        "@angular-devkit/schematics": "11.2.1",
+        "@angular-devkit/core": "13.2.6",
+        "@angular-devkit/schematics": "13.2.6",
         "jsonc-parser": "3.0.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "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"
-          }
-        },
-        "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
-        },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-          "dev": true,
-          "requires": {
-            "sourcemap-codec": "^1.4.4"
-          }
-        }
-      }
-    },
-    "@schematics/update": {
-      "version": "0.1102.1",
-      "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.1102.1.tgz",
-      "integrity": "sha512-BvTqw2OhKnX+VNHt613vGvjg+O1WNdeJYy79aaRCGsVZogOAjolnA7R4tzk6WelTLKo9k8wQZ9d+6IMplYQKNQ==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "11.2.1",
-        "@angular-devkit/schematics": "11.2.1",
-        "@yarnpkg/lockfile": "1.1.0",
-        "ini": "2.0.0",
-        "npm-package-arg": "^8.0.0",
-        "pacote": "11.2.4",
-        "semver": "7.3.4",
-        "semver-intersect": "1.4.0"
-      },
-      "dependencies": {
-        "@angular-devkit/core": {
-          "version": "11.2.1",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.1.tgz",
-          "integrity": "sha512-CPFQn+NNC4x28X/STwmwmWge127iY9dsKuXeIV8OCSTOQiY4odOTYigP19AglXyK4e9DG/0JKxej/3CeUYx6Tg==",
-          "dev": true,
-          "requires": {
-            "ajv": "6.12.6",
-            "fast-json-stable-stringify": "2.1.0",
-            "magic-string": "0.25.7",
-            "rxjs": "6.6.3",
-            "source-map": "0.7.3"
-          }
-        },
-        "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"
-          }
-        },
-        "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
-        },
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-          "dev": true,
-          "requires": {
-            "sourcemap-codec": "^1.4.4"
-          }
-        },
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
       }
     },
     "@tootallnate/once": {
@@ -3201,19 +2523,99 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
+    "@types/body-parser": {
+      "version": "1.19.2",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
+      "dev": true,
+      "requires": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/bonjour": {
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/connect": {
+      "version": "3.4.35",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/connect-history-api-fallback": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
+      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "dev": true,
+      "requires": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/eslint": {
+      "version": "8.4.3",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz",
+      "integrity": "sha512-YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw==",
+      "dev": true,
+      "requires": {
+        "@types/estree": "*",
+        "@types/json-schema": "*"
+      }
+    },
+    "@types/eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==",
+      "dev": true,
+      "requires": {
+        "@types/eslint": "*",
+        "@types/estree": "*"
+      }
+    },
     "@types/estree": {
       "version": "0.0.39",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
-    "@types/glob": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
+    "@types/express": {
+      "version": "4.17.13",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
+      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
+      "dev": true,
+      "requires": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.18",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.17.29",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz",
+      "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*"
+      }
+    },
+    "@types/http-proxy": {
+      "version": "1.17.9",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
+      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
       "dev": true,
       "requires": {
-        "@types/minimatch": "*",
         "@types/node": "*"
       }
     },
@@ -3241,15 +2643,15 @@
       }
     },
     "@types/json-schema": {
-      "version": "7.0.7",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
-      "integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
+      "version": "7.0.11",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
+      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
       "dev": true
     },
-    "@types/minimatch": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
-      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+    "@types/mime": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
       "dev": true
     },
     "@types/node": {
@@ -3270,6 +2672,18 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
+    "@types/qs": {
+      "version": "6.9.7",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
+      "dev": true
+    },
+    "@types/range-parser": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
+      "dev": true
+    },
     "@types/resolve": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
@@ -3279,214 +2693,203 @@
         "@types/node": "*"
       }
     },
+    "@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true
+    },
     "@types/selenium-webdriver": {
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz",
       "integrity": "sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==",
       "dev": true
     },
+    "@types/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
+      "dev": true,
+      "requires": {
+        "@types/express": "*"
+      }
+    },
+    "@types/serve-static": {
+      "version": "1.13.10",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
+      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
+      "dev": true,
+      "requires": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
     "@types/sizzle": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
       "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
     },
-    "@types/source-list-map": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
-      "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==",
-      "dev": true
-    },
-    "@types/webpack-sources": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.8.tgz",
-      "integrity": "sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==",
+    "@types/sockjs": {
+      "version": "0.3.33",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
       "dev": true,
       "requires": {
-        "@types/node": "*",
-        "@types/source-list-map": "*",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "@types/node": "*"
+      }
+    },
+    "@types/ws": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
+      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
       }
     },
     "@webassemblyjs/ast": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
-      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
+      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0"
+        "@webassemblyjs/helper-numbers": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
-      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
+      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
-      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
+      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
-      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
-      "dev": true
-    },
-    "@webassemblyjs/helper-code-frame": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
-      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/wast-printer": "1.9.0"
-      }
-    },
-    "@webassemblyjs/helper-fsm": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
-      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
+      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
       "dev": true
     },
-    "@webassemblyjs/helper-module-context": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
-      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
+    "@webassemblyjs/helper-numbers": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
+      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0"
+        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
-      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
+      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
-      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
+      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0"
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
-      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
+      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
-      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
+      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
-      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
+      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
-      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
+      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/helper-wasm-section": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-opt": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "@webassemblyjs/wast-printer": "1.9.0"
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/helper-wasm-section": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-opt": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@webassemblyjs/wast-printer": "1.11.1"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
-      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
+      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
-      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
+      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-buffer": "1.9.0",
-        "@webassemblyjs/wasm-gen": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0"
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-buffer": "1.11.1",
+        "@webassemblyjs/wasm-gen": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
-      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
-        "@webassemblyjs/ieee754": "1.9.0",
-        "@webassemblyjs/leb128": "1.9.0",
-        "@webassemblyjs/utf8": "1.9.0"
-      }
-    },
-    "@webassemblyjs/wast-parser": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
-      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
+      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
-        "@webassemblyjs/helper-api-error": "1.9.0",
-        "@webassemblyjs/helper-code-frame": "1.9.0",
-        "@webassemblyjs/helper-fsm": "1.9.0",
-        "@xtuc/long": "4.2.2"
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
+        "@webassemblyjs/ieee754": "1.11.1",
+        "@webassemblyjs/leb128": "1.11.1",
+        "@webassemblyjs/utf8": "1.11.1"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
-      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
+      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/wast-parser": "1.9.0",
+        "@webassemblyjs/ast": "1.11.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -3509,9 +2912,9 @@
       "dev": true
     },
     "abab": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
-      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
       "dev": true
     },
     "abbrev": {
@@ -3531,19 +2934,38 @@
       }
     },
     "acorn": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
-      "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+      "version": "8.7.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz",
+      "integrity": "sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==",
+      "dev": true
+    },
+    "acorn-import-assertions": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
+      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
       "dev": true
     },
     "adjust-sourcemap-loader": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz",
-      "integrity": "sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz",
+      "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==",
       "dev": true,
       "requires": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
       }
     },
     "adm-zip": {
@@ -3568,9 +2990,9 @@
       }
     },
     "agentkeepalive": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.4.tgz",
-      "integrity": "sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
+      "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -3589,22 +3011,33 @@
       }
     },
     "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
+      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
+      },
+      "dependencies": {
+        "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
+        }
       }
     },
-    "ajv-errors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
+    "ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "requires": {
+        "ajv": "^8.0.0"
+      }
     },
     "ajv-keywords": {
       "version": "3.5.2",
@@ -3625,18 +3058,18 @@
       "dev": true
     },
     "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
       "requires": {
-        "type-fest": "^0.11.0"
+        "type-fest": "^0.21.3"
       }
     },
-    "ansi-html": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
-      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+    "ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
       "dev": true
     },
     "ansi-regex": {
@@ -3671,45 +3104,19 @@
       "dev": true
     },
     "aproba": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
-      "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+      "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
       "dev": true
     },
     "are-we-there-yet": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz",
+      "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==",
       "dev": true,
       "requires": {
         "delegates": "^1.0.0",
-        "readable-stream": "^2.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
+        "readable-stream": "^3.6.0"
       }
     },
     "arg": {
@@ -3745,12 +3152,6 @@
         "commander": "^2.11.0"
       }
     },
-    "arity-n": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/arity-n/-/arity-n-1.0.4.tgz",
-      "integrity": "sha1-2edrEXM+CFacCEeuezmyhgswt0U=",
-      "dev": true
-    },
     "arr-diff": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
@@ -3776,9 +3177,9 @@
       "dev": true
     },
     "array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
+      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
       "dev": true
     },
     "array-uniq": {
@@ -3814,53 +3215,6 @@
         "safer-buffer": "~2.1.0"
       }
     },
-    "asn1.js": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
-      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
-      }
-    },
-    "assert": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
-      "dev": true,
-      "requires": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
-          "dev": true
-        },
-        "util": {
-          "version": "0.10.3",
-          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
-          "dev": true,
-          "requires": {
-            "inherits": "2.0.1"
-          }
-        }
-      }
-    },
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
@@ -3880,9 +3234,9 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.14"
@@ -3894,12 +3248,6 @@
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
       "dev": true
     },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -3948,9 +3296,9 @@
       }
     },
     "babel-loader": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.2.tgz",
-      "integrity": "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g==",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.3.tgz",
+      "integrity": "sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^3.3.1",
@@ -3999,6 +3347,49 @@
         "object.assign": "^4.1.0"
       }
     },
+    "babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      }
+    },
+    "babel-plugin-polyfill-corejs2": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
+      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "semver": "^6.1.1"
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
+      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "core-js-compat": "^3.21.0"
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
+      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-define-polyfill-provider": "^0.3.1"
+      }
+    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -4111,7 +3502,7 @@
     "batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
     "bcrypt-pbkdf": {
@@ -4161,18 +3552,6 @@
         "minimist": "^1.2.0"
       }
     },
-    "bluebird": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-      "dev": true
-    },
-    "bn.js": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
-      "integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
-      "dev": true
-    },
     "body-parser": {
       "version": "1.19.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
@@ -4217,7 +3596,7 @@
     "bonjour": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
-      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "integrity": "sha512-RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==",
       "dev": true,
       "requires": {
         "array-flatten": "^2.1.0",
@@ -4253,93 +3632,6 @@
         "fill-range": "^7.0.1"
       }
     },
-    "brorand": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
-      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-      "dev": true
-    },
-    "browserify-aes": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
-      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-      "dev": true,
-      "requires": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "browserify-cipher": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
-      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
-      "dev": true,
-      "requires": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
-      }
-    },
-    "browserify-des": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
-      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "browserify-sign": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^5.1.1",
-        "browserify-rsa": "^4.0.1",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.3",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.5",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
-    "browserify-zlib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
-      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
-      "dev": true,
-      "requires": {
-        "pako": "~1.0.5"
-      }
-    },
     "browserslist": {
       "version": "4.16.3",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
@@ -4414,42 +3706,31 @@
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
       "dev": true
     },
-    "buffer-xor": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
-      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-      "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==",
       "dev": true
     },
-    "builtin-status-codes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
-      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
-      "dev": true
-    },
     "builtins": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=",
+      "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
       "dev": true
     },
     "bytes": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true
     },
     "cacache": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
-      "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
       "dev": true,
       "requires": {
+        "@npmcli/fs": "^1.0.0",
         "@npmcli/move-file": "^1.0.1",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -4464,7 +3745,7 @@
         "p-map": "^4.0.0",
         "promise-inflight": "^1.0.1",
         "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
+        "ssri": "^8.0.1",
         "tar": "^6.0.2",
         "unique-filename": "^1.1.1"
       }
@@ -4521,9 +3802,9 @@
       "dev": true
     },
     "camelcase": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
-      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
     "caniuse-api": {
@@ -4544,12 +3825,6 @@
       "integrity": "sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA==",
       "dev": true
     },
-    "canonical-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
-      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
-      "dev": true
-    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -4596,31 +3871,10 @@
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
-      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-          "dev": true
-        }
-      }
-    },
-    "cipher-base": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
+      "dev": true
     },
     "circular-dependency-plugin": {
       "version": "5.2.2",
@@ -4679,54 +3933,14 @@
       "dev": true
     },
     "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
     "clone": {
@@ -4757,12 +3971,6 @@
         "q": "^1.1.2"
       }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
     "codelyzer": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.1.tgz",
@@ -4862,6 +4070,12 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "color-support": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+      "dev": true
+    },
     "colorette": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
@@ -4913,15 +4127,6 @@
       "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
       "dev": true
     },
-    "compose-function": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/compose-function/-/compose-function-3.0.3.tgz",
-      "integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
-      "dev": true,
-      "requires": {
-        "arity-n": "^1.0.4"
-      }
-    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -4958,7 +4163,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -4969,44 +4174,6 @@
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
       "dev": true
     },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
     "connect": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
@@ -5042,31 +4209,27 @@
       "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
       "dev": true
     },
-    "console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
-      "dev": true
-    },
     "console-control-strings": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-      "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-      "dev": true
-    },
-    "constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+      "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
       "dev": true
     },
     "content-disposition": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "requires": {
-        "safe-buffer": "5.1.2"
+        "safe-buffer": "5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "content-type": {
@@ -5076,24 +4239,24 @@
       "dev": true
     },
     "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+      "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"
       }
     },
     "cookie": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true
     },
     "cookie-signature": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
     "copy-anything": {
@@ -5105,40 +4268,6 @@
         "is-what": "^3.12.0"
       }
     },
-    "copy-concurrently": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
-      "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "fs-write-stream-atomic": "^1.0.8",
-        "iferr": "^0.1.5",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "copy-descriptor": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
@@ -5146,96 +4275,107 @@
       "dev": true
     },
     "copy-webpack-plugin": {
-      "version": "6.3.2",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.2.tgz",
-      "integrity": "sha512-MgJ1uouLIbDg4ST1GzqrGQyKoXY5iPqi6fghFqarijam7FQcBa/r6Rg0VkoIuzx75Xq8iAMghyOueMkWUQ5OaA==",
+      "version": "10.2.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz",
+      "integrity": "sha512-nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
-        "fast-glob": "^3.2.4",
-        "find-cache-dir": "^3.3.1",
-        "glob-parent": "^5.1.1",
-        "globby": "^11.0.1",
-        "loader-utils": "^2.0.0",
+        "fast-glob": "^3.2.7",
+        "glob-parent": "^6.0.1",
+        "globby": "^12.0.2",
         "normalize-path": "^3.0.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "webpack-sources": "^1.4.3"
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "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"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "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
-        },
-        "p-limit": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-          "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+        "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": {
-            "yocto-queue": "^0.1.0"
+            "is-glob": "^4.0.3"
           }
         },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+        "is-glob": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+          "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "is-extglob": "^2.1.1"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+        "schema-utils": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "dev": true,
           "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }
     },
     "core-js": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.3.tgz",
-      "integrity": "sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==",
+      "version": "3.20.3",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
+      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.0.tgz",
-      "integrity": "sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ==",
+      "version": "3.23.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.1.tgz",
+      "integrity": "sha512-KeYrEc8t6FJsKYB2qnDwRHWaC0cJNaqlHfCpMe5q3j/W1nje3moib/txNklddLPCtGb+etcBIyJ8zuMa/LN5/A==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.3",
+        "browserslist": "^4.20.4",
         "semver": "7.0.0"
       },
       "dependencies": {
+        "browserslist": {
+          "version": "4.20.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
+          "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001349",
+            "electron-to-chromium": "^1.4.147",
+            "escalade": "^3.1.1",
+            "node-releases": "^2.0.5",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001357",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",
+          "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.4.161",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz",
+          "integrity": "sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
+          "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==",
+          "dev": true
+        },
         "semver": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
@@ -5791,61 +4931,17 @@
         }
       }
     },
-    "create-ecdh": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
-      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
-      }
-    },
-    "create-hash": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
-      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
-      }
-    },
-    "create-hmac": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
-      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-      "dev": true,
-      "requires": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "critters": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.7.tgz",
-      "integrity": "sha512-qUF2SaAWFYjNPdCcPpu68p2DnHiosia84yx5mPTlUMQjkjChR+n6sO1/I7yn2U2qNDgSPTd2SoaTIDQcUL+EwQ==",
+      "version": "0.0.16",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz",
+      "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
-        "css": "^3.0.0",
+        "css-select": "^4.2.0",
         "parse5": "^6.0.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.1",
+        "postcss": "^8.3.7",
         "pretty-bytes": "^5.3.0"
       },
       "dependencies": {
@@ -5859,9 +4955,9 @@
           }
         },
         "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",
@@ -5883,12 +4979,85 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "css-select": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+          "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+          "dev": true,
+          "requires": {
+            "boolbase": "^1.0.0",
+            "css-what": "^6.0.1",
+            "domhandler": "^4.3.1",
+            "domutils": "^2.8.0",
+            "nth-check": "^2.0.1"
+          }
+        },
+        "css-what": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+          "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+          "dev": true
+        },
+        "dom-serializer": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+          "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+          "dev": true,
+          "requires": {
+            "domelementtype": "^2.0.1",
+            "domhandler": "^4.2.0",
+            "entities": "^2.0.0"
+          }
+        },
+        "domelementtype": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+          "dev": true
+        },
+        "domutils": {
+          "version": "2.8.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+          "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+          "dev": true,
+          "requires": {
+            "dom-serializer": "^1.0.1",
+            "domelementtype": "^2.2.0",
+            "domhandler": "^4.2.0"
+          }
+        },
         "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
         },
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true
+        },
+        "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"
+          }
+        },
+        "postcss": {
+          "version": "8.4.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+          "dev": true,
+          "requires": {
+            "nanoid": "^3.3.4",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -5901,45 +5070,27 @@
       }
     },
     "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.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
+        "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"
+          }
         }
       }
     },
-    "crypto-browserify": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
-      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
-      "dev": true,
-      "requires": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      }
-    },
     "css": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/css/-/css-3.0.0.tgz",
@@ -5959,6 +5110,27 @@
         }
       }
     },
+    "css-blank-pseudo": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
+      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
     "css-color-names": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -6003,65 +5175,64 @@
         }
       }
     },
+    "css-has-pseudo": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
+      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
     "css-loader": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.0.1.tgz",
-      "integrity": "sha512-cXc2ti9V234cq7rJzFKhirb2L2iPy8ZjALeVJAozXYz9te3r4eqLSixNAbMDJSgJEQywqXzs8gonxaboeKqwiw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
+      "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
       "dev": true,
       "requires": {
-        "camelcase": "^6.2.0",
-        "cssesc": "^3.0.0",
-        "icss-utils": "^5.0.0",
-        "loader-utils": "^2.0.0",
-        "postcss": "^8.1.4",
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.2.15",
         "postcss-modules-extract-imports": "^3.0.0",
         "postcss-modules-local-by-default": "^4.0.0",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.1.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.2"
+        "semver": "^7.3.5"
       },
       "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "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==",
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
           "dev": true
         },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+        "postcss": {
+          "version": "8.4.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
+            "nanoid": "^3.3.4",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
           }
         },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -6111,6 +5282,12 @@
         }
       }
     },
+    "css-prefers-color-scheme": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
+      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
+      "dev": true
+    },
     "css-select": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
@@ -6172,6 +5349,12 @@
         "through": "X.X.X"
       }
     },
+    "cssdb": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-5.1.0.tgz",
+      "integrity": "sha512-/vqjXhv1x9eGkE/zO6o8ZOI7dgdZbLVLUGyVRbPgk6YipXbW87YzUCcO+Jrmi5bwJlAH6oD+MNeZyRgXea1GZw==",
+      "dev": true
+    },
     "cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -6384,22 +5567,6 @@
       "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
       "dev": true
     },
-    "cyclist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
-      "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
     "damerau-levenshtein": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz",
@@ -6463,13 +5630,12 @@
       "dev": true
     },
     "default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
       "requires": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
+        "execa": "^5.0.0"
       }
     },
     "defaults": {
@@ -6481,6 +5647,12 @@
         "clone": "^1.0.2"
       }
     },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -6532,64 +5704,46 @@
       }
     },
     "del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
+      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
       "dev": true,
       "requires": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
+        "globby": "^11.0.1",
+        "graceful-fs": "^4.2.4",
+        "is-glob": "^4.0.1",
+        "is-path-cwd": "^2.2.0",
+        "is-path-inside": "^3.0.2",
+        "p-map": "^4.0.0",
+        "rimraf": "^3.0.2",
+        "slash": "^3.0.0"
       },
       "dependencies": {
         "array-union": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-          "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-          "dev": true,
-          "requires": {
-            "array-uniq": "^1.0.1"
-          }
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+          "dev": true
         },
         "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
           "dev": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
-          },
-          "dependencies": {
-            "pify": {
-              "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
-            }
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.2.9",
+            "ignore": "^5.2.0",
+            "merge2": "^1.4.1",
+            "slash": "^3.0.0"
           }
         },
-        "p-map": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+        "slash": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
           "dev": true
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
         }
       }
     },
@@ -6602,7 +5756,7 @@
     "delegates": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
-      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
+      "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
       "dev": true
     },
     "depd": {
@@ -6612,31 +5766,21 @@
       "dev": true
     },
     "dependency-graph": {
-      "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz",
-      "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
+      "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
       "dev": true
     },
-    "des.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-      "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
     "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
     "di": {
@@ -6651,25 +5795,6 @@
       "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true
     },
-    "diffie-hellman": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
-      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
-      }
-    },
     "dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -6682,13 +5807,13 @@
     "dns-equal": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
-      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+      "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
       "dev": true
     },
     "dns-packet": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
-      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
+      "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
       "dev": true,
       "requires": {
         "ip": "^1.1.0",
@@ -6698,7 +5823,7 @@
     "dns-txt": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
-      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "integrity": "sha512-Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==",
       "dev": true,
       "requires": {
         "buffer-indexof": "^1.0.0"
@@ -6734,18 +5859,29 @@
         }
       }
     },
-    "domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
-      "dev": true
-    },
     "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
       "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
       "dev": true
     },
+    "domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dev": true,
+      "requires": {
+        "domelementtype": "^2.2.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+          "dev": true
+        }
+      }
+    },
     "domutils": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
@@ -6771,44 +5907,6 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
     "ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -6831,29 +5929,6 @@
       "integrity": "sha512-Ot1pPtAVb5nd7jeVF651zmfLFilRVFomlDzwXmdlWe5jyzOGa6mVsQ06XnAurT7wWfg5VEIY+LopbAdD/bpo5w==",
       "dev": true
     },
-    "elliptic": {
-      "version": "6.5.4",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
-      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
-      }
-    },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -6883,9 +5958,9 @@
       },
       "dependencies": {
         "iconv-lite": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "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,
           "optional": true,
           "requires": {
@@ -6894,15 +5969,6 @@
         }
       }
     },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
     "engine.io": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz",
@@ -6987,9 +6053,9 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz",
-      "integrity": "sha512-6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz",
+      "integrity": "sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
@@ -7009,9 +6075,9 @@
       "dev": true
     },
     "env-paths": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.0.tgz",
-      "integrity": "sha512-6u0VYSCo/OW6IoD5WCLLy9JUGARbamfSavcNXry/eu8aHVFei6CD3Sw+VGX5alea1i9pgPHW0mbu6Xj0uBh7gA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "dev": true
     },
     "err-code": {
@@ -7025,6 +6091,7 @@
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
       "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "prr": "~1.0.1"
       }
@@ -7060,6 +6127,12 @@
         "string.prototype.trimstart": "^1.0.3"
       }
     },
+    "es-module-lexer": {
+      "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
+      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "dev": true
+    },
     "es-to-primitive": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
@@ -7071,28 +6144,6 @@
         "is-symbol": "^1.0.2"
       }
     },
-    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
@@ -7108,15 +6159,144 @@
         "es6-promise": "^4.0.3"
       }
     },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
+    "esbuild-android-arm64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.22.tgz",
+      "integrity": "sha512-k1Uu4uC4UOFgrnTj2zuj75EswFSEBK+H6lT70/DdS4mTAOfs2ECv2I9ZYvr3w0WL0T4YItzJdK7fPNxcPw6YmQ==",
       "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
+      "optional": true
+    },
+    "esbuild-darwin-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.22.tgz",
+      "integrity": "sha512-d8Ceuo6Vw6HM3fW218FB6jTY6O3r2WNcTAU0SGsBkXZ3k8SDoRLd3Nrc//EqzdgYnzDNMNtrWegK2Qsss4THhw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-arm64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.22.tgz",
+      "integrity": "sha512-YAt9Tj3SkIUkswuzHxkaNlT9+sg0xvzDvE75LlBo4DI++ogSgSmKNR6B4eUhU5EUUepVXcXdRIdqMq9ppeRqfw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.22.tgz",
+      "integrity": "sha512-ek1HUv7fkXMy87Qm2G4IRohN+Qux4IcnrDBPZGXNN33KAL0pEJJzdTv0hB/42+DCYWylSrSKxk3KUXfqXOoH4A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-arm64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.22.tgz",
+      "integrity": "sha512-zPh9SzjRvr9FwsouNYTqgqFlsMIW07O8mNXulGeQx6O5ApgGUBZBgtzSlBQXkHi18WjrosYfsvp5nzOKiWzkjQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-32": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.22.tgz",
+      "integrity": "sha512-SnpveoE4nzjb9t2hqCIzzTWBM0RzcCINDMBB67H6OXIuDa4KqFqaIgmTchNA9pJKOVLVIKd5FYxNiJStli21qg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.22.tgz",
+      "integrity": "sha512-Zcl9Wg7gKhOWWNqAjygyqzB+fJa19glgl2JG7GtuxHyL1uEnWlpSMytTLMqtfbmRykIHdab797IOZeKwk5g0zg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.22.tgz",
+      "integrity": "sha512-soPDdbpt/C0XvOOK45p4EFt8HbH5g+0uHs5nUKjHVExfgR7du734kEkXR/mE5zmjrlymk5AA79I0VIvj90WZ4g==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.22.tgz",
+      "integrity": "sha512-8q/FRBJtV5IHnQChO3LHh/Jf7KLrxJ/RCTGdBvlVZhBde+dk3/qS9fFsUy+rs3dEi49aAsyVitTwlKw1SUFm+A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-mips64le": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.22.tgz",
+      "integrity": "sha512-SiNDfuRXhGh1JQLLA9JPprBgPVFOsGuQ0yDfSPTNxztmVJd8W2mX++c4FfLpAwxuJe183mLuKf7qKCHQs5ZnBQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-ppc64le": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.22.tgz",
+      "integrity": "sha512-6t/GI9I+3o1EFm2AyN9+TsjdgWCpg2nwniEhjm2qJWtJyJ5VzTXGUU3alCO3evopu8G0hN2Bu1Jhz2YmZD0kng==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-riscv64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.22.tgz",
+      "integrity": "sha512-AyJHipZKe88sc+tp5layovquw5cvz45QXw5SaDgAq2M911wLHiCvDtf/07oDx8eweCyzYzG5Y39Ih568amMTCQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-s390x": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.22.tgz",
+      "integrity": "sha512-Sz1NjZewTIXSblQDZWEFZYjOK6p8tV6hrshYdXZ0NHTjWE+lwxpOpWeElUGtEmiPcMT71FiuA9ODplqzzSxkzw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-netbsd-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.22.tgz",
+      "integrity": "sha512-TBbCtx+k32xydImsHxvFgsOCuFqCTGIxhzRNbgSL1Z2CKhzxwT92kQMhxort9N/fZM2CkRCPPs5wzQSamtzEHA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-openbsd-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.22.tgz",
+      "integrity": "sha512-vK912As725haT313ANZZZN+0EysEEQXWC/+YE4rQvOQzLuxAQc2tjbzlAFREx3C8+uMuZj/q7E5gyVB7TzpcTA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-sunos-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.22.tgz",
+      "integrity": "sha512-/mbJdXTW7MTcsPhtfDsDyPEOju9EOABvCjeUU2OJ7fWpX/Em/H3WYDa86tzLUbcVg++BScQDzqV/7RYw5XNY0g==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-wasm": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.22.tgz",
+      "integrity": "sha512-FOSAM29GN1fWusw0oLMv6JYhoheDIh5+atC72TkJKfIUMID6yISlicoQSd9gsNSFsNBvABvtE2jR4JB1j4FkFw==",
+      "dev": true
+    },
+    "esbuild-windows-32": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.22.tgz",
+      "integrity": "sha512-1vRIkuvPTjeSVK3diVrnMLSbkuE36jxA+8zGLUOrT4bb7E/JZvDRhvtbWXWaveUc/7LbhaNFhHNvfPuSw2QOQg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.22.tgz",
+      "integrity": "sha512-AxjIDcOmx17vr31C5hp20HIwz1MymtMjKqX4qL6whPj0dT9lwxPexmLj6G1CpR3vFhui6m75EnBEe4QL82SYqw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-arm64": {
+      "version": "0.14.22",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.22.tgz",
+      "integrity": "sha512-5wvQ+39tHmRhNpu2Fx04l7QfeK3mQ9tKzDqqGR8n/4WUxsFxnVLfDRBGirIfk4AfWlxk60kqirlODPoT5LqMUg==",
+      "dev": true,
+      "optional": true
     },
     "escalade": {
       "version": "3.1.1",
@@ -7137,12 +6317,12 @@
       "dev": true
     },
     "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+      "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.1.0",
+        "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
       }
     },
@@ -7162,9 +6342,9 @@
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
           "dev": true
         }
       }
@@ -7190,7 +6370,13 @@
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+      "dev": true
+    },
+    "eventemitter-asyncresource": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz",
+      "integrity": "sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==",
       "dev": true
     },
     "eventemitter3": {
@@ -7200,43 +6386,26 @@
       "dev": true
     },
     "events": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-      "integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
-    "eventsource": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-      "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
-      "dev": true,
-      "requires": {
-        "original": "^1.0.0"
-      }
-    },
-    "evp_bytestokey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-      "dev": true,
-      "requires": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       }
     },
     "exit": {
@@ -7245,56 +6414,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": {
-        "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"
-          }
-        },
-        "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"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
     "expand-range": {
       "version": "1.8.2",
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
@@ -7347,47 +6466,84 @@
       }
     },
     "express": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "version": "4.18.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz",
+      "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==",
       "dev": true,
       "requires": {
-        "accepts": "~1.3.7",
+        "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.19.0",
-        "content-disposition": "0.5.3",
+        "body-parser": "1.20.0",
+        "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.4.0",
+        "cookie": "0.5.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "2.0.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
-        "finalhandler": "~1.1.2",
+        "finalhandler": "1.2.0",
         "fresh": "0.5.2",
+        "http-errors": "2.0.0",
         "merge-descriptors": "1.0.1",
         "methods": "~1.1.2",
-        "on-finished": "~2.3.0",
+        "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
         "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.5",
-        "qs": "6.7.0",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.10.3",
         "range-parser": "~1.2.1",
-        "safe-buffer": "5.1.2",
-        "send": "0.17.1",
-        "serve-static": "1.14.1",
-        "setprototypeof": "1.1.1",
-        "statuses": "~1.5.0",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
         "type-is": "~1.6.18",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+          "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+          "dev": true,
+          "requires": {
+            "mime-types": "~2.1.34",
+            "negotiator": "0.6.3"
+          }
+        },
         "array-flatten": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+          "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+          "dev": true
+        },
+        "body-parser": {
+          "version": "1.20.0",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz",
+          "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==",
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.2",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "2.0.0",
+            "destroy": "1.2.0",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "on-finished": "2.4.1",
+            "qs": "6.10.3",
+            "raw-body": "2.5.1",
+            "type-is": "~1.6.18",
+            "unpipe": "1.0.0"
+          }
+        },
+        "bytes": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
           "dev": true
         },
         "debug": {
@@ -7399,27 +6555,119 @@
             "ms": "2.0.0"
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "finalhandler": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+          "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+          "dev": true,
+          "requires": {
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "2.4.1",
+            "parseurl": "~1.3.3",
+            "statuses": "2.0.1",
+            "unpipe": "~1.0.0"
+          }
+        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "dev": true,
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.52.0"
+          }
+        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
-        }
-      }
-    },
-    "ext": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz",
-      "integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
-      "dev": true,
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.3.0.tgz",
-          "integrity": "sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg==",
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "qs": {
+          "version": "6.10.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz",
+          "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
+          "dev": true,
+          "requires": {
+            "side-channel": "^1.0.4"
+          }
+        },
+        "raw-body": {
+          "version": "2.5.1",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+          "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+          "dev": true,
+          "requires": {
+            "bytes": "3.1.2",
+            "http-errors": "2.0.0",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        },
+        "toidentifier": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
           "dev": true
         }
       }
@@ -7462,71 +6710,6 @@
         "tmp": "^0.0.33"
       }
     },
-    "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"
-          }
-        }
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
@@ -7534,23 +6717,33 @@
       "dev": true
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "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-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
+      },
+      "dependencies": {
+        "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"
+          }
+        }
       }
     },
     "fast-json-stable-stringify": {
@@ -7566,29 +6759,23 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.10.1.tgz",
-      "integrity": "sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
+      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
       }
     },
     "faye-websocket": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
-      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
       "requires": {
         "websocket-driver": ">=0.5.1"
       }
     },
-    "figgy-pudding": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
-      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
-      "dev": true
-    },
     "figures": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
@@ -7598,47 +6785,6 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
-    "file-loader": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
-      "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -7687,9 +6833,9 @@
       }
     },
     "find-cache-dir": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dev": true,
       "requires": {
         "commondir": "^1.0.1",
@@ -7736,58 +6882,22 @@
       "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "follow-redirects": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
-      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
-      "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": "0.1.5",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
-      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+    "follow-redirects": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
+      "integrity": "sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==",
+      "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": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
       "dev": true,
       "requires": {
         "for-in": "^1.0.1"
@@ -7811,9 +6921,9 @@
       }
     },
     "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
     },
     "fraction.js": {
@@ -7834,56 +6944,9 @@
     "fresh": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
-    "from2": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
-      "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "fs-extra": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz",
-      "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
     "fs-minipass": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -7893,43 +6956,11 @@
         "minipass": "^3.0.0"
       }
     },
-    "fs-write-stream-atomic": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
-      "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "iferr": "^0.1.5",
-        "imurmurhash": "^0.1.4",
-        "readable-stream": "1 || 2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
+    "fs-monkey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
+      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+      "dev": true
     },
     "fs.realpath": {
       "version": "1.0.0",
@@ -7950,55 +6981,58 @@
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
       "dev": true
     },
+    "functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true
+    },
     "gauge": {
-      "version": "2.7.4",
-      "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
-      "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.0.3",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.0",
-        "object-assign": "^4.1.0",
-        "signal-exit": "^3.0.0",
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wide-align": "^1.1.0"
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+      "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+      "dev": true,
+      "requires": {
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.3",
+        "console-control-strings": "^1.1.0",
+        "has-unicode": "^2.0.1",
+        "signal-exit": "^3.0.7",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.5"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
+        "signal-exit": {
+          "version": "3.0.7",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+          "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+          "dev": true
         },
         "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
           "dev": true,
           "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
           }
         },
         "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "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": "^2.0.0"
+            "ansi-regex": "^5.0.1"
           }
         }
       }
@@ -8026,6 +7060,12 @@
         "has-symbols": "^1.0.1"
       }
     },
+    "get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true
+    },
     "get-port": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
@@ -8033,13 +7073,10 @@
       "dev": true
     },
     "get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "dev": true
     },
     "get-value": {
       "version": "2.0.6",
@@ -8115,6 +7152,12 @@
         "is-glob": "^4.0.1"
       }
     },
+    "glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "dev": true
+    },
     "glob2base": {
       "version": "0.0.12",
       "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
@@ -8131,17 +7174,17 @@
       "dev": true
     },
     "globby": {
-      "version": "11.0.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz",
-      "integrity": "sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
+      "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
       "dev": true,
       "requires": {
-        "array-union": "^2.1.0",
+        "array-union": "^3.0.1",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.1.1",
-        "ignore": "^5.1.4",
-        "merge2": "^1.3.0",
-        "slash": "^3.0.0"
+        "fast-glob": "^3.2.7",
+        "ignore": "^5.1.9",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
       }
     },
     "graceful-fs": {
@@ -8253,10 +7296,27 @@
       "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
       "dev": true
     },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      },
+      "dependencies": {
+        "has-symbols": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+          "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+          "dev": true
+        }
+      }
+    },
     "has-unicode": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
-      "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
+      "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
       "dev": true
     },
     "has-value": {
@@ -8311,34 +7371,22 @@
         }
       }
     },
-    "hash-base": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
-      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
+    "hdr-histogram-js": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz",
+      "integrity": "sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
+        "@assemblyscript/loader": "^0.10.1",
+        "base64-js": "^1.2.0",
+        "pako": "^1.0.3"
       }
     },
-    "hash.js": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
-      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
-      }
+    "hdr-histogram-percentiles-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz",
+      "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==",
+      "dev": true
     },
     "hex-color-regex": {
       "version": "1.1.0",
@@ -8346,21 +7394,10 @@
       "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
       "dev": true
     },
-    "hmac-drbg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
-      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true,
-      "requires": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
     "hosted-git-info": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
-      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "dev": true,
       "requires": {
         "lru-cache": "^6.0.0"
@@ -8369,7 +7406,7 @@
     "hpack.js": {
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.1",
@@ -8423,9 +7460,9 @@
       "dev": true
     },
     "html-entities": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
-      "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
+      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
       "dev": true
     },
     "html-escaper": {
@@ -8443,7 +7480,7 @@
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
       "dev": true
     },
     "http-errors": {
@@ -8468,9 +7505,9 @@
       }
     },
     "http-parser-js": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.3.tgz",
-      "integrity": "sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz",
+      "integrity": "sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
       "dev": true
     },
     "http-proxy": {
@@ -8496,120 +7533,16 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-      "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
       "requires": {
-        "http-proxy": "^1.17.0",
-        "is-glob": "^4.0.0",
-        "lodash": "^4.17.11",
-        "micromatch": "^3.1.10"
-      },
-      "dependencies": {
-        "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"
-              }
-            }
-          }
-        },
-        "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"
-              }
-            }
-          }
-        },
-        "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"
-              }
-            }
-          }
-        },
-        "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"
-          }
-        },
-        "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"
-          }
-        }
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
       }
     },
     "http-signature": {
@@ -8623,12 +7556,6 @@
         "sshpk": "^1.7.0"
       }
     },
-    "https-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
-      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
-      "dev": true
-    },
     "https-proxy-agent": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
@@ -8639,10 +7566,16 @@
         "debug": "4"
       }
     },
+    "human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "dev": true
+    },
     "humanize-ms": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
+      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
       "dev": true,
       "requires": {
         "ms": "^2.0.0"
@@ -8669,22 +7602,16 @@
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true
     },
-    "iferr": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
-      "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
-      "dev": true
-    },
     "ignore": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
       "dev": true
     },
     "ignore-walk": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz",
-      "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-4.0.1.tgz",
+      "integrity": "sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==",
       "dev": true,
       "requires": {
         "minimatch": "^3.0.4"
@@ -8703,6 +7630,12 @@
       "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=",
       "dev": true
     },
+    "immutable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz",
+      "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
+      "dev": true
+    },
     "import-fresh": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
@@ -8713,65 +7646,10 @@
         "resolve-from": "^3.0.0"
       }
     },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        }
-      }
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true
     },
     "indent-string": {
@@ -8830,21 +7708,22 @@
       }
     },
     "inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz",
+      "integrity": "sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==",
       "dev": true,
       "requires": {
         "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
+        "chalk": "^4.1.1",
         "cli-cursor": "^3.1.0",
         "cli-width": "^3.0.0",
         "external-editor": "^3.0.3",
         "figures": "^3.0.0",
-        "lodash": "^4.17.19",
+        "lodash": "^4.17.21",
         "mute-stream": "0.0.8",
+        "ora": "^5.4.1",
         "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
+        "rxjs": "^7.2.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "through": "^2.3.6"
@@ -8860,9 +7739,9 @@
           }
         },
         "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",
@@ -8891,11 +7770,47 @@
           "dev": true
         },
         "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
         },
+        "log-symbols": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+          "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "is-unicode-supported": "^0.1.0"
+          }
+        },
+        "ora": {
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+          "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+          "dev": true,
+          "requires": {
+            "bl": "^4.1.0",
+            "chalk": "^4.1.0",
+            "cli-cursor": "^3.1.0",
+            "cli-spinners": "^2.5.0",
+            "is-interactive": "^1.0.0",
+            "is-unicode-supported": "^0.1.0",
+            "log-symbols": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "wcwidth": "^1.0.1"
+          }
+        },
+        "rxjs": {
+          "version": "7.5.5",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz",
+          "integrity": "sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==",
+          "dev": true,
+          "requires": {
+            "tslib": "^2.1.0"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -8907,32 +7822,16 @@
         }
       }
     },
-    "internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "dev": true,
-      "requires": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      }
-    },
     "ip": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
-      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
-      "dev": true
-    },
-    "ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
+      "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
+      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
       "dev": true
     },
     "is-absolute-url": {
@@ -8962,12 +7861,13 @@
       }
     },
     "is-arguments": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
-      "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-arrayish": {
@@ -9072,9 +7972,9 @@
       "dev": true
     },
     "is-docker": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-      "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true
     },
     "is-dotfile": {
@@ -9128,7 +8028,7 @@
     "is-lambda": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
-      "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=",
+      "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true
     },
     "is-module": {
@@ -9161,23 +8061,17 @@
       "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "dev": true
     },
-    "is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dev": true,
-      "requires": {
-        "is-path-inside": "^2.1.0"
-      }
-    },
     "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dev": true,
-      "requires": {
-        "path-is-inside": "^1.0.2"
-      }
+      "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-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -9226,9 +8120,9 @@
       "dev": true
     },
     "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true
     },
     "is-svg": {
@@ -9255,6 +8149,12 @@
       "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
       "dev": true
     },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true
+    },
     "is-what": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz",
@@ -9312,6 +8212,27 @@
       "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
       "dev": true
     },
+    "istanbul-lib-instrument": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz",
+      "integrity": "sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "dependencies": {
+        "istanbul-lib-coverage": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+          "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
+          "dev": true
+        }
+      }
+    },
     "istanbul-lib-report": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
@@ -9436,14 +8357,14 @@
       "dev": true
     },
     "jest-worker": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
-      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
       "requires": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
-        "supports-color": "^7.0.0"
+        "supports-color": "^8.0.0"
       },
       "dependencies": {
         "has-flag": {
@@ -9453,9 +8374,9 @@
           "dev": true
         },
         "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==",
+          "version": "8.1.1",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
@@ -9486,9 +8407,9 @@
       "dev": true
     },
     "jsesc": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
     "json-parse-better-errors": {
@@ -9521,20 +8442,11 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
       "dev": true
     },
-    "json3": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
-      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
-      "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"
-      }
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "dev": true
     },
     "jsonc-parser": {
       "version": "3.0.0",
@@ -9554,7 +8466,7 @@
     "jsonparse": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
-      "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=",
+      "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==",
       "dev": true
     },
     "jsprim": {
@@ -9797,12 +8709,6 @@
         "source-map-support": "^0.5.5"
       }
     },
-    "killable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
-      "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
-      "dev": true
-    },
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -9810,9 +8716,9 @@
       "dev": true
     },
     "klona": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.4.tgz",
-      "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
+      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
       "dev": true
     },
     "less": {
@@ -9849,73 +8755,21 @@
       }
     },
     "less-loader": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-7.3.0.tgz",
-      "integrity": "sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-10.2.0.tgz",
+      "integrity": "sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg==",
       "dev": true,
       "requires": {
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
+        "klona": "^2.0.4"
       }
     },
     "license-webpack-plugin": {
-      "version": "2.3.11",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-2.3.11.tgz",
-      "integrity": "sha512-0iVGoX5vx0WDy8dmwTTpOOMYiGqILyUbDeVMFH52AjgBlS58lHwOlFMSoqg5nY8Kxl6+FRKyUZY/UdlQaOyqDw==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
+      "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
       "dev": true,
       "requires": {
-        "@types/webpack-sources": "^0.1.5",
-        "webpack-sources": "^1.2.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
+        "webpack-sources": "^3.0.0"
       }
     },
     "lie": {
@@ -9928,27 +8782,22 @@
       }
     },
     "lines-and-columns": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
+      "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
     },
     "loader-runner": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
-      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true
     },
     "loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      }
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
+      "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
+      "dev": true
     },
     "locate-path": {
       "version": "5.0.0",
@@ -9965,6 +8814,12 @@
       "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
       "dev": true
     },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true
+    },
     "lodash.memoize": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
@@ -10050,12 +8905,6 @@
         "streamroller": "^2.2.4"
       }
     },
-    "loglevel": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
-      "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
-      "dev": true
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -10066,9 +8915,9 @@
       }
     },
     "magic-string": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.4.tgz",
-      "integrity": "sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==",
+      "version": "0.25.7",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
+      "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
       "dev": true,
       "requires": {
         "sourcemap-codec": "^1.4.4"
@@ -10099,13 +8948,13 @@
       "dev": true
     },
     "make-fetch-happen": {
-      "version": "8.0.14",
-      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz",
-      "integrity": "sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz",
+      "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==",
       "dev": true,
       "requires": {
         "agentkeepalive": "^4.1.3",
-        "cacache": "^15.0.5",
+        "cacache": "^15.2.0",
         "http-cache-semantics": "^4.1.0",
         "http-proxy-agent": "^4.0.1",
         "https-proxy-agent": "^5.0.0",
@@ -10116,21 +8965,10 @@
         "minipass-fetch": "^1.3.2",
         "minipass-flush": "^1.0.5",
         "minipass-pipeline": "^1.2.4",
+        "negotiator": "^0.6.2",
         "promise-retry": "^2.0.1",
-        "socks-proxy-agent": "^5.0.0",
+        "socks-proxy-agent": "^6.0.0",
         "ssri": "^8.0.0"
-      },
-      "dependencies": {
-        "promise-retry": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
-          "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
-          "dev": true,
-          "requires": {
-            "err-code": "^2.0.2",
-            "retry": "^0.12.0"
-          }
-        }
       }
     },
     "map-cache": {
@@ -10154,17 +8992,6 @@
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
-    "md5.js": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
-      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
     "mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -10177,65 +9004,21 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
-    "memory-fs": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
-      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+    "memfs": {
+      "version": "3.4.6",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz",
+      "integrity": "sha512-rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw==",
       "dev": true,
       "requires": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
+        "fs-monkey": "^1.0.3"
       }
     },
     "merge-descriptors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+      "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
       "dev": true
     },
-    "merge-source-map": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
-      "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -10251,33 +9034,23 @@
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
-      "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
-      "dev": true,
-      "requires": {
-        "braces": "^3.0.1",
-        "picomatch": "^2.0.5"
-      }
-    },
-    "miller-rabin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
-      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
       },
       "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+        "picomatch": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+          "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
           "dev": true
         }
       }
@@ -10310,59 +9083,33 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.3.5.tgz",
-      "integrity": "sha512-tvmzcwqJJXau4OQE5vT72pRT18o2zF+tQJp8CWchqvfQnTlflkzS+dANYcRdyPRWUWRkfmeNTKltx0NZI/b5dQ==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz",
+      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
       "dev": true,
       "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "webpack-sources": "^1.1.0"
+        "schema-utils": "^4.0.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "6.12.6",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "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"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "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
-        },
         "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "dev": true,
           "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
       }
@@ -10373,12 +9120,6 @@
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
       "dev": true
     },
-    "minimalistic-crypto-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
-      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-      "dev": true
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -10395,9 +9136,9 @@
       "dev": true
     },
     "minipass": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
-      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz",
+      "integrity": "sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA==",
       "dev": true,
       "requires": {
         "yallist": "^4.0.0"
@@ -10413,9 +9154,9 @@
       }
     },
     "minipass-fetch": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.3.tgz",
-      "integrity": "sha512-akCrLDWfbdAWkMLBxJEeWTdNsjML+dt5YgOI4gJ53vuO0vrmYQkUPxa6j6V65s9CcePIr2SSWqjT2EcrNseryQ==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz",
+      "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==",
       "dev": true,
       "requires": {
         "encoding": "^0.1.12",
@@ -10471,24 +9212,6 @@
         "yallist": "^4.0.0"
       }
     },
-    "mississippi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
-      "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
-      "dev": true,
-      "requires": {
-        "concat-stream": "^1.5.0",
-        "duplexify": "^3.4.2",
-        "end-of-stream": "^1.1.0",
-        "flush-write-stream": "^1.0.0",
-        "from2": "^2.1.0",
-        "parallel-transform": "^1.1.0",
-        "pump": "^3.0.0",
-        "pumpify": "^1.3.3",
-        "stream-each": "^1.1.0",
-        "through2": "^2.0.0"
-      }
-    },
     "mixin-deep": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
@@ -10516,40 +9239,6 @@
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "dev": true
     },
-    "move-concurrently": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
-      "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1",
-        "copy-concurrently": "^1.0.0",
-        "fs-write-stream-atomic": "^1.0.8",
-        "mkdirp": "^0.5.1",
-        "rimraf": "^2.5.4",
-        "run-queue": "^1.0.3"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -10569,7 +9258,7 @@
     "multicast-dns-service-types": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
-      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+      "integrity": "sha512-cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ==",
       "dev": true
     },
     "mute-stream": {
@@ -10639,12 +9328,6 @@
       "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
       "dev": true
     },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
     "ng-packagr": {
       "version": "11.2.2",
       "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-11.2.2.tgz",
@@ -10710,40 +9393,52 @@
         }
       }
     },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
+    "nice-napi": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz",
+      "integrity": "sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "node-addon-api": "^3.0.0",
+        "node-gyp-build": "^4.2.2"
+      }
+    },
+    "node-addon-api": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
+      "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
+      "dev": true,
+      "optional": true
     },
     "node-forge": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
-      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true
     },
     "node-gyp": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.2.tgz",
-      "integrity": "sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ==",
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz",
+      "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==",
       "dev": true,
       "requires": {
         "env-paths": "^2.2.0",
         "glob": "^7.1.4",
-        "graceful-fs": "^4.2.3",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^9.1.0",
         "nopt": "^5.0.0",
-        "npmlog": "^4.1.2",
-        "request": "^2.88.2",
+        "npmlog": "^6.0.0",
         "rimraf": "^3.0.2",
-        "semver": "^7.3.2",
-        "tar": "^6.0.2",
+        "semver": "^7.3.5",
+        "tar": "^6.1.2",
         "which": "^2.0.2"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -10760,81 +9455,12 @@
         }
       }
     },
-    "node-libs-browser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
-      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
-      "dev": true,
-      "requires": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
-      },
-      "dependencies": {
-        "buffer": {
-          "version": "4.9.2",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
-          "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
-          "dev": true,
-          "requires": {
-            "base64-js": "^1.0.2",
-            "ieee754": "^1.1.4",
-            "isarray": "^1.0.0"
-          }
-        },
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "string_decoder": {
-              "version": "1.1.1",
-              "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-              "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-              "dev": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            }
-          }
-        }
-      }
+    "node-gyp-build": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz",
+      "integrity": "sha512-amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ==",
+      "dev": true,
+      "optional": true
     },
     "node-releases": {
       "version": "1.1.70",
@@ -10879,9 +9505,9 @@
       "dev": true
     },
     "npm-bundled": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz",
-      "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
+      "integrity": "sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==",
       "dev": true,
       "requires": {
         "npm-normalize-package-bin": "^1.0.1"
@@ -10897,9 +9523,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -10914,20 +9540,20 @@
       "dev": true
     },
     "npm-package-arg": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.0.tgz",
-      "integrity": "sha512-/ep6QDxBkm9HvOhOg0heitSd7JHA1U7y1qhhlRlteYYAi9Pdb/ZV7FW5aHpkrpM8+P+4p/jjR8zCyKPBMBjSig==",
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.5.tgz",
+      "integrity": "sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==",
       "dev": true,
       "requires": {
-        "hosted-git-info": "^3.0.6",
-        "semver": "^7.0.0",
+        "hosted-git-info": "^4.0.1",
+        "semver": "^7.3.4",
         "validate-npm-package-name": "^3.0.0"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -10936,32 +9562,33 @@
       }
     },
     "npm-packlist": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.4.tgz",
-      "integrity": "sha512-Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-3.0.0.tgz",
+      "integrity": "sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==",
       "dev": true,
       "requires": {
         "glob": "^7.1.6",
-        "ignore-walk": "^3.0.3",
+        "ignore-walk": "^4.0.1",
         "npm-bundled": "^1.1.1",
         "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "npm-pick-manifest": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz",
-      "integrity": "sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz",
+      "integrity": "sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==",
       "dev": true,
       "requires": {
         "npm-install-checks": "^4.0.0",
-        "npm-package-arg": "^8.0.0",
-        "semver": "^7.0.0"
+        "npm-normalize-package-bin": "^1.0.1",
+        "npm-package-arg": "^8.1.2",
+        "semver": "^7.3.4"
       },
       "dependencies": {
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -10970,40 +9597,235 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz",
-      "integrity": "sha512-PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz",
+      "integrity": "sha512-Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA==",
       "dev": true,
       "requires": {
-        "@npmcli/ci-detect": "^1.0.0",
-        "lru-cache": "^6.0.0",
-        "make-fetch-happen": "^8.0.9",
-        "minipass": "^3.1.3",
-        "minipass-fetch": "^1.3.0",
+        "make-fetch-happen": "^10.0.1",
+        "minipass": "^3.1.6",
+        "minipass-fetch": "^1.4.1",
         "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.0.0",
-        "npm-package-arg": "^8.0.0"
+        "minizlib": "^2.1.2",
+        "npm-package-arg": "^8.1.5"
+      },
+      "dependencies": {
+        "@npmcli/fs": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.0.tgz",
+          "integrity": "sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==",
+          "dev": true,
+          "requires": {
+            "@gar/promisify": "^1.1.3",
+            "semver": "^7.3.5"
+          }
+        },
+        "@npmcli/move-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.0.tgz",
+          "integrity": "sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==",
+          "dev": true,
+          "requires": {
+            "mkdirp": "^1.0.4",
+            "rimraf": "^3.0.2"
+          }
+        },
+        "@tootallnate/once": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+          "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+          "dev": true
+        },
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        },
+        "cacache": {
+          "version": "16.1.1",
+          "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.1.tgz",
+          "integrity": "sha512-VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg==",
+          "dev": true,
+          "requires": {
+            "@npmcli/fs": "^2.1.0",
+            "@npmcli/move-file": "^2.0.0",
+            "chownr": "^2.0.0",
+            "fs-minipass": "^2.1.0",
+            "glob": "^8.0.1",
+            "infer-owner": "^1.0.4",
+            "lru-cache": "^7.7.1",
+            "minipass": "^3.1.6",
+            "minipass-collect": "^1.0.2",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.4",
+            "mkdirp": "^1.0.4",
+            "p-map": "^4.0.0",
+            "promise-inflight": "^1.0.1",
+            "rimraf": "^3.0.2",
+            "ssri": "^9.0.0",
+            "tar": "^6.1.11",
+            "unique-filename": "^1.1.1"
+          }
+        },
+        "glob": {
+          "version": "8.0.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
+          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^5.0.1",
+            "once": "^1.3.0"
+          }
+        },
+        "http-proxy-agent": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+          "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+          "dev": true,
+          "requires": {
+            "@tootallnate/once": "2",
+            "agent-base": "6",
+            "debug": "4"
+          }
+        },
+        "lru-cache": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.10.1.tgz",
+          "integrity": "sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==",
+          "dev": true
+        },
+        "make-fetch-happen": {
+          "version": "10.1.7",
+          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.7.tgz",
+          "integrity": "sha512-J/2xa2+7zlIUKqfyXDCXFpH3ypxO4k3rgkZHPSZkyUYcBT/hM80M3oyKLM/9dVriZFiGeGGS2Ei+0v2zfhqj3Q==",
+          "dev": true,
+          "requires": {
+            "agentkeepalive": "^4.2.1",
+            "cacache": "^16.1.0",
+            "http-cache-semantics": "^4.1.0",
+            "http-proxy-agent": "^5.0.0",
+            "https-proxy-agent": "^5.0.0",
+            "is-lambda": "^1.0.1",
+            "lru-cache": "^7.7.1",
+            "minipass": "^3.1.6",
+            "minipass-collect": "^1.0.2",
+            "minipass-fetch": "^2.0.3",
+            "minipass-flush": "^1.0.5",
+            "minipass-pipeline": "^1.2.4",
+            "negotiator": "^0.6.3",
+            "promise-retry": "^2.0.1",
+            "socks-proxy-agent": "^7.0.0",
+            "ssri": "^9.0.0"
+          },
+          "dependencies": {
+            "minipass-fetch": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.0.tgz",
+              "integrity": "sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==",
+              "dev": true,
+              "requires": {
+                "encoding": "^0.1.13",
+                "minipass": "^3.1.6",
+                "minipass-sized": "^1.0.3",
+                "minizlib": "^2.1.2"
+              }
+            }
+          }
+        },
+        "minimatch": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
+          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
+          "dev": true,
+          "requires": {
+            "brace-expansion": "^2.0.1"
+          }
+        },
+        "negotiator": {
+          "version": "0.6.3",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          },
+          "dependencies": {
+            "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"
+              }
+            }
+          }
+        },
+        "socks-proxy-agent": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
+          "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
+          "dev": true,
+          "requires": {
+            "agent-base": "^6.0.2",
+            "debug": "^4.3.3",
+            "socks": "^2.6.2"
+          },
+          "dependencies": {
+            "debug": {
+              "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"
+              }
+            }
+          }
+        },
+        "ssri": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
+          "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
+          "dev": true,
+          "requires": {
+            "minipass": "^3.1.1"
+          }
+        }
       }
     },
     "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "requires": {
-        "path-key": "^2.0.0"
+        "path-key": "^3.0.0"
       }
     },
     "npmlog": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+      "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
       "dev": true,
       "requires": {
-        "are-we-there-yet": "~1.1.2",
-        "console-control-strings": "~1.1.0",
-        "gauge": "~2.7.3",
-        "set-blocking": "~2.0.0"
+        "are-we-there-yet": "^3.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^4.0.3",
+        "set-blocking": "^2.0.0"
       }
     },
     "nth-check": {
@@ -11015,12 +9837,6 @@
         "boolbase": "~1.0.0"
       }
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -11071,12 +9887,12 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.4.tgz",
-      "integrity": "sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
+      "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
+        "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
       }
     },
@@ -11189,30 +10005,14 @@
       }
     },
     "open": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
-      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      }
-    },
-    "opn": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
-      "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
       "dev": true,
       "requires": {
-        "is-wsl": "^1.1.0"
-      },
-      "dependencies": {
-        "is-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-          "dev": true
-        }
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
       }
     },
     "ora": {
@@ -11282,33 +10082,12 @@
         }
       }
     },
-    "original": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
-      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
-      "dev": true,
-      "requires": {
-        "url-parse": "^1.4.3"
-      }
-    },
-    "os-browserify": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
-      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
-      "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
     },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -11337,12 +10116,13 @@
       }
     },
     "p-retry": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
-      "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
       "requires": {
-        "retry": "^0.12.0"
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
       }
     },
     "p-try": {
@@ -11352,15 +10132,15 @@
       "dev": true
     },
     "pacote": {
-      "version": "11.2.4",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-11.2.4.tgz",
-      "integrity": "sha512-GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ==",
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-12.0.3.tgz",
+      "integrity": "sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==",
       "dev": true,
       "requires": {
-        "@npmcli/git": "^2.0.1",
-        "@npmcli/installed-package-contents": "^1.0.5",
+        "@npmcli/git": "^2.1.0",
+        "@npmcli/installed-package-contents": "^1.0.6",
         "@npmcli/promise-spawn": "^1.2.0",
-        "@npmcli/run-script": "^1.3.0",
+        "@npmcli/run-script": "^2.0.0",
         "cacache": "^15.0.5",
         "chownr": "^2.0.0",
         "fs-minipass": "^2.1.0",
@@ -11368,13 +10148,13 @@
         "minipass": "^3.1.3",
         "mkdirp": "^1.0.3",
         "npm-package-arg": "^8.0.1",
-        "npm-packlist": "^2.1.4",
+        "npm-packlist": "^3.0.0",
         "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^9.0.0",
-        "promise-retry": "^1.1.1",
-        "read-package-json-fast": "^1.1.3",
+        "npm-registry-fetch": "^12.0.0",
+        "promise-retry": "^2.0.1",
+        "read-package-json-fast": "^2.0.1",
         "rimraf": "^3.0.2",
-        "ssri": "^8.0.0",
+        "ssri": "^8.0.1",
         "tar": "^6.1.0"
       }
     },
@@ -11384,50 +10164,13 @@
       "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "dev": true
     },
-    "parallel-transform": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
-      "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+    "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": {
-        "cyclist": "^1.0.1",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.1.5"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "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"
+        "callsites": "^3.0.0"
       },
       "dependencies": {
         "callsites": {
@@ -11438,19 +10181,6 @@
         }
       }
     },
-    "parse-asn1": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
-      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
-      "dev": true,
-      "requires": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
-      }
-    },
     "parse-glob": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
@@ -11554,18 +10284,6 @@
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
       "dev": true
     },
-    "path-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
-      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
     "path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -11585,9 +10303,9 @@
       "dev": true
     },
     "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "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": {
@@ -11599,7 +10317,7 @@
     "path-to-regexp": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+      "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
       "dev": true
     },
     "path-type": {
@@ -11608,25 +10326,18 @@
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
-    "pbkdf2": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz",
-      "integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
-      "dev": true,
-      "requires": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
-      }
-    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "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.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
@@ -11654,6 +10365,18 @@
         "pinkie": "^2.0.0"
       }
     },
+    "piscina": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz",
+      "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==",
+      "dev": true,
+      "requires": {
+        "eventemitter-asyncresource": "^1.0.0",
+        "hdr-histogram-js": "^2.0.1",
+        "hdr-histogram-percentiles-obj": "^3.0.0",
+        "nice-napi": "^1.0.2"
+      }
+    },
     "pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -11663,15 +10386,6 @@
         "find-up": "^4.0.0"
       }
     },
-    "pnp-webpack-plugin": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
-      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
-      "dev": true,
-      "requires": {
-        "ts-pnp": "^1.1.6"
-      }
-    },
     "portfinder": {
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -11692,13 +10406,19 @@
             "ms": "^2.1.1"
           }
         },
+        "minimist": {
+          "version": "1.2.6",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+          "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+          "dev": true
+        },
         "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "version": "0.5.6",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+          "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.5"
+            "minimist": "^1.2.6"
           }
         }
       }
@@ -11728,6 +10448,27 @@
         }
       }
     },
+    "postcss-attribute-case-insensitive": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.1.tgz",
+      "integrity": "sha512-wrt2VndqSLJpyBRNz9OmJcgnhI9MaongeWgapdBuUMu2a/KNJ8SENesG4SdiTnQwGO9b1VKbTWYAfCPeokLqZQ==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
     "postcss-calc": {
       "version": "7.0.5",
       "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
@@ -11767,6 +10508,57 @@
         }
       }
     },
+    "postcss-color-functional-notation": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.3.tgz",
+      "integrity": "sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-color-hex-alpha": {
+      "version": "8.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
+      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-color-rebeccapurple": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.0.tgz",
+      "integrity": "sha512-1jtE5AKnZcKq4pjOrltFHcbEM2/IvtbD1OdhZ/wqds18//bh0UmQkffcCkzDJU+/vGodfIsVQeKn+45CJvX9Bw==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
     "postcss-colormin": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
@@ -11858,6 +10650,70 @@
         }
       }
     },
+    "postcss-custom-media": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
+      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-custom-properties": {
+      "version": "12.1.8",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.8.tgz",
+      "integrity": "sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-custom-selectors": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
+      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.4"
+      }
+    },
+    "postcss-dir-pseudo-class": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz",
+      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
     "postcss-discard-comments": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
@@ -12006,10 +10862,116 @@
         }
       }
     },
+    "postcss-double-position-gradients": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
+      "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
+      "dev": true,
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-env-function": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
+      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-focus-visible": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
+      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
+    "postcss-focus-within": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
+      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.9"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
+    "postcss-font-variant": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
+      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
+      "dev": true
+    },
+    "postcss-gap-properties": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
+      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
+      "dev": true
+    },
+    "postcss-image-set-function": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz",
+      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
     "postcss-import": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.0.tgz",
-      "integrity": "sha512-gFDDzXhqr9ELmnLHgCC3TbGfA6Dm/YMb/UN8/f7Uuq4fL7VTk2vOIj6hwINEwbokEmp123bLD7a5m+E+KIetRg==",
+      "version": "14.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.0.2.tgz",
+      "integrity": "sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.0.0",
@@ -12017,35 +10979,45 @@
         "resolve": "^1.1.7"
       }
     },
-    "postcss-loader": {
+    "postcss-initial": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
+      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
+      "dev": true
+    },
+    "postcss-lab-function": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.2.0.tgz",
-      "integrity": "sha512-mqgScxHqbiz1yxbnNcPdKYo/6aVt+XExURmEbQlviFVWogDbM4AJ0A/B+ZBpYsJrTRxKw7HyRazg9x0Q9SWwLA==",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz",
+      "integrity": "sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==",
+      "dev": true,
+      "requires": {
+        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-loader": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.4"
+        "klona": "^2.0.5",
+        "semver": "^7.3.5"
       },
       "dependencies": {
-        "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"
-          }
-        },
         "cosmiconfig": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-          "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+          "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
           "dev": true,
           "requires": {
             "@types/parse-json": "^4.0.0",
@@ -12055,12 +11027,6 @@
             "yaml": "^1.10.0"
           }
         },
-        "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
-        },
         "import-fresh": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
@@ -12089,21 +11055,10 @@
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.7",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
+          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -12111,6 +11066,18 @@
         }
       }
     },
+    "postcss-logical": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
+      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
+      "dev": true
+    },
+    "postcss-media-minmax": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
+      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
+      "dev": true
+    },
     "postcss-merge-longhand": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
@@ -12434,6 +11401,28 @@
         "icss-utils": "^5.0.0"
       }
     },
+    "postcss-nesting": {
+      "version": "10.1.8",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.8.tgz",
+      "integrity": "sha512-txdb3/idHYsBbNDFo1PFY0ExCgH5nfWi8G5lO49e6iuU42TydbODTzJgF5UuL5bhgeSlnAtDgfFTDG0Cl1zaSQ==",
+      "dev": true,
+      "requires": {
+        "@csstools/selector-specificity": "^2.0.0",
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
     "postcss-normalize-charset": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
@@ -12878,15 +11867,165 @@
         }
       }
     },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
+    "postcss-overflow-shorthand": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
+      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
+      "dev": true
+    },
+    "postcss-page-break": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
+      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
+      "dev": true
+    },
+    "postcss-place": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
+      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
+      "dev": true,
+      "requires": {
+        "postcss-value-parser": "^4.2.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-preset-env": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.2.3.tgz",
+      "integrity": "sha512-Ok0DhLfwrcNGrBn8sNdy1uZqWRk/9FId0GiQ39W4ILop5GHtjJs8bu1MY9isPwHInpVEPWjb4CEcEaSbBLpfwA==",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "^10.4.2",
+        "browserslist": "^4.19.1",
+        "caniuse-lite": "^1.0.30001299",
+        "css-blank-pseudo": "^3.0.2",
+        "css-has-pseudo": "^3.0.3",
+        "css-prefers-color-scheme": "^6.0.2",
+        "cssdb": "^5.0.0",
+        "postcss-attribute-case-insensitive": "^5.0.0",
+        "postcss-color-functional-notation": "^4.2.1",
+        "postcss-color-hex-alpha": "^8.0.2",
+        "postcss-color-rebeccapurple": "^7.0.2",
+        "postcss-custom-media": "^8.0.0",
+        "postcss-custom-properties": "^12.1.2",
+        "postcss-custom-selectors": "^6.0.0",
+        "postcss-dir-pseudo-class": "^6.0.3",
+        "postcss-double-position-gradients": "^3.0.4",
+        "postcss-env-function": "^4.0.4",
+        "postcss-focus-visible": "^6.0.3",
+        "postcss-focus-within": "^5.0.3",
+        "postcss-font-variant": "^5.0.0",
+        "postcss-gap-properties": "^3.0.2",
+        "postcss-image-set-function": "^4.0.4",
+        "postcss-initial": "^4.0.1",
+        "postcss-lab-function": "^4.0.3",
+        "postcss-logical": "^5.0.3",
+        "postcss-media-minmax": "^5.0.0",
+        "postcss-nesting": "^10.1.2",
+        "postcss-overflow-shorthand": "^3.0.2",
+        "postcss-page-break": "^3.0.4",
+        "postcss-place": "^7.0.3",
+        "postcss-pseudo-class-any-link": "^7.0.2",
+        "postcss-replace-overflow-wrap": "^4.0.0",
+        "postcss-selector-not": "^5.0.0"
+      },
+      "dependencies": {
+        "autoprefixer": {
+          "version": "10.4.7",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
+          "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
+          "dev": true,
+          "requires": {
+            "browserslist": "^4.20.3",
+            "caniuse-lite": "^1.0.30001335",
+            "fraction.js": "^4.2.0",
+            "normalize-range": "^0.1.2",
+            "picocolors": "^1.0.0",
+            "postcss-value-parser": "^4.2.0"
+          }
+        },
+        "browserslist": {
+          "version": "4.20.4",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
+          "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001349",
+            "electron-to-chromium": "^1.4.147",
+            "escalade": "^3.1.1",
+            "node-releases": "^2.0.5",
+            "picocolors": "^1.0.0"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001357",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",
+          "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.4.161",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz",
+          "integrity": "sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==",
+          "dev": true
+        },
+        "fraction.js": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+          "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
+          "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==",
+          "dev": true
+        },
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+          "dev": true
+        }
+      }
+    },
+    "postcss-pseudo-class-any-link": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.4.tgz",
+      "integrity": "sha512-JxRcLXm96u14N3RzFavPIE9cRPuOqLDuzKeBsqi4oRk4vt8n0A7I0plFs/VXTg7U2n7g/XkQi0OwqTO3VWBfEg==",
+      "dev": true,
+      "requires": {
+        "postcss-selector-parser": "^6.0.10"
+      },
+      "dependencies": {
+        "postcss-selector-parser": {
+          "version": "6.0.10",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
+          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
+      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.0.0",
+        "caniuse-api": "^3.0.0",
+        "has": "^1.0.0",
         "postcss": "^7.0.0"
       },
       "dependencies": {
@@ -12964,6 +12103,21 @@
         }
       }
     },
+    "postcss-replace-overflow-wrap": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
+      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
+      "dev": true
+    },
+    "postcss-selector-not": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz",
+      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "postcss-selector-parser": {
       "version": "6.0.4",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
@@ -13111,15 +12265,9 @@
       "dev": true
     },
     "pretty-bytes": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.5.0.tgz",
-      "integrity": "sha512-p+T744ZyjjiaFlMUZZv6YPC5JrkNj8maRmPaQCWFJFplUAzpIUTRaTcS+7wmZtUoFXHtESJb23ISliaWyz3SHA==",
-      "dev": true
-    },
-    "process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "dev": true
     },
     "process-nextick-args": {
@@ -13131,29 +12279,23 @@
     "promise-inflight": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
       "dev": true
     },
     "promise-retry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-1.1.1.tgz",
-      "integrity": "sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz",
+      "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==",
       "dev": true,
       "requires": {
-        "err-code": "^1.0.0",
-        "retry": "^0.10.0"
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
       },
       "dependencies": {
-        "err-code": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz",
-          "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=",
-          "dev": true
-        },
         "retry": {
-          "version": "0.10.1",
-          "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz",
-          "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=",
+          "version": "0.12.0",
+          "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+          "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==",
           "dev": true
         }
       }
@@ -13474,20 +12616,29 @@
       }
     },
     "proxy-addr": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "requires": {
-        "forwarded": "~0.1.2",
+        "forwarded": "0.2.0",
         "ipaddr.js": "1.9.1"
+      },
+      "dependencies": {
+        "ipaddr.js": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+          "dev": true
+        }
       }
     },
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
       "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "psl": {
       "version": "1.8.0",
@@ -13495,67 +12646,6 @@
       "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
-    "public-encrypt": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
-      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
-      "dev": true,
-      "requires": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      },
-      "dependencies": {
-        "bn.js": {
-          "version": "4.11.9",
-          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-          "dev": true
-        }
-      }
-    },
-    "puka": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/puka/-/puka-1.0.1.tgz",
-      "integrity": "sha512-ssjRZxBd7BT3dte1RR3VoeT2cT/ODH8x+h0rUF1rMqB0srHYf48stSDWfiYakTp5UBZMxroZhB2+ExLDHm7W3g==",
-      "dev": true
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      },
-      "dependencies": {
-        "pump": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-          "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -13580,28 +12670,10 @@
       "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
       "dev": true
     },
-    "querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
-      "dev": true
-    },
-    "querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
-      "dev": true
-    },
-    "querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "dev": true
-    },
     "queue-microtask": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz",
-      "integrity": "sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "randomatic": {
@@ -13632,16 +12704,6 @@
         "safe-buffer": "^5.1.0"
       }
     },
-    "randomfill": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
-      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
-      "dev": true,
-      "requires": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
-      }
-    },
     "range-parser": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
@@ -13668,51 +12730,10 @@
         }
       }
     },
-    "raw-loader": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz",
-      "integrity": "sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
-    },
     "read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
       "dev": true,
       "requires": {
         "pify": "^2.3.0"
@@ -13721,15 +12742,15 @@
         "pify": {
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+          "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
           "dev": true
         }
       }
     },
     "read-package-json-fast": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.2.tgz",
-      "integrity": "sha512-39DbPJjkltEzfXJXB6D8/Ir3GFOU2YbSKa2HaB/Y3nKrc/zY+0XrALpID6/13ezWyzqvOHrBbR4t4cjQuTdBVQ==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz",
+      "integrity": "sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==",
       "dev": true,
       "requires": {
         "json-parse-even-better-errors": "^2.3.0",
@@ -13763,30 +12784,30 @@
       "dev": true
     },
     "regenerate": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
-      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
-      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz",
+      "integrity": "sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==",
       "dev": true,
       "requires": {
-        "regenerate": "^1.4.0"
+        "regenerate": "^1.4.2"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
-      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
+      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.4"
@@ -13818,13 +12839,51 @@
       "dev": true
     },
     "regexp.prototype.flags": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
-      "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
+      "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
+        "define-properties": "^1.1.3",
+        "functions-have-names": "^1.2.2"
+      }
+    },
+    "regexpu-core": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz",
+      "integrity": "sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==",
+      "dev": true,
+      "requires": {
+        "regenerate": "^1.4.2",
+        "regenerate-unicode-properties": "^10.0.1",
+        "regjsgen": "^0.6.0",
+        "regjsparser": "^0.8.2",
+        "unicode-match-property-ecmascript": "^2.0.0",
+        "unicode-match-property-value-ecmascript": "^2.0.0"
+      }
+    },
+    "regjsgen": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
+      "integrity": "sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==",
+      "dev": true
+    },
+    "regjsparser": {
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz",
+      "integrity": "sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==",
+      "dev": true,
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
+          "dev": true
+        }
       }
     },
     "remove-trailing-separator": {
@@ -13915,15 +12974,6 @@
         "path-parse": "^1.0.6"
       }
     },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
     "resolve-from": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
@@ -13937,64 +12987,44 @@
       "dev": true
     },
     "resolve-url-loader": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz",
-      "integrity": "sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==",
-      "dev": true,
-      "requires": {
-        "adjust-sourcemap-loader": "3.0.0",
-        "camelcase": "5.3.1",
-        "compose-function": "3.0.3",
-        "convert-source-map": "1.7.0",
-        "es6-iterator": "2.0.3",
-        "loader-utils": "1.2.3",
-        "postcss": "7.0.21",
-        "rework": "1.0.1",
-        "rework-visit": "1.0.0",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
+      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+      "dev": true,
+      "requires": {
+        "adjust-sourcemap-loader": "^4.0.0",
+        "convert-source-map": "^1.7.0",
+        "loader-utils": "^2.0.0",
+        "postcss": "^8.2.14",
         "source-map": "0.6.1"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "emojis-list": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
         "loader-utils": {
-          "version": "1.2.3",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
           "dev": true,
           "requires": {
             "big.js": "^5.2.2",
-            "emojis-list": "^2.0.0",
-            "json5": "^1.0.1"
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
           }
         },
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.21",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.21.tgz",
-          "integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
+          "version": "8.4.14",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "nanoid": "^3.3.4",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
           }
         },
         "source-map": {
@@ -14002,15 +13032,6 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -14031,9 +13052,9 @@
       "dev": true
     },
     "retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true
     },
     "reusify": {
@@ -14042,98 +13063,33 @@
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true
     },
-    "rework": {
+    "rfdc": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz",
+      "integrity": "sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==",
+      "dev": true
+    },
+    "rgb-regex": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz",
-      "integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
-      "dev": true,
-      "requires": {
-        "convert-source-map": "^0.3.3",
-        "css": "^2.0.0"
-      },
-      "dependencies": {
-        "convert-source-map": {
-          "version": "0.3.5",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz",
-          "integrity": "sha1-8dgClQr33SYxof6+BZZVDIarMZA=",
-          "dev": true
-        },
-        "css": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-          "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "source-map": "^0.6.1",
-            "source-map-resolve": "^0.5.2",
-            "urix": "^0.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "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"
-          }
-        }
-      }
-    },
-    "rework-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rework-visit/-/rework-visit-1.0.0.tgz",
-      "integrity": "sha1-mUWygD8hni96ygCtuLyfZA+ELJo=",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.2.0.tgz",
-      "integrity": "sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==",
-      "dev": true
-    },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-      "dev": true
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
+      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
+      "dev": true
+    },
+    "rgba-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
+      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
+      "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"
       }
     },
-    "ripemd160": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
-      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-      "dev": true,
-      "requires": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1"
-      }
-    },
     "rollup": {
       "version": "2.38.4",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz",
@@ -14168,15 +13124,6 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "run-queue": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
-      "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
-      "dev": true,
-      "requires": {
-        "aproba": "^1.1.1"
-      }
-    },
     "rxjs": {
       "version": "6.6.3",
       "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
@@ -14223,56 +13170,13 @@
       }
     },
     "sass-loader": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.1.1.tgz",
-      "integrity": "sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw==",
+      "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
+      "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
       "dev": true,
       "requires": {
         "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "neo-async": "^2.6.2",
-        "schema-utils": "^3.0.0",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        }
+        "neo-async": "^2.6.2"
       }
     },
     "saucelabs": {
@@ -14342,19 +13246,13 @@
             "json-schema-traverse": "^0.4.1",
             "uri-js": "^4.2.2"
           }
-        },
-        "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
         }
       }
     },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
       "dev": true
     },
     "selenium-webdriver": {
@@ -14390,12 +13288,12 @@
       }
     },
     "selfsigned": {
-      "version": "1.10.8",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
-      "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
+      "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
       "dev": true,
       "requires": {
-        "node-forge": "^0.10.0"
+        "node-forge": "^1"
       }
     },
     "semver": {
@@ -14421,42 +13319,25 @@
         }
       }
     },
-    "semver-intersect": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz",
-      "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==",
-      "dev": true,
-      "requires": {
-        "semver": "^5.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
-        }
-      }
-    },
     "send": {
-      "version": "0.17.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
         "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "destroy": "~1.0.4",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "etag": "~1.8.1",
         "fresh": "0.5.2",
-        "http-errors": "~1.7.2",
+        "http-errors": "2.0.0",
         "mime": "1.6.0",
-        "ms": "2.1.1",
-        "on-finished": "~2.3.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
         "range-parser": "~1.2.1",
-        "statuses": "~1.5.0"
+        "statuses": "2.0.1"
       },
       "dependencies": {
         "debug": {
@@ -14471,23 +13352,69 @@
             "ms": {
               "version": "2.0.0",
               "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
               "dev": true
             }
           }
         },
+        "depd": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+          "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+          "dev": true
+        },
+        "http-errors": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+          "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+          "dev": true,
+          "requires": {
+            "depd": "2.0.0",
+            "inherits": "2.0.4",
+            "setprototypeof": "1.2.0",
+            "statuses": "2.0.1",
+            "toidentifier": "1.0.1"
+          }
+        },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "dev": true
+        },
+        "on-finished": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+          "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+          "dev": true,
+          "requires": {
+            "ee-first": "1.1.1"
+          }
+        },
+        "setprototypeof": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+          "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+          "dev": true
+        },
+        "statuses": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+          "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+          "dev": true
+        },
+        "toidentifier": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+          "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
           "dev": true
         }
       }
     },
     "serialize-javascript": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz",
-      "integrity": "sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
+      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -14496,7 +13423,7 @@
     "serve-index": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.4",
@@ -14520,7 +13447,7 @@
         "http-errors": {
           "version": "1.6.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "dev": true,
           "requires": {
             "depd": "~1.1.2",
@@ -14532,13 +13459,13 @@
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
         "setprototypeof": {
@@ -14550,15 +13477,15 @@
       }
     },
     "serve-static": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
         "encodeurl": "~1.0.2",
         "escape-html": "~1.0.3",
         "parseurl": "~1.3.3",
-        "send": "0.17.1"
+        "send": "0.18.0"
       }
     },
     "set-blocking": {
@@ -14596,28 +13523,12 @@
         }
       }
     },
-    "setimmediate": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
-    },
     "setprototypeof": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
       "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
       "dev": true
     },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -14628,18 +13539,18 @@
       }
     },
     "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "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": "^1.0.0"
+        "shebang-regex": "^3.0.0"
       }
     },
     "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true
     },
     "shell-quote": {
@@ -14648,6 +13559,17 @@
       "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==",
       "dev": true
     },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      }
+    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
@@ -14672,15 +13594,15 @@
       }
     },
     "slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "dev": true
     },
     "smart-buffer": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
-      "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
       "dev": true
     },
     "snapdragon": {
@@ -14923,131 +13845,87 @@
       }
     },
     "sockjs": {
-      "version": "0.3.21",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.21.tgz",
-      "integrity": "sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw==",
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
       "requires": {
         "faye-websocket": "^0.11.3",
-        "uuid": "^3.4.0",
+        "uuid": "^8.3.2",
         "websocket-driver": "^0.7.4"
-      }
-    },
-    "sockjs-client": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.5.0.tgz",
-      "integrity": "sha512-8Dt3BDi4FYNrCFGTL/HtwVzkARrENdwOUf1ZoW/9p3M8lZdFT35jVdrHza+qgxuG9H3/shR4cuX/X9umUrjP8Q==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.2.6",
-        "eventsource": "^1.0.7",
-        "faye-websocket": "^0.11.3",
-        "inherits": "^2.0.4",
-        "json3": "^3.3.3",
-        "url-parse": "^1.4.7"
       },
       "dependencies": {
-        "debug": {
-          "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
+        "uuid": {
+          "version": "8.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+          "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+          "dev": true
         }
       }
     },
     "socks": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.5.1.tgz",
-      "integrity": "sha512-oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz",
+      "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==",
       "dev": true,
       "requires": {
         "ip": "^1.1.5",
-        "smart-buffer": "^4.1.0"
+        "smart-buffer": "^4.2.0"
       }
     },
     "socks-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz",
+      "integrity": "sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==",
       "dev": true,
       "requires": {
-        "agent-base": "6",
-        "debug": "4",
-        "socks": "^2.3.3"
+        "agent-base": "^6.0.2",
+        "debug": "^4.3.3",
+        "socks": "^2.6.2"
+      },
+      "dependencies": {
+        "debug": {
+          "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"
+          }
+        }
       }
     },
-    "source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
-      "dev": true
-    },
     "source-map": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
       "dev": true
     },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true
+    },
     "source-map-loader": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-1.1.3.tgz",
-      "integrity": "sha512-6YHeF+XzDOrT/ycFJNI53cgEsp/tHTMl37hi7uVyqFAlTXW109JazaQCkbc+jjoL2637qkH1amLi+JzrIpt5lA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
+      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
       "dev": true,
       "requires": {
         "abab": "^2.0.5",
-        "iconv-lite": "^0.6.2",
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0",
-        "source-map": "^0.6.1",
-        "whatwg-mimetype": "^2.3.0"
+        "iconv-lite": "^0.6.3",
+        "source-map-js": "^1.0.1"
       },
       "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
         "iconv-lite": {
-          "version": "0.6.2",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
-          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "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.0.0"
           }
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
         }
       }
     },
@@ -15118,66 +13996,6 @@
         "wbuf": "^1.7.3"
       }
     },
-    "speed-measure-webpack-plugin": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.4.2.tgz",
-      "integrity": "sha512-AtVzD0bnIy2/B0fWqJpJgmhcrfWFhBlduzSo0uwplr/QvB33ZNZj2NEth3NONgdnZJqicK0W0mSxnLSbsVCDbw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "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": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "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
-        },
-        "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
-        },
-        "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,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -15252,97 +14070,6 @@
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
       "dev": true
     },
-    "stream-browserify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
-      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
-      "dev": true,
-      "requires": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "stream-each": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
-      "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "stream-http": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
-      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
-      "dev": true,
-      "requires": {
-        "builtin-status-codes": "^3.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.3.6",
-        "to-arraybuffer": "^1.0.0",
-        "xtend": "^4.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "stream-shift": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz",
-      "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
-      "dev": true
-    },
     "streamroller": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz",
@@ -15430,52 +14157,11 @@
         "ansi-regex": "^5.0.0"
       }
     },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "style-loader": {
+    "strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
-      "integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^2.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
-      }
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true
     },
     "stylehacks": {
       "version": "4.0.3",
@@ -15561,47 +14247,14 @@
       }
     },
     "stylus-loader": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-4.3.3.tgz",
-      "integrity": "sha512-PpWB5PnCXUzW4WMYhCvNzAHJBjIBPMXwsdfkkKuA9W7k8OQFMl/19/AQvaWsxz2IptxUlCseyJ6TY/eEKJ4+UQ==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-6.2.0.tgz",
+      "integrity": "sha512-5dsDc7qVQGRoc6pvCL20eYgRUxepZ9FpeK28XhdXaIPP6kXr6nI1zAAKFQgP5OBkOfKaURp4WUpJzspg1f01Gg==",
       "dev": true,
       "requires": {
-        "fast-glob": "^3.2.4",
+        "fast-glob": "^3.2.7",
         "klona": "^2.0.4",
-        "loader-utils": "^2.0.0",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^3.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        },
-        "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
-        },
-        "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.6",
-            "ajv": "^6.12.5",
-            "ajv-keywords": "^3.5.2"
-          }
-        }
+        "normalize-path": "^3.0.0"
       }
     },
     "subarg": {
@@ -15622,6 +14275,12 @@
         "has-flag": "^3.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
+    },
     "svgo": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
@@ -15655,9 +14314,9 @@
       }
     },
     "symbol-observable": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-3.0.0.tgz",
-      "integrity": "sha512-6tDOXSHiVjuCaasQSWTmHUWn4PuG7qa3+1WT031yTc/swT7+rLiw3GOrFxaH1E3lLP09dH3bVuVDf2gK5rxG3Q==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
+      "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "dev": true
     },
     "sync-rpc": {
@@ -15670,15 +14329,15 @@
       }
     },
     "tapable": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz",
-      "integrity": "sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true
     },
     "tar": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz",
-      "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==",
+      "version": "6.1.11",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
+      "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
       "dev": true,
       "requires": {
         "chownr": "^2.0.0",
@@ -15701,20 +14360,16 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz",
-      "integrity": "sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz",
+      "integrity": "sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==",
       "dev": true,
       "requires": {
-        "cacache": "^15.0.5",
-        "find-cache-dir": "^3.3.1",
-        "jest-worker": "^26.5.0",
-        "p-limit": "^3.0.2",
-        "schema-utils": "^3.0.0",
-        "serialize-javascript": "^5.0.1",
-        "source-map": "^0.6.1",
-        "terser": "^5.3.4",
-        "webpack-sources": "^1.4.3"
+        "@jridgewell/trace-mapping": "^0.3.7",
+        "jest-worker": "^27.4.5",
+        "schema-utils": "^3.1.1",
+        "serialize-javascript": "^6.0.0",
+        "terser": "^5.7.2"
       },
       "dependencies": {
         "ajv": {
@@ -15729,28 +14384,13 @@
             "uri-js": "^4.2.2"
           }
         },
-        "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
-        },
-        "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,
-          "requires": {
-            "yocto-queue": "^0.1.0"
-          }
-        },
         "schema-utils": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
-          "integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.6",
+            "@types/json-schema": "^7.0.8",
             "ajv": "^6.12.5",
             "ajv-keywords": "^3.5.2"
           }
@@ -15761,22 +14401,45 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+        "source-map-support": {
+          "version": "0.5.21",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "dev": true,
+          "requires": {
+            "buffer-from": "^1.0.0",
+            "source-map": "^0.6.0"
+          }
+        },
+        "terser": {
+          "version": "5.14.1",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz",
+          "integrity": "sha512-+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ==",
           "dev": true,
           "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
+            "@jridgewell/source-map": "^0.3.2",
+            "acorn": "^8.5.0",
+            "commander": "^2.20.0",
+            "source-map-support": "~0.5.20"
           }
         }
       }
     },
+    "test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "requires": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
     "through": {
@@ -15785,67 +14448,22 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
       "dev": true
     },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
-    },
-    "timers-browserify": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
-      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
-      "dev": true,
-      "requires": {
-        "setimmediate": "^1.0.4"
-      }
-    },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-      "dev": true
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+      "dev": true
+    },
+    "timsort": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
+      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
       "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
@@ -15857,16 +14475,10 @@
       "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
       "dev": true
     },
-    "to-arraybuffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
-      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
-      "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=",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true
     },
     "to-object-path": {
@@ -15963,12 +14575,6 @@
         }
       }
     },
-    "ts-pnp": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
-      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
-      "dev": true
-    },
     "tslib": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
@@ -16041,12 +14647,6 @@
         }
       }
     },
-    "tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
-      "dev": true
-    },
     "tunnel-agent": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -16062,16 +14662,10 @@
       "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
       "dev": true
     },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
     "type-fest": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-      "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
     "type-is": {
@@ -16084,10 +14678,10 @@
         "mime-types": "~2.1.24"
       }
     },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+    "typed-assert": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz",
+      "integrity": "sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==",
       "dev": true
     },
     "typescript": {
@@ -16103,31 +14697,31 @@
       "dev": true
     },
     "unicode-canonical-property-names-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true
     },
     "unicode-match-property-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
       "requires": {
-        "unicode-canonical-property-names-ecmascript": "^1.0.4",
-        "unicode-property-aliases-ecmascript": "^1.0.4"
+        "unicode-canonical-property-names-ecmascript": "^2.0.0",
+        "unicode-property-aliases-ecmascript": "^2.0.0"
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
-      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==",
       "dev": true
     },
     "union-value": {
@@ -16172,17 +14766,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "universal-analytics": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.23.tgz",
-      "integrity": "sha512-lgMIH7XBI6OgYn1woDEmxhGdj8yDefMKg7GkWdeATAlQZFrMrNyxSkpDzY57iY0/6fdlzTbBV03OawvvzG+q7A==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "request": "^2.88.2",
-        "uuid": "^3.0.0"
-      }
-    },
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -16241,12 +14824,6 @@
         }
       }
     },
-    "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.2.2",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
@@ -16262,57 +14839,12 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
-      "dev": true,
-      "requires": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.3.2",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
-          "dev": true
-        }
-      }
-    },
-    "url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
-      "dev": true,
-      "requires": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "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": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
-      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "2.0.3"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -16367,7 +14899,7 @@
     "validate-npm-package-name": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=",
+      "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
       "dev": true,
       "requires": {
         "builtins": "^1.0.3"
@@ -16376,7 +14908,7 @@
     "vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
     "vendors": {
@@ -16396,12 +14928,6 @@
         "extsprintf": "^1.2.0"
       }
     },
-    "vm-browserify": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
-      "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
-      "dev": true
-    },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -16409,1059 +14935,298 @@
       "dev": true
     },
     "watchpack": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
-      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
       "requires": {
-        "chokidar": "^3.4.1",
-        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0",
-        "watchpack-chokidar2": "^2.0.1"
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.1.2"
       }
     },
-    "watchpack-chokidar2": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
-      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dev": true,
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "wcwidth": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
+      "dev": true,
+      "requires": {
+        "defaults": "^1.0.3"
+      }
+    },
+    "webdriver-js-extender": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
+      "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "chokidar": "^2.1.8"
+        "@types/selenium-webdriver": "^3.0.0",
+        "selenium-webdriver": "^3.0.1"
+      }
+    },
+    "webpack": {
+      "version": "5.67.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
+      "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
+      "dev": true,
+      "requires": {
+        "@types/eslint-scope": "^3.7.0",
+        "@types/estree": "^0.0.50",
+        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/wasm-edit": "1.11.1",
+        "@webassemblyjs/wasm-parser": "1.11.1",
+        "acorn": "^8.4.1",
+        "acorn-import-assertions": "^1.7.6",
+        "browserslist": "^4.14.5",
+        "chrome-trace-event": "^1.0.2",
+        "enhanced-resolve": "^5.8.3",
+        "es-module-lexer": "^0.9.0",
+        "eslint-scope": "5.1.1",
+        "events": "^3.2.0",
+        "glob-to-regexp": "^0.4.1",
+        "graceful-fs": "^4.2.9",
+        "json-parse-better-errors": "^1.0.2",
+        "loader-runner": "^4.2.0",
+        "mime-types": "^2.1.27",
+        "neo-async": "^2.6.2",
+        "schema-utils": "^3.1.0",
+        "tapable": "^2.1.1",
+        "terser-webpack-plugin": "^5.1.3",
+        "watchpack": "^2.3.1",
+        "webpack-sources": "^3.2.3"
       },
       "dependencies": {
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+        "@types/estree": {
+          "version": "0.0.50",
+          "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz",
+          "integrity": "sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==",
+          "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,
-          "optional": true,
           "requires": {
-            "micromatch": "^3.1.4",
-            "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,
-              "optional": true,
-              "requires": {
-                "remove-trailing-separator": "^1.0.1"
-              }
-            }
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true,
-          "optional": true
+        "graceful-fs": {
+          "version": "4.2.10",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
+          "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+          "dev": true
         },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+        "schema-utils": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
-          "optional": 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,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz",
+      "integrity": "sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==",
+      "dev": true,
+      "requires": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.2.2",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "dependencies": {
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "optional": 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,
-              "optional": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
+        "colorette": {
+          "version": "2.0.19",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+          "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+          "dev": true
         },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true
+        "mime-db": {
+          "version": "1.52.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+          "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+          "dev": true
         },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+        "mime-types": {
+          "version": "2.1.35",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+          "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
+            "mime-db": "1.52.0"
           }
         },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+        "schema-utils": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "dev": true,
-          "optional": true,
           "requires": {
-            "binary-extensions": "^1.0.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,
-          "optional": 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,
-              "optional": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "optional": 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"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.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,
-          "optional": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
-        }
-      }
-    },
-    "wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dev": true,
-      "requires": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dev": true,
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "webdriver-js-extender": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz",
-      "integrity": "sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==",
-      "dev": true,
-      "requires": {
-        "@types/selenium-webdriver": "^3.0.0",
-        "selenium-webdriver": "^3.0.1"
-      }
-    },
-    "webpack": {
-      "version": "4.44.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz",
-      "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==",
-      "dev": true,
-      "requires": {
-        "@webassemblyjs/ast": "1.9.0",
-        "@webassemblyjs/helper-module-context": "1.9.0",
-        "@webassemblyjs/wasm-edit": "1.9.0",
-        "@webassemblyjs/wasm-parser": "1.9.0",
-        "acorn": "^6.4.1",
-        "ajv": "^6.10.2",
-        "ajv-keywords": "^3.4.1",
-        "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^4.3.0",
-        "eslint-scope": "^4.0.3",
-        "json-parse-better-errors": "^1.0.2",
-        "loader-runner": "^2.4.0",
-        "loader-utils": "^1.2.3",
-        "memory-fs": "^0.4.1",
-        "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.3",
-        "neo-async": "^2.6.1",
-        "node-libs-browser": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.7.4",
-        "webpack-sources": "^1.4.1"
-      },
-      "dependencies": {
-        "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"
-              }
-            }
-          }
-        },
-        "cacache": {
-          "version": "12.0.4",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-          "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.5",
-            "chownr": "^1.1.1",
-            "figgy-pudding": "^3.5.1",
-            "glob": "^7.1.4",
-            "graceful-fs": "^4.1.15",
-            "infer-owner": "^1.0.3",
-            "lru-cache": "^5.1.1",
-            "mississippi": "^3.0.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.3",
-            "ssri": "^6.0.1",
-            "unique-filename": "^1.1.1",
-            "y18n": "^4.0.0"
-          }
-        },
-        "chownr": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-          "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-          "dev": true
-        },
-        "enhanced-resolve": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
-          "integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "memory-fs": "^0.5.0",
-            "tapable": "^1.0.0"
-          },
-          "dependencies": {
-            "memory-fs": {
-              "version": "0.5.0",
-              "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
-              "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
-              "dev": true,
-              "requires": {
-                "errno": "^0.1.3",
-                "readable-stream": "^2.0.1"
-              }
-            }
-          }
-        },
-        "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"
-              }
-            }
-          }
-        },
-        "find-cache-dir": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-          "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^2.0.0",
-            "pkg-dir": "^3.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.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-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "lru-cache": {
-          "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-          "dev": true,
-          "requires": {
-            "yallist": "^3.0.2"
-          }
-        },
-        "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"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-          "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-          "dev": true,
-          "requires": {
-            "find-up": "^3.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-        },
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "ssri": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-          "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-          "dev": true,
-          "requires": {
-            "figgy-pudding": "^3.5.1"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "tapable": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
-          "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
-          "dev": true
-        },
-        "terser": {
-          "version": "4.8.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
-          "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
-          "dev": true,
-          "requires": {
-            "commander": "^2.20.0",
-            "source-map": "~0.6.1",
-            "source-map-support": "~0.5.12"
-          }
-        },
-        "terser-webpack-plugin": {
-          "version": "1.4.5",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz",
-          "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
-          "dev": true,
-          "requires": {
-            "cacache": "^12.0.2",
-            "find-cache-dir": "^2.1.0",
-            "is-wsl": "^1.1.0",
-            "schema-utils": "^1.0.0",
-            "serialize-javascript": "^4.0.0",
-            "source-map": "^0.6.1",
-            "terser": "^4.1.2",
-            "webpack-sources": "^1.4.0",
-            "worker-farm": "^1.7.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"
-          }
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true
-        }
-      }
-    },
-    "webpack-dev-middleware": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
-      "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
-      "dev": true,
-      "requires": {
-        "memory-fs": "^0.4.1",
-        "mime": "^2.4.4",
-        "mkdirp": "^0.5.1",
-        "range-parser": "^1.2.1",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.5.2",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
-          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.0"
           }
         }
-      }
-    },
-    "webpack-dev-server": {
-      "version": "3.11.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz",
-      "integrity": "sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==",
-      "dev": true,
-      "requires": {
-        "ansi-html": "0.0.7",
-        "bonjour": "^3.5.0",
-        "chokidar": "^2.1.8",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^1.6.0",
-        "debug": "^4.1.1",
-        "del": "^4.1.1",
-        "express": "^4.17.1",
-        "html-entities": "^1.3.1",
-        "http-proxy-middleware": "0.19.1",
-        "import-local": "^2.0.0",
-        "internal-ip": "^4.3.0",
-        "ip": "^1.1.5",
-        "is-absolute-url": "^3.0.3",
-        "killable": "^1.0.1",
-        "loglevel": "^1.6.8",
-        "opn": "^5.5.0",
-        "p-retry": "^3.0.1",
-        "portfinder": "^1.0.26",
-        "schema-utils": "^1.0.0",
-        "selfsigned": "^1.10.8",
-        "semver": "^6.3.0",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.21",
-        "sockjs-client": "^1.5.0",
-        "spdy": "^4.0.2",
-        "strip-ansi": "^3.0.1",
-        "supports-color": "^6.1.0",
-        "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.7.2",
-        "webpack-log": "^2.0.0",
-        "ws": "^6.2.1",
-        "yargs": "^13.3.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "anymatch": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-          "dev": true,
-          "requires": {
-            "micromatch": "^3.1.4",
-            "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"
-              }
-            }
-          }
-        },
-        "binary-extensions": {
-          "version": "1.13.1",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-          "dev": true
-        },
-        "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"
-              }
-            }
-          }
-        },
-        "chokidar": {
-          "version": "2.1.8",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-          "dev": true,
-          "requires": {
-            "anymatch": "^2.0.0",
-            "async-each": "^1.0.1",
-            "braces": "^2.3.2",
-            "fsevents": "^1.2.7",
-            "glob-parent": "^3.1.0",
-            "inherits": "^2.0.3",
-            "is-binary-path": "^1.0.0",
-            "is-glob": "^4.0.0",
-            "normalize-path": "^3.0.0",
-            "path-is-absolute": "^1.0.0",
-            "readdirp": "^2.2.1",
-            "upath": "^1.1.1"
-          }
-        },
-        "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"
-              }
-            }
-          }
-        },
-        "fsevents": {
-          "version": "1.2.13",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "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-absolute-url": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
-          "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
-          "dev": true
-        },
-        "is-binary-path": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^1.0.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"
-              }
-            }
-          }
-        },
-        "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"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      }
+    },
+    "webpack-dev-server": {
+      "version": "4.7.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz",
+      "integrity": "sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==",
+      "dev": true,
+      "requires": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/serve-index": "^1.9.1",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.2.2",
+        "ansi-html-community": "^0.0.8",
+        "bonjour": "^3.5.0",
+        "chokidar": "^3.5.2",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
+        "default-gateway": "^6.0.3",
+        "del": "^6.0.0",
+        "express": "^4.17.1",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.0",
+        "ipaddr.js": "^2.0.1",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "portfinder": "^1.0.28",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.0.0",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.21",
+        "spdy": "^4.0.2",
+        "strip-ansi": "^7.0.0",
+        "webpack-dev-middleware": "^5.3.0",
+        "ws": "^8.1.0"
+      },
+      "dependencies": {
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "dev": true,
           "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
+            "fast-deep-equal": "^3.1.3"
           }
         },
-        "readdirp": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+        "ansi-regex": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+          "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+          "dev": true
+        },
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
           "dev": true,
           "requires": {
-            "graceful-fs": "^4.1.11",
-            "micromatch": "^3.1.10",
-            "readable-stream": "^2.0.2"
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
           }
         },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+        "chokidar": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
           }
         },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+        "colorette": {
+          "version": "2.0.19",
+          "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+          "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+          "dev": true
+        },
+        "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": {
-            "safe-buffer": "~5.1.0"
+            "is-glob": "^4.0.1"
           }
         },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^2.0.0"
+            "picomatch": "^2.2.1"
           }
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "schema-utils": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
+          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.8.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.0.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=",
+        "strip-ansi": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz",
+          "integrity": "sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==",
           "dev": true,
           "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
+            "ansi-regex": "^6.0.1"
           }
         }
       }
     },
-    "webpack-log": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
-      "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^3.0.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "3.2.4",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
-          "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
-          "dev": true
-        }
-      }
-    },
     "webpack-merge": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
-      "integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
+      "version": "5.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
@@ -17469,48 +15234,18 @@
       }
     },
     "webpack-sources": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz",
-      "integrity": "sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w==",
-      "dev": true,
-      "requires": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true
     },
     "webpack-subresource-integrity": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-1.5.2.tgz",
-      "integrity": "sha512-GBWYBoyalbo5YClwWop9qe6Zclp8CIXYGIz12OPclJhIrSplDxs1Ls1JDMH8xBPPrg1T6ISaTW9Y6zOrwEiAzw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
+      "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
       "dev": true,
       "requires": {
-        "webpack-sources": "^1.3.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "webpack-sources": {
-          "version": "1.4.3",
-          "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
-          "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
-          "dev": true,
-          "requires": {
-            "source-list-map": "^2.0.0",
-            "source-map": "~0.6.1"
-          }
-        }
+        "typed-assert": "^1.0.8"
       }
     },
     "websocket-driver": {
@@ -17530,12 +15265,6 @@
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
-    "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
-    },
     "which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
@@ -17552,45 +15281,12 @@
       "dev": true
     },
     "wide-align": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+      "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
       "dev": true,
       "requires": {
-        "string-width": "^1.0.2 || 2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
+        "string-width": "^1.0.2 || 2 || 3 || 4"
       }
     },
     "wildcard": {
@@ -17599,94 +15295,40 @@
       "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
       "dev": true
     },
-    "worker-farm": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
-      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
-      "dev": true,
-      "requires": {
-        "errno": "~0.1.7"
-      }
-    },
-    "worker-plugin": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/worker-plugin/-/worker-plugin-5.0.0.tgz",
-      "integrity": "sha512-AXMUstURCxDD6yGam2r4E34aJg6kW85IiaeX72hi+I1cxyaMUtrvVY6sbfpGKAj5e7f68Acl62BjQF5aOOx2IQ==",
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "requires": {
-        "loader-utils": "^1.1.0"
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "minimist": "^1.2.0"
+            "color-convert": "^2.0.1"
           }
         },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
+        "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,
           "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
+            "color-name": "~1.1.4"
           }
-        }
-      }
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+        "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
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
         }
       }
     },
@@ -17697,13 +15339,10 @@
       "dev": true
     },
     "ws": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
-      "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
+      "version": "8.8.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
+      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "dev": true
     },
     "xml2js": {
       "version": "0.4.23",
@@ -17727,12 +15366,6 @@
       "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
       "dev": true
     },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
     "xxhashjs": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz",
@@ -17755,120 +15388,65 @@
       "dev": true
     },
     "yaml": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.0.tgz",
-      "integrity": "sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
     "yargs": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-      "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
+      "version": "17.5.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
       "dev": true,
       "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.2"
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+          "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
           "dev": true
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
           }
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "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": "^4.1.0"
+            "ansi-regex": "^5.0.1"
           }
+        },
+        "y18n": {
+          "version": "5.0.8",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+          "dev": true
         }
       }
     },
     "yargs-parser": {
-      "version": "13.1.2",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        }
-      }
+      "version": "21.0.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
+      "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
+      "dev": true
     },
     "yeast": {
       "version": "0.1.2",
@@ -17882,16 +15460,20 @@
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "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
-    },
     "zone.js": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.10.2.tgz",
-      "integrity": "sha512-UAYfiuvxLN4oyuqhJwd21Uxb4CNawrq6fPS/05Su5L4G+1TN+HVDJMUHNMobVQDFJRir2cLAODXwluaOKB7HFg=="
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.6.tgz",
+      "integrity": "sha512-umJqFtKyZlPli669gB1gOrRE9hxUUGkZr7mo878z+NEBJZZixJkKeVYfnoLa7g25SseUDc92OZrMKKHySyJrFg==",
+      "requires": {
+        "tslib": "^2.3.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
+        }
+      }
     }
   }
 }
diff --git a/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/package.json
index b0b5a6b2c..7cc1c4834 100644
--- a/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/package.json
@@ -22,7 +22,7 @@
     "@angular/router": "~13.2.6",
     "rxjs": "~6.6.0",
     "tslib": "^2.1.0",
-    "zone.js": "~0.10.4",
+    "zone.js": "~0.11.6",
     "@2sic.com/2sxc-typings": "^10.24.4"
   },
   "devDependencies": {
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package-lock.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package-lock.json
index 34b7e8366..faac64423 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package-lock.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package-lock.json
@@ -1,29 +1,13 @@
 {
   "name": "@2sic.com/dnn-sxc-angular",
-  "version": "11.00.01",
+  "version": "11.01.02",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@2sic.com/2sxc-typings": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/@2sic.com/2sxc-typings/-/2sxc-typings-11.0.0.tgz",
-      "integrity": "sha512-t5Guvpz2sTa7Vb2Sv7rP895O3X2xx5SU+iT2HEBj8OhpGlYhJS1yP8j2MSvr11+hXHnmamIt6O45AKlQdQJJGg==",
-      "requires": {
-        "@types/jquery": "^3.3.31"
-      }
-    },
-    "@types/jquery": {
-      "version": "3.5.5",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz",
-      "integrity": "sha512-6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w==",
-      "requires": {
-        "@types/sizzle": "*"
-      }
-    },
-    "@types/sizzle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
-      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
+      "version": "14.2.0",
+      "resolved": "https://registry.npmjs.org/@2sic.com/2sxc-typings/-/2sxc-typings-14.2.0.tgz",
+      "integrity": "sha512-mibdNl5tsFbXUmx2DGt7PTlLwgF3JNKvLrNVlL9ayRpByyH/K6MY7zWlGr+Q0gfiP5ODoTYUFA27DKN55n1Rkg=="
     }
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
index c63d3dcd8..73f245ae7 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
@@ -6,14 +6,13 @@
     "url": "https://github.com/2sic/2sxc-ui/issues"
   },
   "dependencies": {
-    "//todo:": "@2mh - get latest 14.x types, sync code",
-    "@2sic.com/2sxc-typings": ">=11.0.0",
+    "@2sic.com/2sxc-typings": "^14.2.0",
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=11.0.0",
-    "@angular/core": ">=11.0.0",
-    "@angular/platform-browser": ">=11.0.0",
+    "@angular/common": ">=13.2.6",
+    "@angular/core": ">=13.2.6",
+    "@angular/platform-browser": ">=13.2.6",
     "rxjs": ">=6.6.0"
   },
   "homepage": "https://github.com/2sic/2sxc-ui/tree/master/projects/dnn-sxc-angular#readme",
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/beta/edit.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/beta/edit.ts
index c4ee84722..1079336c3 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/beta/edit.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/beta/edit.ts
@@ -1,6 +1,5 @@
 import { Context } from '../context/context.service';
 import { Directive, ElementRef, Input, OnInit } from '@angular/core';
-import { SxcInstanceWithEditing } from '@2sic.com/2sxc-typings';
 
 @Directive({
   selector: 'sxc-toolbar'
@@ -10,7 +9,7 @@ export class SxcToolbarDirective implements OnInit {
   constructor(private elementRef: ElementRef, private context: Context) {}
 
   ngOnInit() {
-    const sxc = this.context.sxc as SxcInstanceWithEditing;
+    const sxc = this.context.sxc as any;
     if (!sxc.manage) return; // edit not available, probably not logged in
     this.elementRef.nativeElement.innerHTML = sxc.manage.getToolbar(this.config.toolbar, this.config.settings);
   }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info.ts
index 71c7689c2..4830b4fb1 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context-info.ts
@@ -1,4 +1,4 @@
-import { SxcInstance, SxcRoot } from "@2sic.com/2sxc-typings";
+import { Sxc, SxcGlobal } from "@2sic.com/2sxc-typings";
 
 // These are the parameters which make up the current context / state of this app.
 // It's mainly needed to ensure that the Http Service is correctly set up.
@@ -13,12 +13,12 @@ export interface ContextInfo {
   /**
    * The $2sxc root object which is globally accessible through window.$2sxc
    */
-  $2sxc: SxcRoot;
+  $2sxc: SxcGlobal;
 
   /**
    * the helper sxc-object to communicate with the server
    */
-  sxc: SxcInstance;
+  sxc: Sxc;
 
   /**
    * If false, does not append any custom headers to DNN requests
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts
index 30dabb0f8..3558d37f0 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/context/context.service.ts
@@ -1,11 +1,11 @@
-import { WindowWith$2sxc, SxcRoot, SxcInstance } from '@2sic.com/2sxc-typings';
+import {  SxcGlobal, Sxc } from '@2sic.com/2sxc-typings';
 import { ElementRef, Injectable } from '@angular/core';
 import { appTag } from '../names';
 import { ContextInfo } from './context-info';
 import { AppTagService } from './apptag.service'
 import { ContextInfoPreconfigure } from './context-info-preconfigure'
 
-declare const window: WindowWith$2sxc;
+declare const window: Window;
 
 const runtimeDefaults: Partial<ContextInfo> = {
     addHttpHeaders: true
@@ -32,10 +32,10 @@ declare let __webpack_public_path__: any;
 })
 export class Context implements ContextInfo {
   /** The global $2sxc object */
-  $2sxc: SxcRoot;
+  $2sxc: SxcGlobal;
 
   /** The current module-instance 2sxc-controller */
-  sxc: SxcInstance;
+  sxc: Sxc;
 
   /** Setting if it should add HTTP headers. Default is true. You may want to change this if you have an own interceptor.  */
   addHttpHeaders: boolean;
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
index dcac9a03c..a2d96fc73 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { routeContent } from '../contants';
-import { MetaDataFor } from './metadata-for';
+import { MetadataFor } from '../../../../../../$2sxc/src/data/metadata-for'
 
 /**
  * A helper to access data from 2sxc
@@ -39,12 +39,12 @@ export class Data<T> {
   /**
    * Create new item as metadata for something
    */
-  create(item: T | any, metadataFor: MetaDataFor): Observable<T>;
+  create(item: T | any, metadataFor: MetadataFor): Observable<T>;
 
   /**
    * Internal implementation of create
    */
-  create(item: T | any, metadataFor?: MetaDataFor): Observable<T> {
+  create(item: T | any, metadataFor?: MetadataFor): Observable<T> {
     const url = `${routeContent}/${this.contentType}`;
     item = (metadataFor != null ? { ...item, For: metadataFor } : item);
     return this.http.post<T>(url, item);
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
index 3555ff09c..b9a385c5d 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
@@ -2,4 +2,3 @@ export * from './api';
 export * from './data';
 export * from './sxc-app';
 export * from './query';
-export * from './metadata-for';
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
deleted file mode 100644
index e8b3dfc5b..000000000
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/metadata-for.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// TODO: GET FROM GLOBAL MetadataFor
-export interface MetaDataFor {
-  Target: number;
-  Number?: number;
-  String?: string;
-  Guid?: string;
-}
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
index 7b0c7c50c..e6e276884 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getHttpParams } from '../../utils/params';
+import { getHttpParams, UrlParams } from '../../utils/params';
 import { routeQuery } from '../contants';
 
 /**
@@ -27,18 +27,18 @@ export class Query<T> {
    * Get an object with all the streams, each containing an array of all the data in that stream
    * with url-parameters as HttpParams or string
    */
-  getAll(params: HttpParams | string): Observable<T>;
+  getAll(params: UrlParams): Observable<T>;
 
   /**
    * Get an object with all the streams, each containing an array of all the data in that stream
    * with url-parameters as HttpParams or string using post data
    */
-  getAll(params: HttpParams | string, data: T): Observable<T>;
+  getAll(params: UrlParams, data: T): Observable<T>;
 
   /**
    * Internal implementation of getAll
    */
-  getAll(params?: HttpParams | string, data?: T): Observable<T> {
+  getAll(params?: UrlParams, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}`;
     const streamParams: HttpParams = getHttpParams(params);
 
@@ -55,18 +55,18 @@ export class Query<T> {
    * Get an object with the specified stream, containing an array of all the data in that stream
    * with url-parameters as HttpParams or string
    */
-  getStream(stream: string, urlParams: HttpParams | string): Observable<T>;
+  getStream(stream: string, urlParams: UrlParams): Observable<T>;
 
   /**
    * Get an object with the specified stream, containing an array of all the data in that stream
    * with url-parameters as HttpParams or string using post data
    */
-  getStream(stream: string, urlParams: HttpParams | string, data: T): Observable<T>;
+  getStream(stream: string, urlParams: UrlParams, data: T): Observable<T>;
 
   /**
    * Internal implementation of getStream
    */
-  getStream(stream: string, urlParams?: HttpParams | string, data?: T): Observable<T> {
+  getStream(stream: string, urlParams?: UrlParams, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${stream}`;
     const streamParams: HttpParams = getHttpParams(urlParams);
 
@@ -83,18 +83,18 @@ export class Query<T> {
    * Get an object with the specified streams, each containing an array of all the data in that stream
    * with url-parameters as HttpParams or string
    */
-  getStreams(streams: string[], urlParams: HttpParams | string): Observable<T>;
+  getStreams(streams: string[], urlParams: UrlParams): Observable<T>;
 
   /**
    * Get an object with the specified streams, each containing an array of all the data in that stream
    * with url-parameters as HttpParams or string using post data
    */
-  getStreams(streams: string[], urlParams: HttpParams | string, data: T): Observable<T>;
+  getStreams(streams: string[], urlParams: UrlParams, data: T): Observable<T>;
 
   /**
    * Internal implementation of getStreams
    */
-  getStreams(streams: string[], urlParams?: HttpParams | string, data?: T): Observable<T> {
+  getStreams(streams: string[], urlParams?: UrlParams, data?: T): Observable<T> {
     const url = `${routeQuery}/${this.name}?${this.streamParamKey}=${streams.join(',')}`;
     const streamParams: HttpParams = getHttpParams(urlParams);
 
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
index 1b45cf911..336e91e9a 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/utils/params.ts
@@ -1,12 +1,11 @@
 import { HttpParams } from '@angular/common/http';
 
-export type UrlParams = HttpParams | string | Record<string, unknown | undefined>;
-
+export type UrlParams = HttpParams | string | Record<string, string | readonly string[]>;
 
 export function getHttpParams(params: UrlParams): HttpParams {
-  return typeof(params) !== 'string'
-  ? params as HttpParams
-  : new HttpParams({fromString: params});
-
-  // TODO: @2mh - also handle from-object case (Record<>)
+  return typeof (params) === 'string'
+    ? new HttpParams({ fromString: params })
+    : params instanceof HttpParams
+      ? params
+      : new HttpParams({ fromObject: params });
 }

From a435a42840989e48150ba4f25b6cdef37467a024 Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Mon, 20 Jun 2022 16:51:35 +0200
Subject: [PATCH 37/41] dnn-sxc-angular - improvements typing

---
 docs/dnn-sxc-angular.json                     | 18 +++++++--------
 .../projects/dnn-sxc-angular/README.md        |  6 ++---
 ...rceptor.ts => sxc.interceptor-provider.ts} |  8 +++----
 .../{interceptor.ts => sxc.interceptor.ts}    |  3 +--
 .../projects/dnn-sxc-angular/src/lib/index.ts | 12 +++++-----
 ...-app.component.ts => sxc-app.component.ts} |  6 ++---
 ...-sxc-root.module.ts => sxc-root.module.ts} | 14 +++++-------
 .../src/lib/sxc/{api.ts => api.service.ts}    |  6 ++---
 .../src/lib/sxc/{data.ts => data.service.ts}  |  6 ++---
 .../dnn-sxc-angular/src/lib/sxc/index.ts      |  6 ++---
 .../lib/sxc/{query.ts => query.service.ts}    |  6 ++---
 .../dnn-sxc-angular/src/lib/sxc/sxc-app.ts    | 22 +++++++++----------
 12 files changed, 50 insertions(+), 63 deletions(-)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/{dnn.interceptor.ts => sxc.interceptor-provider.ts} (61%)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/{interceptor.ts => sxc.interceptor.ts} (95%)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/{dnn-app.component.ts => sxc-app.component.ts} (92%)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/{dnn-sxc-root.module.ts => sxc-root.module.ts} (70%)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/{api.ts => api.service.ts} (95%)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/{data.ts => data.service.ts} (95%)
 rename projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/{query.ts => query.service.ts} (97%)

diff --git a/docs/dnn-sxc-angular.json b/docs/dnn-sxc-angular.json
index 2e710fbfd..76d47d412 100644
--- a/docs/dnn-sxc-angular.json
+++ b/docs/dnn-sxc-angular.json
@@ -1807,7 +1807,7 @@
 		},
 		{
 			"id": 8,
-			"name": "DnnAppComponent",
+			"name": "SxcAppComponent",
 			"kind": 128,
 			"kindString": "Class",
 			"flags": {},
@@ -1830,7 +1830,7 @@
 					"signatures": [
 						{
 							"id": 10,
-							"name": "new DnnAppComponent",
+							"name": "new SxcAppComponent",
 							"kind": 16384,
 							"kindString": "Constructor signature",
 							"flags": {},
@@ -1891,7 +1891,7 @@
 							"type": {
 								"type": "reference",
 								"id": 8,
-								"name": "DnnAppComponent"
+								"name": "SxcAppComponent"
 							}
 						}
 					]
@@ -1916,7 +1916,7 @@
 		},
 		{
 			"id": 1,
-			"name": "DnnSxcRootModule",
+			"name": "SxcRootModule",
 			"kind": 128,
 			"kindString": "Class",
 			"flags": {},
@@ -1937,7 +1937,7 @@
 						"name": "NgModule"
 					},
 					"arguments": {
-						"obj": "{\r\n  imports: [\r\n    // Note: it's extremely important that HttpClientModule is _not_ imported\r\n    // anywhere. Otherwise it will break sub-modules\r\n    // because it will create a new HttpClientModule which won't have the interceptor\r\n    // HttpClientModule,\r\n  ],\r\n  providers: [\r\n    Data,\r\n    Context,\r\n    DnnInterceptor,\r\n  ]\r\n}"
+						"obj": "{\r\n  imports: [\r\n    // Note: it's extremely important that HttpClientModule is _not_ imported\r\n    // anywhere. Otherwise it will break sub-modules\r\n    // because it will create a new HttpClientModule which won't have the interceptor\r\n    // HttpClientModule,\r\n  ],\r\n  providers: [\r\n    Data,\r\n    Context,\r\n    SxcHttpInterceptorProvider,\r\n  ]\r\n}"
 					}
 				}
 			],
@@ -1951,7 +1951,7 @@
 					"signatures": [
 						{
 							"id": 3,
-							"name": "new DnnSxcRootModule",
+							"name": "new SxcRootModule",
 							"kind": 16384,
 							"kindString": "Constructor signature",
 							"flags": {},
@@ -1985,14 +1985,14 @@
 									"type": {
 										"type": "reference",
 										"id": 1,
-										"name": "DnnSxcRootModule"
+										"name": "SxcRootModule"
 									}
 								}
 							],
 							"type": {
 								"type": "reference",
 								"id": 1,
-								"name": "DnnSxcRootModule"
+								"name": "SxcRootModule"
 							}
 						}
 					]
@@ -3390,7 +3390,7 @@
 		},
 		{
 			"id": 14,
-			"name": "DnnInterceptor",
+			"name": "SxcHttpInterceptorProvider",
 			"kind": 32,
 			"kindString": "Variable",
 			"flags": {
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md
index 44296b76d..0973b2b53 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/README.md
@@ -52,10 +52,10 @@ By default **dnn-sxc-angular** will pick up all the values on the page automatic
 
 #### Method 2: Set values on initialization
 
-Once installed correctly, the context is autoloaded when the `AppComponent` which inherits `DnnAppComponent` does the `super(...)` call - like this:
+Once installed correctly, the context is autoloaded when the `AppComponent` which inherits `SxcAppComponent` does the `super(...)` call - like this:
 
 ```javascript
-export class AppComponent extends DnnAppComponent {
+export class AppComponent extends SxcAppComponent {
   constructor(el: ElementRef, context: Context) {
     super(el, context);
   }
@@ -65,7 +65,7 @@ export class AppComponent extends DnnAppComponent {
 If you want to provide alternate configurations, you can do this here, by changing the `super` call. Here's an example (you can do more, check the code):
 
 ```javascript
-export class AppComponent extends DnnAppComponent {
+export class AppComponent extends SxcAppComponent {
   constructor(el: ElementRef, context: Context) {
     super(el, context.preConfigure({moduleId: 42}));
   }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/sxc.interceptor-provider.ts
similarity index 61%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/sxc.interceptor-provider.ts
index 0311f7095..bdfe4d31c 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/dnn.interceptor.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/sxc.interceptor-provider.ts
@@ -1,15 +1,13 @@
 import { Provider } from '@angular/core';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { Interceptor } from './interceptor';
-
-// TODO: @2mh RENAME TO SxcHttpInterceptorProvider
+import { SxcHttpInterceptor } from './sxc.interceptor';
 
 /**
  * Register the `SxcInterceptor` in a Module.
  * Happens automatically when you import the SxcRootModule.
  */
-export const DnnInterceptor: Provider = {
+export const SxcHttpInterceptorProvider: Provider = {
   provide: HTTP_INTERCEPTORS,
-  useClass: Interceptor,
+  useClass: SxcHttpInterceptor,
   multi: true
 };
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/sxc.interceptor.ts
similarity index 95%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/sxc.interceptor.ts
index c117c9697..4783fc163 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/interceptor.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/http/sxc.interceptor.ts
@@ -4,9 +4,8 @@ import { Observable } from 'rxjs';
 import { apiRouteName, routeApi, routeRoot } from '../contants';
 import { Context } from '../context/context.service';
 
-// TODO: @2mh RENAME TO SxcHttpInterceptor
 @Injectable()
-export class Interceptor implements HttpInterceptor {
+export class SxcHttpInterceptor implements HttpInterceptor {
   constructor(private context: Context) { }
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts
index c04acc9d3..a459f4f88 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/index.ts
@@ -6,21 +6,21 @@
 // ------------------------- Modules -------------------------
 
 // The root module which should be in the application root
-/** @internal */ export { DnnSxcRootModule } from "./dnn-sxc-root.module";
+/** @internal */ export { SxcRootModule } from './sxc-root.module';
 
 // The data module
 // export { SxcDataModule} from './sxc-data.module';
 
 // The content-manager module with toolbars and content-management functionality
-/** @internal */ export { ContentManagerModule } from "./content-manager.module";
+/** @internal */ export { ContentManagerModule } from './content-manager.module';
 
 
 // ------------------------- Modules -------------------------
 
-/** @internal */ export { DnnAppComponent } from './dnn-app.component'
+/** @internal */ export { SxcAppComponent } from './sxc-app.component';
 /** @internal */ export * from './context';
 /** @internal */ export * from './sxc';
-/** @internal */ export { DnnInterceptor } from './http/dnn.interceptor';
+/** @internal */ export { SxcHttpInterceptorProvider } from './http/sxc.interceptor-provider';
 
-/** @internal */ export { SxcToolbarDirective } from "./beta/edit"
-/** @internal */ export { SxcTagToolbarDirective } from "./toolbar/tag-toolbar"
+/** @internal */ export { SxcToolbarDirective } from './beta/edit';
+/** @internal */ export { SxcTagToolbarDirective } from './toolbar/tag-toolbar';
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc-app.component.ts
similarity index 92%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc-app.component.ts
index bf8239acc..c16183c63 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-app.component.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc-app.component.ts
@@ -1,16 +1,14 @@
 import { Context } from './context/context.service';
 import { ElementRef } from '@angular/core';
 
-// TODO: @2mh RENAME TO SxcAppComponent
-
 /**
  * A root app component which initializes the context-providers once the app is loaded
  * This is the earliest moment we can access the ElementRef, because before that
  * it's not attached to the DOM, so auto-detect wouldn't work.
  * @export
- * @class DnnAppComponent
+ * @class SxcAppComponent
  */
-export class DnnAppComponent {
+export class SxcAppComponent {
   /**
    *
    * @param element the angular ElementRef - required to auto-detect moduleId and more
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc-root.module.ts
similarity index 70%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc-root.module.ts
index fc7274430..d62e53e11 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/dnn-sxc-root.module.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc-root.module.ts
@@ -1,13 +1,13 @@
 import { Context } from './context/context.service';
 import { SxcApp } from './sxc/sxc-app';
-import { DnnInterceptor } from './http/dnn.interceptor';
+import { SxcHttpInterceptorProvider } from './http/sxc.interceptor-provider';
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 
 /**
  * The Root module which must be included in the application root.
  * It ensures that context etc. is singleton across the entire application
  * @export
- * @class DnnSxcRootModule
+ * @class SxcRootModule
  */
 @NgModule({
   imports: [
@@ -19,18 +19,16 @@ import { NgModule, Optional, SkipSelf } from '@angular/core';
   providers: [
     SxcApp,
     Context,
-    DnnInterceptor,
+    SxcHttpInterceptorProvider,
   ]
 })
 
-// TODO: @2mh RENAME TO SxcRootModule
-
-export class DnnSxcRootModule {
+export class SxcRootModule {
 
   // This constructor is a special helper to prevent use in sub-modules
   // https://angular.io/guide/singleton-services#prevent-reimport-of-the-greetingmodule
-  constructor(@Optional() @SkipSelf() parentModule?: DnnSxcRootModule) {
+  constructor(@Optional() @SkipSelf() parentModule?: SxcRootModule) {
     if (parentModule)
-      throw new Error('DnnSxcRootModule is already loaded. Import it in the root AppModule only');
+      throw new Error('SxcRootModule is already loaded. Import it in the root AppModule only');
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.service.ts
similarity index 95%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.service.ts
index f516493f3..59ad8eb02 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/api.service.ts
@@ -3,15 +3,13 @@ import { Observable } from 'rxjs';
 import { getHttpParams, UrlParams } from '../../utils/params';
 import { routeApi } from '../contants';
 
-// TODO: @2mh RENAME TO SxcApiService
-
 /**
  * Quickly call WebApis on the current App
  *
  * @export
- * @class Api
+ * @class SxcApiService
  */
-export class Api {
+export class SxcApiService {
   constructor(
     private http: HttpClient,
     private controller: string
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts
similarity index 95%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts
index 3560738e3..833c9150f 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts
@@ -3,15 +3,13 @@ import { Observable } from 'rxjs';
 import { routeContent } from '../contants';
 import { MetadataFor } from '../../../../../../$2sxc/src/data/metadata-for'
 
-// TODO: @2mh RENAME TO SxcDataService
-
 /**
  * A helper to access data from 2sxc
  *
- * @class Data
+ * @class SxcDataService
  * @template T Type which the system will return
  */
-export class Data<T> {
+export class SxcDataService<T> {
   constructor(
     private http: HttpClient,
     private contentType: string,
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
index 0867f296b..0f1e7eb81 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/index.ts
@@ -1,4 +1,4 @@
-/** @internal */ export * from './api';
-/** @internal */ export * from './data';
+/** @internal */ export * from './api.service';
+/** @internal */ export * from './data.service';
 /** @internal */ export * from './sxc-app';
-/** @internal */ export * from './query';
+/** @internal */ export * from './query.service';
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.service.ts
similarity index 97%
rename from projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
rename to projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.service.ts
index da66e3cb5..0c0c9d233 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/query.service.ts
@@ -4,15 +4,13 @@ import { map } from 'rxjs/operators';
 import { getHttpParams, UrlParams } from '../../utils/params';
 import { routeQuery } from '../contants';
 
-// TODO: @2mh RENAME TO SxcQueryService
-
 /**
  * Query object for getting typed data.
  * @export
- * @class Query
+ * @class SxcQueryService
  * @template T type (usually an interface) of the data coming back
  */
-export class Query<T> {
+export class SxcQueryService<T> {
   constructor(
     private http: HttpClient,
     private name: string
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
index 63b8a0838..abdd68641 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/sxc-app.ts
@@ -1,8 +1,8 @@
-import { Api } from './api';
-import { Data } from './data';
+import { SxcApiService } from './api.service';
+import { SxcDataService } from './data.service';
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Query } from './query';
+import { SxcQueryService } from './query.service';
 
 /**
  * 2sxc App Instance Object
@@ -11,7 +11,7 @@ import { Query } from './query';
  * you can also use the content and query managers, but these are currently not so useful.
  *
  * @export
- * @class SxcData
+ * @class SxcApp
  */
 @Injectable({
   providedIn: 'root',
@@ -26,25 +26,25 @@ export class SxcApp {
    * @param contentType name of the content-type
    * @returns a query object with .getAll(), .getOne(), .create(), .update(), .delete()
    */
-  public data<T>(contentType: string): Data<T> {
-    return new Data<T>(this.http, contentType);
+  public data<T>(contentType: string): SxcDataService<T> {
+    return new SxcDataService<T>(this.http, contentType);
   }
 
   /**
    * get a query object to then start queries
    * @param name the query name
-   * @returns a query object with .getAll(), .getStreams(), .getStream()
+   * @returns a SxcQueryService object with .getAll(), .getStreams(), .getStream()
    */
   public query<T>(name: string) {
-    return new Query<T>(this.http, name);
+    return new SxcQueryService<T>(this.http, name);
   }
 
   /**
    * get an api object to then start api-calls
    * @param controller the api controller
-   * @returns an API object with .url(), .get<T>(), .post<T>(), .put<T>(), .delete<T>() method
+   * @returns an SxcApiService object with .url(), .get<T>(), .post<T>(), .put<T>(), .delete<T>() method
    */
-  public api(controller: string): Api {
-    return new Api(this.http, controller);
+  public api(controller: string): SxcApiService {
+    return new SxcApiService(this.http, controller);
   }
 }

From 6d3af7d4f93b8422c8a32d33535b119f6f03ce1f Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Mon, 20 Jun 2022 17:58:00 +0200
Subject: [PATCH 38/41] typings update

---
 .gitignore                                    |   3 +
 .../dist/$2sxc/src/cms/command-names.d.ts     | 215 ++++++++++++++++++
 .../src/cms/command-params-metadata.d.ts      |  18 ++
 .../sxc-typings/dist/$2sxc/src/cms/index.d.ts |   5 +-
 .../dist/$2sxc/src/cms/run-params.d.ts        |   5 +-
 .../dist/$2sxc/src/data/metadata-for.d.ts     |   4 +-
 .../dist/$2sxc/src/data/target-types.d.ts     |   2 +-
 .../metadata-for.d.ts => tools/obj2url.d.ts}  |   0
 .../inpage/src/commands/command-names.d.ts    | 150 ------------
 .../command/command-add-existing.d.ts         |  10 +
 .../src/commands/command/command-add.d.ts     |  14 ++
 ...-existing.d.ts => command-app-import.d.ts} |   0
 .../{add.d.ts => command-app-resources.d.ts}  |   0
 ...-import.d.ts => command-app-settings.d.ts} |   0
 .../{app-resources.d.ts => command-app.d.ts}  |   0
 .../{app-settings.d.ts => command-apps.d.ts}  |   0
 .../command/command-content-items.d.ts        |  17 ++
 .../command/command-content-type.d.ts         |  13 ++
 .../src/commands/command/command-copy.d.ts    |  10 +
 .../src/commands/command/command-custom.d.ts  |  21 ++
 .../src/commands/command/command-delete.d.ts  |  20 ++
 .../command/{app.d.ts => command-edit.d.ts}   |   0
 ...apps.d.ts => command-insights-server.d.ts} |   0
 ...-items.d.ts => command-instance-list.d.ts} |   0
 ...{content-type.d.ts => command-layout.d.ts} |   0
 .../commands/command/command-metadata.d.ts    |  19 ++
 .../command/{copy.d.ts => command-more.d.ts}  |   0
 .../{custom.d.ts => command-movedown.d.ts}    |   0
 .../{delete.d.ts => command-moveup.d.ts}      |   0
 .../src/commands/command/command-new.d.ts     |  10 +
 .../command/command-params-entity.d.ts        |  52 +++++
 .../{edit.d.ts => command-publish.d.ts}       |   0
 ...sights-server.d.ts => command-remove.d.ts} |   0
 ...nstance-list.d.ts => command-replace.d.ts} |   0
 ...out.d.ts => command-template-develop.d.ts} |   0
 ...adata.d.ts => command-template-query.d.ts} |   0
 ...re.d.ts => command-template-settings.d.ts} |   0
 .../{movedown.d.ts => command-zone.d.ts}      |   0
 .../dist/inpage/src/commands/command/new.d.ts |   1 -
 .../inpage/src/commands/command/publish.d.ts  |   1 -
 .../inpage/src/commands/command/remove.d.ts   |   1 -
 .../inpage/src/commands/command/replace.d.ts  |   1 -
 .../commands/command/template-develop.d.ts    |   1 -
 .../src/commands/command/template-query.d.ts  |   1 -
 .../commands/command/template-settings.d.ts   |   1 -
 .../inpage/src/commands/command/zone.d.ts     |   1 -
 .../dist/inpage/src/commands/index.d.ts       |   4 +-
 .../{dnn-workarounds => }/dnn-08.00.04.d.ts   |   0
 .../dnn/dnn-menu-helper/dnn-inpage-edit.d.ts  |   1 -
 .../dist/inpage/src/dnn/index.d.ts            |   2 +-
 .../sxc-typings/dist/inpage/src/index.d.ts    |   2 +-
 .../moveup.d.ts => sxc/sxc-cms-real.d.ts}     |   0
 .../dist/inpage/src/workflow/index.d.ts       |   2 +-
 ...ger.d.ts => toolbar-workflow-manager.d.ts} |   4 +-
 .../inpage/src/workflow/workflow-step.d.ts    |  33 ++-
 projects/sxc-typings/package.json             |   2 +-
 56 files changed, 471 insertions(+), 175 deletions(-)
 create mode 100644 projects/sxc-typings/dist/$2sxc/src/cms/command-names.d.ts
 create mode 100644 projects/sxc-typings/dist/$2sxc/src/cms/command-params-metadata.d.ts
 rename projects/sxc-typings/dist/$2sxc/src/{cms/metadata-for.d.ts => tools/obj2url.d.ts} (100%)
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-add-existing.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-add.d.ts
 rename projects/sxc-typings/dist/inpage/src/commands/command/{add-existing.d.ts => command-app-import.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{add.d.ts => command-app-resources.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{app-import.d.ts => command-app-settings.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{app-resources.d.ts => command-app.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{app-settings.d.ts => command-apps.d.ts} (100%)
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-content-items.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-content-type.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-copy.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-custom.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-delete.d.ts
 rename projects/sxc-typings/dist/inpage/src/commands/command/{app.d.ts => command-edit.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{apps.d.ts => command-insights-server.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{content-items.d.ts => command-instance-list.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{content-type.d.ts => command-layout.d.ts} (100%)
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts
 rename projects/sxc-typings/dist/inpage/src/commands/command/{copy.d.ts => command-more.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{custom.d.ts => command-movedown.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{delete.d.ts => command-moveup.d.ts} (100%)
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-new.d.ts
 create mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/command-params-entity.d.ts
 rename projects/sxc-typings/dist/inpage/src/commands/command/{edit.d.ts => command-publish.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{insights-server.d.ts => command-remove.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{instance-list.d.ts => command-replace.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{layout.d.ts => command-template-develop.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{metadata.d.ts => command-template-query.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{more.d.ts => command-template-settings.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/commands/command/{movedown.d.ts => command-zone.d.ts} (100%)
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/new.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/publish.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/remove.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/replace.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/template-develop.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/template-query.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/template-settings.d.ts
 delete mode 100644 projects/sxc-typings/dist/inpage/src/commands/command/zone.d.ts
 rename projects/sxc-typings/dist/inpage/src/dnn/{dnn-workarounds => }/dnn-08.00.04.d.ts (100%)
 delete mode 100644 projects/sxc-typings/dist/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.d.ts
 rename projects/sxc-typings/dist/inpage/src/{commands/command/moveup.d.ts => sxc/sxc-cms-real.d.ts} (100%)
 rename projects/sxc-typings/dist/inpage/src/workflow/{workflow-manager.d.ts => toolbar-workflow-manager.d.ts} (70%)

diff --git a/.gitignore b/.gitignore
index 60396461d..0e44a78b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,6 @@ projects/$2sxc/docs/typedoc
 projects/$2sxc/docs/docFx
 projects/$2sxc/docs/_docFxSite
 projects/$2sxc/docs/obj
+
+# Sub-Projects dist - to make sure results don't appear in search
+projects/quick-dialog/dist
diff --git a/projects/sxc-typings/dist/$2sxc/src/cms/command-names.d.ts b/projects/sxc-typings/dist/$2sxc/src/cms/command-names.d.ts
new file mode 100644
index 000000000..6e9f8fb84
--- /dev/null
+++ b/projects/sxc-typings/dist/$2sxc/src/cms/command-names.d.ts
@@ -0,0 +1,215 @@
+/**
+ * Names of commands known to 2sxc CMS - for use in toolbars and calling commands directly from code
+ */
+export declare enum CommandNames {
+    /**
+     * `add` opens a `new` dialog to create and add a new item to a **list of items**.
+     * <br> The new item is placed after the item the (+) was clicked on.
+     * <br>💡
+     * This is similar to `new` but also adds the item to the existing list of items shown on the page.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandAddParams)
+     */
+    add = "add",
+    /**
+     * `add-existing` opens a dialog allowing the user to select an existing item to add to a **list of items**.
+     * <br> The new item is placed after the item the (+) was clicked on.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandAddExistingParams)
+     * <br> 🆕 in v11.01
+     */
+    addExisting = "add-existing",
+    /**
+     * `app` opens the app-admin dialog
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    app = "app",
+    /**
+     * `app-import` opens the dialog to import an App.
+     * <br> 🔘 This is not available on the toolbar.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    appImport = "app-import",
+    /**
+     * `app-resources` opens the edit dialog for app-resources (multi-language texts, labels etc.).
+     * <br> 🔘 It's disabled on the toolbar if the app doesn't have resource-values to configure.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    appResources = "app-resources",
+    /**
+     * `app-settings` opens the edit dialog for the app-settings.
+     * <br> 🔘 It's disabled on the toolbar if the app doesn't have setting-values to configure
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    appSettings = "app-settings",
+    /**
+     * `apps` opens the manage all apps dialog.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected based on toolbar)
+     */
+    apps = "apps",
+    /**
+     * `contentitems` opens the list to manage all items of a specific content-type.
+     * <br> 🔘 Will use the settings of the current template to open.
+     * It is only shown to elevated admins.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentItemsParams)
+     */
+    contentItems = "contentitems",
+    /**
+     * `contenttype` opens the dialog to view or modify fields of a content-type.
+     * <br> 🔘 On a toolbar it will use the content-type of the current item.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentTypeParams)
+     */
+    contentType = "contenttype",
+    /**
+     * `copy` opens the edit-dialog for the current item in copy-mode, so when saving it will be a new item.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandCopyParams)
+     * <br> 🆕 in v14.03
+     */
+    copy = "copy",
+    /**
+     * `custom` will execute custom javascript.
+     * <br> 🔘 This is mainly for toolbars, to add buttons with custom code.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandCustomParams)
+     */
+    custom = "custom",
+    /**
+     * `delete` will delete (not just remove) a content-item.
+     * <br> 💡 This is similar to `remove` but really deletes the data from the DB.
+     * <br> 🔘 It only appears if the toolbar explicitly asks for it.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandDeleteParams)
+     * (auto-detected from context)
+     */
+    delete = "delete",
+    /**
+     * `edit` opens an edit-dialog.
+     * <br>
+     * In scenarios where the page is currently showing a demo item, this will have the same effect as `add`
+     * <br> 🔘 Only appears if `entityId` is known or item is in a list.
+     * <br> 📩 Parameters either one of these:
+     * [Id](xref:Api.Js.SxcJs.CommandParamsEntityById),
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
+     */
+    edit = "edit",
+    /**
+     * `insights-server` opens the insights logs page
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required.
+     */
+    insightsServer = "insights-server",
+    /**
+     * `instance-list` opens a dialog to manually re-order **items in a list**.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    instanceList = "instance-list",
+    /**
+     * `layout` opens the in-page dialog to change the layout of the current content.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    layout = "layout",
+    /**
+     * `metadata` opens the edit-dialog for the current metadata item.
+     * <br> 🔘 It only appears if the toolbar explicitly asks for it.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandMetadataParams)
+     */
+    metadata = "metadata",
+    /**
+     * `more` create a "…" (ellipsis) button which flips through the button groups of toolbars
+     * <br> 🔘 It only appears if the toolbar has `more`=`auto` and has multiple groups.
+     * <br> 📩 No params required,
+     * (auto-detected based on toolbar)
+     */
+    more = "more",
+    /**
+     * `movedown` moves a content-item down one position in a **list of items**.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 Parameters either one of these:
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
+     */
+    moveDown = "movedown",
+    /**
+     * `moveup` moves a content-item up one position in a **list of items**.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 Parameters either one of these:
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
+     */
+    moveUp = "moveup",
+    /**
+     * `new` opens the edit-dialog for a new content-item.
+     * <br>
+     * It will only create an item, not add it to a list.
+     * For that you would need to use `add`
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandContentTypeParams)
+     * (auto-detected from context)
+     */
+    new = "new",
+    /**
+     * `publish` tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
+     * <br> 🔘 Appears automatically if the item is in draft mode / not published.
+     * <br> 📩 Parameters either one of these:
+     * [Id](xref:Api.Js.SxcJs.CommandParamsEntityById),
+     * [In Block](xref:Api.Js.SxcJs.CommandParamsEntityInContentBlock),
+     * [In List](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
+     */
+    publish = "publish",
+    /**
+     * `remove` removes an item from a list of items.
+     * <br> 🪜 Only appears on toolbars of items which are in a list.
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
+     */
+    remove = "remove",
+    /**
+     * `replace` opens the dialog to assign a different content-item in this slot on module-assigned content items
+     * <br> 📩 [Parameters](xref:Api.Js.SxcJs.CommandParamsEntityInList)
+     * (auto-detected from context)
+     */
+    replace = "replace",
+    /**
+     * `template-develop` opens the template-editor dialog in a new window.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    templateDevelop = "template-develop",
+    /**
+     * `template-query` opens the pipeline/query-designer in a new window.
+     * <br> 🔘 It's not available on the simple Content App, only on full Apps.
+     * It is disabled if no query is configured.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    templateQuery = "template-query",
+    /**
+     * `template-settings` will change settings on the template currently used
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     */
+    templateSettings = "template-settings",
+    /**
+     * `zone` opens the system dialog for this zone/site.
+     * <br> 🔐 Toolbar shows this automatically to elevated admins.
+     * <br> 📩 No params required,
+     * (auto-detected from context)
+     */
+    zone = "zone"
+}
diff --git a/projects/sxc-typings/dist/$2sxc/src/cms/command-params-metadata.d.ts b/projects/sxc-typings/dist/$2sxc/src/cms/command-params-metadata.d.ts
new file mode 100644
index 000000000..3a83954d6
--- /dev/null
+++ b/projects/sxc-typings/dist/$2sxc/src/cms/command-params-metadata.d.ts
@@ -0,0 +1,18 @@
+import { MetadataTargetTypes } from '../data';
+/**
+ * Parameters on `metadata` for commands which have a metadata-target.
+ */
+export interface CommandParamsMetadata {
+    /**
+     * The key which identifies the target of this metadata item
+     */
+    key: string;
+    /**
+     * the key type, will default to 'string'
+     */
+    keyType?: string;
+    /**
+     * The target type, will default to 10 = CMS-Item
+     */
+    targetType?: MetadataTargetTypes;
+}
diff --git a/projects/sxc-typings/dist/$2sxc/src/cms/index.d.ts b/projects/sxc-typings/dist/$2sxc/src/cms/index.d.ts
index 56d9b2a7e..69f3d22e8 100644
--- a/projects/sxc-typings/dist/$2sxc/src/cms/index.d.ts
+++ b/projects/sxc-typings/dist/$2sxc/src/cms/index.d.ts
@@ -1,4 +1,5 @@
-export * from './metadata-for';
-export * from './item-identifiers';
 export * from './command-params';
+export * from './command-names';
+export * from './item-identifiers';
+export * from './command-params-metadata';
 export * from './run-params';
diff --git a/projects/sxc-typings/dist/$2sxc/src/cms/run-params.d.ts b/projects/sxc-typings/dist/$2sxc/src/cms/run-params.d.ts
index dba41f95e..dfda81a93 100644
--- a/projects/sxc-typings/dist/$2sxc/src/cms/run-params.d.ts
+++ b/projects/sxc-typings/dist/$2sxc/src/cms/run-params.d.ts
@@ -1,4 +1,5 @@
 import { ContextIdentifier, Sxc } from '..';
+import { CommandNames } from './command-names';
 import { CommandParams } from './command-params';
 /**
  * Parameters for the Instance sxc.cms.run(...) command.
@@ -7,9 +8,9 @@ import { CommandParams } from './command-params';
 export interface RunParams {
     /**
      * The action to perform.
-     * Required if you don't have params which themselves have the action
+     * Required.
      */
-    action?: string;
+    action?: CommandNames;
     /**
      * The command params, like contentType, entityId etc.
      * Optional for many actions, but can themselves also contain the property `action`, in which case action can be ommited.
diff --git a/projects/sxc-typings/dist/$2sxc/src/data/metadata-for.d.ts b/projects/sxc-typings/dist/$2sxc/src/data/metadata-for.d.ts
index 1f9a7f3f6..56d70e8c2 100644
--- a/projects/sxc-typings/dist/$2sxc/src/data/metadata-for.d.ts
+++ b/projects/sxc-typings/dist/$2sxc/src/data/metadata-for.d.ts
@@ -1,4 +1,4 @@
-import { TargetTypes } from './target-types';
+import { MetadataTargetTypes } from './target-types';
 /**
  * A Metadata-Target identifier to tell an entity that it describes something else.
  *
@@ -12,7 +12,7 @@ export interface MetadataFor {
      * The target type identifier
      * - TODO: @2dm - THIS SHOULD probably be number only
      */
-    Target: string | TargetTypes;
+    Target: string | MetadataTargetTypes;
     /**
      * The number of the target, if it's identified by a number.
      * @type {number}
diff --git a/projects/sxc-typings/dist/$2sxc/src/data/target-types.d.ts b/projects/sxc-typings/dist/$2sxc/src/data/target-types.d.ts
index 80265f8ae..f396a2471 100644
--- a/projects/sxc-typings/dist/$2sxc/src/data/target-types.d.ts
+++ b/projects/sxc-typings/dist/$2sxc/src/data/target-types.d.ts
@@ -5,7 +5,7 @@
  *
  * Use it for the @see MetadataFor objects
  */
-export declare enum TargetTypes {
+export declare enum MetadataTargetTypes {
     /**
      * Undefined Type (0) - included for completeness.
      * Not usually used, actually None (1) is the default
diff --git a/projects/sxc-typings/dist/$2sxc/src/cms/metadata-for.d.ts b/projects/sxc-typings/dist/$2sxc/src/tools/obj2url.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/$2sxc/src/cms/metadata-for.d.ts
rename to projects/sxc-typings/dist/$2sxc/src/tools/obj2url.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts
deleted file mode 100644
index 67211cdd6..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command-names.d.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Names of commands known to 2sxc CMS - for use in toolbars and calling commands directly from code
- */
-export declare enum CommandNames {
-    /**
-     * `add` command open a `new` dialog to add a new item to a list of items
-     * Note that this is similar to `new` but still not the same
-     */
-    add = "add",
-    /**
-     * `add-existing` command to open a dialog allowing the user to select something to add to a list of items
-     */
-    addExisting = "add-existing",
-    /**
-     * `app-import` command will open the dialog to import an App
-     */
-    appImport = "app-import",
-    /**
-     * `app-resources` will open the edit for app-resources (multi-language texts, labels etc.). It's disabled if the app doesn't have resource-values to configure
-     */
-    appResources = "app-resources",
-    /**
-     * `app-settings` will open the edit dialog for the app-settings. It's disabled if the app doesn't have setting-values to configure
-     */
-    appSettings = "app-settings",
-    /**
-     * `app` will open the app-admin dialog
-     */
-    app = "app",
-    /**
-     * `apps` will open the manage all apps dialog
-     */
-    apps = "apps",
-    /**
-     * `contentitems` will open the dialog to manage content-items for the current template. Will use the settings of the current template to open.
-     *  contentType (optional) - name of data-type to manage/open
-     */
-    contentItems = "contentitems",
-    /**
-     * `contenttype` will open the dialog to view or change the current content-type, meaning you can change what fields it has, their types etc
-     */
-    contentType = "contenttype",
-    /**
-     * `copy` command will open the edit-dialog for the current item in copy-mode, so when saving it will be a new item
-     *
-     * To work, it also needs `contentTypeName`
-     * WIP v14.02
-     */
-    copy = "copy",
-    /**
-     * `custom` will execute custom javascript
-     * customCode - some JS like "alert('hello');"
-     */
-    custom = "custom",
-    /**
-     * `delete` will delete (not just remove) a content-item. Needs:
-     * entityId
-     * entityGuid
-     * entityTitle
-     */
-    delete = "delete",
-    /**
-     * `edit` command will open the edit-dialog for the current item.
-     * In scenarios where we have a list of items and it's currently showing the demo, this will have the same effect as `add`
-     */
-    edit = "edit",
-    /**
-     * `insights-server` command will open the insights logs page
-     */
-    insightsServer = "insights-server",
-    /**
-     * `instance-list` command will open a dialog to manually re-order items in a list. (note: in older versions was called "sort"
-     */
-    instanceList = "instance-list",
-    /**
-     * `layout` command will open the in-page dialog to change the layout of the current content.
-     * [no parameters needed]
-     */
-    layout = "layout",
-    /**
-     * `metadata` command will open the edit-dialog for the current metadata item
-     */
-    metadata = "metadata",
-    /**
-     * `image` command will open the edit-dialog for the metadata of the current image
-     */
-    image = "image",
-    /**
-     * `more` command create a "…" button which flips through the menu-buttons of toolbars
-     */
-    more = "more",
-    /**
-     * `movedown` command moves a content-item down one position in the list
-     * useModuleList: true (required to be true for it to work)
-     * sortOrder: [number] (important so it knows the position)
-     */
-    moveDown = "movedown",
-    /**
-     * `moveup` command moves a content-item up one position in the list
-     * useModuleList: true (required to be true for it to work)
-     * sortOrder: [number] (important so it knows the position)
-     */
-    moveUp = "moveup",
-    /**
-     * `new` command opens the edit-dialog for a new content-item.
-     * contentType
-     *
-     * Then it needs either the ID...:
-     * entityId
-     *
-     * ...or it needs the position within the list:
-     * useModuleList: true
-     * sortOrder: [number] (important so it knows the position
-     */
-    new = "new",
-    /**
-     * `new` command sets new mode used in parameters
-     */
-    newMode = "new",
-    /**
-     * `publish` command tells the system to update a content-items status to published. If there was a published and a draft before, the draft will replace the previous item
-     */
-    publish = "publish",
-    /**
-     * `remove` command removes an item from a list of items.
-     * useModuleList: true (required to be true for it to work)
-     * sortOrder: [number] (important so it knows the position)
-     */
-    remove = "remove",
-    /**
-     * `replace` command will open the dialog to assign a different content-item in this slot on module-assigned content items
-     */
-    replace = "replace",
-    /**
-     * `template-develop` will open the template-editor dialog in a new window. (note: in older versions was called "develop")
-     */
-    templateDevelop = "replace",
-    /**
-     * `template-query` will open the pipeline/query-designer in a new window. It's invisible on content, and disabled if no pipeline is configured
-     */
-    templateQuery = "template-query",
-    /**
-     * `template-settings` will change settings on the template currently used
-     */
-    templateSettings = "template-settings",
-    /**
-     * `zone` will open the manage all apps dialog
-     */
-    zone = "zone"
-}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-add-existing.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-add-existing.d.ts
new file mode 100644
index 000000000..f62a5abbf
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-add-existing.d.ts
@@ -0,0 +1,10 @@
+import { CommandAddParams } from './command-add';
+/**
+ * Parameters used for the command `add-existing`.
+ * <br>
+ * The contentType name determines what items will be shown in the dialog.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandAddExistingParams extends CommandAddParams {
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-add.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-add.d.ts
new file mode 100644
index 000000000..e11411bd9
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-add.d.ts
@@ -0,0 +1,14 @@
+import { CommandContentTypeParams } from './command-content-type';
+/**
+ * Parameters used for the command `add`.
+ * <br>
+ * The contentType name determines what items will be created.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandAddParams extends CommandContentTypeParams {
+    /**
+     * Determins the position where a new item will be added to.
+     */
+    sortOrder: number;
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/add-existing.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-app-import.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/add-existing.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-app-import.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/add.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-app-resources.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/add.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-app-resources.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/app-import.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-app-settings.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/app-import.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-app-settings.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/app-resources.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-app.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/app-resources.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-app.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/app-settings.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-apps.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/app-settings.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-apps.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-content-items.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-content-items.d.ts
new file mode 100644
index 000000000..1d5ac63d0
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-content-items.d.ts
@@ -0,0 +1,17 @@
+import { CommandContentTypeParams } from './command-content-type';
+/**
+ * Parameters used for the command `contentitems`.
+ * <br>
+ * The content-type name determines what items will be managed.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandContentItemsParams extends CommandContentTypeParams {
+    /**
+     * Filters to apply to the list of items.
+     * <br>
+     * Each property targets a field.
+     * The value is a string, number or array for filtering EntityIds or EntityGuids
+     */
+    filters?: Record<string, string | number | string[] | number[]>;
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-content-type.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-content-type.d.ts
new file mode 100644
index 000000000..61e36db6d
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-content-type.d.ts
@@ -0,0 +1,13 @@
+/**
+ * Parameters used for the command `contenttype`.
+ * <br>
+ * The content-type name determines what items will be loaded to manage the fields.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandContentTypeParams {
+    /**
+     * The content-type name
+     */
+    contentType: string;
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-copy.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-copy.d.ts
new file mode 100644
index 000000000..7fa534daa
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-copy.d.ts
@@ -0,0 +1,10 @@
+import { CommandContentTypeParams } from './command-content-type';
+import { CommandParamsEntityById } from './command-params-entity';
+/**
+ * Parameters used for the command `copy`.
+ * Will copy the entity on `entityId`.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandCopyParams extends CommandContentTypeParams, CommandParamsEntityById {
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-custom.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-custom.d.ts
new file mode 100644
index 000000000..1dc6ae4f5
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-custom.d.ts
@@ -0,0 +1,21 @@
+/**
+ * Parameters used for the command `custom` on toolbars.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandCustomParams {
+    /**
+     * Name of the function to call - must be available in the context.
+     * This is usually as a function window. Example:
+     * <br>
+     * If `call` is `sayHello` you need a `window.sayHello(context, event)`.
+     */
+    call: string;
+    /**
+     * **OBSOLETE - avoid using**
+     * <br>
+     * JavaScript as string containing the code to execute.
+     * This is the old V9 name.
+     */
+    customCode: string;
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-delete.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-delete.d.ts
new file mode 100644
index 000000000..19a63a503
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-delete.d.ts
@@ -0,0 +1,20 @@
+/**
+ * Parameters used for the command `delete`.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandDeleteParams {
+    /**
+     * ID of item to delete, usually detected from context.
+     */
+    entityId: number;
+    /**
+     * Guid of item to delete, usually detected from context.
+     */
+    entityGuid: string;
+    /**
+     * Title of item to delete, usually detected from context.
+     * This is important to show the "Are you sure?" dialog.
+     */
+    entityTitle: string;
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/app.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-edit.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/app.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-edit.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/apps.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-insights-server.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/apps.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-insights-server.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/content-items.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-instance-list.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/content-items.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-instance-list.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/content-type.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-layout.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/content-type.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-layout.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts
new file mode 100644
index 000000000..1e39d84c1
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts
@@ -0,0 +1,19 @@
+import { CommandParamsEntityById } from '..';
+import { CommandParamsMetadata } from '../../../../$2sxc/src/cms';
+import { CommandContentTypeParams } from './command-content-type';
+/**
+ * Parameters used for the command `metadata`.
+ * <br>
+ * Will do either one of these:
+ * - if it has an `entityId`, will just open `edit` for that Entity
+ * - if it has no `entityId`, will open `new` for the current `contentType`
+ * and assign to the target specified by TODO:
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandMetadataParams extends CommandContentTypeParams, CommandParamsEntityById {
+    /**
+     * Target to assign the metadata to.
+     */
+    metadata: CommandParamsMetadata;
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/copy.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-more.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/copy.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-more.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/custom.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-movedown.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/custom.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-movedown.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/delete.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-moveup.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/delete.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-moveup.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-new.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-new.d.ts
new file mode 100644
index 000000000..ee44b5925
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-new.d.ts
@@ -0,0 +1,10 @@
+import { CommandContentTypeParams } from './command-content-type';
+/**
+ * Parameters used for the command `new`
+ * <br>
+ * The ContentType name determines what kind of item will be created.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandNewParams extends CommandContentTypeParams {
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-params-entity.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-params-entity.d.ts
new file mode 100644
index 000000000..4b2955567
--- /dev/null
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-params-entity.d.ts
@@ -0,0 +1,52 @@
+/**
+ * Parameters used for commands which address a specificy entity.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandParamsEntityById {
+    /**
+     * ID of item to edit.
+     */
+    entityId: number;
+}
+/**
+ * Parameters used for command which expect an item from a list of a ContentBlock.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandParamsEntityInContentBlock {
+    /**
+     * Determins the position of the item in the list that will be edited.
+     */
+    sortOrder: number;
+    /**
+     * Must be true, to work on the module list.
+     */
+    useModuleList: true;
+}
+/**
+ * Parameters used for command which expect an item in a list (field) of a parent.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandParamsEntityInList {
+    /**
+     * Determins the position of the item in the list that will be edited.
+     */
+    sortOrder: number;
+    /**
+     * Parent entity GUID.
+     */
+    parent: string;
+    /**
+     * Parent Entity field(s) name(s).
+     */
+    fields: string;
+}
+/**
+ * Parameters used for commands which need an entity ID or a list-reference.
+ * <br>
+ * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
+ */
+export interface CommandParamsEntity extends CommandParamsEntityById, CommandParamsEntityInContentBlock {
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/edit.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-publish.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/edit.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-publish.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/insights-server.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-remove.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/insights-server.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-remove.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/instance-list.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-replace.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/instance-list.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-replace.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/layout.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-template-develop.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/layout.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-template-develop.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/metadata.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-template-query.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/metadata.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-template-query.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/more.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-template-settings.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/more.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-template-settings.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/movedown.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-zone.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/movedown.d.ts
rename to projects/sxc-typings/dist/inpage/src/commands/command/command-zone.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/new.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/new.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/new.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/publish.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/publish.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/publish.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/remove.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/remove.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/remove.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/replace.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/replace.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/replace.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/template-develop.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/template-develop.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/template-develop.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/template-query.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/template-query.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/template-query.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/template-settings.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/template-settings.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/template-settings.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/zone.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/zone.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/commands/command/zone.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/commands/index.d.ts b/projects/sxc-typings/dist/inpage/src/commands/index.d.ts
index be6c8a3f1..896e0c60b 100644
--- a/projects/sxc-typings/dist/inpage/src/commands/index.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/commands/index.d.ts
@@ -1,8 +1,8 @@
-export * from './command-names';
+export * from '../../../$2sxc/src/cms/command-names';
 export * from './command-code';
 export * from './command';
 export * from './commands';
-export * from './command/index';
+export * from './command/';
 export * from '../../../$2sxc/src/cms/command-params';
 export * from './engine/cms-engine';
 export * from './command-code';
diff --git a/projects/sxc-typings/dist/inpage/src/dnn/dnn-workarounds/dnn-08.00.04.d.ts b/projects/sxc-typings/dist/inpage/src/dnn/dnn-08.00.04.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/dnn/dnn-workarounds/dnn-08.00.04.d.ts
rename to projects/sxc-typings/dist/inpage/src/dnn/dnn-08.00.04.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.d.ts b/projects/sxc-typings/dist/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.d.ts
deleted file mode 100644
index cb0ff5c3b..000000000
--- a/projects/sxc-typings/dist/inpage/src/dnn/dnn-menu-helper/dnn-inpage-edit.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {};
diff --git a/projects/sxc-typings/dist/inpage/src/dnn/index.d.ts b/projects/sxc-typings/dist/inpage/src/dnn/index.d.ts
index 11cafccb7..3b5b7864a 100644
--- a/projects/sxc-typings/dist/inpage/src/dnn/index.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/dnn/index.d.ts
@@ -1 +1 @@
-export * from './dnn-menu-helper/dnn-inpage-edit';
+import './dnn-08.00.04';
diff --git a/projects/sxc-typings/dist/inpage/src/index.d.ts b/projects/sxc-typings/dist/inpage/src/index.d.ts
index cb0ff5c3b..f50eca1a9 100644
--- a/projects/sxc-typings/dist/inpage/src/index.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/index.d.ts
@@ -1 +1 @@
-export {};
+import './dnn/index';
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/moveup.d.ts b/projects/sxc-typings/dist/inpage/src/sxc/sxc-cms-real.d.ts
similarity index 100%
rename from projects/sxc-typings/dist/inpage/src/commands/command/moveup.d.ts
rename to projects/sxc-typings/dist/inpage/src/sxc/sxc-cms-real.d.ts
diff --git a/projects/sxc-typings/dist/inpage/src/workflow/index.d.ts b/projects/sxc-typings/dist/inpage/src/workflow/index.d.ts
index e408cc752..add6fedba 100644
--- a/projects/sxc-typings/dist/inpage/src/workflow/index.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/workflow/index.d.ts
@@ -1,4 +1,4 @@
-export * from './workflow-manager';
+export * from './toolbar-workflow-manager';
 export * from './workflow-step-code-arguments';
 export * from './workflow-phases';
 export * from './workflow-step';
diff --git a/projects/sxc-typings/dist/inpage/src/workflow/workflow-manager.d.ts b/projects/sxc-typings/dist/inpage/src/workflow/toolbar-workflow-manager.d.ts
similarity index 70%
rename from projects/sxc-typings/dist/inpage/src/workflow/workflow-manager.d.ts
rename to projects/sxc-typings/dist/inpage/src/workflow/toolbar-workflow-manager.d.ts
index 3a5a73587..60a226332 100644
--- a/projects/sxc-typings/dist/inpage/src/workflow/workflow-manager.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/workflow/toolbar-workflow-manager.d.ts
@@ -5,10 +5,10 @@ import { HasLog } from '../core';
  * When toolbars are created, they will add a Manager and then raise an event for in-page code to add workflow steps.
  * Normally the toolbar with raise a `toolbar-init` event where you can then add steps.
  */
-export declare class WorkflowManager extends HasLog {
+export declare class ToolbarWorkflowManager extends HasLog {
     private isDummy;
     /**
-     * Add one or many steps to the workflow
+     * Register one or many [workflow-steps](xref:Api.Js.SxcJs.WorkflowStep) to the toolbar, to use if toolbar commands are executed.
      */
     add(steps: WorkflowStep | WorkflowStep[]): void;
 }
diff --git a/projects/sxc-typings/dist/inpage/src/workflow/workflow-step.d.ts b/projects/sxc-typings/dist/inpage/src/workflow/workflow-step.d.ts
index cb0ff5c3b..1b45c3bba 100644
--- a/projects/sxc-typings/dist/inpage/src/workflow/workflow-step.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/workflow/workflow-step.d.ts
@@ -1 +1,32 @@
-export {};
+import { WorkflowPhases, WorkflowStepCode } from '.';
+/**
+ * A workflow step (code-sequence) to run before/after specific events.
+ */
+export interface WorkflowStep {
+    /**
+     * The name of this step, in case it needs to be replaced or somehow controlled
+     * Will be empty by default
+     */
+    name?: string;
+    /**
+     * The action this step is for, can be 'any', 'edit', etc.
+     * Will be 'all' by default
+     */
+    command: string;
+    /**
+     * Action-phase being run, like 'all', 'before', 'after'
+     * will be 'before' by default
+     */
+    phase?: WorkflowPhases;
+    /**
+     * Execution priority, higher comes first
+     * Will be 1 by default.
+     */
+    priority?: number;
+    /**
+     * The code which is run, must be a promise-factory.
+     * So it's a function that will return a promise.
+     * Required.
+     */
+    code: WorkflowStepCode;
+}
diff --git a/projects/sxc-typings/package.json b/projects/sxc-typings/package.json
index c30cb4170..e3578f6d5 100644
--- a/projects/sxc-typings/package.json
+++ b/projects/sxc-typings/package.json
@@ -1,6 +1,6 @@
 {
   "// notes": "The version is used in the final NPM. For beta releases, use pattern '14.02.0-beta.0'",
-  "version": "14.02.01-beta.0",
+  "version": "14.02.01",
   "types": "./index.d.ts",
   "scripts": {
     "generate": "typings.cmd \".\\dist\"",

From 102bb259a023d8ce1b8873173315678105b813df Mon Sep 17 00:00:00 2001
From: maaaximum <Maxim.Huesler@2sic.com>
Date: Mon, 20 Jun 2022 18:11:45 +0200
Subject: [PATCH 39/41] wip

---
 projects/dnn-sxc-angular/angular.json         |    3 +
 projects/dnn-sxc-angular/package-lock.json    | 5362 ++++++-----------
 projects/dnn-sxc-angular/package.json         |   34 +-
 .../projects/dnn-sxc-angular/ng-package.json  |    4 +-
 .../projects/dnn-sxc-angular/package.json     |    6 +-
 .../src/lib/sxc/data.service.ts               |    2 +-
 6 files changed, 1996 insertions(+), 3415 deletions(-)

diff --git a/projects/dnn-sxc-angular/angular.json b/projects/dnn-sxc-angular/angular.json
index eae1874ff..6269aeb25 100644
--- a/projects/dnn-sxc-angular/angular.json
+++ b/projects/dnn-sxc-angular/angular.json
@@ -1,5 +1,8 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "cli": {
+    "analytics": false
+  },
   "version": 1, 
   "newProjectRoot": "projects",
   "projects": {
diff --git a/projects/dnn-sxc-angular/package-lock.json b/projects/dnn-sxc-angular/package-lock.json
index 95b465437..deb7da782 100644
--- a/projects/dnn-sxc-angular/package-lock.json
+++ b/projects/dnn-sxc-angular/package-lock.json
@@ -5,30 +5,28 @@
   "requires": true,
   "dependencies": {
     "@2sic.com/2sxc-typings": {
-      "version": "10.25.2",
-      "resolved": "https://registry.npmjs.org/@2sic.com/2sxc-typings/-/2sxc-typings-10.25.2.tgz",
-      "integrity": "sha512-kLyhP25iiQW96vecmyyXqfiO1w8uViEQmKd2LGPjKT+97k5MYQDpezEihI9TxPWwzJp/HOmsuSWzV/2J2mui7g==",
-      "requires": {
-        "@types/jquery": "^3.3.31"
-      }
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@2sic.com/2sxc-typings/-/2sxc-typings-14.2.1.tgz",
+      "integrity": "sha512-cSE9AGyHfcKdm3ZSrpvJpSoIsC2pGyWMjUjzQpwmtPFdHHteAhczs6xuTaEsbLYIXgGN/f5PbDtgpPZmMLgDHg==",
+      "dev": true
     },
     "@ampproject/remapping": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-1.1.1.tgz",
-      "integrity": "sha512-YVAcA4DKLOj296CF5SrQ8cYiMRiUGc2sqFpLxsDGWE34suHqhGP/5yMsDHKsrh8hs8I5TiRVXNwKPWQpX3iGjw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-1.0.1.tgz",
+      "integrity": "sha512-Ta9bMA3EtUHDaZJXqUoT5cn/EecwOp+SXpKJqxDbDuMbLvEMu6YTyDDuvTWeStODfdmXyfMo7LymQyPkN3BicA==",
       "dev": true,
       "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/resolve-uri": "1.0.0",
         "sourcemap-codec": "1.4.8"
       }
     },
     "@angular-devkit/architect": {
-      "version": "0.1302.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1302.6.tgz",
-      "integrity": "sha512-NztzorUMfwJeRaT7SY00Y8WSqc2lQYuF11yNoyEm7Dae3V7VZ28rW2Z9RwibP27rYQL0RjSMaz2wKITHX2vOAw==",
+      "version": "0.1300.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1300.0.tgz",
+      "integrity": "sha512-bLbCrsp2SIMgdNWESJEXodAZ1R0SIDbrnGB3euFwKt8srJinayECEBczAVhRBstOOlLJKVRCQMX4ho4SqeWqLw==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "13.2.6",
+        "@angular-devkit/core": "13.0.0",
         "rxjs": "6.6.7"
       },
       "dependencies": {
@@ -50,76 +48,76 @@
       }
     },
     "@angular-devkit/build-angular": {
-      "version": "13.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-13.2.6.tgz",
-      "integrity": "sha512-Y2ojy6xbZ0kwScppcutLHBP8eW0qNOjburTISSBU/L5l/9FOeZ1E7yAreKuVu/qibZiLbSJfAhk+SLwhRHFSSQ==",
-      "dev": true,
-      "requires": {
-        "@ampproject/remapping": "1.1.1",
-        "@angular-devkit/architect": "0.1302.6",
-        "@angular-devkit/build-webpack": "0.1302.6",
-        "@angular-devkit/core": "13.2.6",
-        "@babel/core": "7.16.12",
-        "@babel/generator": "7.16.8",
-        "@babel/helper-annotate-as-pure": "7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "7.16.8",
-        "@babel/plugin-transform-async-to-generator": "7.16.8",
-        "@babel/plugin-transform-runtime": "7.16.10",
-        "@babel/preset-env": "7.16.11",
-        "@babel/runtime": "7.16.7",
-        "@babel/template": "7.16.7",
-        "@discoveryjs/json-ext": "0.5.6",
-        "@ngtools/webpack": "13.2.6",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-13.0.0.tgz",
+      "integrity": "sha512-KAKirILLCByvL81LJDESeJXMe8jEtKlRn+OabZrfVmXLNpPfje2f/ISMYqeAyl3yhUCub2fMl23BtxZisCYbdA==",
+      "dev": true,
+      "requires": {
+        "@ampproject/remapping": "1.0.1",
+        "@angular-devkit/architect": "0.1300.0",
+        "@angular-devkit/build-webpack": "0.1300.0",
+        "@angular-devkit/core": "13.0.0",
+        "@babel/core": "7.15.8",
+        "@babel/generator": "7.15.8",
+        "@babel/helper-annotate-as-pure": "7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "7.15.8",
+        "@babel/plugin-transform-async-to-generator": "7.14.5",
+        "@babel/plugin-transform-runtime": "7.15.8",
+        "@babel/preset-env": "7.15.8",
+        "@babel/runtime": "7.15.4",
+        "@babel/template": "7.15.4",
+        "@discoveryjs/json-ext": "0.5.5",
+        "@ngtools/webpack": "13.0.0",
         "ansi-colors": "4.1.1",
         "babel-loader": "8.2.3",
         "babel-plugin-istanbul": "6.1.1",
         "browserslist": "^4.9.1",
         "cacache": "15.3.0",
+        "caniuse-lite": "^1.0.30001032",
         "circular-dependency-plugin": "5.2.2",
-        "copy-webpack-plugin": "10.2.1",
-        "core-js": "3.20.3",
-        "critters": "0.0.16",
-        "css-loader": "6.5.1",
-        "esbuild": "0.14.22",
-        "esbuild-wasm": "0.14.22",
+        "copy-webpack-plugin": "9.0.1",
+        "core-js": "3.19.0",
+        "critters": "0.0.14",
+        "css-loader": "6.5.0",
+        "esbuild": "0.13.12",
+        "esbuild-wasm": "0.13.12",
         "glob": "7.2.0",
         "https-proxy-agent": "5.0.0",
         "inquirer": "8.2.0",
-        "jsonc-parser": "3.0.0",
         "karma-source-map-support": "1.4.0",
         "less": "4.1.2",
         "less-loader": "10.2.0",
-        "license-webpack-plugin": "4.0.2",
-        "loader-utils": "3.2.0",
-        "mini-css-extract-plugin": "2.5.3",
+        "license-webpack-plugin": "3.0.0",
+        "loader-utils": "3.0.0",
+        "mini-css-extract-plugin": "2.4.3",
         "minimatch": "3.0.4",
         "open": "8.4.0",
         "ora": "5.4.1",
         "parse5-html-rewriting-stream": "6.0.1",
-        "piscina": "3.2.0",
-        "postcss": "8.4.5",
+        "piscina": "3.1.0",
+        "postcss": "8.3.11",
         "postcss-import": "14.0.2",
-        "postcss-loader": "6.2.1",
-        "postcss-preset-env": "7.2.3",
+        "postcss-loader": "6.2.0",
+        "postcss-preset-env": "6.7.0",
         "regenerator-runtime": "0.13.9",
-        "resolve-url-loader": "5.0.0",
+        "resolve-url-loader": "4.0.0",
         "rxjs": "6.6.7",
-        "sass": "1.49.0",
-        "sass-loader": "12.4.0",
+        "sass": "1.43.4",
+        "sass-loader": "12.3.0",
         "semver": "7.3.5",
-        "source-map-loader": "3.0.1",
-        "source-map-support": "0.5.21",
-        "stylus": "0.56.0",
+        "source-map-loader": "3.0.0",
+        "source-map-support": "0.5.20",
+        "stylus": "0.55.0",
         "stylus-loader": "6.2.0",
-        "terser": "5.11.0",
+        "terser": "5.9.0",
         "text-table": "0.2.0",
         "tree-kill": "1.2.2",
         "tslib": "2.3.1",
-        "webpack": "5.67.0",
-        "webpack-dev-middleware": "5.3.0",
-        "webpack-dev-server": "4.7.3",
+        "webpack": "5.60.0",
+        "webpack-dev-middleware": "5.2.1",
+        "webpack-dev-server": "4.4.0",
         "webpack-merge": "5.8.0",
-        "webpack-subresource-integrity": "5.1.0"
+        "webpack-subresource-integrity": "5.0.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -157,40 +155,38 @@
           "dev": true
         },
         "debug": {
-          "version": "4.3.4",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-          "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
           "dev": true,
           "requires": {
-            "ms": "2.1.2"
+            "ms": "2.0.0"
           }
         },
         "esbuild": {
-          "version": "0.14.22",
-          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.22.tgz",
-          "integrity": "sha512-CjFCFGgYtbFOPrwZNJf7wsuzesx8kqwAffOlbYcFDLFuUtP8xloK1GH+Ai13Qr0RZQf9tE7LMTHJ2iVGJ1SKZA==",
+          "version": "0.13.12",
+          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.12.tgz",
+          "integrity": "sha512-vTKKUt+yoz61U/BbrnmlG9XIjwpdIxmHB8DlPR0AAW6OdS+nBQBci6LUHU2q9WbBobMEIQxxDpKbkmOGYvxsow==",
           "dev": true,
           "optional": true,
           "requires": {
-            "esbuild-android-arm64": "0.14.22",
-            "esbuild-darwin-64": "0.14.22",
-            "esbuild-darwin-arm64": "0.14.22",
-            "esbuild-freebsd-64": "0.14.22",
-            "esbuild-freebsd-arm64": "0.14.22",
-            "esbuild-linux-32": "0.14.22",
-            "esbuild-linux-64": "0.14.22",
-            "esbuild-linux-arm": "0.14.22",
-            "esbuild-linux-arm64": "0.14.22",
-            "esbuild-linux-mips64le": "0.14.22",
-            "esbuild-linux-ppc64le": "0.14.22",
-            "esbuild-linux-riscv64": "0.14.22",
-            "esbuild-linux-s390x": "0.14.22",
-            "esbuild-netbsd-64": "0.14.22",
-            "esbuild-openbsd-64": "0.14.22",
-            "esbuild-sunos-64": "0.14.22",
-            "esbuild-windows-32": "0.14.22",
-            "esbuild-windows-64": "0.14.22",
-            "esbuild-windows-arm64": "0.14.22"
+            "esbuild-android-arm64": "0.13.12",
+            "esbuild-darwin-64": "0.13.12",
+            "esbuild-darwin-arm64": "0.13.12",
+            "esbuild-freebsd-64": "0.13.12",
+            "esbuild-freebsd-arm64": "0.13.12",
+            "esbuild-linux-32": "0.13.12",
+            "esbuild-linux-64": "0.13.12",
+            "esbuild-linux-arm": "0.13.12",
+            "esbuild-linux-arm64": "0.13.12",
+            "esbuild-linux-mips64le": "0.13.12",
+            "esbuild-linux-ppc64le": "0.13.12",
+            "esbuild-netbsd-64": "0.13.12",
+            "esbuild-openbsd-64": "0.13.12",
+            "esbuild-sunos-64": "0.13.12",
+            "esbuild-windows-32": "0.13.12",
+            "esbuild-windows-64": "0.13.12",
+            "esbuild-windows-arm64": "0.13.12"
           }
         },
         "glob": {
@@ -241,6 +237,12 @@
             "is-unicode-supported": "^0.1.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+          "dev": true
+        },
         "nanoid": {
           "version": "3.3.4",
           "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
@@ -265,14 +267,14 @@
           }
         },
         "postcss": {
-          "version": "8.4.5",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz",
-          "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==",
+          "version": "8.3.11",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz",
+          "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==",
           "dev": true,
           "requires": {
             "nanoid": "^3.1.30",
             "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.1"
+            "source-map-js": "^0.6.2"
           }
         },
         "rxjs": {
@@ -293,14 +295,12 @@
           }
         },
         "sass": {
-          "version": "1.49.0",
-          "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.0.tgz",
-          "integrity": "sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==",
+          "version": "1.43.4",
+          "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz",
+          "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==",
           "dev": true,
           "requires": {
-            "chokidar": ">=3.0.0 <4.0.0",
-            "immutable": "^4.0.0",
-            "source-map-js": ">=0.6.2 <2.0.0"
+            "chokidar": ">=3.0.0 <4.0.0"
           }
         },
         "semver": {
@@ -318,10 +318,16 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "source-map-js": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
+          "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+          "dev": true
+        },
         "source-map-support": {
-          "version": "0.5.21",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-          "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+          "version": "0.5.20",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz",
+          "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==",
           "dev": true,
           "requires": {
             "buffer-from": "^1.0.0",
@@ -329,19 +335,27 @@
           }
         },
         "stylus": {
-          "version": "0.56.0",
-          "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.56.0.tgz",
-          "integrity": "sha512-Ev3fOb4bUElwWu4F9P9WjnnaSpc8XB9OFHSFZSKMFL1CE1oM+oFXWEgAqPmmZIyhBihuqIQlFsVTypiiS9RxeA==",
+          "version": "0.55.0",
+          "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.55.0.tgz",
+          "integrity": "sha512-MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw==",
           "dev": true,
           "requires": {
             "css": "^3.0.0",
-            "debug": "^4.3.2",
+            "debug": "~3.1.0",
             "glob": "^7.1.6",
+            "mkdirp": "~1.0.4",
             "safer-buffer": "^2.1.2",
             "sax": "~1.2.4",
+            "semver": "^6.3.0",
             "source-map": "^0.7.3"
           },
           "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
+            },
             "source-map": {
               "version": "0.7.4",
               "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
@@ -360,12 +374,11 @@
           }
         },
         "terser": {
-          "version": "5.11.0",
-          "resolved": "https://registry.npmjs.org/terser/-/terser-5.11.0.tgz",
-          "integrity": "sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==",
+          "version": "5.9.0",
+          "resolved": "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz",
+          "integrity": "sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==",
           "dev": true,
           "requires": {
-            "acorn": "^8.5.0",
             "commander": "^2.20.0",
             "source-map": "~0.7.2",
             "source-map-support": "~0.5.20"
@@ -388,12 +401,12 @@
       }
     },
     "@angular-devkit/build-webpack": {
-      "version": "0.1302.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1302.6.tgz",
-      "integrity": "sha512-TYEh2n9tPe932rEIgdiSpojOqtDppW2jzb/empVqCkLF7WUZsXKvTanttZC34L6R2VD6SAGWhb6JDg75ghUVYA==",
+      "version": "0.1300.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1300.0.tgz",
+      "integrity": "sha512-En00FVrYdCP17fWJPPfP7QIQlqkFfCgkVnjImH02sUiSe70yGf930/3VNgKXfhawWI+X/gBewAvRNXtoSGmw/g==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1302.6",
+        "@angular-devkit/architect": "0.1300.0",
         "rxjs": "6.6.7"
       },
       "dependencies": {
@@ -415,12 +428,12 @@
       }
     },
     "@angular-devkit/core": {
-      "version": "13.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-13.2.6.tgz",
-      "integrity": "sha512-8h2mWdBTN/dYwZuzKMg2IODlOWMdbJcpQG4XVrkk9ejCPP+3aX5Aa3glCe/voN6eBNiRfs8YDM0jxmpN2aWVtg==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-13.0.0.tgz",
+      "integrity": "sha512-dWybyCroiil+1cmX/tGmx1lHRaCU9lsCL/fubTTe+GFp32hGQGtFgdm8uuVx0GUi83wgRJQDYj58za82llqHrw==",
       "dev": true,
       "requires": {
-        "ajv": "8.9.0",
+        "ajv": "8.6.3",
         "ajv-formats": "2.1.1",
         "fast-json-stable-stringify": "2.1.0",
         "magic-string": "0.25.7",
@@ -452,12 +465,12 @@
       }
     },
     "@angular-devkit/schematics": {
-      "version": "13.2.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.2.6.tgz",
-      "integrity": "sha512-mPgSqdnZRuPSMeUA+T+mwVCrq2yhXpcYm1/Rjbhy09CyHs4wSrFv21WHCrE6shlvXpcmwr0n+I0DIeagAPmjUA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.0.0.tgz",
+      "integrity": "sha512-0bOU7cIPgTmnfrl0IPv5y5cROOv32HDiG7JVTx75MTXOTWDt6dvfrNoy2CephU0hD0sss/Ju8X9x56nNzz6MEg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "13.2.6",
+        "@angular-devkit/core": "13.0.0",
         "jsonc-parser": "3.0.0",
         "magic-string": "0.25.7",
         "ora": "5.4.1",
@@ -558,9 +571,9 @@
       }
     },
     "@angular/animations": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-13.2.7.tgz",
-      "integrity": "sha512-FthGqRPQ1AOcOx/NIW65xeFYkQZJ7PpXcX59Kt+qkoUzngAQEY+UUpOteG52tmL0iZSVwOCjtxRFi9w4heVgEg==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-13.0.0.tgz",
+      "integrity": "sha512-tFe40hc+asglO6C2XDM+dWXrSPdCxqzHR3b83pH1TdhoYSLt43P7bOPP4uKH0AWCMUMpKcpJGkcbzPPCVO0QZw==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -573,18 +586,18 @@
       }
     },
     "@angular/cli": {
-      "version": "13.2.6",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-13.2.6.tgz",
-      "integrity": "sha512-xIjEaQI5sWemXXc7GXLm4u9UL5sjtrQL/y1PJvvk/Jsa8+kIT+MutOfZfC7zcdAh9fqHd8mokH3guFV8BJdFxA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-13.0.0.tgz",
+      "integrity": "sha512-qnWH/uKOOlIGAbudQ7zDEL5EyoRyP0yG6RDLnPeZBh+6g9PBrRWFeWUFidrfAZpqa/Z7iy8y/sF3uZ38YC+ILg==",
       "dev": true,
       "requires": {
-        "@angular-devkit/architect": "0.1302.6",
-        "@angular-devkit/core": "13.2.6",
-        "@angular-devkit/schematics": "13.2.6",
-        "@schematics/angular": "13.2.6",
+        "@angular-devkit/architect": "0.1300.0",
+        "@angular-devkit/core": "13.0.0",
+        "@angular-devkit/schematics": "13.0.0",
+        "@schematics/angular": "13.0.0",
         "@yarnpkg/lockfile": "1.1.0",
         "ansi-colors": "4.1.1",
-        "debug": "4.3.3",
+        "debug": "4.3.2",
         "ini": "2.0.0",
         "inquirer": "8.2.0",
         "jsonc-parser": "3.0.0",
@@ -592,8 +605,8 @@
         "npm-pick-manifest": "6.1.1",
         "open": "8.4.0",
         "ora": "5.4.1",
-        "pacote": "12.0.3",
-        "resolve": "1.22.0",
+        "pacote": "12.0.2",
+        "resolve": "1.20.0",
         "semver": "7.3.5",
         "symbol-observable": "4.0.0",
         "uuid": "8.3.2"
@@ -634,9 +647,9 @@
           "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.2",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+          "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -648,15 +661,6 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "is-core-module": {
-          "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"
-          }
-        },
         "log-symbols": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
@@ -684,23 +688,6 @@
             "wcwidth": "^1.0.1"
           }
         },
-        "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
-        },
-        "resolve": {
-          "version": "1.22.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
-          "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
-          "dev": true,
-          "requires": {
-            "is-core-module": "^2.8.1",
-            "path-parse": "^1.0.7",
-            "supports-preserve-symlinks-flag": "^1.0.0"
-          }
-        },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -728,9 +715,9 @@
       }
     },
     "@angular/common": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-13.2.7.tgz",
-      "integrity": "sha512-gSkv9aMz5q2ynIqSwgp5HEVVwlmpMYGVZFNZnEnezGY96Hza0eXlb/AYdqO7S3VQVvx+FXpvXP/eq/SsCw7rFA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-13.0.0.tgz",
+      "integrity": "sha512-7KNu6fcNeX71nrOAs29T/PGdO0fAHaX0mtmobIBeIwMF9qY1fqc7a1Rssp6/dUe9XlADf2sXVtx5ZQ8c6bAMsA==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -743,9 +730,9 @@
       }
     },
     "@angular/compiler": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-13.2.7.tgz",
-      "integrity": "sha512-auRMo+k+xCQmIBkZ5UgkAAmhbpcoOUWQrJN2PQnPl88DPquui3tXC4R6RANpWCu59oT8m29FQMviHcN3ZTFl6Q==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-13.0.0.tgz",
+      "integrity": "sha512-EBFHKDbYHSjVNlz0/7FmWU6owFAaRSx0OVjkq2zvR+ECUT8qsQNAfUAeaGHK3a4TMJ/fbgUFC3cSUY6/jhgcgg==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -758,16 +745,17 @@
       }
     },
     "@angular/compiler-cli": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-13.2.7.tgz",
-      "integrity": "sha512-EZFWHyC2PO3ECEgX/WTMaTEvH4isvtw8E/l+48YHvINeHoxPGF7Or8qEeu/lvGlXMzBd89QH1ohutfz93vNz+g==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-13.0.0.tgz",
+      "integrity": "sha512-t0ayzBT2QIKehqNaCfO2wS+WBU0PyzV2eiOnNu7rKTLrw5wlamq5nWGeT5P9yuLjjiVHYl96QyydoY1L938OeQ==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.17.2",
+        "@babel/core": "^7.8.6",
+        "canonical-path": "1.0.0",
         "chokidar": "^3.0.0",
         "convert-source-map": "^1.5.1",
         "dependency-graph": "^0.11.0",
-        "magic-string": "^0.26.0",
+        "magic-string": "^0.25.0",
         "reflect-metadata": "^0.1.2",
         "semver": "^7.0.0",
         "sourcemap-codec": "^1.4.8",
@@ -775,110 +763,6 @@
         "yargs": "^17.2.1"
       },
       "dependencies": {
-        "@ampproject/remapping": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz",
-          "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/gen-mapping": "^0.1.0",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        },
-        "@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/core": {
-          "version": "7.18.5",
-          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz",
-          "integrity": "sha512-MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ==",
-          "dev": true,
-          "requires": {
-            "@ampproject/remapping": "^2.1.0",
-            "@babel/code-frame": "^7.16.7",
-            "@babel/generator": "^7.18.2",
-            "@babel/helper-compilation-targets": "^7.18.2",
-            "@babel/helper-module-transforms": "^7.18.0",
-            "@babel/helpers": "^7.18.2",
-            "@babel/parser": "^7.18.5",
-            "@babel/template": "^7.16.7",
-            "@babel/traverse": "^7.18.5",
-            "@babel/types": "^7.18.4",
-            "convert-source-map": "^1.7.0",
-            "debug": "^4.1.0",
-            "gensync": "^1.0.0-beta.2",
-            "json5": "^2.2.1",
-            "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/generator": {
-          "version": "7.18.2",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz",
-          "integrity": "sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.18.2",
-            "@jridgewell/gen-mapping": "^0.3.0",
-            "jsesc": "^2.5.1"
-          },
-          "dependencies": {
-            "@jridgewell/gen-mapping": {
-              "version": "0.3.1",
-              "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz",
-              "integrity": "sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==",
-              "dev": true,
-              "requires": {
-                "@jridgewell/set-array": "^1.0.0",
-                "@jridgewell/sourcemap-codec": "^1.4.10",
-                "@jridgewell/trace-mapping": "^0.3.9"
-              }
-            }
-          }
-        },
-        "@babel/highlight": {
-          "version": "7.17.12",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
-          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.16.7",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@jridgewell/gen-mapping": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-          "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/set-array": "^1.0.0",
-            "@jridgewell/sourcemap-codec": "^1.4.10"
-          }
-        },
-        "magic-string": {
-          "version": "0.26.2",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz",
-          "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==",
-          "dev": true,
-          "requires": {
-            "sourcemap-codec": "^1.4.8"
-          }
-        },
         "semver": {
           "version": "7.3.7",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
@@ -897,9 +781,9 @@
       }
     },
     "@angular/core": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-13.2.7.tgz",
-      "integrity": "sha512-6J6C2ymIy+cZudock25BLEZFckhqFfXOSZw5YBIoAJuntV4hckLNfRTn/dxn5qmWF/Vw60NKdhV367YYejz6Gg==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-13.0.0.tgz",
+      "integrity": "sha512-OU7VDJR4pN0yUUbhlLiHgkTK8kcJFccHMBEtx3TKenBMkFU3CRynSzz67M4zBmXHR15729/UloL/8xuvxKQsGQ==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -912,9 +796,9 @@
       }
     },
     "@angular/forms": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-13.2.7.tgz",
-      "integrity": "sha512-Did5ShmHTu52cljmNtMxUBUGEYHJ/FV5ZpKhbI7sd/VSFhXp9KWYUbfma0m7+CUJMGmpt6bmDaN0G2WS8Es1LQ==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-13.0.0.tgz",
+      "integrity": "sha512-F2XO1vOzIgGj0OfSLJHPzKcVTKmyttlBWBxIuRoVw3yxdGPKa83ka6B+/+byEE6SY0EvIRt3uJKTqS6iA9/ZxA==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -927,15 +811,15 @@
       }
     },
     "@angular/language-service": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-13.2.7.tgz",
-      "integrity": "sha512-hkZ1du/XxG6efri3FSOPc7JBwWHgHUAwI8dAUC+xFL3ZcVhFMPwrouMo8y4w/P5RctCO0ls4dDxThn/uDEZBQA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-13.0.0.tgz",
+      "integrity": "sha512-gU8MWazBeO9InC/vhQPzd4H7BPPl41PNXbQ5VhuM0TX4aG1/fkgU/ufCn3z2Wlmjdp8g6dnQvVhiT+r3NoJPEA==",
       "dev": true
     },
     "@angular/platform-browser": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-13.2.7.tgz",
-      "integrity": "sha512-3rpeS2n+mfey9FqJg/NQKPiyHC47vgldWXmuz5FmOCHrOY54AaFfoiwQcdxzh6Lxx/CUVm0TlOS8S/xI9iEqXw==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-13.0.0.tgz",
+      "integrity": "sha512-3svk0R9UVDL0600Lf5sfFKcOrduKU17UIqrXm+iN0EBGCGostKfQb+GCFPJVZ0wUFJuXyHGovESIJX85uGhpHA==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -948,9 +832,9 @@
       }
     },
     "@angular/platform-browser-dynamic": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.2.7.tgz",
-      "integrity": "sha512-3tKiUohQ8wl4hp1zYLKvMJ7GVYpg2K5dRrihtUKkJk8xUv3iuTUI0wbNCrUDZkrWc0GMhnQNXwE22gd+hKjfKg==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.0.0.tgz",
+      "integrity": "sha512-CmQGPyCIh3Fd+hZSt1jSLSBdVwppU1x76vyQ7C33qpNt921VhuVfB54bcbMjD+PTc+Fh1+KVI5R/sUscp0F/Bw==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -963,9 +847,9 @@
       }
     },
     "@angular/router": {
-      "version": "13.2.7",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-13.2.7.tgz",
-      "integrity": "sha512-VzEFKyUE8CR23IbmAjmcSFY6pa4NsjaaTqT4mDYhzFeYc7R0s58Ow9d4Fy+0sWX6rzys01rcVNCg+ifJAnwYZA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-13.0.0.tgz",
+      "integrity": "sha512-+aNeABp83pEz6NGJ70aplsf2Dy+z4ef5vlm8ICMxUUdfQdiY1sZ/UVjMbbEYb+0XKVNc/1cVCb5xlr3KlpXXng==",
       "requires": {
         "tslib": "^2.3.0"
       },
@@ -999,20 +883,20 @@
       "dev": true
     },
     "@babel/core": {
-      "version": "7.16.12",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz",
-      "integrity": "sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/generator": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-module-transforms": "^7.16.7",
-        "@babel/helpers": "^7.16.7",
-        "@babel/parser": "^7.16.12",
-        "@babel/template": "^7.16.7",
-        "@babel/traverse": "^7.16.10",
-        "@babel/types": "^7.16.8",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.8.tgz",
+      "integrity": "sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.15.8",
+        "@babel/generator": "^7.15.8",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.8",
+        "@babel/helpers": "^7.15.4",
+        "@babel/parser": "^7.15.8",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.6",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -1050,12 +934,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz",
-      "integrity": "sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.8.tgz",
+      "integrity": "sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.16.8",
+        "@babel/types": "^7.15.6",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -1069,12 +953,12 @@
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
-      "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
+      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.16.7"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
@@ -1145,6 +1029,17 @@
         "@babel/helper-optimise-call-expression": "^7.16.7",
         "@babel/helper-replace-supers": "^7.16.7",
         "@babel/helper-split-export-declaration": "^7.16.7"
+      },
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.7"
+          }
+        }
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
@@ -1155,12 +1050,23 @@
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.16.7",
         "regexpu-core": "^5.0.1"
+      },
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.7"
+          }
+        }
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz",
-      "integrity": "sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz",
+      "integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==",
       "dev": true,
       "requires": {
         "@babel/helper-compilation-targets": "^7.13.0",
@@ -1196,6 +1102,39 @@
       "requires": {
         "@babel/template": "^7.16.7",
         "@babel/types": "^7.17.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"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.16.7",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@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"
+          }
+        }
       }
     },
     "@babel/helper-hoist-variables": {
@@ -1239,6 +1178,39 @@
         "@babel/template": "^7.16.7",
         "@babel/traverse": "^7.18.0",
         "@babel/types": "^7.18.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"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.16.7",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@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"
+          }
+        }
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -1265,6 +1237,17 @@
         "@babel/helper-annotate-as-pure": "^7.16.7",
         "@babel/helper-wrap-function": "^7.16.8",
         "@babel/types": "^7.16.8"
+      },
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.7"
+          }
+        }
       }
     },
     "@babel/helper-replace-supers": {
@@ -1329,6 +1312,39 @@
         "@babel/template": "^7.16.7",
         "@babel/traverse": "^7.16.8",
         "@babel/types": "^7.16.8"
+      },
+      "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/highlight": {
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.16.7",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@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"
+          }
+        }
       }
     },
     "@babel/helpers": {
@@ -1340,6 +1356,39 @@
         "@babel/template": "^7.16.7",
         "@babel/traverse": "^7.18.2",
         "@babel/types": "^7.18.2"
+      },
+      "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/highlight": {
+          "version": "7.17.12",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz",
+          "integrity": "sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.16.7",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "@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"
+          }
+        }
       }
     },
     "@babel/highlight": {
@@ -1359,15 +1408,6 @@
       "integrity": "sha512-YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw==",
       "dev": true
     },
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.17.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz",
-      "integrity": "sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.17.12"
-      }
-    },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.17.12",
       "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz",
@@ -1380,13 +1420,13 @@
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz",
-      "integrity": "sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz",
+      "integrity": "sha512-2Z5F2R2ibINTc63mY7FLqGfEbmofrHU9FitJW1Q7aPaKFhiPvSq6QEt/BoWN5oME3GVyjcRuNNSRbb9LC0CSWA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
@@ -1525,6 +1565,17 @@
         "@babel/helper-create-class-features-plugin": "^7.17.12",
         "@babel/helper-plugin-utils": "^7.17.12",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.7"
+          }
+        }
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
@@ -1673,14 +1724,14 @@
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.16.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz",
-      "integrity": "sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-remap-async-to-generator": "^7.16.8"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
@@ -1715,6 +1766,17 @@
         "@babel/helper-replace-supers": "^7.18.2",
         "@babel/helper-split-export-declaration": "^7.16.7",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": {
+          "version": "7.16.7",
+          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz",
+          "integrity": "sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.16.7"
+          }
+        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -1915,16 +1977,16 @@
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz",
-      "integrity": "sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.8.tgz",
+      "integrity": "sha512-+6zsde91jMzzvkzuEA3k63zCw+tm/GvuuabkpisgbDMTPQsIMHllE3XczJFFtEHLjjhKQFZmGQVRdELetlWpVw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
+        "@babel/helper-module-imports": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.5",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
         "semver": "^6.3.0"
       }
     },
@@ -1994,32 +2056,31 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.16.11",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
-      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.16.8",
-        "@babel/helper-compilation-targets": "^7.16.7",
-        "@babel/helper-plugin-utils": "^7.16.7",
-        "@babel/helper-validator-option": "^7.16.7",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.7",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-async-generator-functions": "^7.16.8",
-        "@babel/plugin-proposal-class-properties": "^7.16.7",
-        "@babel/plugin-proposal-class-static-block": "^7.16.7",
-        "@babel/plugin-proposal-dynamic-import": "^7.16.7",
-        "@babel/plugin-proposal-export-namespace-from": "^7.16.7",
-        "@babel/plugin-proposal-json-strings": "^7.16.7",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.16.7",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.7",
-        "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-        "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
-        "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.11",
-        "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
+      "version": "7.15.8",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.8.tgz",
+      "integrity": "sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.8",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.15.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.15.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
@@ -2034,44 +2095,44 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.16.7",
-        "@babel/plugin-transform-async-to-generator": "^7.16.8",
-        "@babel/plugin-transform-block-scoped-functions": "^7.16.7",
-        "@babel/plugin-transform-block-scoping": "^7.16.7",
-        "@babel/plugin-transform-classes": "^7.16.7",
-        "@babel/plugin-transform-computed-properties": "^7.16.7",
-        "@babel/plugin-transform-destructuring": "^7.16.7",
-        "@babel/plugin-transform-dotall-regex": "^7.16.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.16.7",
-        "@babel/plugin-transform-exponentiation-operator": "^7.16.7",
-        "@babel/plugin-transform-for-of": "^7.16.7",
-        "@babel/plugin-transform-function-name": "^7.16.7",
-        "@babel/plugin-transform-literals": "^7.16.7",
-        "@babel/plugin-transform-member-expression-literals": "^7.16.7",
-        "@babel/plugin-transform-modules-amd": "^7.16.7",
-        "@babel/plugin-transform-modules-commonjs": "^7.16.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.16.7",
-        "@babel/plugin-transform-modules-umd": "^7.16.7",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.8",
-        "@babel/plugin-transform-new-target": "^7.16.7",
-        "@babel/plugin-transform-object-super": "^7.16.7",
-        "@babel/plugin-transform-parameters": "^7.16.7",
-        "@babel/plugin-transform-property-literals": "^7.16.7",
-        "@babel/plugin-transform-regenerator": "^7.16.7",
-        "@babel/plugin-transform-reserved-words": "^7.16.7",
-        "@babel/plugin-transform-shorthand-properties": "^7.16.7",
-        "@babel/plugin-transform-spread": "^7.16.7",
-        "@babel/plugin-transform-sticky-regex": "^7.16.7",
-        "@babel/plugin-transform-template-literals": "^7.16.7",
-        "@babel/plugin-transform-typeof-symbol": "^7.16.7",
-        "@babel/plugin-transform-unicode-escapes": "^7.16.7",
-        "@babel/plugin-transform-unicode-regex": "^7.16.7",
-        "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.16.8",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.5.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "core-js-compat": "^3.20.2",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.15.3",
+        "@babel/plugin-transform-classes": "^7.15.4",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.15.4",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.15.4",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.15.8",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.15.6",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.5",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
         "semver": "^6.3.0"
       }
     },
@@ -2089,23 +2150,23 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz",
-      "integrity": "sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz",
-      "integrity": "sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
+      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/types": "^7.16.7"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -2191,33 +2252,16 @@
         "to-fast-properties": "^2.0.0"
       }
     },
-    "@csstools/postcss-progressive-custom-properties": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz",
-      "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "@csstools/selector-specificity": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz",
-      "integrity": "sha512-aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA==",
+    "@csstools/convert-colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
+      "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
       "dev": true
     },
     "@discoveryjs/json-ext": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz",
-      "integrity": "sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz",
+      "integrity": "sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA==",
       "dev": true
     },
     "@gar/promisify": {
@@ -2265,9 +2309,9 @@
       }
     },
     "@jridgewell/resolve-uri": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
-      "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-1.0.0.tgz",
+      "integrity": "sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==",
       "dev": true
     },
     "@jridgewell/set-array": {
@@ -2300,12 +2344,20 @@
       "requires": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
+      },
+      "dependencies": {
+        "@jridgewell/resolve-uri": {
+          "version": "3.0.7",
+          "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz",
+          "integrity": "sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==",
+          "dev": true
+        }
       }
     },
     "@ngtools/webpack": {
-      "version": "13.2.6",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.2.6.tgz",
-      "integrity": "sha512-N8SvRV91+/57TcAfbghc0k0tKCukw/7KqbDaLPAQTGFekJ4xMGT3elMzOyBXTH3Hvp5HL8/hiBt2tG04qiMf+w==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-13.0.0.tgz",
+      "integrity": "sha512-1SYRo2/ieXGRaveSUsNns3M5kcbEahp60rwZ9yA5uc3eSO7hM5CRcXi4JxAM7bAXi2cvB3zM6heMpr5gVGEBew==",
       "dev": true
     },
     "@nodelib/fs.scandir": {
@@ -2438,32 +2490,6 @@
         "read-package-json-fast": "^2.0.1"
       }
     },
-    "@rollup/plugin-commonjs": {
-      "version": "17.1.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz",
-      "integrity": "sha512-PoMdXCw0ZyvjpCMT5aV4nkL0QywxP29sODQsSGeDpr/oI49Qq9tRtAsb/LbYbDzFlOydVEqHmmZWFtXJEAX9ew==",
-      "dev": true,
-      "requires": {
-        "@rollup/pluginutils": "^3.1.0",
-        "commondir": "^1.0.1",
-        "estree-walker": "^2.0.1",
-        "glob": "^7.1.6",
-        "is-reference": "^1.2.1",
-        "magic-string": "^0.25.7",
-        "resolve": "^1.17.0"
-      },
-      "dependencies": {
-        "magic-string": {
-          "version": "0.25.7",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz",
-          "integrity": "sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==",
-          "dev": true,
-          "requires": {
-            "sourcemap-codec": "^1.4.4"
-          }
-        }
-      }
-    },
     "@rollup/plugin-json": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
@@ -2474,15 +2500,15 @@
       }
     },
     "@rollup/plugin-node-resolve": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.0.tgz",
-      "integrity": "sha512-qHjNIKYt5pCcn+5RUBQxK8krhRvf1HnyVgUCcFFcweDS7fhkOLZeYh0mhHK6Ery8/bb9tvN/ubPzmfF0qjDCTA==",
+      "version": "13.3.0",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz",
+      "integrity": "sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==",
       "dev": true,
       "requires": {
         "@rollup/pluginutils": "^3.1.0",
         "@types/resolve": "1.17.1",
-        "builtin-modules": "^3.1.0",
         "deepmerge": "^4.2.2",
+        "is-builtin-module": "^3.1.0",
         "is-module": "^1.0.0",
         "resolve": "^1.19.0"
       }
@@ -2496,24 +2522,16 @@
         "@types/estree": "0.0.39",
         "estree-walker": "^1.0.1",
         "picomatch": "^2.2.2"
-      },
-      "dependencies": {
-        "estree-walker": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
-          "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
-          "dev": true
-        }
       }
     },
     "@schematics/angular": {
-      "version": "13.2.6",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-13.2.6.tgz",
-      "integrity": "sha512-8NzHMX9+FSgaB0lJYxlTJv9OcBuolwZJqo9M/yX3RPSqSHghA33jWwgVbV551hBJOpbVEePerG1DQkIC99DXKA==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-13.0.0.tgz",
+      "integrity": "sha512-2Dk/N0cHQEFjOd2DwmEOoav88RCxFNKtVNImW9zcZQ+siZa7aEID7dtFeySY+NKuQmlu+icQ2+zdDKJLo8h42g==",
       "dev": true,
       "requires": {
-        "@angular-devkit/core": "13.2.6",
-        "@angular-devkit/schematics": "13.2.6",
+        "@angular-devkit/core": "13.0.0",
+        "@angular-devkit/schematics": "13.0.0",
         "jsonc-parser": "3.0.0"
       }
     },
@@ -2523,44 +2541,6 @@
       "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
       "dev": true
     },
-    "@types/body-parser": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
-      "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
-      "dev": true,
-      "requires": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "@types/bonjour": {
-      "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
-      "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect": {
-      "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
-      "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
-      "dev": true,
-      "requires": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
     "@types/eslint": {
       "version": "8.4.3",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz",
@@ -2587,29 +2567,6 @@
       "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
       "dev": true
     },
-    "@types/express": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz",
-      "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==",
-      "dev": true,
-      "requires": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.17.29",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz",
-      "integrity": "sha512-uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*"
-      }
-    },
     "@types/http-proxy": {
       "version": "1.17.9",
       "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
@@ -2634,26 +2591,12 @@
         "@types/jasmine": "*"
       }
     },
-    "@types/jquery": {
-      "version": "3.3.33",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.33.tgz",
-      "integrity": "sha512-U6IdXYGkfUI42SR79vB2Spj+h1Ly3J3UZjpd8mi943lh126TK7CB+HZOxGh2nM3IySor7wqVQdemD/xtydsBKA==",
-      "requires": {
-        "@types/sizzle": "*"
-      }
-    },
     "@types/json-schema": {
       "version": "7.0.11",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz",
       "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
       "dev": true
     },
-    "@types/mime": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz",
-      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
-      "dev": true
-    },
     "@types/node": {
       "version": "12.12.28",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.28.tgz",
@@ -2666,24 +2609,6 @@
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
-    "@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
-      "dev": true
-    },
-    "@types/qs": {
-      "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
-      "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
-      "dev": true
-    },
-    "@types/range-parser": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
-      "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
-      "dev": true
-    },
     "@types/resolve": {
       "version": "1.17.1",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz",
@@ -2705,48 +2630,6 @@
       "integrity": "sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==",
       "dev": true
     },
-    "@types/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
-      "dev": true,
-      "requires": {
-        "@types/express": "*"
-      }
-    },
-    "@types/serve-static": {
-      "version": "1.13.10",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz",
-      "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==",
-      "dev": true,
-      "requires": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
-    },
-    "@types/sizzle": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
-      "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="
-    },
-    "@types/sockjs": {
-      "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
-      "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -3011,9 +2894,9 @@
       }
     },
     "ajv": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz",
-      "integrity": "sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==",
+      "version": "8.6.3",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz",
+      "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==",
       "dev": true,
       "requires": {
         "fast-deep-equal": "^3.1.1",
@@ -3045,12 +2928,6 @@
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true
     },
-    "alphanum-sort": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
-      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=",
-      "dev": true
-    },
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -3177,9 +3054,9 @@
       "dev": true
     },
     "array-union": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
-      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
     "array-uniq": {
@@ -3260,20 +3137,6 @@
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
       "dev": true
     },
-    "autoprefixer": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.4.tgz",
-      "integrity": "sha512-DCCdUQiMD+P/as8m3XkeTUkUKuuRqLGcwD0nll7wevhqoJfMRpJlkFd1+MQh1pvupjiQuip42lc/VFvfUTMSKw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.16.1",
-        "caniuse-lite": "^1.0.30001181",
-        "colorette": "^1.2.1",
-        "fraction.js": "^4.0.13",
-        "normalize-range": "^0.1.2",
-        "postcss-value-parser": "^4.1.0"
-      }
-    },
     "aws-sign2": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
@@ -3361,33 +3224,33 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz",
-      "integrity": "sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz",
+      "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
+        "@babel/helper-define-polyfill-provider": "^0.2.4",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz",
-      "integrity": "sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==",
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz",
+      "integrity": "sha512-ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1",
-        "core-js-compat": "^3.21.0"
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.16.2"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz",
-      "integrity": "sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz",
+      "integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.1"
+        "@babel/helper-define-polyfill-provider": "^0.2.4"
       }
     },
     "babel-runtime": {
@@ -3526,6 +3389,16 @@
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bl": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -3707,9 +3580,9 @@
       "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
     },
     "builtins": {
@@ -3777,54 +3650,24 @@
         "get-intrinsic": "^1.0.2"
       }
     },
-    "caller-callsite": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
-      "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
-      "dev": true,
-      "requires": {
-        "callsites": "^2.0.0"
-      }
-    },
-    "caller-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
-      "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
-      "dev": true,
-      "requires": {
-        "caller-callsite": "^2.0.0"
-      }
-    },
-    "callsites": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
-      "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
-      "dev": true
-    },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true
     },
-    "caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
     "caniuse-lite": {
       "version": "1.0.30001187",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz",
       "integrity": "sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA==",
       "dev": true
     },
+    "canonical-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz",
+      "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==",
+      "dev": true
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -3960,17 +3803,6 @@
         "shallow-clone": "^3.0.0"
       }
     },
-    "coa": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
-      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
-      "dev": true,
-      "requires": {
-        "@types/q": "^1.5.1",
-        "chalk": "^2.4.1",
-        "q": "^1.1.2"
-      }
-    },
     "codelyzer": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-6.0.1.tgz",
@@ -4035,16 +3867,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "color": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
-      "integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.1",
-        "color-string": "^1.5.4"
-      }
-    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -4060,16 +3882,6 @@
       "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
       "dev": true
     },
-    "color-string": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz",
-      "integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==",
-      "dev": true,
-      "requires": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
     "color-support": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
@@ -4275,26 +4087,30 @@
       "dev": true
     },
     "copy-webpack-plugin": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz",
-      "integrity": "sha512-nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg==",
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz",
+      "integrity": "sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw==",
       "dev": true,
       "requires": {
-        "fast-glob": "^3.2.7",
-        "glob-parent": "^6.0.1",
-        "globby": "^12.0.2",
+        "fast-glob": "^3.2.5",
+        "glob-parent": "^6.0.0",
+        "globby": "^11.0.3",
         "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
+        "p-limit": "^3.1.0",
+        "schema-utils": "^3.0.0",
         "serialize-javascript": "^6.0.0"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+        "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.3"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "glob-parent": {
@@ -4315,24 +4131,32 @@
             "is-extglob": "^2.1.1"
           }
         },
+        "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,
+          "requires": {
+            "yocto-queue": "^0.1.0"
+          }
+        },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
     "core-js": {
-      "version": "3.20.3",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz",
-      "integrity": "sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==",
+      "version": "3.19.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.0.tgz",
+      "integrity": "sha512-L1TpFRWXZ76vH1yLM+z6KssLZrP8Z6GxxW4auoCj+XiViOzNPJCAuTIkn03BGdFe6Z5clX5t64wRIRypsZQrUg==",
       "dev": true
     },
     "core-js-compat": {
@@ -4390,18 +4214,6 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
-      "dev": true,
-      "requires": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      }
-    },
     "cpx": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/cpx/-/cpx-1.5.0.tgz",
@@ -4535,7 +4347,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
         },
         "glob-parent": {
           "version": "2.0.0",
@@ -4932,13 +4748,13 @@
       }
     },
     "critters": {
-      "version": "0.0.16",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz",
-      "integrity": "sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==",
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.14.tgz",
+      "integrity": "sha512-YiBoGKfU8/xg+tVMw0KfMBgmr0TWa1JGmRXDzbQRQQaDarGUcZZtZEB25QyYrLasQZAnvqoZhSg2GW0zdsQkYQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
-        "css-select": "^4.2.0",
+        "css-select": "^4.1.3",
         "parse5": "^6.0.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.1",
         "postcss": "^8.3.7",
@@ -5111,51 +4927,28 @@
       }
     },
     "css-blank-pseudo": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz",
-      "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-          "dev": true,
-          "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
-          }
-        }
-      }
-    },
-    "css-color-names": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
-      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=",
-      "dev": true
-    },
-    "css-declaration-sorter": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz",
-      "integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
+      "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.1",
-        "timsort": "^0.3.0"
+        "postcss": "^7.0.5"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -5163,43 +4956,64 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
     "css-has-pseudo": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz",
-      "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
+      "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.9"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^5.0.0-rc.4"
       },
       "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-          "dev": true,
-          "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
-          }
-        }
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+          "dev": true
+        },
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+          "dev": true,
+          "requires": {
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
     "css-loader": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.1.tgz",
-      "integrity": "sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.5.0.tgz",
+      "integrity": "sha512-VmuSdQa3K+wJsl39i7X3qGBM5+ZHmtTnv65fqMGI+fzmHoYmszTVvTqC1XN8JwWDViCB1a8wgNim5SV4fb37xg==",
       "dev": true,
       "requires": {
         "icss-utils": "^5.1.0",
@@ -5240,25 +5054,29 @@
         }
       }
     },
-    "css-parse": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz",
-      "integrity": "sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=",
+    "css-prefers-color-scheme": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
+      "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
       "dev": true,
       "requires": {
-        "css": "^2.0.0"
+        "postcss": "^7.0.5"
       },
       "dependencies": {
-        "css": {
-          "version": "2.2.4",
-          "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
-          "integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "inherits": "^2.0.3",
-            "source-map": "^0.6.1",
-            "source-map-resolve": "^0.5.2",
-            "urix": "^0.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -5266,46 +5084,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "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"
-          }
         }
       }
     },
-    "css-prefers-color-scheme": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz",
-      "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==",
-      "dev": true
-    },
-    "css-select": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
-      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
-      "dev": true,
-      "requires": {
-        "boolbase": "^1.0.0",
-        "css-what": "^3.2.1",
-        "domutils": "^1.7.0",
-        "nth-check": "^1.0.2"
-      }
-    },
-    "css-select-base-adapter": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
-      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
-      "dev": true
-    },
     "css-selector-tokenizer": {
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz",
@@ -5316,30 +5097,6 @@
         "fastparse": "^1.1.2"
       }
     },
-    "css-tree": {
-      "version": "1.0.0-alpha.37",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
-      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
-      "dev": true,
-      "requires": {
-        "mdn-data": "2.0.4",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
-    "css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
-      "dev": true
-    },
     "cssauron": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz",
@@ -5350,9 +5107,9 @@
       }
     },
     "cssdb": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-5.1.0.tgz",
-      "integrity": "sha512-/vqjXhv1x9eGkE/zO6o8ZOI7dgdZbLVLUGyVRbPgk6YipXbW87YzUCcO+Jrmi5bwJlAH6oD+MNeZyRgXea1GZw==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
+      "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==",
       "dev": true
     },
     "cssesc": {
@@ -5361,204 +5118,10 @@
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
-    "cssnano": {
-      "version": "4.1.10",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz",
-      "integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^5.0.0",
-        "cssnano-preset-default": "^4.0.7",
-        "is-resolvable": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "cssnano-preset-default": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz",
-      "integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
-      "dev": true,
-      "requires": {
-        "css-declaration-sorter": "^4.0.1",
-        "cssnano-util-raw-cache": "^4.0.1",
-        "postcss": "^7.0.0",
-        "postcss-calc": "^7.0.1",
-        "postcss-colormin": "^4.0.3",
-        "postcss-convert-values": "^4.0.1",
-        "postcss-discard-comments": "^4.0.2",
-        "postcss-discard-duplicates": "^4.0.2",
-        "postcss-discard-empty": "^4.0.1",
-        "postcss-discard-overridden": "^4.0.1",
-        "postcss-merge-longhand": "^4.0.11",
-        "postcss-merge-rules": "^4.0.3",
-        "postcss-minify-font-values": "^4.0.2",
-        "postcss-minify-gradients": "^4.0.2",
-        "postcss-minify-params": "^4.0.2",
-        "postcss-minify-selectors": "^4.0.2",
-        "postcss-normalize-charset": "^4.0.1",
-        "postcss-normalize-display-values": "^4.0.2",
-        "postcss-normalize-positions": "^4.0.2",
-        "postcss-normalize-repeat-style": "^4.0.2",
-        "postcss-normalize-string": "^4.0.2",
-        "postcss-normalize-timing-functions": "^4.0.2",
-        "postcss-normalize-unicode": "^4.0.1",
-        "postcss-normalize-url": "^4.0.1",
-        "postcss-normalize-whitespace": "^4.0.2",
-        "postcss-ordered-values": "^4.1.2",
-        "postcss-reduce-initial": "^4.0.3",
-        "postcss-reduce-transforms": "^4.0.2",
-        "postcss-svgo": "^4.0.2",
-        "postcss-unique-selectors": "^4.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "cssnano-util-get-arguments": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz",
-      "integrity": "sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=",
-      "dev": true
-    },
-    "cssnano-util-get-match": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz",
-      "integrity": "sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=",
-      "dev": true
-    },
-    "cssnano-util-raw-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz",
-      "integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "cssnano-util-same-parent": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz",
-      "integrity": "sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==",
-      "dev": true
-    },
-    "csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dev": true,
-      "requires": {
-        "css-tree": "^1.1.2"
-      },
-      "dependencies": {
-        "css-tree": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz",
-          "integrity": "sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ==",
-          "dev": true,
-          "requires": {
-            "mdn-data": "2.0.14",
-            "source-map": "^0.6.1"
-          }
-        },
-        "mdn-data": {
-          "version": "2.0.14",
-          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-          "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "cuint": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz",
-      "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=",
+      "integrity": "sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==",
       "dev": true
     },
     "custom-event": {
@@ -5717,34 +5280,6 @@
         "p-map": "^4.0.0",
         "rimraf": "^3.0.2",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "array-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-          "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-          "dev": true
-        },
-        "globby": {
-          "version": "11.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-          "dev": true,
-          "requires": {
-            "array-union": "^2.1.0",
-            "dir-glob": "^3.0.1",
-            "fast-glob": "^3.2.9",
-            "ignore": "^5.2.0",
-            "merge2": "^1.4.1",
-            "slash": "^3.0.0"
-          }
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        }
       }
     },
     "delayed-stream": {
@@ -5841,30 +5376,6 @@
         "void-elements": "^2.0.0"
       }
     },
-    "dom-serializer": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
-          "integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
     "domhandler": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
@@ -5882,25 +5393,6 @@
         }
       }
     },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "duplexer": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
@@ -6105,45 +5597,12 @@
         "is-arrayish": "^0.2.1"
       }
     },
-    "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"
-      }
-    },
     "es-module-lexer": {
       "version": "0.9.3",
       "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
       "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
       "dev": true
     },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
     "es6-promise": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
@@ -6160,141 +5619,127 @@
       }
     },
     "esbuild-android-arm64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.22.tgz",
-      "integrity": "sha512-k1Uu4uC4UOFgrnTj2zuj75EswFSEBK+H6lT70/DdS4mTAOfs2ECv2I9ZYvr3w0WL0T4YItzJdK7fPNxcPw6YmQ==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.12.tgz",
+      "integrity": "sha512-TSVZVrb4EIXz6KaYjXfTzPyyRpXV5zgYIADXtQsIenjZ78myvDGaPi11o4ZSaHIwFHsuwkB6ne5SZRBwAQ7maw==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.22.tgz",
-      "integrity": "sha512-d8Ceuo6Vw6HM3fW218FB6jTY6O3r2WNcTAU0SGsBkXZ3k8SDoRLd3Nrc//EqzdgYnzDNMNtrWegK2Qsss4THhw==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.12.tgz",
+      "integrity": "sha512-c51C+N+UHySoV2lgfWSwwmlnLnL0JWj/LzuZt9Ltk9ub1s2Y8cr6SQV5W3mqVH1egUceew6KZ8GyI4nwu+fhsw==",
       "dev": true,
       "optional": true
     },
     "esbuild-darwin-arm64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.22.tgz",
-      "integrity": "sha512-YAt9Tj3SkIUkswuzHxkaNlT9+sg0xvzDvE75LlBo4DI++ogSgSmKNR6B4eUhU5EUUepVXcXdRIdqMq9ppeRqfw==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.12.tgz",
+      "integrity": "sha512-JvAMtshP45Hd8A8wOzjkY1xAnTKTYuP/QUaKp5eUQGX+76GIie3fCdUUr2ZEKdvpSImNqxiZSIMziEiGB5oUmQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.22.tgz",
-      "integrity": "sha512-ek1HUv7fkXMy87Qm2G4IRohN+Qux4IcnrDBPZGXNN33KAL0pEJJzdTv0hB/42+DCYWylSrSKxk3KUXfqXOoH4A==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.12.tgz",
+      "integrity": "sha512-r6On/Skv9f0ZjTu6PW5o7pdXr8aOgtFOEURJZYf1XAJs0IQ+gW+o1DzXjVkIoT+n1cm3N/t1KRJfX71MPg/ZUA==",
       "dev": true,
       "optional": true
     },
     "esbuild-freebsd-arm64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.22.tgz",
-      "integrity": "sha512-zPh9SzjRvr9FwsouNYTqgqFlsMIW07O8mNXulGeQx6O5ApgGUBZBgtzSlBQXkHi18WjrosYfsvp5nzOKiWzkjQ==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.12.tgz",
+      "integrity": "sha512-F6LmI2Q1gii073kmBE3NOTt/6zLL5zvZsxNLF8PMAwdHc+iBhD1vzfI8uQZMJA1IgXa3ocr3L3DJH9fLGXy6Yw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-32": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.22.tgz",
-      "integrity": "sha512-SnpveoE4nzjb9t2hqCIzzTWBM0RzcCINDMBB67H6OXIuDa4KqFqaIgmTchNA9pJKOVLVIKd5FYxNiJStli21qg==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.12.tgz",
+      "integrity": "sha512-U1UZwG3UIwF7/V4tCVAo/nkBV9ag5KJiJTt+gaCmLVWH3bPLX7y+fNlhIWZy8raTMnXhMKfaTvWZ9TtmXzvkuQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.22.tgz",
-      "integrity": "sha512-Zcl9Wg7gKhOWWNqAjygyqzB+fJa19glgl2JG7GtuxHyL1uEnWlpSMytTLMqtfbmRykIHdab797IOZeKwk5g0zg==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.12.tgz",
+      "integrity": "sha512-YpXSwtu2NxN3N4ifJxEdsgd6Q5d8LYqskrAwjmoCT6yQnEHJSF5uWcxv783HWN7lnGpJi9KUtDvYsnMdyGw71Q==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.22.tgz",
-      "integrity": "sha512-soPDdbpt/C0XvOOK45p4EFt8HbH5g+0uHs5nUKjHVExfgR7du734kEkXR/mE5zmjrlymk5AA79I0VIvj90WZ4g==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.12.tgz",
+      "integrity": "sha512-SyiT/JKxU6J+DY2qUiSLZJqCAftIt3uoGejZ0HDnUM2MGJqEGSGh7p1ecVL2gna3PxS4P+j6WAehCwgkBPXNIw==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-arm64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.22.tgz",
-      "integrity": "sha512-8q/FRBJtV5IHnQChO3LHh/Jf7KLrxJ/RCTGdBvlVZhBde+dk3/qS9fFsUy+rs3dEi49aAsyVitTwlKw1SUFm+A==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.12.tgz",
+      "integrity": "sha512-sgDNb8kb3BVodtAlcFGgwk+43KFCYjnFOaOfJibXnnIojNWuJHpL6aQJ4mumzNWw8Rt1xEtDQyuGK9f+Y24jGA==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-mips64le": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.22.tgz",
-      "integrity": "sha512-SiNDfuRXhGh1JQLLA9JPprBgPVFOsGuQ0yDfSPTNxztmVJd8W2mX++c4FfLpAwxuJe183mLuKf7qKCHQs5ZnBQ==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.12.tgz",
+      "integrity": "sha512-qQJHlZBG+QwVIA8AbTEtbvF084QgDi4DaUsUnA+EolY1bxrG+UyOuGflM2ZritGhfS/k7THFjJbjH2wIeoKA2g==",
       "dev": true,
       "optional": true
     },
     "esbuild-linux-ppc64le": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.22.tgz",
-      "integrity": "sha512-6t/GI9I+3o1EFm2AyN9+TsjdgWCpg2nwniEhjm2qJWtJyJ5VzTXGUU3alCO3evopu8G0hN2Bu1Jhz2YmZD0kng==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-riscv64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.22.tgz",
-      "integrity": "sha512-AyJHipZKe88sc+tp5layovquw5cvz45QXw5SaDgAq2M911wLHiCvDtf/07oDx8eweCyzYzG5Y39Ih568amMTCQ==",
-      "dev": true,
-      "optional": true
-    },
-    "esbuild-linux-s390x": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.22.tgz",
-      "integrity": "sha512-Sz1NjZewTIXSblQDZWEFZYjOK6p8tV6hrshYdXZ0NHTjWE+lwxpOpWeElUGtEmiPcMT71FiuA9ODplqzzSxkzw==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.12.tgz",
+      "integrity": "sha512-2dSnm1ldL7Lppwlo04CGQUpwNn5hGqXI38OzaoPOkRsBRWFBozyGxTFSee/zHFS+Pdh3b28JJbRK3owrrRgWNw==",
       "dev": true,
       "optional": true
     },
     "esbuild-netbsd-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.22.tgz",
-      "integrity": "sha512-TBbCtx+k32xydImsHxvFgsOCuFqCTGIxhzRNbgSL1Z2CKhzxwT92kQMhxort9N/fZM2CkRCPPs5wzQSamtzEHA==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.12.tgz",
+      "integrity": "sha512-D4raxr02dcRiQNbxOLzpqBzcJNFAdsDNxjUbKkDMZBkL54Z0vZh4LRndycdZAMcIdizC/l/Yp/ZsBdAFxc5nbA==",
       "dev": true,
       "optional": true
     },
     "esbuild-openbsd-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.22.tgz",
-      "integrity": "sha512-vK912As725haT313ANZZZN+0EysEEQXWC/+YE4rQvOQzLuxAQc2tjbzlAFREx3C8+uMuZj/q7E5gyVB7TzpcTA==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.12.tgz",
+      "integrity": "sha512-KuLCmYMb2kh05QuPJ+va60bKIH5wHL8ypDkmpy47lzwmdxNsuySeCMHuTv5o2Af1RUn5KLO5ZxaZeq4GEY7DaQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-sunos-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.22.tgz",
-      "integrity": "sha512-/mbJdXTW7MTcsPhtfDsDyPEOju9EOABvCjeUU2OJ7fWpX/Em/H3WYDa86tzLUbcVg++BScQDzqV/7RYw5XNY0g==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.12.tgz",
+      "integrity": "sha512-jBsF+e0woK3miKI8ufGWKG3o3rY9DpHvCVRn5eburMIIE+2c+y3IZ1srsthKyKI6kkXLvV4Cf/E7w56kLipMXw==",
       "dev": true,
       "optional": true
     },
     "esbuild-wasm": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.14.22.tgz",
-      "integrity": "sha512-FOSAM29GN1fWusw0oLMv6JYhoheDIh5+atC72TkJKfIUMID6yISlicoQSd9gsNSFsNBvABvtE2jR4JB1j4FkFw==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.13.12.tgz",
+      "integrity": "sha512-eGdiSewbnJffEvyA0qQmr+w3HurBMVp4QhOfICzeeoL9naC8qC3PFaw6hZaqSgks5DXnQONtUGUFLsX3eXpq8A==",
       "dev": true
     },
     "esbuild-windows-32": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.22.tgz",
-      "integrity": "sha512-1vRIkuvPTjeSVK3diVrnMLSbkuE36jxA+8zGLUOrT4bb7E/JZvDRhvtbWXWaveUc/7LbhaNFhHNvfPuSw2QOQg==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.12.tgz",
+      "integrity": "sha512-L9m4lLFQrFeR7F+eLZXG82SbXZfUhyfu6CexZEil6vm+lc7GDCE0Q8DiNutkpzjv1+RAbIGVva9muItQ7HVTkQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.22.tgz",
-      "integrity": "sha512-AxjIDcOmx17vr31C5hp20HIwz1MymtMjKqX4qL6whPj0dT9lwxPexmLj6G1CpR3vFhui6m75EnBEe4QL82SYqw==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.12.tgz",
+      "integrity": "sha512-k4tX4uJlSbSkfs78W5d9+I9gpd+7N95W7H2bgOMFPsYREVJs31+Q2gLLHlsnlY95zBoPQMIzHooUIsixQIBjaQ==",
       "dev": true,
       "optional": true
     },
     "esbuild-windows-arm64": {
-      "version": "0.14.22",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.22.tgz",
-      "integrity": "sha512-5wvQ+39tHmRhNpu2Fx04l7QfeK3mQ9tKzDqqGR8n/4WUxsFxnVLfDRBGirIfk4AfWlxk60kqirlODPoT5LqMUg==",
+      "version": "0.13.12",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.12.tgz",
+      "integrity": "sha512-2tTv/BpYRIvuwHpp2M960nG7uvL+d78LFW/ikPItO+2GfK51CswIKSetSpDii+cjz8e9iSPgs+BU4o8nWICBwQ==",
       "dev": true,
       "optional": true
     },
@@ -6356,9 +5801,9 @@
       "dev": true
     },
     "estree-walker": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
-      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz",
+      "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==",
       "dev": true
     },
     "esutils": {
@@ -6785,6 +6230,13 @@
         "escape-string-regexp": "^1.0.5"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filename-regex": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
@@ -6861,9 +6313,9 @@
       "dev": true
     },
     "find-parent-dir": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz",
-      "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=",
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz",
+      "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==",
       "dev": true
     },
     "find-up": {
@@ -6882,6 +6334,12 @@
       "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
       "dev": true
     },
+    "flatten": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+      "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
+      "dev": true
+    },
     "follow-redirects": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.2.tgz",
@@ -6926,12 +6384,6 @@
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
     },
-    "fraction.js": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz",
-      "integrity": "sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA==",
-      "dev": true
-    },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -7066,12 +6518,6 @@
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true
     },
-    "get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=",
-      "dev": true
-    },
     "get-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
@@ -7174,17 +6620,17 @@
       "dev": true
     },
     "globby": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
-      "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
-        "array-union": "^3.0.1",
+        "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.7",
-        "ignore": "^5.1.9",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
         "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "slash": "^3.0.0"
       }
     },
     "graceful-fs": {
@@ -7388,12 +6834,6 @@
       "integrity": "sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==",
       "dev": true
     },
-    "hex-color-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
-      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==",
-      "dev": true
-    },
     "hosted-git-info": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
@@ -7441,24 +6881,6 @@
         }
       }
     },
-    "hsl-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz",
-      "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=",
-      "dev": true
-    },
-    "hsla-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz",
-      "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=",
-      "dev": true
-    },
-    "html-comment-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
-      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==",
-      "dev": true
-    },
     "html-entities": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
@@ -7636,16 +7058,6 @@
       "integrity": "sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==",
       "dev": true
     },
-    "import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
-      "dev": true,
-      "requires": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      }
-    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -7822,24 +7234,44 @@
         }
       }
     },
+    "internal-ip": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-6.2.0.tgz",
+      "integrity": "sha512-D8WGsR6yDt8uq7vDMu7mjcR+yRMm3dW8yufyChmszWRjcSHuxLBkR3GdS2HZAjodsaGuCvXeEJpueisXJULghg==",
+      "dev": true,
+      "requires": {
+        "default-gateway": "^6.0.0",
+        "ipaddr.js": "^1.9.1",
+        "is-ip": "^3.1.0",
+        "p-event": "^4.2.0"
+      },
+      "dependencies": {
+        "ipaddr.js": {
+          "version": "1.9.1",
+          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+          "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+          "dev": true
+        }
+      }
+    },
     "ip": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz",
       "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==",
       "dev": true
     },
+    "ip-regex": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz",
+      "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==",
+      "dev": true
+    },
     "ipaddr.js": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
       "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
       "dev": true
     },
-    "is-absolute-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
-      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=",
-      "dev": true
-    },
     "is-accessor-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -7891,24 +7323,13 @@
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
       "dev": true
     },
-    "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
-    },
-    "is-color-stop": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz",
-      "integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
+    "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": {
-        "css-color-names": "^0.0.4",
-        "hex-color-regex": "^1.1.0",
-        "hsl-regex": "^1.0.0",
-        "hsla-regex": "^1.0.0",
-        "rgb-regex": "^1.0.1",
-        "rgba-regex": "^1.0.0"
+        "builtin-modules": "^3.0.0"
       }
     },
     "is-core-module": {
@@ -7965,12 +7386,6 @@
         }
       }
     },
-    "is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
-      "dev": true
-    },
     "is-docker": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
@@ -8025,6 +7440,15 @@
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "dev": true
     },
+    "is-ip": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-3.1.0.tgz",
+      "integrity": "sha512-35vd5necO7IitFPjd/YBeqwWnyDWbuLH9ZXQdMfDA8TEo7pv5X8yfrvVO3xbJbLUlERCMvf6X0hTUamQxCYJ9Q==",
+      "dev": true,
+      "requires": {
+        "ip-regex": "^4.0.0"
+      }
+    },
     "is-lambda": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz",
@@ -8034,13 +7458,7 @@
     "is-module": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
-    },
-    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==",
       "dev": true
     },
     "is-number": {
@@ -8049,12 +7467,6 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
     "is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -8094,15 +7506,6 @@
       "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
       "dev": true
     },
-    "is-reference": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
-      "integrity": "sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*"
-      }
-    },
     "is-regex": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
@@ -8113,36 +7516,12 @@
         "has-symbols": "^1.0.1"
       }
     },
-    "is-resolvable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
-      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
-      "dev": true
-    },
     "is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true
     },
-    "is-svg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
-      "integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
-      "dev": true,
-      "requires": {
-        "html-comment-regex": "^1.1.0"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -8722,9 +8101,9 @@
       "dev": true
     },
     "less": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/less/-/less-4.1.1.tgz",
-      "integrity": "sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/less/-/less-4.1.3.tgz",
+      "integrity": "sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==",
       "dev": true,
       "requires": {
         "copy-anything": "^2.0.1",
@@ -8733,12 +8112,44 @@
         "image-size": "~0.5.0",
         "make-dir": "^2.1.0",
         "mime": "^1.4.1",
-        "needle": "^2.5.2",
+        "needle": "^3.1.0",
         "parse-node-version": "^1.0.1",
         "source-map": "~0.6.0",
-        "tslib": "^1.10.0"
+        "tslib": "^2.3.0"
       },
       "dependencies": {
+        "debug": {
+          "version": "3.2.7",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "iconv-lite": {
+          "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,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        },
+        "needle": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/needle/-/needle-3.1.0.tgz",
+          "integrity": "sha512-gCE9weDhjVGCRqS8dwDR/D3GTAeyXLXuqp7I8EzH6DllZGXSUyxuqqLh+YX9rMAWaaTFyVAg6rHGL25dqvczKw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "^3.2.6",
+            "iconv-lite": "^0.6.3",
+            "sax": "^1.2.4"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -8747,9 +8158,9 @@
           "optional": true
         },
         "tslib": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
+          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
           "dev": true
         }
       }
@@ -8764,13 +8175,10 @@
       }
     },
     "license-webpack-plugin": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz",
-      "integrity": "sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==",
-      "dev": true,
-      "requires": {
-        "webpack-sources": "^3.0.0"
-      }
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-3.0.0.tgz",
+      "integrity": "sha512-Owp0mXaJu/09h9hvZTazMni/Ni7bjh4R4xIfLhWP1O2wrhhKtezAA8U42TTeNDpyDMUD2ljeGC8Jh9xSFnyq4Q==",
+      "dev": true
     },
     "lie": {
       "version": "3.3.0",
@@ -8794,10 +8202,21 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
-      "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.0.0.tgz",
+      "integrity": "sha512-ry4RE7qen73BFLgihlbyllGIW9SVWLUD5Cq9VWtzrqhntOMOJl8yEjA89d5mCUTT0puCnHo4EecO6bz+BOAS8w==",
+      "dev": true,
+      "requires": {
+        "big.js": "^6.1.1"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-6.2.0.tgz",
+          "integrity": "sha512-paIKvJiAaOYdLt6MfnvxkDo64lTOV257XYJyX3oJnJQocIclUn+48k6ZerH/c5FxWE6DGJu1TKDYis7tqHg9kg==",
+          "dev": true
+        }
+      }
     },
     "locate-path": {
       "version": "5.0.0",
@@ -8820,25 +8239,14 @@
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "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.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=",
-      "dev": true
-    },
     "log-symbols": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
-      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "requires": {
-        "chalk": "^4.0.0"
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8851,9 +8259,9 @@
           }
         },
         "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",
@@ -8992,12 +8400,6 @@
       "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==",
       "dev": true
     },
-    "mdn-data": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
-      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
-      "dev": true
-    },
     "media-typer": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
@@ -9083,33 +8485,35 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz",
-      "integrity": "sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==",
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.3.tgz",
+      "integrity": "sha512-zekavl9mZuGyk7COjsfFY/f655AX61EKE0AthXPrmDk+oZyjZ9WzO4WPjXnnO9xl8obK2kmM6rAQrBEmk+WK1g==",
       "dev": true,
       "requires": {
-        "schema-utils": "^4.0.0"
+        "schema-utils": "^3.1.0"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+        "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.3"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
@@ -9267,10 +8671,17 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "dev": true
     },
+    "nan": {
+      "version": "2.16.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.16.0.tgz",
+      "integrity": "sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA==",
+      "dev": true,
+      "optional": true
+    },
     "nanoid": {
-      "version": "3.1.20",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz",
-      "integrity": "sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==",
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
       "dev": true
     },
     "nanomatch": {
@@ -9329,67 +8740,189 @@
       "dev": true
     },
     "ng-packagr": {
-      "version": "11.2.2",
-      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-11.2.2.tgz",
-      "integrity": "sha512-zCRjoXgmAGC3RNTJqr0tqH6i+o/IlRM87wv49el6dO2fyROSWNzggb9d+Lu5MS4p/Gba4kkNNwTTOfjvJbDXlg==",
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-13.0.0.tgz",
+      "integrity": "sha512-Si0BMJLFy0A1JTDbNrbwwCmgG00h3QFhKLgenHFRwICGPJxAmCqwMmp5miWT7wknAJvqptFyObQ+SbBrUvl4cg==",
       "dev": true,
       "requires": {
-        "@rollup/plugin-commonjs": "^17.0.0",
         "@rollup/plugin-json": "^4.1.0",
-        "@rollup/plugin-node-resolve": "^11.1.0",
-        "ajv": "^7.0.3",
+        "@rollup/plugin-node-resolve": "^13.0.0",
+        "ajv": "^8.0.0",
         "ansi-colors": "^4.1.1",
-        "autoprefixer": "^10.2.4",
         "browserslist": "^4.16.1",
+        "cacache": "^15.0.6",
         "chokidar": "^3.5.1",
-        "commander": "^7.0.0",
-        "cssnano": "^4.1.10",
+        "commander": "^8.0.0",
+        "dependency-graph": "^0.11.0",
+        "esbuild": "^0.13.0",
+        "esbuild-wasm": "^0.13.0",
+        "find-cache-dir": "^3.3.1",
+        "find-parent-dir": "^0.3.1",
         "glob": "^7.1.6",
         "injection-js": "^2.4.0",
+        "jsonc-parser": "^3.0.0",
         "less": "^4.1.0",
-        "node-sass-tilde-importer": "^1.0.2",
         "ora": "^5.1.0",
         "postcss": "^8.2.4",
+        "postcss-preset-env": "^6.7.0",
         "postcss-url": "^10.1.1",
-        "rimraf": "^3.0.0",
-        "rollup": "^2.37.0",
+        "rollup": "^2.45.1",
         "rollup-plugin-sourcemaps": "^0.6.3",
         "rxjs": "^6.5.0",
-        "sass": "^1.32.5",
-        "stylus": "^0.54.8",
-        "sync-rpc": "^1.3.6",
-        "terser": "^5.5.1"
+        "sass": "^1.32.8",
+        "stylus": "^0.55.0"
       },
       "dependencies": {
-        "ajv": {
-          "version": "7.1.1",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-7.1.1.tgz",
-          "integrity": "sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ==",
+        "commander": {
+          "version": "8.3.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+          "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+          "dev": true
+        },
+        "esbuild": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.13.15.tgz",
+          "integrity": "sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw==",
           "dev": true,
+          "optional": 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"
-          }
+            "esbuild-android-arm64": "0.13.15",
+            "esbuild-darwin-64": "0.13.15",
+            "esbuild-darwin-arm64": "0.13.15",
+            "esbuild-freebsd-64": "0.13.15",
+            "esbuild-freebsd-arm64": "0.13.15",
+            "esbuild-linux-32": "0.13.15",
+            "esbuild-linux-64": "0.13.15",
+            "esbuild-linux-arm": "0.13.15",
+            "esbuild-linux-arm64": "0.13.15",
+            "esbuild-linux-mips64le": "0.13.15",
+            "esbuild-linux-ppc64le": "0.13.15",
+            "esbuild-netbsd-64": "0.13.15",
+            "esbuild-openbsd-64": "0.13.15",
+            "esbuild-sunos-64": "0.13.15",
+            "esbuild-windows-32": "0.13.15",
+            "esbuild-windows-64": "0.13.15",
+            "esbuild-windows-arm64": "0.13.15"
+          }
+        },
+        "esbuild-android-arm64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz",
+          "integrity": "sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==",
+          "dev": true,
+          "optional": true
         },
-        "commander": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz",
-          "integrity": "sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==",
-          "dev": true
+        "esbuild-darwin-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz",
+          "integrity": "sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==",
+          "dev": true,
+          "optional": true
         },
-        "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
+        "esbuild-darwin-arm64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.15.tgz",
+          "integrity": "sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==",
+          "dev": true,
+          "optional": true
         },
-        "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
+        "esbuild-freebsd-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.15.tgz",
+          "integrity": "sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-freebsd-arm64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.15.tgz",
+          "integrity": "sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-linux-32": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.15.tgz",
+          "integrity": "sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-linux-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.15.tgz",
+          "integrity": "sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-linux-arm": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.15.tgz",
+          "integrity": "sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-linux-arm64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.15.tgz",
+          "integrity": "sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-linux-mips64le": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.15.tgz",
+          "integrity": "sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-linux-ppc64le": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.15.tgz",
+          "integrity": "sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-netbsd-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.15.tgz",
+          "integrity": "sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-openbsd-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.15.tgz",
+          "integrity": "sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-sunos-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.15.tgz",
+          "integrity": "sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-windows-32": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.15.tgz",
+          "integrity": "sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-windows-64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz",
+          "integrity": "sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==",
+          "dev": true,
+          "optional": true
+        },
+        "esbuild-windows-arm64": {
+          "version": "0.13.15",
+          "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz",
+          "integrity": "sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==",
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -9412,9 +8945,9 @@
       "optional": true
     },
     "node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+      "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
       "dev": true
     },
     "node-gyp": {
@@ -9468,15 +9001,6 @@
       "integrity": "sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==",
       "dev": true
     },
-    "node-sass-tilde-importer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/node-sass-tilde-importer/-/node-sass-tilde-importer-1.0.2.tgz",
-      "integrity": "sha512-Swcmr38Y7uB78itQeBm3mThjxBy9/Ah/ykPIaURY/L6Nec9AyRoL/jJ7ECfMR+oZeCTVQNxVMu/aHU+TLRVbdg==",
-      "dev": true,
-      "requires": {
-        "find-parent-dir": "^0.3.0"
-      }
-    },
     "nopt": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -9498,12 +9022,6 @@
       "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
       "dev": true
     },
-    "normalize-url": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "dev": true
-    },
     "npm-bundled": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz",
@@ -9597,214 +9115,17 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz",
-      "integrity": "sha512-Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA==",
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz",
+      "integrity": "sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==",
       "dev": true,
       "requires": {
-        "make-fetch-happen": "^10.0.1",
-        "minipass": "^3.1.6",
-        "minipass-fetch": "^1.4.1",
+        "make-fetch-happen": "^9.0.1",
+        "minipass": "^3.1.3",
+        "minipass-fetch": "^1.3.0",
         "minipass-json-stream": "^1.0.1",
-        "minizlib": "^2.1.2",
-        "npm-package-arg": "^8.1.5"
-      },
-      "dependencies": {
-        "@npmcli/fs": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.0.tgz",
-          "integrity": "sha512-DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ==",
-          "dev": true,
-          "requires": {
-            "@gar/promisify": "^1.1.3",
-            "semver": "^7.3.5"
-          }
-        },
-        "@npmcli/move-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.0.tgz",
-          "integrity": "sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg==",
-          "dev": true,
-          "requires": {
-            "mkdirp": "^1.0.4",
-            "rimraf": "^3.0.2"
-          }
-        },
-        "@tootallnate/once": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-          "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
-          "dev": true
-        },
-        "brace-expansion": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-          "dev": true,
-          "requires": {
-            "balanced-match": "^1.0.0"
-          }
-        },
-        "cacache": {
-          "version": "16.1.1",
-          "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.1.tgz",
-          "integrity": "sha512-VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg==",
-          "dev": true,
-          "requires": {
-            "@npmcli/fs": "^2.1.0",
-            "@npmcli/move-file": "^2.0.0",
-            "chownr": "^2.0.0",
-            "fs-minipass": "^2.1.0",
-            "glob": "^8.0.1",
-            "infer-owner": "^1.0.4",
-            "lru-cache": "^7.7.1",
-            "minipass": "^3.1.6",
-            "minipass-collect": "^1.0.2",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.4",
-            "mkdirp": "^1.0.4",
-            "p-map": "^4.0.0",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^3.0.2",
-            "ssri": "^9.0.0",
-            "tar": "^6.1.11",
-            "unique-filename": "^1.1.1"
-          }
-        },
-        "glob": {
-          "version": "8.0.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz",
-          "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^5.0.1",
-            "once": "^1.3.0"
-          }
-        },
-        "http-proxy-agent": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-          "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-          "dev": true,
-          "requires": {
-            "@tootallnate/once": "2",
-            "agent-base": "6",
-            "debug": "4"
-          }
-        },
-        "lru-cache": {
-          "version": "7.10.1",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.10.1.tgz",
-          "integrity": "sha512-BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A==",
-          "dev": true
-        },
-        "make-fetch-happen": {
-          "version": "10.1.7",
-          "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.7.tgz",
-          "integrity": "sha512-J/2xa2+7zlIUKqfyXDCXFpH3ypxO4k3rgkZHPSZkyUYcBT/hM80M3oyKLM/9dVriZFiGeGGS2Ei+0v2zfhqj3Q==",
-          "dev": true,
-          "requires": {
-            "agentkeepalive": "^4.2.1",
-            "cacache": "^16.1.0",
-            "http-cache-semantics": "^4.1.0",
-            "http-proxy-agent": "^5.0.0",
-            "https-proxy-agent": "^5.0.0",
-            "is-lambda": "^1.0.1",
-            "lru-cache": "^7.7.1",
-            "minipass": "^3.1.6",
-            "minipass-collect": "^1.0.2",
-            "minipass-fetch": "^2.0.3",
-            "minipass-flush": "^1.0.5",
-            "minipass-pipeline": "^1.2.4",
-            "negotiator": "^0.6.3",
-            "promise-retry": "^2.0.1",
-            "socks-proxy-agent": "^7.0.0",
-            "ssri": "^9.0.0"
-          },
-          "dependencies": {
-            "minipass-fetch": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.0.tgz",
-              "integrity": "sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg==",
-              "dev": true,
-              "requires": {
-                "encoding": "^0.1.13",
-                "minipass": "^3.1.6",
-                "minipass-sized": "^1.0.3",
-                "minizlib": "^2.1.2"
-              }
-            }
-          }
-        },
-        "minimatch": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz",
-          "integrity": "sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==",
-          "dev": true,
-          "requires": {
-            "brace-expansion": "^2.0.1"
-          }
-        },
-        "negotiator": {
-          "version": "0.6.3",
-          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-          "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
-          "dev": true
-        },
-        "semver": {
-          "version": "7.3.7",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz",
-          "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          },
-          "dependencies": {
-            "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"
-              }
-            }
-          }
-        },
-        "socks-proxy-agent": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz",
-          "integrity": "sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==",
-          "dev": true,
-          "requires": {
-            "agent-base": "^6.0.2",
-            "debug": "^4.3.3",
-            "socks": "^2.6.2"
-          },
-          "dependencies": {
-            "debug": {
-              "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"
-              }
-            }
-          }
-        },
-        "ssri": {
-          "version": "9.0.1",
-          "resolved": "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz",
-          "integrity": "sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==",
-          "dev": true,
-          "requires": {
-            "minipass": "^3.1.1"
-          }
-        }
+        "minizlib": "^2.0.0",
+        "npm-package-arg": "^8.0.0"
       }
     },
     "npm-run-path": {
@@ -9828,14 +9149,11 @@
         "set-blocking": "^2.0.0"
       }
     },
-    "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
-      "dev": true,
-      "requires": {
-        "boolbase": "~1.0.0"
-      }
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==",
+      "dev": true
     },
     "oauth-sign": {
       "version": "0.9.0",
@@ -9923,17 +9241,6 @@
         "object-keys": "^1.1.1"
       }
     },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz",
-      "integrity": "sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1"
-      }
-    },
     "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
@@ -9953,18 +9260,6 @@
         "isobject": "^3.0.1"
       }
     },
-    "object.values": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.2.tgz",
-      "integrity": "sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==",
-      "dev": true,
-      "requires": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.1",
-        "has": "^1.0.3"
-      }
-    },
     "obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
@@ -10016,17 +9311,18 @@
       }
     },
     "ora": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
-      "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dev": true,
       "requires": {
-        "bl": "^4.0.3",
+        "bl": "^4.1.0",
         "chalk": "^4.1.0",
         "cli-cursor": "^3.1.0",
         "cli-spinners": "^2.5.0",
         "is-interactive": "^1.0.0",
-        "log-symbols": "^4.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
       },
@@ -10041,9 +9337,9 @@
           }
         },
         "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",
@@ -10088,6 +9384,21 @@
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
+    "p-event": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/p-event/-/p-event-4.2.0.tgz",
+      "integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
+      "dev": true,
+      "requires": {
+        "p-timeout": "^3.1.0"
+      }
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true
+    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -10125,6 +9436,15 @@
         "retry": "^0.13.1"
       }
     },
+    "p-timeout": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
+      "integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
+      "dev": true,
+      "requires": {
+        "p-finally": "^1.0.0"
+      }
+    },
     "p-try": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
@@ -10132,9 +9452,9 @@
       "dev": true
     },
     "pacote": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-12.0.3.tgz",
-      "integrity": "sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-12.0.2.tgz",
+      "integrity": "sha512-Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg==",
       "dev": true,
       "requires": {
         "@npmcli/git": "^2.1.0",
@@ -10150,7 +9470,7 @@
         "npm-package-arg": "^8.0.1",
         "npm-packlist": "^3.0.0",
         "npm-pick-manifest": "^6.0.0",
-        "npm-registry-fetch": "^12.0.0",
+        "npm-registry-fetch": "^11.0.0",
         "promise-retry": "^2.0.1",
         "read-package-json-fast": "^2.0.1",
         "rimraf": "^3.0.2",
@@ -10210,16 +9530,6 @@
         }
       }
     },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
     "parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
@@ -10366,9 +9676,9 @@
       }
     },
     "piscina": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz",
-      "integrity": "sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-3.1.0.tgz",
+      "integrity": "sha512-KTW4sjsCD34MHrUbx9eAAbuUSpVj407hQSgk/6Epkg0pbRBmv4a3UX7Sr8wxm9xYqQLnsN4mFOjqGDzHAdgKQg==",
       "dev": true,
       "requires": {
         "eventemitter-asyncresource": "^1.0.0",
@@ -10430,65 +9740,74 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.4.tgz",
-      "integrity": "sha512-kRFftRoExRVXZlwUuay9iC824qmXPcQQVzAjbCCgjpXnkdMCJYBu2gTwAaFBzv8ewND6O8xFb3aELmEkh9zTzg==",
+      "version": "8.4.14",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
+      "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
       "dev": true,
       "requires": {
-        "colorette": "^1.2.1",
-        "nanoid": "^3.1.20",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
       }
     },
     "postcss-attribute-case-insensitive": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.1.tgz",
-      "integrity": "sha512-wrt2VndqSLJpyBRNz9OmJcgnhI9MaongeWgapdBuUMu2a/KNJ8SENesG4SdiTnQwGO9b1VKbTWYAfCPeokLqZQ==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
+      "integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.10"
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^6.0.2"
       },
       "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "postcss-calc": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
-      "integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
+    "postcss-color-functional-notation": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
+      "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.27",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.0.2"
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -10496,242 +9815,204 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-color-functional-notation": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.3.tgz",
-      "integrity": "sha512-5fbr6FzFzjwHXKsVnkmEYrJYG8VNNzvD1tAXaPPWR97S6rhKI5uh2yOfV5TAzhDkZoq4h+chxEplFDc8GeyFtw==",
+    "postcss-color-gray": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
+      "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.5",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "postcss-color-hex-alpha": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz",
-      "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
+      "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "postcss": "^7.0.14",
+        "postcss-values-parser": "^2.0.1"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
-        }
-      }
-    },
-    "postcss-color-rebeccapurple": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.0.tgz",
-      "integrity": "sha512-1jtE5AKnZcKq4pjOrltFHcbEM2/IvtbD1OdhZ/wqds18//bh0UmQkffcCkzDJU+/vGodfIsVQeKn+45CJvX9Bw==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
-    "postcss-colormin": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
-      "integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
+    "postcss-color-mod-function": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
+      "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "color": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-convert-values": {
+    "postcss-color-rebeccapurple": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz",
-      "integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
+      "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
+      "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
     "postcss-custom-media": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz",
-      "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==",
-      "dev": true,
-      "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-custom-properties": {
-      "version": "12.1.8",
-      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.8.tgz",
-      "integrity": "sha512-8rbj8kVu00RQh2fQF81oBqtduiANu4MIxhyf0HbbStgPtnFlWn0yiaYTpLHrPnJbffVY1s9apWsIoVZcc68FxA==",
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
+      "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "postcss": "^7.0.14"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
-        }
-      }
-    },
-    "postcss-custom-selectors": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz",
-      "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.4"
-      }
-    },
-    "postcss-dir-pseudo-class": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz",
-      "integrity": "sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.9"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "postcss-discard-comments": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
-      "integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
+    "postcss-custom-properties": {
+      "version": "8.0.11",
+      "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
+      "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.17",
+        "postcss-values-parser": "^2.0.1"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -10739,36 +10020,50 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-discard-duplicates": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz",
-      "integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
+    "postcss-custom-selectors": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
+      "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
       },
       "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+          "dev": true
+        },
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         },
         "source-map": {
@@ -10776,36 +10071,50 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-discard-empty": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz",
-      "integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
+    "postcss-dir-pseudo-class": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
+      "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
       },
       "dependencies": {
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+          "dev": true
+        },
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         },
         "source-map": {
@@ -10813,36 +10122,33 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-discard-overridden": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz",
-      "integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
+    "postcss-double-position-gradients": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
+      "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.5",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -10850,120 +10156,205 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
+        }
+      }
+    },
+    "postcss-env-function": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
+      "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "postcss-double-position-gradients": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz",
-      "integrity": "sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==",
+    "postcss-focus-visible": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
+      "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
       "dev": true,
       "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
-    "postcss-env-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz",
-      "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==",
+    "postcss-focus-within": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
+      "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
-    "postcss-focus-visible": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz",
-      "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==",
+    "postcss-font-variant": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
+      "integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.9"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "postcss-focus-within": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
-      "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==",
+    "postcss-gap-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
+      "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
       "dev": true,
       "requires": {
-        "postcss-selector-parser": "^6.0.9"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
-    "postcss-font-variant": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
-      "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==",
-      "dev": true
-    },
-    "postcss-gap-properties": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz",
-      "integrity": "sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==",
-      "dev": true
-    },
     "postcss-image-set-function": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz",
-      "integrity": "sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
+      "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
@@ -10980,37 +10371,81 @@
       }
     },
     "postcss-initial": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz",
-      "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==",
-      "dev": true
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz",
+      "integrity": "sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
+      "dev": true,
+      "requires": {
+        "postcss": "^7.0.2"
+      },
+      "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
     },
     "postcss-lab-function": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.0.tgz",
-      "integrity": "sha512-Zb1EO9DGYfa3CP8LhINHCcTTCTLI+R3t7AX2mKsDzdgVQ/GkCpHOTgOr6HBHslP7XDdVbqgHW5vvRPMdVANQ8w==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
+      "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
       "dev": true,
       "requires": {
-        "@csstools/postcss-progressive-custom-properties": "^1.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "@csstools/convert-colors": "^1.4.0",
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
+          "dev": true,
+          "requires": {
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
       }
     },
     "postcss-loader": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
-      "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.0.tgz",
+      "integrity": "sha512-H9hv447QjQJVDbHj3OUdciyAXY3v5+UDduzEytAlZCVHCpNAAg/mCSwhYYqZr9BiGYhmYspU8QXxZwiHTLn3yA==",
       "dev": true,
       "requires": {
         "cosmiconfig": "^7.0.0",
-        "klona": "^2.0.5",
+        "klona": "^2.0.4",
         "semver": "^7.3.5"
       },
       "dependencies": {
@@ -11067,97 +10502,61 @@
       }
     },
     "postcss-logical": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz",
-      "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==",
-      "dev": true
-    },
-    "postcss-media-minmax": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz",
-      "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==",
-      "dev": true
-    },
-    "postcss-merge-longhand": {
-      "version": "4.0.11",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz",
-      "integrity": "sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
+      "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
       "dev": true,
       "requires": {
-        "css-color-names": "0.0.4",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "stylehacks": "^4.0.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-merge-rules": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz",
-      "integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
+    "postcss-media-minmax": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
+      "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "cssnano-util-same-parent": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0",
-        "vendors": "^1.0.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
         },
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -11165,204 +10564,6 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-font-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz",
-      "integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-gradients": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz",
-      "integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "is-color-stop": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-params": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz",
-      "integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "browserslist": "^4.0.0",
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-minify-selectors": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz",
-      "integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
-      "dev": true,
-      "requires": {
-        "alphanum-sort": "^1.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -11402,642 +10603,263 @@
       }
     },
     "postcss-nesting": {
-      "version": "10.1.8",
-      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.1.8.tgz",
-      "integrity": "sha512-txdb3/idHYsBbNDFo1PFY0ExCgH5nfWi8G5lO49e6iuU42TydbODTzJgF5UuL5bhgeSlnAtDgfFTDG0Cl1zaSQ==",
-      "dev": true,
-      "requires": {
-        "@csstools/selector-specificity": "^2.0.0",
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
-          "dev": true,
-          "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
-          }
-        }
-      }
-    },
-    "postcss-normalize-charset": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
-      "integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
+      "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-display-values": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz",
-      "integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-normalize-positions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz",
-      "integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
+    "postcss-overflow-shorthand": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
+      "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-repeat-style": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz",
-      "integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-normalize-string": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz",
-      "integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
+    "postcss-page-break": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
+      "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
       "dev": true,
       "requires": {
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-timing-functions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz",
-      "integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-normalize-unicode": {
+    "postcss-place": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz",
-      "integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
+      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
+      "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.2",
+        "postcss-values-parser": "^2.0.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-normalize-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz",
-      "integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
-      "dev": true,
-      "requires": {
-        "is-absolute-url": "^2.0.0",
-        "normalize-url": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-normalize-whitespace": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz",
-      "integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
-      "dev": true,
-      "requires": {
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+    "postcss-preset-env": {
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
+      "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
+      "dev": true,
+      "requires": {
+        "autoprefixer": "^9.6.1",
+        "browserslist": "^4.6.4",
+        "caniuse-lite": "^1.0.30000981",
+        "css-blank-pseudo": "^0.1.4",
+        "css-has-pseudo": "^0.10.0",
+        "css-prefers-color-scheme": "^3.1.1",
+        "cssdb": "^4.4.0",
+        "postcss": "^7.0.17",
+        "postcss-attribute-case-insensitive": "^4.0.1",
+        "postcss-color-functional-notation": "^2.0.1",
+        "postcss-color-gray": "^5.0.0",
+        "postcss-color-hex-alpha": "^5.0.3",
+        "postcss-color-mod-function": "^3.0.3",
+        "postcss-color-rebeccapurple": "^4.0.1",
+        "postcss-custom-media": "^7.0.8",
+        "postcss-custom-properties": "^8.0.11",
+        "postcss-custom-selectors": "^5.1.2",
+        "postcss-dir-pseudo-class": "^5.0.0",
+        "postcss-double-position-gradients": "^1.0.0",
+        "postcss-env-function": "^2.0.2",
+        "postcss-focus-visible": "^4.0.0",
+        "postcss-focus-within": "^3.0.0",
+        "postcss-font-variant": "^4.0.0",
+        "postcss-gap-properties": "^2.0.0",
+        "postcss-image-set-function": "^3.0.1",
+        "postcss-initial": "^3.0.0",
+        "postcss-lab-function": "^2.0.1",
+        "postcss-logical": "^3.0.0",
+        "postcss-media-minmax": "^4.0.0",
+        "postcss-nesting": "^7.0.0",
+        "postcss-overflow-shorthand": "^2.0.0",
+        "postcss-page-break": "^2.0.0",
+        "postcss-place": "^4.0.1",
+        "postcss-pseudo-class-any-link": "^6.0.0",
+        "postcss-replace-overflow-wrap": "^3.0.0",
+        "postcss-selector-matches": "^4.0.0",
+        "postcss-selector-not": "^4.0.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+        "autoprefixer": {
+          "version": "9.8.8",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz",
+          "integrity": "sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "browserslist": "^4.12.0",
+            "caniuse-lite": "^1.0.30001109",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "picocolors": "^0.2.1",
+            "postcss": "^7.0.32",
+            "postcss-value-parser": "^4.1.0"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-ordered-values": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz",
-      "integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
-      "dev": true,
-      "requires": {
-        "cssnano-util-get-arguments": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-overflow-shorthand": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz",
-      "integrity": "sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==",
-      "dev": true
-    },
-    "postcss-page-break": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz",
-      "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==",
-      "dev": true
-    },
-    "postcss-place": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.4.tgz",
-      "integrity": "sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==",
+    "postcss-pseudo-class-any-link": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
+      "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
       "dev": true,
       "requires": {
-        "postcss-value-parser": "^4.2.0"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-preset-env": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.2.3.tgz",
-      "integrity": "sha512-Ok0DhLfwrcNGrBn8sNdy1uZqWRk/9FId0GiQ39W4ILop5GHtjJs8bu1MY9isPwHInpVEPWjb4CEcEaSbBLpfwA==",
-      "dev": true,
-      "requires": {
-        "autoprefixer": "^10.4.2",
-        "browserslist": "^4.19.1",
-        "caniuse-lite": "^1.0.30001299",
-        "css-blank-pseudo": "^3.0.2",
-        "css-has-pseudo": "^3.0.3",
-        "css-prefers-color-scheme": "^6.0.2",
-        "cssdb": "^5.0.0",
-        "postcss-attribute-case-insensitive": "^5.0.0",
-        "postcss-color-functional-notation": "^4.2.1",
-        "postcss-color-hex-alpha": "^8.0.2",
-        "postcss-color-rebeccapurple": "^7.0.2",
-        "postcss-custom-media": "^8.0.0",
-        "postcss-custom-properties": "^12.1.2",
-        "postcss-custom-selectors": "^6.0.0",
-        "postcss-dir-pseudo-class": "^6.0.3",
-        "postcss-double-position-gradients": "^3.0.4",
-        "postcss-env-function": "^4.0.4",
-        "postcss-focus-visible": "^6.0.3",
-        "postcss-focus-within": "^5.0.3",
-        "postcss-font-variant": "^5.0.0",
-        "postcss-gap-properties": "^3.0.2",
-        "postcss-image-set-function": "^4.0.4",
-        "postcss-initial": "^4.0.1",
-        "postcss-lab-function": "^4.0.3",
-        "postcss-logical": "^5.0.3",
-        "postcss-media-minmax": "^5.0.0",
-        "postcss-nesting": "^10.1.2",
-        "postcss-overflow-shorthand": "^3.0.2",
-        "postcss-page-break": "^3.0.4",
-        "postcss-place": "^7.0.3",
-        "postcss-pseudo-class-any-link": "^7.0.2",
-        "postcss-replace-overflow-wrap": "^4.0.0",
-        "postcss-selector-not": "^5.0.0"
+        "postcss": "^7.0.2",
+        "postcss-selector-parser": "^5.0.0-rc.3"
       },
       "dependencies": {
-        "autoprefixer": {
-          "version": "10.4.7",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz",
-          "integrity": "sha512-ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA==",
-          "dev": true,
-          "requires": {
-            "browserslist": "^4.20.3",
-            "caniuse-lite": "^1.0.30001335",
-            "fraction.js": "^4.2.0",
-            "normalize-range": "^0.1.2",
-            "picocolors": "^1.0.0",
-            "postcss-value-parser": "^4.2.0"
-          }
-        },
-        "browserslist": {
-          "version": "4.20.4",
-          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz",
-          "integrity": "sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==",
-          "dev": true,
-          "requires": {
-            "caniuse-lite": "^1.0.30001349",
-            "electron-to-chromium": "^1.4.147",
-            "escalade": "^3.1.1",
-            "node-releases": "^2.0.5",
-            "picocolors": "^1.0.0"
-          }
-        },
-        "caniuse-lite": {
-          "version": "1.0.30001357",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",
-          "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==",
-          "dev": true
-        },
-        "electron-to-chromium": {
-          "version": "1.4.161",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.161.tgz",
-          "integrity": "sha512-sTjBRhqh6wFodzZtc5Iu8/R95OkwaPNn7tj/TaDU5nu/5EFiQDtADGAXdR4tJcTEHlYfJpHqigzJqHvPgehP8A==",
-          "dev": true
-        },
-        "fraction.js": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
-          "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
+        "cssesc": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+          "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
           "dev": true
         },
-        "node-releases": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
-          "integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
-        "postcss-value-parser": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-          "dev": true
-        }
-      }
-    },
-    "postcss-pseudo-class-any-link": {
-      "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.4.tgz",
-      "integrity": "sha512-JxRcLXm96u14N3RzFavPIE9cRPuOqLDuzKeBsqi4oRk4vt8n0A7I0plFs/VXTg7U2n7g/XkQi0OwqTO3VWBfEg==",
-      "dev": true,
-      "requires": {
-        "postcss-selector-parser": "^6.0.10"
-      },
-      "dependencies": {
-        "postcss-selector-parser": {
-          "version": "6.0.10",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-          "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+        "postcss": {
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "cssesc": "^3.0.0",
-            "util-deprecate": "^1.0.2"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
-        }
-      }
-    },
-    "postcss-reduce-initial": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz",
-      "integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "caniuse-api": "^3.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+        },
+        "postcss-selector-parser": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+          "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "cssesc": "^2.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
         },
         "source-map": {
@@ -12045,165 +10867,100 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-reduce-transforms": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz",
-      "integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
+    "postcss-replace-overflow-wrap": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
+      "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
       "dev": true,
       "requires": {
-        "cssnano-util-get-match": "^4.0.0",
-        "has": "^1.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0"
+        "postcss": "^7.0.2"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-replace-overflow-wrap": {
+    "postcss-selector-matches": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
-      "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==",
-      "dev": true
-    },
-    "postcss-selector-not": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz",
-      "integrity": "sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==",
+      "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
+      "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
       "dev": true,
       "requires": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
-      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1",
-        "util-deprecate": "^1.0.2"
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.2"
       },
       "dependencies": {
-        "cssesc": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-          "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
-        }
-      }
-    },
-    "postcss-svgo": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz",
-      "integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
-      "dev": true,
-      "requires": {
-        "is-svg": "^3.0.0",
-        "postcss": "^7.0.0",
-        "postcss-value-parser": "^3.0.0",
-        "svgo": "^1.0.0"
-      },
-      "dependencies": {
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
-        "postcss-value-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
-    "postcss-unique-selectors": {
+    "postcss-selector-not": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz",
-      "integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
+      "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
+      "integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
       "dev": true,
       "requires": {
-        "alphanum-sort": "^1.0.0",
-        "postcss": "^7.0.0",
-        "uniqs": "^2.0.0"
+        "balanced-match": "^1.0.0",
+        "postcss": "^7.0.2"
       },
       "dependencies": {
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
+          "dev": true
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -12211,28 +10968,39 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+      "dev": true,
+      "requires": {
+        "cssesc": "^3.0.0",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1",
+        "util-deprecate": "^1.0.2"
+      },
+      "dependencies": {
+        "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
         }
       }
     },
     "postcss-url": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.1.tgz",
-      "integrity": "sha512-cYeRNcXUMiM1sr3UgHkY+zMuqhSmJaLeP3VOZWWqShBDMB10DlrK5KfciLK0LGr7xKDPP5nH7Q2odvDHQSrP9A==",
+      "version": "10.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-10.1.3.tgz",
+      "integrity": "sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==",
       "dev": true,
       "requires": {
-        "make-dir": "3.1.0",
-        "mime": "2.4.6",
-        "minimatch": "3.0.4",
-        "xxhashjs": "0.2.2"
+        "make-dir": "~3.1.0",
+        "mime": "~2.5.2",
+        "minimatch": "~3.0.4",
+        "xxhashjs": "~0.2.2"
       },
       "dependencies": {
         "make-dir": {
@@ -12245,9 +11013,9 @@
           }
         },
         "mime": {
-          "version": "2.4.6",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-          "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
           "dev": true
         }
       }
@@ -12258,6 +11026,17 @@
       "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
+    "postcss-values-parser": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
+      "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
+      "dev": true,
+      "requires": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
     "preserve": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
@@ -12652,12 +11431,6 @@
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
-    "q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
-      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
-      "dev": true
-    },
     "qjobs": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
@@ -12670,6 +11443,12 @@
       "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
       "dev": true
     },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "dev": true
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -12974,12 +11753,6 @@
         "path-parse": "^1.0.6"
       }
     },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
     "resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -12987,15 +11760,15 @@
       "dev": true
     },
     "resolve-url-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
-      "integrity": "sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz",
+      "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==",
       "dev": true,
       "requires": {
         "adjust-sourcemap-loader": "^4.0.0",
         "convert-source-map": "^1.7.0",
         "loader-utils": "^2.0.0",
-        "postcss": "^8.2.14",
+        "postcss": "^7.0.35",
         "source-map": "0.6.1"
       },
       "dependencies": {
@@ -13010,21 +11783,20 @@
             "json5": "^2.1.2"
           }
         },
-        "nanoid": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+        "picocolors": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
         "postcss": {
-          "version": "8.4.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
-          "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
+          "version": "7.0.39",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
-            "nanoid": "^3.3.4",
-            "picocolors": "^1.0.0",
-            "source-map-js": "^1.0.2"
+            "picocolors": "^0.2.1",
+            "source-map": "^0.6.1"
           }
         },
         "source-map": {
@@ -13069,18 +11841,6 @@
       "integrity": "sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==",
       "dev": true
     },
-    "rgb-regex": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
-      "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=",
-      "dev": true
-    },
-    "rgba-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz",
-      "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=",
-      "dev": true
-    },
     "rimraf": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -13091,12 +11851,12 @@
       }
     },
     "rollup": {
-      "version": "2.38.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.38.4.tgz",
-      "integrity": "sha512-B0LcJhjiwKkTl79aGVF/u5KdzsH8IylVfV56Ut6c9ouWLJcUK17T83aZBetNYSnZtXf2OHD4+2PbmRW+Fp5ulg==",
+      "version": "2.75.7",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz",
+      "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==",
       "dev": true,
       "requires": {
-        "fsevents": "~2.3.1"
+        "fsevents": "~2.3.2"
       }
     },
     "rollup-plugin-sourcemaps": {
@@ -13161,18 +11921,20 @@
       "dev": true
     },
     "sass": {
-      "version": "1.32.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.6.tgz",
-      "integrity": "sha512-1bcDHDcSqeFtMr0JXI3xc/CXX6c4p0wHHivJdru8W7waM7a1WjKMm4m/Z5sY7CbVw4Whi2Chpcw6DFfSWwGLzQ==",
+      "version": "1.52.3",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz",
+      "integrity": "sha512-LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA==",
       "dev": true,
       "requires": {
-        "chokidar": ">=2.0.0 <4.0.0"
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
       }
     },
     "sass-loader": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.4.0.tgz",
-      "integrity": "sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==",
+      "version": "12.3.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.3.0.tgz",
+      "integrity": "sha512-6l9qwhdOb7qSrtOu96QQ81LVl8v6Dp9j1w3akOm0aWHyrTYtagDt5+kS32N4yq4hHk3M+rdqoRMH+lIdqvW6HA==",
       "dev": true,
       "requires": {
         "klona": "^2.0.4",
@@ -13288,12 +12050,12 @@
       }
     },
     "selfsigned": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz",
-      "integrity": "sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==",
+      "version": "1.10.14",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz",
+      "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==",
       "dev": true,
       "requires": {
-        "node-forge": "^1"
+        "node-forge": "^0.10.0"
       }
     },
     "semver": {
@@ -13576,27 +12338,10 @@
       "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
-    "simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.3.1"
-      },
-      "dependencies": {
-        "is-arrayish": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-          "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-          "dev": true
-        }
-      }
-    },
     "slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
     "smart-buffer": {
@@ -13908,14 +12653,14 @@
       "dev": true
     },
     "source-map-loader": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.1.tgz",
-      "integrity": "sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.0.tgz",
+      "integrity": "sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==",
       "dev": true,
       "requires": {
         "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
+        "iconv-lite": "^0.6.2",
+        "source-map-js": "^0.6.2"
       },
       "dependencies": {
         "iconv-lite": {
@@ -13926,6 +12671,12 @@
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
+        },
+        "source-map-js": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
+          "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==",
+          "dev": true
         }
       }
     },
@@ -14037,12 +12788,6 @@
         "minipass": "^3.1.1"
       }
     },
-    "stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "dev": true
-    },
     "static-extend": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -14111,26 +12856,6 @@
         "strip-ansi": "^6.0.0"
       }
     },
-    "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"
-      }
-    },
     "string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -14163,63 +12888,13 @@
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
-    "stylehacks": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
-      "integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.0.0",
-        "postcss": "^7.0.0",
-        "postcss-selector-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "postcss-selector-parser": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
-          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
-          "dev": true,
-          "requires": {
-            "dot-prop": "^5.2.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "stylus": {
-      "version": "0.54.8",
-      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.8.tgz",
-      "integrity": "sha512-vr54Or4BZ7pJafo2mpf0ZcwA74rpuYCZbxrHBsH8kbcXOwSfvBFwsRfpGO5OD5fhG5HDCFW737PKaawI7OqEAg==",
+      "version": "0.55.0",
+      "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.55.0.tgz",
+      "integrity": "sha512-MuzIIVRSbc8XxHH7FjkvWqkIcr1BvoMZoR/oFuAJDlh7VSaNJzrB4uJ38GRQa+mWjLXODAMzeDe0xi9GYbGwnw==",
       "dev": true,
       "requires": {
-        "css-parse": "~2.0.0",
+        "css": "^3.0.0",
         "debug": "~3.1.0",
         "glob": "^7.1.6",
         "mkdirp": "~1.0.4",
@@ -14241,7 +12916,7 @@
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
@@ -14275,59 +12950,12 @@
         "has-flag": "^3.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
-    },
-    "svgo": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
-      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.4.1",
-        "coa": "^2.0.2",
-        "css-select": "^2.0.0",
-        "css-select-base-adapter": "^0.1.1",
-        "css-tree": "1.0.0-alpha.37",
-        "csso": "^4.0.2",
-        "js-yaml": "^3.13.1",
-        "mkdirp": "~0.5.1",
-        "object.values": "^1.1.0",
-        "sax": "~1.2.4",
-        "stable": "^0.1.8",
-        "unquote": "~1.1.1",
-        "util.promisify": "~1.0.0"
-      },
-      "dependencies": {
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-      }
-    },
     "symbol-observable": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz",
       "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "dev": true
     },
-    "sync-rpc": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.6.tgz",
-      "integrity": "sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==",
-      "dev": true,
-      "requires": {
-        "get-port": "^3.1.0"
-      }
-    },
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -14348,17 +12976,6 @@
         "yallist": "^4.0.0"
       }
     },
-    "terser": {
-      "version": "5.5.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.5.1.tgz",
-      "integrity": "sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.7.2",
-        "source-map-support": "~0.5.19"
-      }
-    },
     "terser-webpack-plugin": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz",
@@ -14454,12 +13071,6 @@
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
-    "timsort": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
-      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
-      "dev": true
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -14685,9 +13296,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.5.tgz",
-      "integrity": "sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==",
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz",
+      "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==",
       "dev": true
     },
     "ua-parser-js": {
@@ -14742,12 +13353,6 @@
       "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
       "dev": true
     },
-    "uniqs": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
-      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=",
-      "dev": true
-    },
     "unique-filename": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
@@ -14778,12 +13383,6 @@
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
       "dev": true
     },
-    "unquote": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
-      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
-      "dev": true
-    },
     "unset-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
@@ -14839,6 +13438,24 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==",
+      "dev": true,
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==",
+          "dev": true
+        }
+      }
+    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -14851,39 +13468,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "util.promisify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.2",
-        "has-symbols": "^1.0.1",
-        "object.getownpropertydescriptors": "^2.1.0"
-      },
-      "dependencies": {
-        "es-abstract": {
-          "version": "1.17.7",
-          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz",
-          "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==",
-          "dev": true,
-          "requires": {
-            "es-to-primitive": "^1.2.1",
-            "function-bind": "^1.1.1",
-            "has": "^1.0.3",
-            "has-symbols": "^1.0.1",
-            "is-callable": "^1.2.2",
-            "is-regex": "^1.1.1",
-            "object-inspect": "^1.8.0",
-            "object-keys": "^1.1.1",
-            "object.assign": "^4.1.1",
-            "string.prototype.trimend": "^1.0.1",
-            "string.prototype.trimstart": "^1.0.1"
-          }
-        }
-      }
-    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -14911,12 +13495,6 @@
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
-    "vendors": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
-      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
-      "dev": true
-    },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
@@ -14973,9 +13551,9 @@
       }
     },
     "webpack": {
-      "version": "5.67.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
-      "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
+      "version": "5.60.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.60.0.tgz",
+      "integrity": "sha512-OL5GDYi2dKxnwJPSOg2tODgzDxAffN0osgWkZaBo/l3ikCxDFP+tuJT3uF7GyBE3SDBpKML/+a8EobyWAQO3DQ==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.0",
@@ -14992,7 +13570,7 @@
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.2.9",
+        "graceful-fs": "^4.2.4",
         "json-parse-better-errors": "^1.0.2",
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
@@ -15000,8 +13578,8 @@
         "schema-utils": "^3.1.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
-        "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.3"
+        "watchpack": "^2.2.0",
+        "webpack-sources": "^3.2.0"
       },
       "dependencies": {
         "@types/estree": {
@@ -15022,12 +13600,6 @@
             "uri-js": "^4.2.2"
           }
         },
-        "graceful-fs": {
-          "version": "4.2.10",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-          "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-          "dev": true
-        },
         "schema-utils": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
@@ -15042,25 +13614,28 @@
       }
     },
     "webpack-dev-middleware": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz",
-      "integrity": "sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.2.1.tgz",
+      "integrity": "sha512-Kx1X+36Rn9JaZcQMrJ7qN3PMAuKmEDD9ZISjUj3Cgq4A6PtwYsC4mpaKotSRYH3iOF6HsUa8viHKS59FlyVifQ==",
       "dev": true,
       "requires": {
         "colorette": "^2.0.10",
         "memfs": "^3.2.2",
         "mime-types": "^2.1.31",
         "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
+        "schema-utils": "^3.1.0"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+        "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.3"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
         "colorette": {
@@ -15085,63 +13660,61 @@
           }
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         }
       }
     },
     "webpack-dev-server": {
-      "version": "4.7.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz",
-      "integrity": "sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.4.0.tgz",
+      "integrity": "sha512-+S0XRIbsopVjPFjCO8I07FXYBWYqkFmuP56ucGMTs2hA/gV4q2M9xTmNo5Tg4o8ffRR+Nm3AsXnQXxKRyYovrA==",
       "dev": true,
       "requires": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/serve-index": "^1.9.1",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.2.2",
         "ansi-html-community": "^0.0.8",
         "bonjour": "^3.5.0",
         "chokidar": "^3.5.2",
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^1.6.0",
-        "default-gateway": "^6.0.3",
         "del": "^6.0.0",
         "express": "^4.17.1",
         "graceful-fs": "^4.2.6",
         "html-entities": "^2.3.2",
         "http-proxy-middleware": "^2.0.0",
+        "internal-ip": "^6.2.0",
         "ipaddr.js": "^2.0.1",
         "open": "^8.0.9",
         "p-retry": "^4.5.0",
         "portfinder": "^1.0.28",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.0.0",
+        "schema-utils": "^3.1.0",
+        "selfsigned": "^1.10.11",
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.21",
         "spdy": "^4.0.2",
         "strip-ansi": "^7.0.0",
-        "webpack-dev-middleware": "^5.3.0",
+        "url": "^0.11.0",
+        "webpack-dev-middleware": "^5.2.1",
         "ws": "^8.1.0"
       },
       "dependencies": {
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+        "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.3"
+            "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-regex": {
@@ -15201,15 +13774,14 @@
           }
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
+          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
           "dev": true,
           "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "@types/json-schema": "^7.0.8",
+            "ajv": "^6.12.5",
+            "ajv-keywords": "^3.5.2"
           }
         },
         "strip-ansi": {
@@ -15240,9 +13812,9 @@
       "dev": true
     },
     "webpack-subresource-integrity": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz",
-      "integrity": "sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.0.0.tgz",
+      "integrity": "sha512-x9514FpLRydO+UAQ8DY4aLtCjxmdLkuQVcDFN1kGzuusREYJ1B0rzk/iIlWiL6dnvrhEGFj2+UsdxDkP8Z4UKg==",
       "dev": true,
       "requires": {
         "typed-assert": "^1.0.8"
@@ -15460,6 +14032,12 @@
       "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "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
+    },
     "zone.js": {
       "version": "0.11.6",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.11.6.tgz",
diff --git a/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/package.json
index 7cc1c4834..d9df85953 100644
--- a/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/package.json
@@ -2,7 +2,7 @@
   "name": "dnn-sxc-angular-workspace",
   "version": "0.0.0",
   "scripts": {
-    "build": "ng build --prod",
+    "build": "ng build --configuration production",
     "dsa-copy:dist": "cpx \"dist/dnn-sxc-angular/{,**/}*.**.*\" \"../../../app-dnn-sxc-angular-dev/node_modules/@2sic.com/dnn-sxc-angular\" -w",
     "dsa-copy:2dm": "cpx \"dist/dnn-sxc-angular/{,**/}*.**.*\" \"../../../app-Directory/node_modules/@2sic.com/dnn-sxc-angular\" -w -v",
     "dsa-copy:template-ng11": "cpx \"dist/dnn-sxc-angular/{,**/}*.*\" \"/Projects/2sxc/app-template-angular/ng/node_modules/@2sic.com/dnn-sxc-angular\" -v",
@@ -12,24 +12,24 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~13.2.6",
-    "@angular/common": "~13.2.6",
-    "@angular/compiler": "~13.2.6",
-    "@angular/core": "~13.2.6",
-    "@angular/forms": "~13.2.6",
-    "@angular/platform-browser": "~13.2.6",
-    "@angular/platform-browser-dynamic": "~13.2.6",
-    "@angular/router": "~13.2.6",
+    "@angular/animations": "^13.0.0",
+    "@angular/common": "^13.0.0",
+    "@angular/compiler": "^13.0.0",
+    "@angular/core": "^13.0.0",
+    "@angular/forms": "^13.0.0",
+    "@angular/platform-browser": "^13.0.0",
+    "@angular/platform-browser-dynamic": "^13.0.0",
+    "@angular/router": "^13.0.0",
     "rxjs": "~6.6.0",
     "tslib": "^2.1.0",
-    "zone.js": "~0.11.6",
-    "@2sic.com/2sxc-typings": "^10.24.4"
+    "zone.js": "~0.11.6"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~13.2.6",
-    "@angular/cli": "~13.2.6",
-    "@angular/compiler-cli": "~13.2.6",
-    "@angular/language-service": "~13.2.6",
+    "@2sic.com/2sxc-typings": "^14.2.1",
+    "@angular-devkit/build-angular": "^13.0.0",
+    "@angular/cli": "^13.0.0",
+    "@angular/compiler-cli": "^13.0.0",
+    "@angular/language-service": "^13.0.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
@@ -42,10 +42,10 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^11.0.0",
+    "ng-packagr": "^13.0.0",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
-    "typescript": "~4.1.5"
+    "typescript": "^4.4.2"
   }
 }
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/ng-package.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/ng-package.json
index 51a8ffc2e..e0c33e72c 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/ng-package.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/ng-package.json
@@ -4,5 +4,5 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   },
-  "whitelistedNonPeerDependencies": ["@2sic.com/2sxc-typings"]
-}
\ No newline at end of file
+  "allowedNonPeerDependencies": ["@2sic.com/2sxc-typings"]
+}
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
index 73f245ae7..48f55702f 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/package.json
@@ -10,9 +10,9 @@
     "tslib": "^2.0.0"
   },
   "peerDependencies": {
-    "@angular/common": ">=13.2.6",
-    "@angular/core": ">=13.2.6",
-    "@angular/platform-browser": ">=13.2.6",
+    "@angular/common": ">=13.0.0",
+    "@angular/core": ">=13.0.0",
+    "@angular/platform-browser": ">=13.0.0",
     "rxjs": ">=6.6.0"
   },
   "homepage": "https://github.com/2sic/2sxc-ui/tree/master/projects/dnn-sxc-angular#readme",
diff --git a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts
index 833c9150f..c5edd49d2 100644
--- a/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts
+++ b/projects/dnn-sxc-angular/projects/dnn-sxc-angular/src/lib/sxc/data.service.ts
@@ -1,7 +1,7 @@
+import { MetadataFor } from '@2sic.com/2sxc-typings';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { routeContent } from '../contants';
-import { MetadataFor } from '../../../../../../$2sxc/src/data/metadata-for'
 
 /**
  * A helper to access data from 2sxc

From 450e1ae85dec8dbfc279d071dcec1eb88749eb98 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Tue, 21 Jun 2022 08:57:57 +0200
Subject: [PATCH 40/41] fx alignments (no code changes)

---
 .../commands/command/command-add-existing.ts  |  40 ++---
 .../src/commands/command/command-add.ts       |  20 +--
 .../commands/command/command-app-resources.ts |  20 +--
 .../commands/command/command-app-settings.ts  |  26 ++--
 .../src/commands/command/command-app.ts       |   6 +-
 .../src/commands/command/command-apps.ts      |   6 +-
 .../src/commands/command/command-delete.ts    |  36 ++---
 .../src/commands/command/command-edit.ts      |  16 +-
 .../command/command-insights-server.ts        |  18 +--
 .../commands/command/command-instance-list.ts |  22 +--
 .../src/commands/command/command-layout.ts    |  30 ++--
 .../src/commands/command/command-metadata.ts  |  48 +++---
 .../src/commands/command/command-more.ts      |  98 ++++++------
 .../src/commands/command/command-movedown.ts  |  18 +--
 .../src/commands/command/command-moveup.ts    |  22 +--
 .../src/commands/command/command-new.ts       |  62 ++++----
 .../commands/command/command-params-entity.ts |  11 +-
 .../src/commands/command/command-remove.ts    |  16 +-
 .../src/commands/command/command-replace.ts   |  30 ++--
 .../command/command-template-query.ts         |  16 +-
 .../command/command-template-settings.ts      |  10 +-
 .../src/commands/command/command-zone.ts      |   6 +-
 .../commands/command/content-list-actions.ts  | 140 +++++++++---------
 .../src/commands/command/shared-logic.ts      |  18 +--
 .../src/commands/command/workflow-commands.ts |   8 +-
 25 files changed, 372 insertions(+), 371 deletions(-)

diff --git a/projects/inpage/src/commands/command/command-add-existing.ts b/projects/inpage/src/commands/command/command-add-existing.ts
index 618ec1d2c..86ff01e22 100644
--- a/projects/inpage/src/commands/command/command-add-existing.ts
+++ b/projects/inpage/src/commands/command/command-add-existing.ts
@@ -8,28 +8,28 @@ import { SharedLogic } from './shared-logic';
  * @internal
  */
 Commands.add(CommandNames.addExisting, 'AddExisting', 'add-existing', false, true, {
-    dialog: (_) => 'replace',
+  dialog: (_) => 'replace',
 
-    showCondition(context) {
-        return SharedLogic.isList(context);
-    },
+  showCondition(context) {
+    return SharedLogic.isList(context);
+  },
 
-    configureLinkGenerator: (context, linkGenerator) => {
-        if (SharedLogic.isFieldList(context)) {
-            const params = context.button.command.params;
-            linkGenerator.items = [{ Group: {
-                Guid: params.parent,
-                Part: params.fields,
-                Index: params.sortOrder + 1,
-                Add: true,
-            }}];
-        } else if (SharedLogic.isPartOfBlockList(context)) {
-            const topItem = linkGenerator.items[0] as ItemIdentifierGroup;
-            topItem.Group.Add = true;
-            topItem.Group.Index++;
-            linkGenerator.items = [topItem];
-        }
-    },
+  configureLinkGenerator: (context, linkGenerator) => {
+    if (SharedLogic.isFieldList(context)) {
+      const params = context.button.command.params;
+      linkGenerator.items = [{ Group: {
+        Guid: params.parent,
+        Part: params.fields,
+        Index: params.sortOrder + 1,
+        Add: true,
+      }}];
+    } else if (SharedLogic.isPartOfBlockList(context)) {
+      const topItem = linkGenerator.items[0] as ItemIdentifierGroup;
+      topItem.Group.Add = true;
+      topItem.Group.Index++;
+      linkGenerator.items = [topItem];
+    }
+  },
 });
 
 /**
diff --git a/projects/inpage/src/commands/command/command-add.ts b/projects/inpage/src/commands/command/command-add.ts
index c86031344..ec1b24ba1 100644
--- a/projects/inpage/src/commands/command/command-add.ts
+++ b/projects/inpage/src/commands/command/command-add.ts
@@ -10,17 +10,17 @@ import { SharedLogic } from './shared-logic';
  * @internal
  */
 Commands.add(
-    CommandNames.add,
-    'AddDemo',
-    'plus-circled',
-    false,
-    true,
-    {
-        showCondition: (context) => SharedLogic.isList(context),
-        code(context) {
-            return Actions.addItem(context, context.button.command.params.sortOrder + 1);
-        },
+  CommandNames.add,
+  'AddDemo',
+  'plus-circled',
+  false,
+  true,
+  {
+    showCondition: (context) => SharedLogic.isList(context),
+    code(context) {
+      return Actions.addItem(context, context.button.command.params.sortOrder + 1);
     },
+  },
 );
 
 /**
diff --git a/projects/inpage/src/commands/command/command-app-resources.ts b/projects/inpage/src/commands/command/command-app-resources.ts
index bd8ddfb8b..8e3c204e6 100644
--- a/projects/inpage/src/commands/command/command-app-resources.ts
+++ b/projects/inpage/src/commands/command/command-app-resources.ts
@@ -5,19 +5,19 @@
  * @internal
  */
 Commands.add(CommandNames.appResources, 'AppResources', 'translate', true, false, {
-    dialog: (_) => CommandNames.edit,
+  dialog: (_) => CommandNames.edit,
 
-    disabled: (context) => context.app.resourcesId === null,
+  disabled: (context) => context.app.resourcesId === null,
 
-    title: (context) => `Toolbar.AppResources${context.app.resourcesId === null ? 'Disabled' : ''}`,
+  title: (context) => `Toolbar.AppResources${context.app.resourcesId === null ? 'Disabled' : ''}`,
 
-    // only if resources exist or are 0 (to be created)...
-    showCondition: (context) => !!context.user.CanAdmin,
+  // only if resources exist or are 0 (to be created)...
+  showCondition: (context) => !!context.user.CanAdmin,
 
-    configureLinkGenerator: (context, linkGenerator) => {
-        linkGenerator.items = [{ EntityId: context.app.resourcesId }];
-    },
+  configureLinkGenerator: (context, linkGenerator) => {
+    linkGenerator.items = [{ EntityId: context.app.resourcesId }];
+  },
 
-    // if it doesn't have a query, make the button faded
-    dynamicClasses: (context) => context.app.resourcesId !== null ? '' : 'empty',
+  // if it doesn't have a query, make the button faded
+  dynamicClasses: (context) => context.app.resourcesId !== null ? '' : 'empty',
 });
diff --git a/projects/inpage/src/commands/command/command-app-settings.ts b/projects/inpage/src/commands/command/command-app-settings.ts
index 79b5e2e39..94a763b9a 100644
--- a/projects/inpage/src/commands/command/command-app-settings.ts
+++ b/projects/inpage/src/commands/command/command-app-settings.ts
@@ -6,22 +6,22 @@
  */
 Commands.add(CommandNames.appSettings, 'AppSettings', 'sliders', true, false, {
 
-    dialog: () => CommandNames.edit,
+  dialog: () => CommandNames.edit,
 
-    disabled: (context) => context.app.settingsId === null,
+  disabled: (context) => context.app.settingsId === null,
 
-    title: (context) =>
-        `Toolbar.AppSettings${
-            context.app.settingsId === null ? 'Disabled' : ''
-    }`,
+  title: (context) =>
+  `Toolbar.AppSettings${
+    context.app.settingsId === null ? 'Disabled' : ''
+  }`,
 
-    // only if settings exist, or are 0 (to be created)
-    showCondition: (context) => context.user.CanAdmin,
+  // only if settings exist, or are 0 (to be created)
+  showCondition: (context) => context.user.CanAdmin,
 
-    configureLinkGenerator: (context, linkGenerator) => {
-        linkGenerator.items = [{ EntityId: context.app.settingsId }];
-    },
+  configureLinkGenerator: (context, linkGenerator) => {
+    linkGenerator.items = [{ EntityId: context.app.settingsId }];
+  },
 
-    // if it doesn't have a settings, make it less strong
-    dynamicClasses: (context) => context.app.settingsId !== null ? '' : 'empty',
+  // if it doesn't have a settings, make it less strong
+  dynamicClasses: (context) => context.app.settingsId !== null ? '' : 'empty',
 });
diff --git a/projects/inpage/src/commands/command/command-app.ts b/projects/inpage/src/commands/command/command-app.ts
index 5a0ef347f..93c95df96 100644
--- a/projects/inpage/src/commands/command/command-app.ts
+++ b/projects/inpage/src/commands/command/command-app.ts
@@ -5,7 +5,7 @@
  * @internal
  */
 Commands.add(CommandNames.app, 'App', 'settings', true, false, {
-    showCondition: (context) => {
-        return context.user.CanAdmin;
-    },
+  showCondition: (context) => {
+    return context.user.CanAdmin;
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-apps.ts b/projects/inpage/src/commands/command/command-apps.ts
index a06bf65b1..60bf34555 100644
--- a/projects/inpage/src/commands/command/command-apps.ts
+++ b/projects/inpage/src/commands/command/command-apps.ts
@@ -5,7 +5,7 @@
  * @internal
  */
 Commands.add(CommandNames.apps, 'Zone', 'manage', true, false, {
-    showCondition: (context) => {
-        return !!context.user.CanAdmin;
-    },
+  showCondition: (context) => {
+    return !!context.user.CanAdmin;
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-delete.ts b/projects/inpage/src/commands/command/command-delete.ts
index cc1bf2d02..4c985e1ac 100644
--- a/projects/inpage/src/commands/command/command-delete.ts
+++ b/projects/inpage/src/commands/command/command-delete.ts
@@ -6,27 +6,27 @@ import { contentItems } from '../../entity-manipulation/item-commands';
  * @internal
  */
 Commands.add(CommandNames.delete, 'Delete', 'cancel', true, false, {
-    // disabled: true,
-    showCondition(context) {
-        const p = context.button.command.params;
-        // can never be used for a modulelist item, as it is always in use somewhere
-        if (p.useModuleList) return false;
+  // disabled: true,
+  showCondition(context) {
+    const p = context.button.command.params;
+    // can never be used for a modulelist item, as it is always in use somewhere
+    if (p.useModuleList) return false;
 
-        // check if all data exists required for deleting
-        // before 10.27, it was entityId, entityGuid and entityTitle
-        // since 10.27, there will always be a guid (if it has an ID)
-        // and enabling it requires an action-modifier "+delete",
-        // so the automatic detection only applies
-        // to the pre-10.27 custom toolbars case
-        return (!!p.entityId && !!p.entityGuid && !!p.entityTitle);
-    },
+    // check if all data exists required for deleting
+    // before 10.27, it was entityId, entityGuid and entityTitle
+    // since 10.27, there will always be a guid (if it has an ID)
+    // and enabling it requires an action-modifier "+delete",
+    // so the automatic detection only applies
+    // to the pre-10.27 custom toolbars case
+    return (!!p.entityId && !!p.entityGuid && !!p.entityTitle);
+  },
 
 
-    code(context) {
-        const p = context.button.command.params;
-        const title = p.title || p.entityTitle; // prefer new title, and fallback to old for pre 10.27 configs
-        return contentItems.delete(context, p.entityId, p.entityGuid, title);
-    },
+  code(context) {
+    const p = context.button.command.params;
+    const title = p.title || p.entityTitle; // prefer new title, and fallback to old for pre 10.27 configs
+    return contentItems.delete(context, p.entityId, p.entityGuid, title);
+  },
 });
 
 /**
diff --git a/projects/inpage/src/commands/command/command-edit.ts b/projects/inpage/src/commands/command/command-edit.ts
index 98dac6902..fab1a3b6e 100644
--- a/projects/inpage/src/commands/command/command-edit.ts
+++ b/projects/inpage/src/commands/command/command-edit.ts
@@ -7,12 +7,12 @@
  * @internal
  */
 Commands.add(CommandNames.edit, 'Edit', 'pencil', false, true, {
-    addParamsToLink: (ctx) => ({ mode: CommandNames.edit }),
-    showCondition(ctx) {
-        // need ID or a "slot", otherwise edit won't work
-        const result =
-            !!ctx.button.command.params.entityId ||
-            !!ctx.button.command.params.useModuleList;
-        return result;
-    },
+  addParamsToLink: (ctx) => ({ mode: CommandNames.edit }),
+  showCondition(ctx) {
+    // need ID or a "slot", otherwise edit won't work
+    const result =
+      !!ctx.button.command.params.entityId ||
+      !!ctx.button.command.params.useModuleList;
+    return result;
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-insights-server.ts b/projects/inpage/src/commands/command/command-insights-server.ts
index d0cd4e910..757bcf146 100644
--- a/projects/inpage/src/commands/command/command-insights-server.ts
+++ b/projects/inpage/src/commands/command/command-insights-server.ts
@@ -5,13 +5,13 @@
  * @internal
  */
 Commands.add(CommandNames.insightsServer, 'Insights', 'speed', true, false, {
-    showCondition: (context) => context.user.CanDevelop,
-    code(context, event) {
-        return new Promise((resolve, reject) => {
-            console.log('context', context);
-            const path = window.$2sxc.http.apiUrl('sys/insights/logs');
-            window.open(path, '_blank');
-            return resolve();
-        });
-    },
+  showCondition: (context) => context.user.CanDevelop,
+  code(context, event) {
+    return new Promise((resolve, reject) => {
+      console.log('context', context);
+      const path = window.$2sxc.http.apiUrl('sys/insights/logs');
+      window.open(path, '_blank');
+      return resolve();
+    });
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-instance-list.ts b/projects/inpage/src/commands/command/command-instance-list.ts
index 09c0aa666..75efe35b5 100644
--- a/projects/inpage/src/commands/command/command-instance-list.ts
+++ b/projects/inpage/src/commands/command/command-instance-list.ts
@@ -5,17 +5,17 @@
  * @internal
  */
 Commands.add(CommandNames.instanceList, 'Sort', 'list-numbered', false, true, {
-    showCondition: (context) => SharedLogic.isList(context),
+  showCondition: (context) => SharedLogic.isList(context),
 
-    configureLinkGenerator: (context, linkGenerator) => {
-        if (!SharedLogic.isFieldList(context)) return;
+  configureLinkGenerator: (context, linkGenerator) => {
+    if (!SharedLogic.isFieldList(context)) return;
 
-        const params = context.button.command.params;
-        linkGenerator.items = [{ Group: {
-            Guid: params.parent,
-            Part: params.fields,
-            Index: params.sortOrder,
-            Add: false,
-        }}];
-    },
+    const params = context.button.command.params;
+    linkGenerator.items = [{ Group: {
+      Guid: params.parent,
+      Part: params.fields,
+      Index: params.sortOrder,
+      Add: false,
+    }}];
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-layout.ts b/projects/inpage/src/commands/command/command-layout.ts
index 2836af91c..8cf59c022 100644
--- a/projects/inpage/src/commands/command/command-layout.ts
+++ b/projects/inpage/src/commands/command/command-layout.ts
@@ -9,21 +9,21 @@ import { SxcTools } from '../../sxc/sxc-tools';
  */
 Commands.add(CommandNames.layout, 'ChangeLayout', 'glasses', true, true, {
 
-    inlineWindow: (_) => true,
+  inlineWindow: (_) => true,
 
-    code(context, event) {
-        // console.log('layout');
-        // Try to find the closest tag based on the click
-        // if this fails, try to find it based on the sxc-instance
-        const attrSel = '[' + QeSelectors.blocks.cb.context + ']';
-        // note: sometimes when the page loads, this can be auto-triggered and not have an event
-        const listSpecs = SxcTools.getTag(context.sxc).closest<HTMLElement>(attrSel);
+  code(context, event) {
+    // console.log('layout');
+    // Try to find the closest tag based on the click
+    // if this fails, try to find it based on the sxc-instance
+    const attrSel = '[' + QeSelectors.blocks.cb.context + ']';
+    // note: sometimes when the page loads, this can be auto-triggered and not have an event
+    const listSpecs = SxcTools.getTag(context.sxc).closest<HTMLElement>(attrSel);
 
-        // Now check if we have apps-parameters to pass on
-        if (listSpecs) {
-            const specs = ContextForLists.getFromDom(listSpecs);
-            context.button.command.params.apps = specs.apps;
-        }
-        return CmsEngine.openDialog(context, event);
-    },
+    // Now check if we have apps-parameters to pass on
+    if (listSpecs) {
+      const specs = ContextForLists.getFromDom(listSpecs);
+      context.button.command.params.apps = specs.apps;
+    }
+    return CmsEngine.openDialog(context, event);
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-metadata.ts b/projects/inpage/src/commands/command/command-metadata.ts
index 7d9a01409..bcca5ed6e 100644
--- a/projects/inpage/src/commands/command/command-metadata.ts
+++ b/projects/inpage/src/commands/command/command-metadata.ts
@@ -1,5 +1,5 @@
 ﻿import { Command, CommandNames, CommandParamsEntityById, Commands } from '..';
-import { ItemIdentifierSimple, CommandParamsMetadata } from '../../../../$2sxc/src/cms';
+import { CommandParamsMetadata, ItemIdentifierSimple } from '../../../../$2sxc/src/cms';
 import { CommandContentTypeParams } from './command-content-type';
 
 const MetadataDefaultKeyType = 'string';
@@ -12,36 +12,36 @@ const MetadataDefaultTargetType = 10; // cms-item
  */
 export const MetadataCommand = Command.build(CommandNames.metadata, 'Metadata', 'tag', false, false, {
 
-    addParamsToLink: (_) => ({ mode: CommandNames.newMode }),
+  addParamsToLink: (_) => ({ mode: CommandNames.newMode }),
 
-    dialog: (_) => CommandNames.edit, // don't use "new" (default) but use "edit"
+  dialog: (_) => CommandNames.edit, // don't use "new" (default) but use "edit"
 
-    // if it doesn't have data yet, make it less strong
-    dynamicClasses: (ctx) => ctx.button.command.params.entityId ? '' : 'empty',
+  // if it doesn't have data yet, make it less strong
+  dynamicClasses: (ctx) => ctx.button.command.params.entityId ? '' : 'empty',
 
-    // only add a metadata-button if it has metadata-infos
-    showCondition: (ctx) => !!ctx.button.command.params.metadata,
+  // only add a metadata-button if it has metadata-infos
+  showCondition: (ctx) => !!ctx.button.command.params.metadata,
 
-    configureLinkGenerator(_, linkGenerator) {
-        const itm: Partial<ItemIdentifierSimple> = {
-            Metadata: {
-                ...{ keyType: MetadataDefaultKeyType, targetType: MetadataDefaultTargetType },
-                ...linkGenerator.context.button.command.params.metadata },
-        };
-        linkGenerator.items[0] = {...linkGenerator.items[0], ...itm };
-    },
+  configureLinkGenerator(_, linkGenerator) {
+    const itm: Partial<ItemIdentifierSimple> = {
+      Metadata: {
+        ...{ keyType: MetadataDefaultKeyType, targetType: MetadataDefaultTargetType },
+        ...linkGenerator.context.button.command.params.metadata },
+    };
+    linkGenerator.items[0] = {...linkGenerator.items[0], ...itm };
+  },
 });
 
 /**
  * @internal
  */
 export const ImageMetadataCommand = Command.build(CommandNames.image, 'Image', 'focus', false, false, {
-    addParamsToLink: MetadataCommand.buttonDefaults.addParamsToLink,
-    dialog: MetadataCommand.buttonDefaults.dialog,
-    classes: 'single-field',
-    dynamicClasses: MetadataCommand.buttonDefaults.dynamicClasses,
-    showCondition: MetadataCommand.buttonDefaults.showCondition,
-    configureLinkGenerator: MetadataCommand.buttonDefaults.configureLinkGenerator,
+  addParamsToLink: MetadataCommand.buttonDefaults.addParamsToLink,
+  dialog: MetadataCommand.buttonDefaults.dialog,
+  classes: 'single-field',
+  dynamicClasses: MetadataCommand.buttonDefaults.dynamicClasses,
+  showCondition: MetadataCommand.buttonDefaults.showCondition,
+  configureLinkGenerator: MetadataCommand.buttonDefaults.configureLinkGenerator,
 });
 
 Commands.addCommand(MetadataCommand);
@@ -53,12 +53,12 @@ Commands.addCommand(ImageMetadataCommand);
  * <br>
  * Will do either one of these:
  * - if it has an `entityId`, will just open `edit` for that Entity
- * - if it has no `entityId`, will open `new` for the current `contentType` 
- * and assign to the target specified by TODO:
+ * - if it has no `entityId`, will open `new` for the current `contentType`
+ * and assign to the target specified by `metadata`:
  * <br>
  * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
  */
- export interface CommandMetadataParams extends CommandContentTypeParams, CommandParamsEntityById {
+export interface CommandMetadataParams extends CommandContentTypeParams, CommandParamsEntityById {
   /**
    * Target to assign the metadata to.
    */
diff --git a/projects/inpage/src/commands/command/command-more.ts b/projects/inpage/src/commands/command/command-more.ts
index 3611756d7..8cce9caa2 100644
--- a/projects/inpage/src/commands/command/command-more.ts
+++ b/projects/inpage/src/commands/command/command-more.ts
@@ -8,53 +8,53 @@ import { IDs } from '../../constants/ids';
  * @internal
  */
 Commands.add(CommandNames.more, 'MoreActions', 'options btn-mode', true, false, {
-    code(context, event) {
-        return new Promise((resolve, reject) => {
-            const btn2 = event.target as HTMLElement;
-            const fullMenu2 = btn2.closest(IDs.sel.tagScMenu) as HTMLElement;
-            const oldState2 = Number(fullMenu2.getAttribute('data-state') || 0);
-            const max2 = Number(fullMenu2.getAttribute('group-count'));
-            const newState2 = (oldState2 + 1) % max2;
-
-            fullMenu2.classList.remove(`group-${oldState2}`);
-            fullMenu2.classList.add(`group-${newState2}`);
-            fullMenu2.setAttribute('data-state', String(newState2));
-
-            event.preventDefault();
-
-            function mouseenterHandler(e: MouseEvent) {
-                fullMenu2.style.opacity = '1';
-            }
-
-            function mouseleaveHandler(e: MouseEvent) {
-                if (e.screenX !== 0 && e.screenY !== 0) {
-                    // hide toolbar on mouseleave
-                    fullMenu2.style.opacity = '0';
-                } else {
-                    // this is fix for Chrome issue
-                    // ensure to show toolbar because X=0 and Y=0
-                    fullMenu2.style.opacity = '1';
-                    console.warn(
-                        'workaround for toolbar hide onmouseleave issue',
-                        e.screenX,
-                        e.screenY,
-                        e.target,
-                    );
-                }
-            }
-
-            // because of issue in Chrome we need to override CSS rules in edit.css for toolbar toggle on mouse hover
-            const scElement = fullMenu2.closest(
-                '.' + C.Toolbar.classes.oldHover,
-            );
-            // add mouseenter and mouseleave events to parent sc-element if not already added
-            if (scElement && fullMenu2.getAttribute('listener') !== 'true') {
-                scElement.addEventListener('mouseenter', mouseenterHandler);
-                scElement.addEventListener('mouseleave', mouseleaveHandler);
-                fullMenu2.setAttribute('listener', 'true'); // flag that events are added
-            }
-
-            resolve();
-        });
-    },
+  code(context, event) {
+    return new Promise((resolve, reject) => {
+      const btn2 = event.target as HTMLElement;
+      const fullMenu2 = btn2.closest(IDs.sel.tagScMenu) as HTMLElement;
+      const oldState2 = Number(fullMenu2.getAttribute('data-state') || 0);
+      const max2 = Number(fullMenu2.getAttribute('group-count'));
+      const newState2 = (oldState2 + 1) % max2;
+
+      fullMenu2.classList.remove(`group-${oldState2}`);
+      fullMenu2.classList.add(`group-${newState2}`);
+      fullMenu2.setAttribute('data-state', String(newState2));
+
+      event.preventDefault();
+
+      function mouseenterHandler(e: MouseEvent) {
+        fullMenu2.style.opacity = '1';
+      }
+
+      function mouseleaveHandler(e: MouseEvent) {
+        if (e.screenX !== 0 && e.screenY !== 0) {
+          // hide toolbar on mouseleave
+          fullMenu2.style.opacity = '0';
+        } else {
+          // this is fix for Chrome issue
+          // ensure to show toolbar because X=0 and Y=0
+          fullMenu2.style.opacity = '1';
+          console.warn(
+            'workaround for toolbar hide onmouseleave issue',
+            e.screenX,
+            e.screenY,
+            e.target,
+          );
+        }
+      }
+
+      // because of issue in Chrome we need to override CSS rules in edit.css for toolbar toggle on mouse hover
+      const scElement = fullMenu2.closest(
+        '.' + C.Toolbar.classes.oldHover,
+      );
+      // add mouseenter and mouseleave events to parent sc-element if not already added
+      if (scElement && fullMenu2.getAttribute('listener') !== 'true') {
+        scElement.addEventListener('mouseenter', mouseenterHandler);
+        scElement.addEventListener('mouseleave', mouseleaveHandler);
+        fullMenu2.setAttribute('listener', 'true'); // flag that events are added
+      }
+
+      resolve();
+    });
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-movedown.ts b/projects/inpage/src/commands/command/command-movedown.ts
index 5f43f716c..df6cae4f7 100644
--- a/projects/inpage/src/commands/command/command-movedown.ts
+++ b/projects/inpage/src/commands/command/command-movedown.ts
@@ -6,14 +6,14 @@ import { Actions } from './content-list-actions';
  * @internal
  */
 Commands.add(CommandNames.moveDown, 'MoveDown', 'move-down', false, true, {
-    // TODO: do not display if is last item in list
-    showCondition: (context) => SharedLogic.isList(context),
-    code(context) {
-        // TODO: make sure index is never greater than the amount of items
-        return Actions.changeOrder(
-            context,
-            context.button.command.params.sortOrder,
-            context.button.command.params.sortOrder + 1,
-        );
+  // TODO: do not display if is last item in list
+  showCondition: (context) => SharedLogic.isList(context),
+  code(context) {
+    // TODO: make sure index is never greater than the amount of items
+    return Actions.changeOrder(
+      context,
+      context.button.command.params.sortOrder,
+      context.button.command.params.sortOrder + 1,
+      );
     },
 });
diff --git a/projects/inpage/src/commands/command/command-moveup.ts b/projects/inpage/src/commands/command/command-moveup.ts
index 2f8ea3418..590baa687 100644
--- a/projects/inpage/src/commands/command/command-moveup.ts
+++ b/projects/inpage/src/commands/command/command-moveup.ts
@@ -7,16 +7,16 @@ import { SharedLogic } from './shared-logic';
  * @internal
  */
 Commands.add(CommandNames.moveUp, 'MoveUp', 'move-up', false, true, {
-    showCondition(context) {
-        return !!(SharedLogic.isList(context) &&
-            context.button.command.params.sortOrder !== 0
-        );
-    },
-    code(context) {
-        return Actions.changeOrder(
-            context,
-            context.button.command.params.sortOrder,
-            Math.max(context.button.command.params.sortOrder - 1, 0),
-        );
+  showCondition(context) {
+    return !!(SharedLogic.isList(context) &&
+    context.button.command.params.sortOrder !== 0
+    );
+  },
+  code(context) {
+    return Actions.changeOrder(
+      context,
+      context.button.command.params.sortOrder,
+      Math.max(context.button.command.params.sortOrder - 1, 0),
+      );
     },
 });
diff --git a/projects/inpage/src/commands/command/command-new.ts b/projects/inpage/src/commands/command/command-new.ts
index 7031c1f7a..7afb053e8 100644
--- a/projects/inpage/src/commands/command/command-new.ts
+++ b/projects/inpage/src/commands/command/command-new.ts
@@ -12,37 +12,37 @@ import { SharedLogic } from './shared-logic';
  * @internal
  */
 Commands.add(CommandNames.new, 'New', 'plus', false, true, {
-    addParamsToLink: (_) => ({ mode: CommandNames.newMode }),
-
-    dialog: (_) => CommandNames.edit, // don't use "new" (default) but use "edit"
-
-    showCondition(context) {
-        // don't provide new if type unknown or on the header-item
-        return  !!context.button.command.params.contentType || SharedLogic.isList(context);
-    },
-
-    code(context, event) {
-        const params = context.button.command.params;
-        // todo - should refactor this to be a toolbarManager.contentBlock command
-        params.sortOrder = params.sortOrder + 1;
-
-        // if we have an EntityId, this means that it picked up id/guid from the current item,
-        // so we must reset both EntityId and EntityGuid
-        // note that we don't reset this if entityId = 0, because that usually means the guid was preset on purpose
-        if (params.entityId && params.entityId !== 0) {
-            delete params.entityId;
-            delete params.entityGuid;
-        }
-
-        // if we have useModuleList AND contentType then something is inconsistent
-        // since useModuleList doesn't need to specify the contentType
-        // this means that it's a custom new button, and useModuleList is wrong.
-        if (params.useModuleList && params.contentType)
-            delete params.useModuleList;
-
-        // done
-        return CmsEngine.openDialog(context, event);
-    },
+  addParamsToLink: (_) => ({ mode: CommandNames.newMode }),
+
+  dialog: (_) => CommandNames.edit, // don't use "new" (default) but use "edit"
+
+  showCondition(context) {
+    // don't provide new if type unknown or on the header-item
+    return  !!context.button.command.params.contentType || SharedLogic.isList(context);
+  },
+
+  code(context, event) {
+    const params = context.button.command.params;
+    // todo - should refactor this to be a toolbarManager.contentBlock command
+    params.sortOrder = params.sortOrder + 1;
+
+    // if we have an EntityId, this means that it picked up id/guid from the current item,
+    // so we must reset both EntityId and EntityGuid
+    // note that we don't reset this if entityId = 0, because that usually means the guid was preset on purpose
+    if (params.entityId && params.entityId !== 0) {
+      delete params.entityId;
+      delete params.entityGuid;
+    }
+
+    // if we have useModuleList AND contentType then something is inconsistent
+    // since useModuleList doesn't need to specify the contentType
+    // this means that it's a custom new button, and useModuleList is wrong.
+    if (params.useModuleList && params.contentType)
+    delete params.useModuleList;
+
+    // done
+    return CmsEngine.openDialog(context, event);
+  },
 });
 
 /**
diff --git a/projects/inpage/src/commands/command/command-params-entity.ts b/projects/inpage/src/commands/command/command-params-entity.ts
index 2408f449c..5a37e627b 100644
--- a/projects/inpage/src/commands/command/command-params-entity.ts
+++ b/projects/inpage/src/commands/command/command-params-entity.ts
@@ -6,7 +6,7 @@
  */
  export interface CommandParamsEntityById {
   /**
-   * ID of item to edit. 
+   * ID of item to edit.
    */
   entityId: number;
 }
@@ -18,12 +18,12 @@
  */
  export interface CommandParamsEntityInContentBlock {
   /**
-   * Determins the position of the item in the list that will be edited. 
+   * Determins the position of the item in the list that will be edited.
    */
   sortOrder: number;
 
   /**
-   * Must be true, to work on the module list. 
+   * Must be true, to work on the module list.
    */
   useModuleList: true;
 }
@@ -35,7 +35,7 @@
  */
  export interface CommandParamsEntityInList {
   /**
-   * Determins the position of the item in the list that will be edited. 
+   * Determins the position of the item in the list that will be edited.
    */
   sortOrder: number;
 
@@ -57,6 +57,7 @@
  * <br>
  * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
  */
+// tslint:disable-next-line: align
 export interface CommandParamsEntity extends CommandParamsEntityById, CommandParamsEntityInContentBlock {
 
-}
\ No newline at end of file
+}
diff --git a/projects/inpage/src/commands/command/command-remove.ts b/projects/inpage/src/commands/command/command-remove.ts
index 44a4d6978..b3c0acfa2 100644
--- a/projects/inpage/src/commands/command/command-remove.ts
+++ b/projects/inpage/src/commands/command/command-remove.ts
@@ -9,12 +9,12 @@ import { Actions } from './content-list-actions';
  * @internal
  */
 Commands.add(CommandNames.remove, 'Remove', 'minus-circled', false, true, {
-    showCondition: (context) => SharedLogic.isList(context),
-    code(context) {
-        return new Promise((resolve, reject) => {
-            if (confirm(translate('Toolbar.ConfirmRemove')))
-                return Actions.removeFromList(context);
-            return resolve();
-        });
-    },
+  showCondition: (context) => SharedLogic.isList(context),
+  code(context) {
+    return new Promise((resolve, reject) => {
+      if (confirm(translate('Toolbar.ConfirmRemove')))
+      return Actions.removeFromList(context);
+      return resolve();
+    });
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-replace.ts b/projects/inpage/src/commands/command/command-replace.ts
index ef187a9ba..026a37d24 100644
--- a/projects/inpage/src/commands/command/command-replace.ts
+++ b/projects/inpage/src/commands/command/command-replace.ts
@@ -7,21 +7,21 @@ import { SharedLogic } from './shared-logic';
  */
 Commands.add(CommandNames.replace, 'Replace', 'replace', false, true, {
 
-    showCondition(context) {
-        return SharedLogic.isReferencedItem(context);
-    },
+  showCondition(context) {
+    return SharedLogic.isReferencedItem(context);
+  },
 
-    configureLinkGenerator: (context, linkGenerator) => {
-        // default case is ContentBlock - in which case it doesn't need to redefine the items
-        if (!SharedLogic.isFieldList(context)) return;
+  configureLinkGenerator: (context, linkGenerator) => {
+    // default case is ContentBlock - in which case it doesn't need to redefine the items
+    if (!SharedLogic.isFieldList(context)) return;
 
-        // fieldList - redefine the items
-        const params = context.button.command.params;
-        linkGenerator.items = [{ Group: {
-            Guid: params.parent,
-            Part: params.fields,
-            Index: params.sortOrder,
-            Add: false,
-        }}];
-    },
+    // fieldList - redefine the items
+    const params = context.button.command.params;
+    linkGenerator.items = [{ Group: {
+      Guid: params.parent,
+      Part: params.fields,
+      Index: params.sortOrder,
+      Add: false,
+    }}];
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-template-query.ts b/projects/inpage/src/commands/command/command-template-query.ts
index 20b31673d..5edb9713f 100644
--- a/projects/inpage/src/commands/command/command-template-query.ts
+++ b/projects/inpage/src/commands/command/command-template-query.ts
@@ -5,18 +5,18 @@
  * @internal
  */
 Commands.add(CommandNames.templateQuery, 'QueryEdit', 'filter', true, false, {
-    dialog: (_) => 'pipeline-designer',
+  dialog: (_) => 'pipeline-designer',
 
-    addParamsToLink: (ctx) => ({ pipelineId: ctx.contentBlock.queryId }),
+  addParamsToLink: (ctx) => ({ pipelineId: ctx.contentBlock.queryId }),
 
-    newWindow: (_) => true,
+  newWindow: (_) => true,
 
-    disabled: (ctx) => ctx.app.settingsId === null || !ctx.contentBlock.queryId,
+  disabled: (ctx) => ctx.app.settingsId === null || !ctx.contentBlock.queryId,
 
-    title: (ctx) => `Toolbar.QueryEdit${ctx.contentBlock.queryId === null ? 'Disabled' : ''}`,
+  title: (ctx) => `Toolbar.QueryEdit${ctx.contentBlock.queryId === null ? 'Disabled' : ''}`,
 
-    showCondition: (ctx) => !!ctx.user.CanDevelop && !ctx.app.isContent,
+  showCondition: (ctx) => !!ctx.user.CanDevelop && !ctx.app.isContent,
 
-    // if it doesn't have a query, make it less strong
-    dynamicClasses: (ctx) => ctx.contentBlock.queryId ? '' : 'empty',
+  // if it doesn't have a query, make it less strong
+  dynamicClasses: (ctx) => ctx.contentBlock.queryId ? '' : 'empty',
 });
diff --git a/projects/inpage/src/commands/command/command-template-settings.ts b/projects/inpage/src/commands/command/command-template-settings.ts
index b63c6007f..445028ca5 100644
--- a/projects/inpage/src/commands/command/command-template-settings.ts
+++ b/projects/inpage/src/commands/command/command-template-settings.ts
@@ -5,11 +5,11 @@
  * @internal
  */
 Commands.add(CommandNames.templateSettings, 'TemplateSettings', 'sliders', true, false, {
-    dialog: (_) => 'edit',
+  dialog: (_) => 'edit',
 
-    showCondition: (ctx) => !!ctx.user.CanDevelop && !ctx.app.isContent,
+  showCondition: (ctx) => !!ctx.user.CanDevelop && !ctx.app.isContent,
 
-    configureLinkGenerator: (ctx, linkGen) => {
-        linkGen.items = [{ EntityId: ctx.contentBlock.templateId }];
-    },
+  configureLinkGenerator: (ctx, linkGen) => {
+    linkGen.items = [{ EntityId: ctx.contentBlock.templateId }];
+  },
 });
diff --git a/projects/inpage/src/commands/command/command-zone.ts b/projects/inpage/src/commands/command/command-zone.ts
index cecbfd183..c20012455 100644
--- a/projects/inpage/src/commands/command/command-zone.ts
+++ b/projects/inpage/src/commands/command/command-zone.ts
@@ -5,7 +5,7 @@
  * @internal
  */
 Commands.add(CommandNames.zone, 'Zone', 'manage', true, false, {
-    showCondition: (context) => {
-        return !!context.user.CanAdmin;
-    },
+  showCondition: (context) => {
+    return !!context.user.CanAdmin;
+  },
 });
diff --git a/projects/inpage/src/commands/command/content-list-actions.ts b/projects/inpage/src/commands/command/content-list-actions.ts
index 02db89885..d22288a0a 100644
--- a/projects/inpage/src/commands/command/content-list-actions.ts
+++ b/projects/inpage/src/commands/command/content-list-actions.ts
@@ -17,67 +17,67 @@ const webApiBlockPublish = 'cms/block/publish';
  * @internal
  */
 class ContentListActions {
-    /**
-     * add an item to the list at this position
-     * @param {ContextComplete} context
-     * @param {number} index
-     */
-    addItem<T>(context: ContextComplete, index: number) {
-        return doAndReload<T>(context, webApiAdd, { index }, 'post');
-    }
+  /**
+   * add an item to the list at this position
+   * @param {ContextComplete} context
+   * @param {number} index
+   */
+  addItem<T>(context: ContextComplete, index: number) {
+    return doAndReload<T>(context, webApiAdd, { index }, 'post');
+  }
 
-    /**
-     * remove an item from a list, then reload
-     * @param {ContextComplete} context
-     * @param {number} sortOrder
-     */
-    removeFromList(context: ContextComplete) {
-        const params = context.button.command.params;
-        return doAndReload<void>(context, webApiRemoveFromList, {
-            index: params.sortOrder,
-            parent: params.parent,
-            fields: params.fields,
-        }, 'delete');
-    }
+  /**
+   * remove an item from a list, then reload
+   * @param {ContextComplete} context
+   * @param {number} sortOrder
+   */
+  removeFromList(context: ContextComplete) {
+    const params = context.button.command.params;
+    return doAndReload<void>(context, webApiRemoveFromList, {
+      index: params.sortOrder,
+      parent: params.parent,
+      fields: params.fields,
+    }, 'delete');
+  }
 
-    /**
-     * change the order of an item in a list, then reload
-     * @param {ContextComplete} context
-     * @param {number} index
-     * @param {number} toIndex
-     */
-    changeOrder(context: ContextComplete, index: number, toIndex: number) {
-        const params = context.button.command.params;
-        return doAndReload<void>(context, webApiReorder, {
-            parent: params.parent,
-            fields: params.fields,
-            index,
-            toIndex,
-        }, 'post');
-    }
+  /**
+   * change the order of an item in a list, then reload
+   * @param {ContextComplete} context
+   * @param {number} index
+   * @param {number} toIndex
+   */
+  changeOrder(context: ContextComplete, index: number, toIndex: number) {
+    const params = context.button.command.params;
+    return doAndReload<void>(context, webApiReorder, {
+      parent: params.parent,
+      fields: params.fields,
+      index,
+      toIndex,
+    }, 'post');
+  }
 
-    /**
-     * set a content-item in this block to published, then reload
-     * @param {ContextComplete} context
-     * @param {string} part
-     * @param {number} index
-     */
-    publish(context: ContextComplete, part: string, index: number) {
-        return doAndReload<void>(context, webApiBlockPublish, {
-            part,
-            index,
-        }, 'post');
-    }
+  /**
+   * set a content-item in this block to published, then reload
+   * @param {ContextComplete} context
+   * @param {string} part
+   * @param {number} index
+   */
+  publish(context: ContextComplete, part: string, index: number) {
+    return doAndReload<void>(context, webApiBlockPublish, {
+      part,
+      index,
+    }, 'post');
+  }
 
-    /**
-     * publish an item using it's ID
-     * @param {ContextComplete} context
-     * @param {number} entityId
-     */
-    publishId(context: ContextComplete, entityId: number) {
-        return doAndReload<void>(context, webApiItemPublish,
-            { id: entityId },
-            'post');
+  /**
+   * publish an item using it's ID
+   * @param {ContextComplete} context
+   * @param {number} entityId
+   */
+  publishId(context: ContextComplete, entityId: number) {
+    return doAndReload<void>(context, webApiItemPublish,
+      { id: entityId },
+      'post');
     }
 }
 
@@ -105,18 +105,18 @@ export const Actions = new ContentListActions();
  * @returns {void | T}
  */
 function doAndReload<T>(
-    context: ContextComplete,
-    url: string,
-    params: ContentListActionParams,
-    verb: 'get' | 'post' | 'delete' = 'get',
-    postData: TypeUnsafe = {},
+  context: ContextComplete,
+  url: string,
+  params: ContentListActionParams,
+  verb: 'get' | 'post' | 'delete' = 'get',
+  postData: TypeUnsafe = {},
 ): Promise<void | T> {
-    return (verb === 'post'
-        ? context.sxc.webApi.fetchRaw(context.sxc.webApi.url(url, params), postData, 'POST')
-        : verb === 'delete'
-            ? context.sxc.webApi.fetchRaw(context.sxc.webApi.url(url, params), undefined, 'DELETE')
-            : context.sxc.webApi.fetchJson(context.sxc.webApi.url(url, params)))
-        .then(() => {
-            renderer.reloadAndReInitialize(context);
-        });
+  return (verb === 'post'
+    ? context.sxc.webApi.fetchRaw(context.sxc.webApi.url(url, params), postData, 'POST')
+    : verb === 'delete'
+      ? context.sxc.webApi.fetchRaw(context.sxc.webApi.url(url, params), undefined, 'DELETE')
+      : context.sxc.webApi.fetchJson(context.sxc.webApi.url(url, params)))
+    .then(() => {
+      renderer.reloadAndReInitialize(context);
+    });
 }
diff --git a/projects/inpage/src/commands/command/shared-logic.ts b/projects/inpage/src/commands/command/shared-logic.ts
index effb8ff36..cfbfe9d36 100644
--- a/projects/inpage/src/commands/command/shared-logic.ts
+++ b/projects/inpage/src/commands/command/shared-logic.ts
@@ -6,10 +6,10 @@ import { ContextComplete } from '../../context';
  * @internal
  */
 export class SharedLogic {
-    static isPartOfBlockList(context: ContextComplete) {
-        return !!(context.contentBlock.isList &&
-            context.button.command.params.useModuleList &&
-            context.button.command.params.sortOrder !== -1);    // -1 is the header item
+  static isPartOfBlockList(context: ContextComplete) {
+    return !!(context.contentBlock.isList &&
+      context.button.command.params.useModuleList &&
+      context.button.command.params.sortOrder !== -1);    // -1 is the header item
     }
 
     /**
@@ -18,19 +18,19 @@ export class SharedLogic {
      * a non-list (single item only)
      */
     static isBlockReference(context: ContextComplete) {
-        return !!context.button.command.params.useModuleList;    // -1 is the header item
+      return !!context.button.command.params.useModuleList;    // -1 is the header item
     }
 
     static isFieldList(context: ContextComplete) {
-        const params = context.button?.command.params;
-        return !!(params?.fields && params?.parent);
+      const params = context.button?.command.params;
+      return !!(params?.fields && params?.parent);
     }
 
     static isList(context: ContextComplete) {
-        return this.isPartOfBlockList(context) || this.isFieldList(context);
+      return this.isPartOfBlockList(context) || this.isFieldList(context);
     }
 
     static isReferencedItem(context: ContextComplete) {
-        return this.isBlockReference(context) || this.isFieldList(context);
+      return this.isBlockReference(context) || this.isFieldList(context);
     }
 }
diff --git a/projects/inpage/src/commands/command/workflow-commands.ts b/projects/inpage/src/commands/command/workflow-commands.ts
index 121881a9b..8ff3fa7df 100644
--- a/projects/inpage/src/commands/command/workflow-commands.ts
+++ b/projects/inpage/src/commands/command/workflow-commands.ts
@@ -2,9 +2,9 @@
  * @internal
  */
 export const WorkflowCommands = {
-    /** Special command: 'all' is a catch-all for workflows that should run on every command */
-    all: 'all',
+  /** Special command: 'all' is a catch-all for workflows that should run on every command */
+  all: 'all',
 
-    /** Special Command: 'refresh' is usually run inside other commands after execution */
-    refresh: 'refresh',
+  /** Special Command: 'refresh' is usually run inside other commands after execution */
+  refresh: 'refresh',
 };

From ff4da9a149bbb951fdb1372c8dfe3944c48f3710 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Tue, 21 Jun 2022 16:45:47 +0200
Subject: [PATCH 41/41] minor experimental

---
 projects/$2sxc/src/cms/command-params.ts               | 10 ++++++++++
 .../sxc-typings/dist/$2sxc/src/cms/command-params.d.ts |  7 ++++++-
 .../inpage/src/commands/command/command-metadata.d.ts  |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/projects/$2sxc/src/cms/command-params.ts b/projects/$2sxc/src/cms/command-params.ts
index d8be253bb..26725315e 100644
--- a/projects/$2sxc/src/cms/command-params.ts
+++ b/projects/$2sxc/src/cms/command-params.ts
@@ -1,6 +1,13 @@
 ﻿import { CommandNames, ItemIdentifierGroup, ItemIdentifierSimple, CommandParamsMetadata } from '.';
 import { TypeValue } from '../../../inpage/src/plumbing';
 
+/**
+ * Stub interface for typescript definitions to because of export.
+ * Real implementation is more complex but not published. 
+ */
+export interface CommandParams {
+}
+
 /**
  * Command parameters are handed over to a command for execution
  * @internal
@@ -53,3 +60,6 @@ export interface CommandParams {
     /** for template edit dialog */
     isshared?: boolean;
 }
+
+
+// export CommandParams as CommandParams;
\ No newline at end of file
diff --git a/projects/sxc-typings/dist/$2sxc/src/cms/command-params.d.ts b/projects/sxc-typings/dist/$2sxc/src/cms/command-params.d.ts
index cb0ff5c3b..aea350e70 100644
--- a/projects/sxc-typings/dist/$2sxc/src/cms/command-params.d.ts
+++ b/projects/sxc-typings/dist/$2sxc/src/cms/command-params.d.ts
@@ -1 +1,6 @@
-export {};
+/**
+ * Stub interface for typescript definitions to because of export.
+ * Real implementation is more complex but not published.
+ */
+export interface CommandParams {
+}
diff --git a/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts b/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts
index 1e39d84c1..6d044fae1 100644
--- a/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts
+++ b/projects/sxc-typings/dist/inpage/src/commands/command/command-metadata.d.ts
@@ -7,7 +7,7 @@ import { CommandContentTypeParams } from './command-content-type';
  * Will do either one of these:
  * - if it has an `entityId`, will just open `edit` for that Entity
  * - if it has no `entityId`, will open `new` for the current `contentType`
- * and assign to the target specified by TODO:
+ * and assign to the target specified by `metadata`:
  * <br>
  * ⤴️ back to [All Command Names](xref:Api.Js.SxcJs.CommandNames)
  */
