From e06348ee330eff08cd3478dd948b6493feb7c3e6 Mon Sep 17 00:00:00 2001
From: David <dmgf2008@hotmail.com>
Date: Thu, 17 Nov 2022 14:45:32 -0800
Subject: [PATCH 01/35] Allow using mouse wheel to navigate through the emoji
 tabs

---
 src/components/emoji_picker/emoji_picker.js  | 4 ++++
 src/components/emoji_picker/emoji_picker.vue | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 3b355ca6..834bf7f1 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -62,6 +62,10 @@ const EmojiPicker = {
       this.scrolledGroup(target)
       this.triggerLoadMore(target)
     },
+    onWheel (e) {
+      e.preventDefault()
+      this.$refs['emoji-tabs'].scrollBy(e.deltaY, 0)
+    },
     highlight (key) {
       this.setShowStickers(false)
       this.activeGroup = key
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index a629c9ad..00ffb9d2 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="emoji-picker panel panel-default panel-body">
     <div class="heading">
-      <span class="emoji-tabs">
+      <span
+        class="emoji-tabs"
+        @wheel="onWheel"
+        ref="emoji-tabs"
+      >
         <span
           v-for="group in emojis"
           :key="group.id"

From 862c93706cc51b3e53483dde21ead248058285e7 Mon Sep 17 00:00:00 2001
From: astra <nocebo@cathoderay.tube>
Date: Fri, 18 Nov 2022 08:49:57 -0500
Subject: [PATCH 02/35] move domain block to drop down menu

---
 .../account_actions/account_actions.js           | 11 +++++++++++
 .../account_actions/account_actions.vue          | 14 ++++++++++++++
 src/components/user_card/user_card.js            |  8 --------
 src/components/user_card/user_card.vue           | 16 ----------------
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 7a712e31..0f348474 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -26,6 +26,9 @@ const AccountActions = {
     ConfirmModal
   },
   methods: {
+    refetchRelationship () {
+      return this.$store.dispatch('fetchUserRelationship', this.user.id)
+    },
     showConfirmBlock () {
       this.showingConfirmBlock = true
     },
@@ -57,6 +60,14 @@ const AccountActions = {
     },
     reportUser () {
       this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
+    },
+    muteDomain () {
+      this.$store.dispatch('muteDomain', this.user.screen_name.split('@')[1])
+        .then(() => this.refetchRelationship())
+    },
+    unmuteDomain () {
+      this.$store.dispatch('unmuteDomain', this.user.screen_name.split('@')[1])
+        .then(() => this.refetchRelationship())
     }
   },
   computed: {
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 2f86b102..126f6fa9 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -55,6 +55,20 @@
           >
             {{ $t('user_card.report') }}
           </button>
+          <button
+            v-if="relationship.domain_blocking"
+            class="btn button-default btn-block dropdown-item"
+            @click="unmuteDomain"
+          >
+            {{ $t('user_card.domain_muted') }}
+          </button>
+          <button
+            v-else-if="!user.is_local"
+            class="btn button-default btn-block dropdown-item"
+            @click="muteDomain"
+          >
+            {{ $t('user_card.mute_domain') }}
+          </button>
         </div>
       </template>
       <template v-slot:trigger>
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 3ca78467..f7bff63f 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -154,14 +154,6 @@ export default {
     unmuteUser () {
       this.$store.dispatch('unmuteUser', this.user.id)
     },
-    muteDomain () {
-      this.$store.dispatch('muteDomain', this.user.screen_name.split('@')[1])
-        .then(() => this.refetchRelationship())
-    },
-    unmuteDomain () {
-      this.$store.dispatch('unmuteDomain', this.user.screen_name.split('@')[1])
-        .then(() => this.refetchRelationship())
-    },
     subscribeUser () {
       return this.$store.dispatch('subscribeUser', this.user.id)
     },
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 1de9c0bb..c850e53b 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -225,22 +225,6 @@
               {{ $t('user_card.mute') }}
             </button>
           </div>
-          <div>
-            <button
-              v-if="relationship.domain_blocking"
-              class="btn button-default btn-block toggled"
-              @click="unmuteDomain"
-            >
-              {{ $t('user_card.domain_muted') }}
-            </button>
-            <button
-              v-else
-              class="btn button-default btn-block"
-              @click="muteDomain"
-            >
-              {{ $t('user_card.mute_domain') }}
-            </button>
-          </div>
           <div>
             <button
               class="btn button-default btn-block"

From 2d4b2f2e20e7a5fca201e442b2dc521b87b60fc8 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sat, 19 Nov 2022 21:22:45 +0000
Subject: [PATCH 03/35] Translated using Weblate (Spanish)

Currently translated at 87.1% (893 of 1025 strings)

Co-authored-by: taretka <info@tarteka.net>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/es.json | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 8dd49993..2a973db5 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -254,6 +254,10 @@
         "hint": "Inicia sesión para unirte a la discusión",
         "login": "Identificarse",
         "logout": "Cerrar sesión",
+        "logout_confirm": "¿Estás seguro que quieres cerrar la sesión?",
+        "logout_confirm_accept_button": "Cerrar sesión",
+        "logout_confirm_cancel_button": "Cancelar",
+        "logout_confirm_title": "Cerrar sesión",
         "password": "Contraseña",
         "placeholder": "miusuario",
         "recovery_code": "Código de recuperación",
@@ -277,14 +281,15 @@
             "delete_note_confirm": "¿Estás seguro que quieres eliminar esta nota?",
             "delete_note_title": "Confirma la eliminación",
             "no_content": "Sin descripción dada",
+            "no_reports": "No hay informes que mostrar",
             "note_placeholder": "Dejar una nota...",
-            "notes": "notas",
+            "notes": "{ count } nota | { count } notas",
             "reopen": "Reabrir",
             "report": "Reportar",
             "reports": "Reportes",
             "resolve": "Resolver",
             "show_closed": "Mostrar cerrados",
-            "statuses": "estados",
+            "statuses": "{ count } estado | { count } estados",
             "tag_policy_notice": "Habilitar TagPolicy MRF para establecer restricciones de publicación",
             "tags": "Establecer restricciones de publicación"
         },
@@ -445,6 +450,7 @@
     },
     "settings": {
         "accent": "Acento",
+        "account_alias": "Alias de cuenta",
         "account_alias_table_head": "Alias",
         "account_backup": "Copia de seguridad de la cuenta",
         "account_backup_description": "Esto le permite descargar un archivo con la información de su cuenta y sus publicaciones, pero aún no se pueden importar a una cuenta de Pleroma.",
@@ -492,7 +498,16 @@
         "columns": "Columnas",
         "composing": "Redactando",
         "confirm_dialogs": "Requiere confirmación de:",
+        "confirm_dialogs_approve_follow": "Aceptar una solicitud de seguimiento",
+        "confirm_dialogs_block": "Bloqueando a alguien",
+        "confirm_dialogs_delete": "Eliminar una publicación",
+        "confirm_dialogs_deny_follow": "Rechazar una solicitud de seguimiento",
+        "confirm_dialogs_mute": "Silenciar a alguien",
+        "confirm_dialogs_repeat": "Repitiendo una publicación",
+        "confirm_dialogs_unfollow": "Dejar de seguir a alguien",
         "confirm_new_password": "Confirmar la nueva contraseña",
+        "confirmation_dialogs": "Opciones de confirmación",
+        "conversation_display": "Estilo de visualización de la conversación",
         "conversation_display_linear": "Lineal",
         "conversation_display_tree": "Ramificado",
         "conversation_other_replies_button": "Mostrar el botón \"otras respuestas\"",
@@ -543,6 +558,7 @@
         "hide_all_muted_posts": "Ocultar las publicaciones silenciadas",
         "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
         "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
+        "hide_bot_indication": "Ocultar indicación de bot en publicaciones",
         "hide_favorites_description": "No mostrar la lista de mis favoritos (las personas aún serán notificadas)",
         "hide_filtered_statuses": "Ocultar estados filtrados",
         "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
@@ -587,8 +603,10 @@
         "mention_link_display_full": "siempre como nombre completo (p. ej. {'@'}foo{'@'}example.org)",
         "mention_link_display_full_for_remote": "como nombre completo solo para usuarios remotos (p. ej. {'@'}foo{'@'}example.org)",
         "mention_link_display_short": "siempre como nombres cortos (p. ej. {'@'}foo)",
+        "mention_link_fade_domain": "Renombrar dominios (p. ej. {'@'}ejemplo.org en {'@'}algo{'@'}ejemplo.org)",
         "mention_link_show_avatar": "Mostrar el avatar del usuario detrás del enlace",
         "mention_link_show_tooltip": "Mostrar el nombre completo de los usuarios remotos como información emergente",
+        "mention_links": "Mencionar enlaces",
         "mfa": {
             "authentication_methods": "Métodos de autentificación",
             "confirm_and_enable": "Confirmar y habilitar OTP",
@@ -637,6 +655,7 @@
         "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
         "notification_setting_block_from_strangers": "Bloquea las notificaciones de los usuarios que no sigues",
         "notification_setting_filters": "Filtros",
+        "notification_setting_hide_if_cw": "Ocultar las notificaciones \"push\", si la publicación está marcada como \"contenido sensible\"",
         "notification_setting_hide_notification_contents": "Ocultar el remitente y el contenido de las notificaciones push",
         "notification_setting_privacy": "Privacidad",
         "notification_visibility": "Tipos de notificaciones a mostrar",

From 7538369fa11d0715fe6709d42e9bc4656ab24326 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sun, 20 Nov 2022 22:18:34 +0000
Subject: [PATCH 04/35] Copy conversation display style from instance

Fixes #210
---
 build/webpack.base.conf.js | 5 -----
 build/webpack.prod.conf.js | 5 +++++
 src/boot/after_store.js    | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index e478d341..ad508867 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -119,11 +119,6 @@ module.exports = {
     ]
   },
   plugins: [
-    new WorkboxPlugin.InjectManifest({
-      swSrc: path.join(__dirname, '..', 'src/sw.js'),
-      swDest: 'sw-pleroma.js',
-      maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
-    }),
     new VueLoaderPlugin()
   ]
 }
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 7c94ec3c..edc95857 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -32,6 +32,11 @@ var webpackConfig = merge(baseWebpackConfig, {
     chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
   },
   plugins: [
+    new WorkboxPlugin.InjectManifest({
+      swSrc: path.join(__dirname, '..', 'src/sw.js'),
+      swDest: 'sw-pleroma.js',
+      maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
+    }),
     // http://vuejs.github.io/vue-loader/workflow/production.html
     new webpack.DefinePlugin({
       'process.env': env,
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index e63b313b..4bafca1d 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -150,6 +150,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('showPanelNavShortcuts')
   copyInstanceOption('stopGifs')
   copyInstanceOption('logo')
+  copyInstanceOption('conversationDisplay')
 
   store.dispatch('setInstanceOption', {
     name: 'logoMask',

From 867a86d88767d0e95eadced2d99c6fe5eec9ae60 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sun, 20 Nov 2022 22:26:16 +0000
Subject: [PATCH 05/35] Fix build

---
 build/webpack.base.conf.js | 1 -
 build/webpack.prod.conf.js | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index ad508867..2a3db96e 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -2,7 +2,6 @@ var path = require('path')
 var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
-const WorkboxPlugin = require('workbox-webpack-plugin');
 var { VueLoaderPlugin } = require('vue-loader')
 
 var env = process.env.NODE_ENV
diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index edc95857..d528cb0e 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -2,6 +2,7 @@ var path = require('path')
 var config = require('../config')
 var utils = require('./utils')
 var webpack = require('webpack')
+const WorkboxPlugin = require('workbox-webpack-plugin');
 var { merge } = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
 var MiniCssExtractPlugin = require('mini-css-extract-plugin')

From fcbbbad8d4f84272104f3a7c95478d6a20973222 Mon Sep 17 00:00:00 2001
From: Beefox <bee@beefox.xyz>
Date: Sat, 10 Sep 2022 16:36:12 +1000
Subject: [PATCH 06/35] Allow for searching unicode emoji via inputting emoji
 (This is needed for the react menu)

---
 src/components/emoji_picker/emoji_picker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 3b355ca6..13533bb0 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -138,7 +138,7 @@ const EmojiPicker = {
       if (this.keyword === '') return list
       const regex = new RegExp(escapeRegExp(trim(this.keyword)), 'i')
       return list.filter(emoji => {
-        return regex.test(emoji.displayText)
+        return (regex.test(emoji.displayText) || (!emoji.imageUrl && emoji.replacement === this.keyword))
       })
     }
   },

From efe0f53736f975afe2081cfb968488d387f9d09f Mon Sep 17 00:00:00 2001
From: Mergan <mergan@noreply.akkoma>
Date: Mon, 21 Nov 2022 10:10:50 +0000
Subject: [PATCH 07/35] Constrain content to status content (#218) (#220)

MFM No longer overflows
![image](/attachments/7bbf519a-9fd2-492d-aba0-9a0e1ded6373)

Co-authored-by: David <dmgf2008@hotmail.com>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/220
Co-authored-by: Mergan <mergan@noreply.akkoma>
Co-committed-by: Mergan <mergan@noreply.akkoma>
---
 src/components/status_content/status_content.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index ab13141e..245cd6e9 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -68,6 +68,7 @@
 .StatusContent {
   flex: 1;
   min-width: 0;
+  overflow: hidden;
 
   img, video {
     &.emoji {

From 684894aee3bfd061328f3be0f571b105c0201a3b Mon Sep 17 00:00:00 2001
From: Beefox <bee@beefox.xyz>
Date: Mon, 21 Nov 2022 16:49:18 +0000
Subject: [PATCH 08/35] mobile-newline (#226)

Allows the handle of users to drop down onto the next line if there isn't enough room in order to improve useability on mobile

Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/226
Co-authored-by: Beefox <bee@beefox.xyz>
Co-committed-by: Beefox <bee@beefox.xyz>
---
 .gitignore                        |  1 +
 src/components/status/status.scss |  9 +++++++++
 src/components/status/status.vue  | 28 +++++++++++++++-------------
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a400ce86..a0be5c16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ selenium-debug.log
 config/local.json
 config/local.*.json
 docs/site/
+.vscode/
\ No newline at end of file
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 448577d3..ce199203 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -130,6 +130,13 @@
   .heading-left {
     display: flex;
     min-width: 0;
+    flex-wrap: wrap;
+    img {
+      aspect-ratio: 1 / 1;
+    }
+    .nowrap{
+      white-space: nowrap;
+    }
   }
 
   .heading-right {
@@ -140,6 +147,8 @@
       padding: 5px;
       margin: -5px;
 
+      height: min-content;
+
       &:hover svg {
         color: $fallback--lightText;
         color: var(--lightText, $fallback--lightText);
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index ceb66c21..24f64248 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -166,19 +166,21 @@
                 >
                   {{ status.user.name }}
                 </h4>
-                <router-link
-                  class="account-name"
-                  :title="status.user.screen_name_ui"
-                  :to="userProfileLink"
-                >
-                  {{ status.user.screen_name_ui }}
-                </router-link>
-                <img
-                  v-if="!!(status.user && status.user.favicon)"
-                  class="status-favicon"
-                  :src="status.user.favicon"
-                  :title="faviconAlt(status)"
-                >
+                <span class="nowrap">
+                  <router-link
+                    class="account-name"
+                    :title="status.user.screen_name_ui"
+                    :to="userProfileLink"
+                  >
+                    @{{ status.user.screen_name_ui }}
+                  </router-link>
+                  <img
+                    v-if="!!(status.user && status.user.favicon)"
+                    class="status-favicon"
+                    :src="status.user.favicon"
+                    :title="faviconAlt(status)"
+                  >
+                </span>
               </div>
 
               <span class="heading-right">

From b1f41add0ed176f19e29e099cfc49207b10305f6 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 21 Nov 2022 17:08:53 +0000
Subject: [PATCH 09/35] Don't error out if we can't fetch reports

---
 src/services/api/api.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 4e3e1ced..aeb43661 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -650,7 +650,7 @@ const getReports = ({ state, limit, page, pageSize, credentials }) => {
   url = url + (args ? '?' + args : '')
   return fetch(url, { headers: authHeaders(credentials) })
     .then((data) => data.json())
-    .then((data) => data.reports.map(parseReport))
+    .then((data) => data?.reports?.map(parseReport) ?? [])
 }
 
 const updateReportStates = ({ credentials, reports }) => {

From 105b934f90ef41538fb196d44819118608da94f3 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Tue, 22 Nov 2022 14:40:25 +0000
Subject: [PATCH 10/35] Only reload user if it _is_ a user (#232)

Ref #181

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/232
---
 .stylelintrc.json                           |  14 +-
 .woodpecker.yml                             |   2 +-
 package.json                                |  12 +-
 src/components/status/status.scss           |  16 +-
 src/components/user_profile/user_profile.js |   6 +-
 yarn.lock                                   | 899 +++++++-------------
 6 files changed, 313 insertions(+), 636 deletions(-)

diff --git a/.stylelintrc.json b/.stylelintrc.json
index fbf3a245..bf408009 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,19 +1,13 @@
 {
   "extends": [
-    "stylelint-rscss/config",
+    "stylelint-config-recommended-vue/scss",
     "stylelint-config-recommended",
     "stylelint-config-standard"
   ],
+  "customSyntax": "postcss-scss",
   "rules": {
     "declaration-no-important": true,
-    "rscss/no-descendant-combinator": false,
-    "rscss/class-format": [
-      true,
-      {
-        "component": "pascal-case",
-        "variant": "^-[a-z]\\w+",
-        "element": "^[a-z]\\w+"
-      }
-    ]
+    "selector-class-pattern": null,
+    "custom-property-pattern": null
   }
 }
diff --git a/.woodpecker.yml b/.woodpecker.yml
index b5b6e889..cad4b698 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -7,7 +7,7 @@ pipeline:
     commands:
     - yarn
     - yarn lint
-    - yarn stylelint
+    #- yarn stylelint
 
   test:
     when:
diff --git a/package.json b/package.json
index cd00c490..bf803011 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "unit:watch": "karma start test/unit/karma.conf.js --single-run=false",
     "e2e": "node test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
-    "stylelint": "npx stylelint src/components/status/status.scss",
+    "stylelint": "stylelint src/**/*.scss",
     "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
     "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
   },
@@ -103,7 +103,9 @@
     "nightwatch": "0.9.21",
     "opn": "4.0.2",
     "ora": "0.4.1",
+    "postcss-html": "^1.5.0",
     "postcss-loader": "3.0.0",
+    "postcss-sass": "^0.5.0",
     "raw-loader": "0.5.1",
     "sass": "^1.56.0",
     "sass-loader": "^13.2.0",
@@ -112,9 +114,11 @@
     "shelljs": "0.8.5",
     "sinon": "2.4.1",
     "sinon-chai": "2.14.0",
-    "stylelint": "13.6.1",
-    "stylelint-config-standard": "20.0.0",
-    "stylelint-rscss": "0.4.0",
+    "stylelint": "^14.15.0",
+    "stylelint-config-recommended-vue": "^1.4.0",
+    "stylelint-config-standard": "^29.0.0",
+    "stylelint-config-standard-scss": "^6.1.0",
+    "stylelint-rscss": "^0.4.0",
     "url-loader": "^4.1.1",
     "vue-loader": "^17.0.0",
     "vue-style-loader": "^4.1.2",
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index ce199203..cf729c63 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../_variables.scss";
 
 .Status {
   min-width: 0;
@@ -131,10 +131,12 @@
     display: flex;
     min-width: 0;
     flex-wrap: wrap;
+
     img {
       aspect-ratio: 1 / 1;
     }
-    .nowrap{
+
+    .nowrap {
       white-space: nowrap;
     }
   }
@@ -146,7 +148,6 @@
     .button-unstyled {
       padding: 5px;
       margin: -5px;
-
       height: min-content;
 
       &:hover svg {
@@ -194,7 +195,7 @@
 
   .reply-to-popover {
     .reply-to:hover::before {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       bottom: 0;
@@ -204,13 +205,12 @@
     }
 
     .faint-link:hover {
-      // override default
       text-decoration: none;
     }
 
     &.-strikethrough {
       .reply-to::after {
-        content: '';
+        content: "";
         display: block;
         position: absolute;
         top: 50%;
@@ -349,7 +349,7 @@
       margin-left: 0.2em;
 
       &::before {
-        content: ' ';
+        content: " ";
       }
     }
 
@@ -396,7 +396,7 @@
     align-items: center;
 
     &::before {
-      content: '';
+      content: "";
       position: absolute;
       height: 100%;
       width: 1px;
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 8af757d7..42c5ec9e 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -33,6 +33,8 @@ const FriendList = withLoadMore({
   additionalPropNames: ['userId']
 })(List)
 
+const isUserPage = ({ name }) => name === 'user-profile' || name === 'external-user-profile'
+
 const UserProfile = {
   data () {
     return {
@@ -182,12 +184,12 @@ const UserProfile = {
   },
   watch: {
     '$route.params.id': function (newVal) {
-      if (newVal) {
+      if (isUserPage(this.$route) && newVal) {
         this.switchUser(newVal)
       }
     },
     '$route.params.name': function (newVal) {
-      if (newVal) {
+      if (isUserPage(this.$route) && newVal) {
         this.switchUser(newVal)
       }
     },
diff --git a/yarn.lock b/yarn.lock
index 893b5e13..fa3aeb07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -85,7 +85,7 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.17.9", "@babel/core@^7.18.6":
+"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.6":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"
   integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
@@ -1465,6 +1465,11 @@
   resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
+"@csstools/selector-specificity@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
+  integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
+
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
@@ -1983,21 +1988,6 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@stylelint/postcss-css-in-js@^0.37.1":
-  version "0.37.3"
-  resolved "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz"
-  integrity sha512-scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==
-  dependencies:
-    "@babel/core" "^7.17.9"
-
-"@stylelint/postcss-markdown@^0.36.1":
-  version "0.36.2"
-  resolved "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz"
-  integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==
-  dependencies:
-    remark "^13.0.0"
-    unist-util-find-all-after "^3.0.2"
-
 "@surma/rollup-plugin-off-main-thread@^2.2.3":
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053"
@@ -2140,13 +2130,6 @@
   resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/mdast@^3.0.0":
-  version "3.0.10"
-  resolved "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz"
-  integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==
-  dependencies:
-    "@types/unist" "*"
-
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz"
@@ -2189,11 +2172,6 @@
   resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
   integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
 
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz"
-  integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
-
 "@types/yargs-parser@*":
   version "21.0.0"
   resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"
@@ -2616,7 +2594,7 @@ ajv-keywords@^5.0.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2668,11 +2646,6 @@ ansi-regex@^3.0.0:
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
   integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
-ansi-regex@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"
-  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
-
 ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
@@ -2683,7 +2656,7 @@ ansi-styles@^2.2.1:
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
   integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
@@ -2785,11 +2758,6 @@ ast-types@0.x.x:
   dependencies:
     tslib "^2.0.1"
 
-astral-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"
-  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-
 astral-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
@@ -2827,19 +2795,6 @@ autoprefixer@6.7.7:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^9.8.0:
-  version "9.8.8"
-  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz"
-  integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
-  dependencies:
-    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"
-
 axios@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35"
@@ -3108,16 +3063,16 @@ babylon@^6.18.0:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
-bail@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz"
-  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+balanced-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
+
 base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"
@@ -3217,16 +3172,6 @@ browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
-browserslist@^4.12.0, browserslist@^4.20.2, browserslist@^4.21.3:
-  version "4.21.3"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"
-  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
-  dependencies:
-    caniuse-lite "^1.0.30001370"
-    electron-to-chromium "^1.4.202"
-    node-releases "^2.0.6"
-    update-browserslist-db "^1.0.5"
-
 browserslist@^4.14.5, browserslist@^4.21.4:
   version "4.21.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
@@ -3237,6 +3182,16 @@ browserslist@^4.14.5, browserslist@^4.21.4:
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.9"
 
+browserslist@^4.20.2, browserslist@^4.21.3:
+  version "4.21.3"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"
+  integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
+  dependencies:
+    caniuse-lite "^1.0.30001370"
+    electron-to-chromium "^1.4.202"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.5"
+
 bser@2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"
@@ -3341,7 +3296,7 @@ caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   resolved "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001373.tgz"
   integrity sha512-NOoFLQ0w7geqot8ENHEE/cRqQN0HdVtJeG2h+2cjmEYb07X0HGwBQxREKWpt5YUhNPmAxHKVGPbak1FLey6GGw==
 
-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001370:
+caniuse-lite@^1.0.30001370:
   version "1.0.30001373"
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz"
   integrity sha512-pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ==
@@ -3383,7 +3338,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
   version "2.4.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -3414,21 +3369,6 @@ char-regex@^1.0.2:
   resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-character-entities-legacy@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"
-  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
-
-character-entities@^1.0.0:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz"
-  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
-
-character-reference-invalid@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"
-  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
-
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -3533,13 +3473,6 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone-regexp@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz"
-  integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
-  dependencies:
-    is-regexp "^2.0.0"
-
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
@@ -3584,6 +3517,11 @@ color-name@~1.1.4:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
+colord@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
+
 colorette@^2.0.10:
   version "2.0.19"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
@@ -3730,16 +3668,16 @@ cosmiconfig@^5.0.0:
     js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
+cosmiconfig@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
+    import-fresh "^3.2.1"
     parse-json "^5.0.0"
     path-type "^4.0.0"
-    yaml "^1.7.2"
+    yaml "^1.10.0"
 
 cropperjs@1.5.12:
   version "1.5.12"
@@ -3760,6 +3698,11 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
+css-functions-list@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
+  integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
+
 css-loader@^6.7.2:
   version "6.7.2"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.2.tgz#26bc22401b5921686a10fbeba75d124228302304"
@@ -3861,7 +3804,7 @@ debug@2.6.8:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -4046,14 +3989,6 @@ dom-serialize@^2.2.1:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    domelementtype "^2.0.1"
-    entities "^2.0.0"
-
 dom-serializer@^1.0.1:
   version "1.4.1"
   resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"
@@ -4063,23 +3998,20 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
-domelementtype@1, domelementtype@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+dom-serializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
+  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    entities "^4.2.0"
 
-domelementtype@^2.0.1, domelementtype@^2.2.0:
+domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domhandler@^2.3.0:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"
-  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
-  dependencies:
-    domelementtype "1"
-
 domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
   resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
@@ -4087,13 +4019,12 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
-domutils@^1.5.1:
-  version "1.7.0"
-  resolved "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+domhandler@^5.0.1, domhandler@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
+  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
   dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+    domelementtype "^2.3.0"
 
 domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
@@ -4104,6 +4035,15 @@ domutils@^2.5.2, domutils@^2.8.0:
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
+domutils@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
+  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
+  dependencies:
+    dom-serializer "^2.0.0"
+    domelementtype "^2.3.0"
+    domhandler "^5.0.1"
+
 dot-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
@@ -4144,11 +4084,6 @@ emittery@^0.10.2:
   resolved "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz"
   integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
 
-emoji-regex@^7.0.1:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
-  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
@@ -4222,16 +4157,16 @@ ent@~2.2.0:
   resolved "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
   integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
 
-entities@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"
-  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
 entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.2.0, entities@^4.3.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
@@ -4742,13 +4677,6 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execall@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz"
-  integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
-  dependencies:
-    clone-regexp "^2.1.0"
-
 exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
@@ -4822,6 +4750,17 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-glob@^3.2.12:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-glob@^3.2.9:
   version "3.2.11"
   resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"
@@ -4843,6 +4782,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
+fastest-levenshtein@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"
@@ -4864,13 +4808,6 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
-file-entry-cache@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
-  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
-  dependencies:
-    flat-cache "^2.0.1"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
@@ -4959,15 +4896,6 @@ find-up@^4.0.0, find-up@^4.1.0:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
-flat-cache@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"
-  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
-  dependencies:
-    flatted "^2.0.0"
-    rimraf "2.6.3"
-    write "1.0.3"
-
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
@@ -4976,11 +4904,6 @@ flat-cache@^3.0.4:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flatted@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"
-  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
-
 flatted@^3.1.0, flatted@^3.2.6:
   version "3.2.6"
   resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"
@@ -5142,11 +5065,6 @@ get-stdin@^4.0.1:
   resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
   integrity sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==
 
-get-stdin@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz"
-  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
-
 get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"
@@ -5278,7 +5196,7 @@ globals@^9.18.0:
   resolved "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz"
   integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
 
-globby@^11.0.1, globby@^11.1.0:
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -5297,7 +5215,7 @@ globjoin@^0.1.4:
 
 gonzales-pe@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
   integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
   dependencies:
     minimist "^1.2.5"
@@ -5425,6 +5343,13 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
+hosted-git-info@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
+  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 html-entities@^2.1.0:
   version "2.3.3"
   resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"
@@ -5448,7 +5373,7 @@ html-minifier-terser@^6.0.2:
     relateurl "^0.2.7"
     terser "^5.10.0"
 
-html-tags@^3.1.0:
+html-tags@^3.1.0, html-tags@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz"
   integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
@@ -5464,18 +5389,6 @@ html-webpack-plugin@^5.5.0:
     pretty-error "^4.0.0"
     tapable "^2.0.0"
 
-htmlparser2@^3.10.0:
-  version "3.10.1"
-  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"
-  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
-  dependencies:
-    domelementtype "^1.3.1"
-    domhandler "^2.3.0"
-    domutils "^1.5.1"
-    entities "^1.1.1"
-    inherits "^2.0.1"
-    readable-stream "^3.1.1"
-
 htmlparser2@^6.1.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"
@@ -5486,6 +5399,16 @@ htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
+htmlparser2@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010"
+  integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    domutils "^3.0.1"
+    entities "^4.3.0"
+
 http-errors@1.8.1:
   version "1.8.1"
   resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"
@@ -5581,7 +5504,7 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1, ignore@^5.1.8, ignore@^5.2.0:
+ignore@^5.1.1, ignore@^5.2.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
@@ -5611,7 +5534,7 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -5669,7 +5592,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -5727,19 +5650,6 @@ ipaddr.js@1.9.1:
   resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-is-alphabetical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz"
-  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
-
-is-alphanumerical@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"
-  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
-  dependencies:
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
@@ -5767,11 +5677,6 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@^2.0.0:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"
-  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
-
 is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
   resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"
@@ -5782,7 +5687,7 @@ is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.8.1:
+is-core-module@^2.5.0, is-core-module@^2.8.1:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
   integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
@@ -5803,11 +5708,6 @@ is-date-object@^1.0.1:
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-decimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz"
-  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
-
 is-directory@^0.3.1:
   version "0.3.1"
   resolved "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"
@@ -5828,11 +5728,6 @@ is-finite@^1.0.0:
   resolved "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz"
   integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
 
-is-fullwidth-code-point@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
-  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
-
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
@@ -5850,11 +5745,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-hexadecimal@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"
-  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
-
 is-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
@@ -5887,11 +5777,6 @@ is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"
   integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
-is-plain-obj@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"
-  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
-
 is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
@@ -5899,6 +5784,11 @@ is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-plain-object@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+
 is-reference@^1.2.1:
   version "1.2.1"
   resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
@@ -5919,11 +5809,6 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
 
-is-regexp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz"
-  integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
@@ -5950,16 +5835,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
-is-unicode-supported@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"
-  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
-
 is-url@^1.2.4:
   version "1.2.4"
   resolved "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"
@@ -6503,6 +6378,11 @@ js-tokens@^3.0.2:
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz"
   integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==
 
+js-tokens@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-8.0.0.tgz#5dbe2cdfa9afc93251d3a77bf18c3ad6fa8a4de4"
+  integrity sha512-PC7MzqInq9OqKyTXfIvQNcjMkODJYC8A17kAaQgeW79yfhqTWSOfjHYQ2mDDcwJ96Iibtwkfh0C7R/OvqPlgVA==
+
 js-yaml@3.x, js-yaml@^3.13.1:
   version "3.14.1"
   resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
@@ -6729,10 +6609,10 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
-known-css-properties@^0.19.0:
-  version "0.19.0"
-  resolved "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz"
-  integrity sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==
+known-css-properties@^0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz#008295115abddc045a9f4ed7e2a84dc8b3a77649"
+  integrity sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==
 
 leven@^3.1.0:
   version "3.1.0"
@@ -6992,7 +6872,7 @@ lodash.truncate@^4.4.2:
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
   integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
-lodash@4.17.21, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
+lodash@4.17.21, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -7004,21 +6884,13 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
-log-symbols@^2.1.0, log-symbols@^2.2.0:
+log-symbols@^2.1.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"
   integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
   dependencies:
     chalk "^2.0.1"
 
-log-symbols@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"
-  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
-  dependencies:
-    chalk "^4.1.0"
-    is-unicode-supported "^0.1.0"
-
 log4js@^6.4.1:
   version "6.6.1"
   resolved "https://registry.npmjs.org/log4js/-/log4js-6.6.1.tgz"
@@ -7035,11 +6907,6 @@ lolex@1.6.0, lolex@^1.6.0:
   resolved "https://registry.npmjs.org/lolex/-/lolex-1.6.0.tgz"
   integrity sha512-/bpxDL56TG5LS5zoXxKqA6Ro5tkOS5M8cm/7yQcwLIKIcM2HR5fjjNCaIhJNv96SEk4hNGSafYMZK42Xv5fihQ==
 
-longest-streak@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz"
-  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
-
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -7146,34 +7013,6 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-mdast-util-from-markdown@^0.8.0:
-  version "0.8.5"
-  resolved "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"
-  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-string "^2.0.0"
-    micromark "~2.11.0"
-    parse-entities "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
-mdast-util-to-markdown@^0.6.0:
-  version "0.6.5"
-  resolved "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"
-  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    longest-streak "^2.0.0"
-    mdast-util-to-string "^2.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.0.0"
-    zwitch "^1.0.0"
-
-mdast-util-to-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"
-  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
@@ -7202,22 +7041,23 @@ meow@^3.3.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
-meow@^7.0.1:
-  version "7.1.1"
-  resolved "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz"
-  integrity sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
   dependencies:
     "@types/minimist" "^1.2.0"
     camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
     decamelize-keys "^1.1.0"
     hard-rejection "^2.1.0"
     minimist-options "4.1.0"
-    normalize-package-data "^2.5.0"
+    normalize-package-data "^3.0.0"
     read-pkg-up "^7.0.1"
     redent "^3.0.0"
     trim-newlines "^3.0.0"
-    type-fest "^0.13.1"
-    yargs-parser "^18.1.3"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
@@ -7239,15 +7079,7 @@ methods@~1.1.2:
   resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromark@~2.11.0:
-  version "2.11.4"
-  resolved "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz"
-  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
-  dependencies:
-    debug "^4.0.0"
-    parse-entities "^2.0.0"
-
-micromatch@^4.0.2, micromatch@^4.0.4:
+micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -7510,6 +7342,16 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
+normalize-package-data@^3.0.0:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e"
+  integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    is-core-module "^2.5.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
@@ -7520,11 +7362,6 @@ normalize-range@^0.1.2:
   resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
-normalize-selector@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz"
-  integrity sha512-dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==
-
 normalize-url@1.9.1:
   version "1.9.1"
   resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"
@@ -7772,18 +7609,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-entities@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz"
-  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
-  dependencies:
-    character-entities "^1.0.0"
-    character-entities-legacy "^1.0.0"
-    character-reference-invalid "^1.0.0"
-    is-alphanumerical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-hexadecimal "^1.0.0"
-
 parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
@@ -7968,19 +7793,15 @@ pointer-tracker@^2.0.3:
   resolved "https://registry.npmjs.org/pointer-tracker/-/pointer-tracker-2.5.3.tgz"
   integrity sha512-LiJUeIbzk4dXq678YeyrZ++mdY17q4n/2sBHfU9wIuvmSzdiPgMvmvWN2g8mY4J7YwYOIrqrZUWP/MfFHVwYtg==
 
-postcss-html@^0.36.0:
-  version "0.36.0"
-  resolved "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz"
-  integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
+postcss-html@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-1.5.0.tgz#57a43bc9e336f516ecc448a37d2e8c2290170a6f"
+  integrity sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA==
   dependencies:
-    htmlparser2 "^3.10.0"
-
-postcss-less@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz"
-  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
-  dependencies:
-    postcss "^7.0.14"
+    htmlparser2 "^8.0.0"
+    js-tokens "^8.0.0"
+    postcss "^8.4.0"
+    postcss-safe-parser "^6.0.0"
 
 postcss-load-config@^2.0.0:
   version "2.1.2"
@@ -8033,42 +7854,28 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-reporter@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-6.0.1.tgz"
-  integrity sha512-LpmQjfRWyabc+fRygxZjpRxfhRf9u/fdlKf4VHG4TSPbV2XNsuISzYW1KL+1aQzx53CAppa1bKG4APIB/DOXXw==
-  dependencies:
-    chalk "^2.4.1"
-    lodash "^4.17.11"
-    log-symbols "^2.2.0"
-    postcss "^7.0.7"
-
 postcss-resolve-nested-selector@0.1.1, postcss-resolve-nested-selector@^0.1.1:
   version "0.1.1"
   resolved "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"
   integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
 
-postcss-safe-parser@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz"
-  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
-  dependencies:
-    postcss "^7.0.26"
+postcss-safe-parser@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
+  integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
-postcss-sass@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz"
-  integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
+postcss-sass@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.5.0.tgz#a599717eef90165d267e6a974c66c2ed15376b77"
+  integrity sha512-qtu8awh1NMF3o9j/x9j3EZnd+BlF66X6NZYl12BdKoG2Z4hmydOt/dZj2Nq+g0kfk2pQy3jeYFBmvG9DBwynGQ==
   dependencies:
     gonzales-pe "^4.3.0"
-    postcss "^7.0.21"
+    postcss "^8.2.14"
 
-postcss-scss@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz"
-  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
-  dependencies:
-    postcss "^7.0.6"
+postcss-scss@^4.0.2:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.5.tgz#8ee33c1dda8d9d4753b565ec79014803dc6edabf"
+  integrity sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==
 
 postcss-selector-parser@2.2.1:
   version "2.2.1"
@@ -8079,6 +7886,14 @@ postcss-selector-parser@2.2.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
   version "6.0.10"
   resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"
@@ -8087,11 +7902,6 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-syntax@^0.36.2:
-  version "0.36.2"
-  resolved "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz"
-  integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
-
 postcss-value-parser@^3.2.3:
   version "3.3.1"
   resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"
@@ -8112,7 +7922,7 @@ postcss@^5.2.16:
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
-postcss@^7.0.0, postcss@^7.0.14, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0:
   version "7.0.39"
   resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
@@ -8129,7 +7939,7 @@ postcss@^8.1.10:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.18:
+postcss@^8.2.14, postcss@^8.4.0, postcss@^8.4.18, postcss@^8.4.19:
   version "8.4.19"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
   integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
@@ -8405,15 +8215,6 @@ readable-stream@2:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.1.1:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -8521,29 +8322,6 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
 
-remark-parse@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz"
-  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
-  dependencies:
-    mdast-util-from-markdown "^0.8.0"
-
-remark-stringify@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz"
-  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
-  dependencies:
-    mdast-util-to-markdown "^0.6.0"
-
-remark@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz"
-  integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
-  dependencies:
-    remark-parse "^9.0.0"
-    remark-stringify "^9.0.0"
-    unified "^9.1.0"
-
 renderkid@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a"
@@ -8555,11 +8333,6 @@ renderkid@^3.0.0:
     lodash "^4.17.21"
     strip-ansi "^6.0.1"
 
-repeat-string@^1.0.0:
-  version "1.6.1"
-  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
-  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
-
 repeating@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
@@ -8651,13 +8424,6 @@ rfdc@^1.3.0:
   resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
-rimraf@2.6.3:
-  version "2.6.3"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"
-  integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
@@ -8696,7 +8462,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@5.2.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -8799,7 +8565,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.6, semver@^7.3.8:
+semver@^7.2.1, semver@^7.3.4, semver@^7.3.6, semver@^7.3.8:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
@@ -8947,15 +8713,6 @@ slash@^3.0.0:
   resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"
-  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
-  dependencies:
-    ansi-styles "^3.2.0"
-    astral-regex "^1.0.0"
-    is-fullwidth-code-point "^2.0.0"
-
 slice-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
@@ -9108,11 +8865,6 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"
   integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
-specificity@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz"
-  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
@@ -9157,15 +8909,6 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-width@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
-  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
-  dependencies:
-    emoji-regex "^7.0.1"
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^5.1.0"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -9207,13 +8950,6 @@ string.prototype.trimstart@^1.0.5:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
@@ -9249,13 +8985,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
-  integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
-  dependencies:
-    ansi-regex "^4.1.0"
-
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
@@ -9319,86 +9048,111 @@ style-search@^0.1.0:
   resolved "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz"
   integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
 
-stylelint-config-recommended@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz"
-  integrity sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==
+stylelint-config-html@>=1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz#999db19aea713b7ff6dde92ada76e4c1bd812b66"
+  integrity sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==
 
-stylelint-config-standard@20.0.0:
-  version "20.0.0"
-  resolved "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz"
-  integrity sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==
+stylelint-config-recommended-scss@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-8.0.0.tgz#1c1e93e619fe2275d4c1067928d92e0614f7d64f"
+  integrity sha512-BxjxEzRaZoQb7Iinc3p92GS6zRdRAkIuEu2ZFLTxJK2e1AIcCb5B5MXY9KOXdGTnYFZ+KKx6R4Fv9zU6CtMYPQ==
   dependencies:
-    stylelint-config-recommended "^3.0.0"
+    postcss-scss "^4.0.2"
+    stylelint-config-recommended "^9.0.0"
+    stylelint-scss "^4.0.0"
 
-stylelint-rscss@0.4.0:
+stylelint-config-recommended-vue@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz#0a182da17dc9e846e4bec65a7676ccf882b35964"
+  integrity sha512-DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q==
+  dependencies:
+    semver "^7.3.5"
+    stylelint-config-html ">=1.0.0"
+    stylelint-config-recommended ">=6.0.0"
+
+stylelint-config-recommended@>=6.0.0, stylelint-config-recommended@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40"
+  integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==
+
+stylelint-config-standard-scss@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-6.1.0.tgz#a6cddd2a9430578b92fc89726a59474d5548a444"
+  integrity sha512-iZ2B5kQT2G3rUzx+437cEpdcnFOQkwnwqXuY8Z0QUwIHQVE8mnYChGAquyKFUKZRZ0pRnrciARlPaR1RBtPb0Q==
+  dependencies:
+    stylelint-config-recommended-scss "^8.0.0"
+    stylelint-config-standard "^29.0.0"
+
+stylelint-config-standard@^29.0.0:
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz#4cc0e0f05512a39bb8b8e97853247d3a95d66fa2"
+  integrity sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==
+  dependencies:
+    stylelint-config-recommended "^9.0.0"
+
+stylelint-rscss@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/stylelint-rscss/-/stylelint-rscss-0.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/stylelint-rscss/-/stylelint-rscss-0.4.0.tgz#ea77c478e1c703dbda878c00f53bbc002b2d07b7"
   integrity sha512-JMmORFkoi543AvHRZlrerflUFmegv5h9l3Fw0DUkkGrCaeyCY5rMVODrQQWS5iARSY42BWfjPd3WCalgVm2ecg==
   dependencies:
     postcss-resolve-nested-selector "0.1.1"
     postcss-selector-parser "2.2.1"
 
-stylelint@13.6.1:
-  version "13.6.1"
-  resolved "https://registry.npmjs.org/stylelint/-/stylelint-13.6.1.tgz"
-  integrity sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==
+stylelint-scss@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.3.0.tgz#638800faf823db11fff60d537c81051fe74c90fa"
+  integrity sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ==
   dependencies:
-    "@stylelint/postcss-css-in-js" "^0.37.1"
-    "@stylelint/postcss-markdown" "^0.36.1"
-    autoprefixer "^9.8.0"
-    balanced-match "^1.0.0"
-    chalk "^4.1.0"
-    cosmiconfig "^6.0.0"
-    debug "^4.1.1"
-    execall "^2.0.0"
-    file-entry-cache "^5.0.1"
-    get-stdin "^8.0.0"
+    lodash "^4.17.21"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-selector-parser "^6.0.6"
+    postcss-value-parser "^4.1.0"
+
+stylelint@^14.15.0:
+  version "14.15.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.15.0.tgz#4df55078e734869f81f6b85bbec2d56a4b478ece"
+  integrity sha512-JOgDAo5QRsqiOZPZO+B9rKJvBm64S0xasbuRPAbPs6/vQDgDCnZLIiw6XcAS6GQKk9k1sBWR6rmH3Mfj8OknKg==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
+    balanced-match "^2.0.0"
+    colord "^2.9.3"
+    cosmiconfig "^7.1.0"
+    css-functions-list "^3.1.0"
+    debug "^4.3.4"
+    fast-glob "^3.2.12"
+    fastest-levenshtein "^1.0.16"
+    file-entry-cache "^6.0.1"
     global-modules "^2.0.0"
-    globby "^11.0.1"
+    globby "^11.1.0"
     globjoin "^0.1.4"
-    html-tags "^3.1.0"
-    ignore "^5.1.8"
+    html-tags "^3.2.0"
+    ignore "^5.2.0"
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
-    known-css-properties "^0.19.0"
-    leven "^3.1.0"
-    lodash "^4.17.15"
-    log-symbols "^4.0.0"
+    is-plain-object "^5.0.0"
+    known-css-properties "^0.26.0"
     mathml-tag-names "^2.1.3"
-    meow "^7.0.1"
-    micromatch "^4.0.2"
-    normalize-selector "^0.2.0"
-    postcss "^7.0.32"
-    postcss-html "^0.36.0"
-    postcss-less "^3.1.4"
+    meow "^9.0.0"
+    micromatch "^4.0.5"
+    normalize-path "^3.0.0"
+    picocolors "^1.0.0"
+    postcss "^8.4.19"
     postcss-media-query-parser "^0.2.3"
-    postcss-reporter "^6.0.1"
     postcss-resolve-nested-selector "^0.1.1"
-    postcss-safe-parser "^4.0.2"
-    postcss-sass "^0.4.4"
-    postcss-scss "^2.1.1"
-    postcss-selector-parser "^6.0.2"
-    postcss-syntax "^0.36.2"
-    postcss-value-parser "^4.1.0"
+    postcss-safe-parser "^6.0.0"
+    postcss-selector-parser "^6.0.10"
+    postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
-    slash "^3.0.0"
-    specificity "^0.4.1"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
     style-search "^0.1.0"
-    sugarss "^2.0.0"
+    supports-hyperlinks "^2.3.0"
     svg-tags "^1.0.0"
-    table "^5.4.6"
-    v8-compile-cache "^2.1.1"
-    write-file-atomic "^3.0.3"
-
-sugarss@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz"
-  integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==
-  dependencies:
-    postcss "^7.0.2"
+    table "^6.8.1"
+    v8-compile-cache "^2.3.0"
+    write-file-atomic "^4.0.2"
 
 supports-color@3.1.2:
   version "3.1.2"
@@ -9448,6 +9202,14 @@ supports-hyperlinks@^2.0.0:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
 
+supports-hyperlinks@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
+  dependencies:
+    has-flag "^4.0.0"
+    supports-color "^7.0.0"
+
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
@@ -9458,17 +9220,7 @@ svg-tags@^1.0.0:
   resolved "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz"
   integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
-table@^5.4.6:
-  version "5.4.6"
-  resolved "https://registry.npmjs.org/table/-/table-5.4.6.tgz"
-  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
-  dependencies:
-    ajv "^6.10.2"
-    lodash "^4.17.14"
-    slice-ansi "^2.1.0"
-    string-width "^3.0.0"
-
-table@^6.0.9:
+table@^6.0.9, table@^6.8.1:
   version "6.8.1"
   resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
   integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
@@ -9616,11 +9368,6 @@ trim-right@^1.0.1:
   resolved "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
   integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==
 
-trough@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz"
-  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
-
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -9677,16 +9424,16 @@ type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
   resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
-type-fest@^0.13.1:
-  version "0.13.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"
-  integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==
-
 type-fest@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860"
   integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==
 
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
 type-fest@^0.20.2:
   version "0.20.2"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
@@ -9715,13 +9462,6 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 ua-parser-js@^0.7.30:
   version "0.7.31"
   resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz"
@@ -9770,18 +9510,6 @@ unicode-property-aliases-ecmascript@^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==
 
-unified@^9.1.0:
-  version "9.2.2"
-  resolved "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"
-  integrity sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
-
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"
@@ -9794,25 +9522,6 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-unist-util-find-all-after@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz"
-  integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==
-  dependencies:
-    unist-util-is "^4.0.0"
-
-unist-util-is@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz"
-  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
-
-unist-util-stringify-position@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"
-  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
-  dependencies:
-    "@types/unist" "^2.0.2"
-
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
@@ -9873,7 +9582,7 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
+util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
@@ -9888,7 +9597,7 @@ utils-merge@1.0.1:
   resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1:
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -9915,24 +9624,6 @@ vary@^1, vary@~1.1.2:
   resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-vfile-message@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz"
-  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-
-vfile@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz"
-  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
-  dependencies:
-    "@types/unist" "^2.0.0"
-    is-buffer "^2.0.0"
-    unist-util-stringify-position "^2.0.0"
-    vfile-message "^2.0.0"
-
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
@@ -10365,16 +10056,6 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 write-file-atomic@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz"
@@ -10383,12 +10064,13 @@ write-file-atomic@^4.0.1:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-write@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/write/-/write-1.0.3.tgz"
-  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
-    mkdirp "^0.5.1"
+    imurmurhash "^0.1.4"
+    signal-exit "^3.0.7"
 
 ws@~8.2.3:
   version "8.2.3"
@@ -10434,12 +10116,12 @@ yaml-eslint-parser@^0.3.2:
     lodash "^4.17.20"
     yaml "^1.10.0"
 
-yaml@^1.10.0, yaml@^1.7.2:
+yaml@^1.10.0:
   version "1.10.2"
   resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@^18.1.2, yargs-parser@^18.1.3:
+yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"
   integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
@@ -10447,7 +10129,7 @@ yargs-parser@^18.1.2, yargs-parser@^18.1.3:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.2.2:
+yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.9"
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
@@ -10512,8 +10194,3 @@ yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
-zwitch@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz"
-  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==

From c01c62f149e210118e70838fa26a249b9ac1361d Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Tue, 22 Nov 2022 14:44:44 +0000
Subject: [PATCH 11/35] Redirect users to "awaiting approval" message on
 register (#231)

Ref #81 - this implements a "your request has been sent" message

 ![image](/attachments/61dc3f5e-2706-46f9-a1ca-4efe3f526ff3)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/231
---
 package.json                                  |    6 +-
 src/boot/routes.js                            |    4 +
 .../awaiting_email_confirmation.js            |    4 +
 .../awaiting_email_confirmation.vue           |   12 +
 src/components/registration/registration.js   |   12 +-
 src/components/registration/registration.vue  |    1 +
 .../registration_request_sent.js              |    4 +
 .../registration_request_sent.vue             |   12 +
 src/components/rich_content/rich_content.jsx  |    2 -
 src/i18n/en.json                              |    4 +
 src/modules/users.js                          |   14 +-
 yarn.lock                                     | 1564 +----------------
 12 files changed, 133 insertions(+), 1506 deletions(-)
 create mode 100644 src/components/awaiting_email_confirmation/awaiting_email_confirmation.js
 create mode 100644 src/components/awaiting_email_confirmation/awaiting_email_confirmation.vue
 create mode 100644 src/components/registration_request_sent/registration_request_sent.js
 create mode 100644 src/components/registration_request_sent/registration_request_sent.vue

diff --git a/package.json b/package.json
index bf803011..19a7e186 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,8 @@
     "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@fortawesome/vue-fontawesome": "3.0.1",
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
-    "@vuelidate/core": "2.0.0-alpha.42",
-    "@vuelidate/validators": "2.0.0-alpha.30",
+    "@vuelidate/core": "^2.0.0",
+    "@vuelidate/validators": "^2.0.0",
     "body-scroll-lock": "2.7.1",
     "chromatism": "3.0.0",
     "click-outside-vue3": "4.0.1",
@@ -33,8 +33,6 @@
     "escape-html": "1.0.3",
     "js-cookie": "^3.0.1",
     "localforage": "1.10.0",
-    "marked": "^4.2.2",
-    "marked-mfm": "^0.5.0",
     "parse-link-header": "^2.0.0",
     "phoenix": "1.6.2",
     "punycode.js": "2.1.0",
diff --git a/src/boot/routes.js b/src/boot/routes.js
index d762f057..93a94a9b 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -22,6 +22,8 @@ import Lists from 'components/lists/lists.vue'
 import ListTimeline from 'components/list_timeline/list_timeline.vue'
 import ListEdit from 'components/list_edit/list_edit.vue'
 import AnnouncementsPage from 'components/announcements_page/announcements_page.vue'
+import RegistrationRequestSent from 'components/registration_request_sent/registration_request_sent.vue'
+import AwaitingEmailConfirmation from 'components/awaiting_email_confirmation/awaiting_email_confirmation.vue'
 
 export default (store) => {
   const validateAuthenticatedRoute = (to, from, next) => {
@@ -62,6 +64,8 @@ export default (store) => {
     { name: 'interactions', path: '/users/:username/interactions', component: Interactions, beforeEnter: validateAuthenticatedRoute },
     { name: 'dms', path: '/users/:username/dms', component: DMs, beforeEnter: validateAuthenticatedRoute },
     { name: 'registration', path: '/registration', component: Registration },
+    { name: 'registration-request-sent', path: '/registration-request-sent', component: RegistrationRequestSent },
+    { name: 'awaiting-email-confirmation', path: '/awaiting-email-confirmation', component: AwaitingEmailConfirmation },
     { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true },
     { name: 'registration-token', path: '/registration/:token', component: Registration },
     { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute },
diff --git a/src/components/awaiting_email_confirmation/awaiting_email_confirmation.js b/src/components/awaiting_email_confirmation/awaiting_email_confirmation.js
new file mode 100644
index 00000000..3809de4a
--- /dev/null
+++ b/src/components/awaiting_email_confirmation/awaiting_email_confirmation.js
@@ -0,0 +1,4 @@
+export default {
+  computed: {
+  }
+}
diff --git a/src/components/awaiting_email_confirmation/awaiting_email_confirmation.vue b/src/components/awaiting_email_confirmation/awaiting_email_confirmation.vue
new file mode 100644
index 00000000..559457e6
--- /dev/null
+++ b/src/components/awaiting_email_confirmation/awaiting_email_confirmation.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4>{{ $t('registration.awaiting_email_confirmation_title') }}</h4>
+    </div>
+    <div class="panel-body">
+      <p>{{ $t('registration.awaiting_email_confirmation') }}</p>
+    </div>
+  </div>
+</template>
+
+<script src="./awaiting_email_confirmation.js"></script>
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 6eb316d0..9778a2f3 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -79,8 +79,16 @@ const registration = {
 
       if (!this.v$.$invalid) {
         try {
-          await this.signUp(this.user)
-          this.$router.push({ name: 'friends' })
+          const data = await this.signUp(this.user)
+          if (data.me) {
+            this.$router.push({ name: 'friends' })
+          } else if (data.identifier === 'awaiting_approval') {
+            this.$router.push({ name: 'registration-request-sent' })
+          } else if (data.identifier === 'missing_confirmed_email') {
+            this.$router.push({ name: 'awaiting-email-confirmation' })
+          } else {
+            console.warn('Unknown response from sign up', data)
+          }
         } catch (error) {
           console.warn('Registration failed: ', error)
           this.setCaptcha()
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index cc655c0b..9a88d68d 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -177,6 +177,7 @@
             <div
               v-if="accountApprovalRequired"
               class="form-group"
+              :class="{ 'form-group--error': v$.user.reason.$error }"
             >
               <label
                 class="form--label"
diff --git a/src/components/registration_request_sent/registration_request_sent.js b/src/components/registration_request_sent/registration_request_sent.js
new file mode 100644
index 00000000..3809de4a
--- /dev/null
+++ b/src/components/registration_request_sent/registration_request_sent.js
@@ -0,0 +1,4 @@
+export default {
+  computed: {
+  }
+}
diff --git a/src/components/registration_request_sent/registration_request_sent.vue b/src/components/registration_request_sent/registration_request_sent.vue
new file mode 100644
index 00000000..370837d2
--- /dev/null
+++ b/src/components/registration_request_sent/registration_request_sent.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <h4>{{ $t('registration.request_sent_title') }}</h4>
+    </div>
+    <div class="panel-body">
+      <p>{{ $t('registration.request_sent') }}</p>
+    </div>
+  </div>
+</template>
+
+<script src="./registration_request_sent.js"></script>
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index df3d4416..c5fb1688 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -2,8 +2,6 @@ import { unescape, flattenDeep } from 'lodash'
 import { getTagName, processTextForEmoji, getAttrs } from 'src/services/html_converter/utility.service.js'
 import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js'
 import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js'
-import { marked } from 'marked'
-import markedMfm from 'marked-mfm'
 import StillImage from 'src/components/still-image/still-image.vue'
 import MentionsLine, { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.vue'
 import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 83b8363c..2de13ace 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -409,6 +409,8 @@
         }
     },
     "registration": {
+        "awaiting_email_confirmation_title": "Awaiting email confirmation",
+        "awaiting_email_confirmation": "Your account has been registered and an email has been sent to your address. Please check the email to complete registration.",
         "bio": "Bio",
         "bio_placeholder": "e.g.\nHi! Welcome to my bio.\nI love watching anime and playing games. I hope we can be friends!",
         "captcha": "CAPTCHA",
@@ -422,6 +424,8 @@
         "reason_placeholder": "This instance approves registrations manually.\nLet the administration know why you want to register.",
         "register": "Register",
         "registration": "Registration",
+        "request_sent": "Your registration request has been sent for approval. You will receive an email when your account is approved.",
+        "request_sent_title": "Registration request sent",
         "token": "Invite token",
         "username_placeholder": "e.g. akko",
         "validations": {
diff --git a/src/modules/users.js b/src/modules/users.js
index ff5d4c93..022cc1dc 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -489,9 +489,17 @@ const users = {
         let data = await rootState.api.backendInteractor.register(
           { params: { ...userInfo } }
         )
-        store.commit('signUpSuccess')
-        store.commit('setToken', data.access_token)
-        store.dispatch('loginUser', data.access_token)
+        if (data.identifier === 'awaiting_approval' || data.identifier === 'missing_confirmed_email') {
+          store.commit('signUpSuccess')
+          return data
+        } else if (data.me !== undefined) {
+          store.commit('signUpSuccess')
+          store.commit('setToken', data.access_token)
+          store.dispatch('loginUser', data.access_token)
+          return data
+        } else {
+          store.commit('signUpFailure', data)
+        }
       } catch (e) {
         let errors = e.message
         store.commit('signUpFailure', errors)
diff --git a/yarn.lock b/yarn.lock
index fa3aeb07..bbceba0b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26,7 +26,7 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
@@ -85,27 +85,6 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"
-  integrity sha512-1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.9"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helpers" "^7.18.9"
-    "@babel/parser" "^7.18.9"
-    "@babel/template" "^7.18.6"
-    "@babel/traverse" "^7.18.9"
-    "@babel/types" "^7.18.9"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.2.1"
-    semver "^6.3.0"
-
 "@babel/eslint-parser@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4"
@@ -115,7 +94,7 @@
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.7", "@babel/generator@^7.18.9", "@babel/generator@^7.7.2":
+"@babel/generator@^7.17.7", "@babel/generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz"
   integrity sha512-wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug==
@@ -405,7 +384,7 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helpers@^7.17.8", "@babel/helpers@^7.18.9":
+"@babel/helpers@^7.17.8":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"
   integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
@@ -432,7 +411,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.17.8", "@babel/parser@^7.18.6", "@babel/parser@^7.18.9":
+"@babel/parser@^7.16.4", "@babel/parser@^7.17.8", "@babel/parser@^7.18.6", "@babel/parser@^7.18.9":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz"
   integrity sha512-9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==
@@ -458,7 +437,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.16.8", "@babel/plugin-proposal-async-generator-functions@^7.18.6":
+"@babel/plugin-proposal-async-generator-functions@^7.16.8":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"
   integrity sha512-WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w==
@@ -543,7 +522,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.16.7", "@babel/plugin-proposal-object-rest-spread@^7.18.9":
+"@babel/plugin-proposal-object-rest-spread@^7.16.7":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"
   integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
@@ -615,14 +594,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-bigint@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"
-  integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.8.0"
-
-"@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
+"@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
@@ -650,13 +622,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"
-  integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-syntax-import-assertions@^7.20.0":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
@@ -664,13 +629,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-syntax-import-meta@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"
-  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
@@ -685,7 +643,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
+"@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
@@ -699,7 +657,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
+"@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
   resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
@@ -734,20 +692,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+"@babel/plugin-syntax-top-level-await@^7.14.5":
   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==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-typescript@^7.7.2":
-  version "7.18.6"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz"
-  integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-transform-arrow-functions@^7.16.7", "@babel/plugin-transform-arrow-functions@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"
@@ -771,7 +722,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.16.7", "@babel/plugin-transform-block-scoping@^7.18.9":
+"@babel/plugin-transform-block-scoping@^7.16.7":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"
   integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
@@ -785,7 +736,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.16.7", "@babel/plugin-transform-classes@^7.18.9":
+"@babel/plugin-transform-classes@^7.16.7":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"
   integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
@@ -821,7 +772,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.16.7", "@babel/plugin-transform-destructuring@^7.18.9":
+"@babel/plugin-transform-destructuring@^7.16.7":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz"
   integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==
@@ -888,7 +839,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.16.7", "@babel/plugin-transform-modules-amd@^7.18.6":
+"@babel/plugin-transform-modules-amd@^7.16.7":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"
   integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
@@ -905,7 +856,7 @@
     "@babel/helper-module-transforms" "^7.19.6"
     "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8", "@babel/plugin-transform-modules-commonjs@^7.18.6":
+"@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"
   integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
@@ -924,7 +875,7 @@
     "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7", "@babel/plugin-transform-modules-systemjs@^7.18.9":
+"@babel/plugin-transform-modules-systemjs@^7.16.7":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"
   integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
@@ -953,7 +904,7 @@
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8", "@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
+"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"
   integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
@@ -1039,7 +990,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.16.7", "@babel/plugin-transform-spread@^7.18.9":
+"@babel/plugin-transform-spread@^7.16.7":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"
   integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
@@ -1076,7 +1027,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7", "@babel/plugin-transform-unicode-escapes@^7.18.6":
+"@babel/plugin-transform-unicode-escapes@^7.16.7":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"
   integrity sha512-XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw==
@@ -1259,87 +1210,6 @@
     core-js-compat "^3.25.1"
     semver "^6.3.0"
 
-"@babel/preset-env@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.9.tgz"
-  integrity sha512-75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg==
-  dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-validator-option" "^7.18.6"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.6"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.18.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
-    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
-    "@babel/plugin-proposal-json-strings" "^7.18.6"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.18.9"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
-    "@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-import-assertions" "^7.18.6"
-    "@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.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@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.18.6"
-    "@babel/plugin-transform-async-to-generator" "^7.18.6"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.18.9"
-    "@babel/plugin-transform-classes" "^7.18.9"
-    "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.18.9"
-    "@babel/plugin-transform-dotall-regex" "^7.18.6"
-    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
-    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.18.8"
-    "@babel/plugin-transform-function-name" "^7.18.9"
-    "@babel/plugin-transform-literals" "^7.18.9"
-    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.18.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.18.8"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.18.6"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.18.9"
-    "@babel/plugin-transform-sticky-regex" "^7.18.6"
-    "@babel/plugin-transform-template-literals" "^7.18.9"
-    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.6"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
-    "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.1"
-    babel-plugin-polyfill-corejs3 "^0.5.2"
-    babel-plugin-polyfill-regenerator "^0.3.1"
-    core-js-compat "^3.22.1"
-    semver "^6.3.0"
-
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
   resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
@@ -1383,7 +1253,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.16.7", "@babel/template@^7.18.6", "@babel/template@^7.3.3":
+"@babel/template@^7.0.0", "@babel/template@^7.16.7", "@babel/template@^7.18.6":
   version "7.18.6"
   resolved "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"
   integrity sha512-JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw==
@@ -1401,7 +1271,7 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.18.9", "@babel/traverse@^7.7.2":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.17.3", "@babel/traverse@^7.18.9":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz"
   integrity sha512-LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg==
@@ -1433,7 +1303,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.4.4":
   version "7.18.9"
   resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz"
   integrity sha512-WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg==
@@ -1450,11 +1320,6 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@bcoe/v8-coverage@^0.2.3":
-  version "0.2.3"
-  resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
-  integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
-
 "@chenfengyuan/vue-qrcode@2.0.0":
   version "2.0.0"
   resolved "https://registry.npmjs.org/@chenfengyuan/vue-qrcode/-/vue-qrcode-2.0.0.tgz"
@@ -1485,21 +1350,6 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@eslint/eslintrc@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.0.tgz"
-  integrity sha512-UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.3.2"
-    globals "^13.15.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
 "@fortawesome/fontawesome-common-types@6.2.0":
   version "6.2.0"
   resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"
@@ -1545,16 +1395,7 @@
     debug "^4.1.1"
     minimatch "^3.0.4"
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
-
-"@humanwhocodes/object-schema@^1.2.0", "@humanwhocodes/object-schema@^1.2.1":
+"@humanwhocodes/object-schema@^1.2.0":
   version "1.2.1"
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
@@ -1619,215 +1460,6 @@
     json5 "^2.2.0"
     loader-utils "^2.0.0"
 
-"@istanbuljs/load-nyc-config@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
-  integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
-  dependencies:
-    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"
-
-"@istanbuljs/schema@^0.1.2":
-  version "0.1.3"
-  resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"
-  integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
-
-"@jest/console@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz"
-  integrity sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    slash "^3.0.0"
-
-"@jest/core@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz"
-  integrity sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/reporters" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    jest-changed-files "^28.1.3"
-    jest-config "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-resolve-dependencies "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    jest-watcher "^28.1.3"
-    micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-    strip-ansi "^6.0.0"
-
-"@jest/environment@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz"
-  integrity sha512-1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA==
-  dependencies:
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    jest-mock "^28.1.3"
-
-"@jest/expect-utils@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz"
-  integrity sha512-wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA==
-  dependencies:
-    jest-get-type "^28.0.2"
-
-"@jest/expect@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz"
-  integrity sha512-lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw==
-  dependencies:
-    expect "^28.1.3"
-    jest-snapshot "^28.1.3"
-
-"@jest/fake-timers@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz"
-  integrity sha512-D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@sinonjs/fake-timers" "^9.1.2"
-    "@types/node" "*"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
-
-"@jest/globals@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz"
-  integrity sha512-XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/types" "^28.1.3"
-
-"@jest/reporters@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz"
-  integrity sha512-JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg==
-  dependencies:
-    "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    collect-v8-coverage "^1.0.0"
-    exit "^0.1.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^5.1.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-lib-source-maps "^4.0.0"
-    istanbul-reports "^3.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    slash "^3.0.0"
-    string-length "^4.0.1"
-    strip-ansi "^6.0.0"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^9.0.1"
-
-"@jest/schemas@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz"
-  integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
-  dependencies:
-    "@sinclair/typebox" "^0.24.1"
-
-"@jest/source-map@^28.1.2":
-  version "28.1.2"
-  resolved "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz"
-  integrity sha512-cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.13"
-    callsites "^3.0.0"
-    graceful-fs "^4.2.9"
-
-"@jest/test-result@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz"
-  integrity sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    collect-v8-coverage "^1.0.0"
-
-"@jest/test-sequencer@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz"
-  integrity sha512-NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw==
-  dependencies:
-    "@jest/test-result" "^28.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    slash "^3.0.0"
-
-"@jest/transform@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz"
-  integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
-    slash "^3.0.0"
-    write-file-atomic "^4.0.1"
-
-"@jest/types@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz"
-  integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"
@@ -1868,14 +1500,6 @@
   resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.14"
-  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"
-  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/trace-mapping@^0.3.14":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
@@ -1884,6 +1508,14 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.14"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@kazvmoe-infra/pinch-zoom-element@1.2.0":
   version "1.2.0"
   resolved "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz"
@@ -1919,7 +1551,7 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@rollup/plugin-babel@^5.2.0", "@rollup/plugin-babel@^5.3.1":
+"@rollup/plugin-babel@^5.2.0":
   version "5.3.1"
   resolved "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz"
   integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==
@@ -1927,19 +1559,6 @@
     "@babel/helper-module-imports" "^7.10.4"
     "@rollup/pluginutils" "^3.1.0"
 
-"@rollup/plugin-commonjs@^22.0.1":
-  version "22.0.1"
-  resolved "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-22.0.1.tgz"
-  integrity sha512-dGfEZvdjDHObBiP5IvwTKMVeq/tBZGMBHZFMdIV1ClMM/YoWS34xrHFGfag9SN2ZtMgNZRFruqvxZQEa70O6nQ==
-  dependencies:
-    "@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"
-
 "@rollup/plugin-node-resolve@^11.2.1":
   version "11.2.1"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
@@ -1969,25 +1588,6 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@sinclair/typebox@^0.24.1":
-  version "0.24.22"
-  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.22.tgz"
-  integrity sha512-JsBe3cOFpNZ6yjBYnXKhcENWy5qZE3PQZwExQ5ksA/h8qp4bwwxFmy07A6bC2R6qv6+RF3SfrbQTskTwYNTXUQ==
-
-"@sinonjs/commons@^1.7.0":
-  version "1.8.3"
-  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
-  dependencies:
-    type-detect "4.0.8"
-
-"@sinonjs/fake-timers@^9.1.2":
-  version "9.1.2"
-  resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"
-  integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
 "@surma/rollup-plugin-off-main-thread@^2.2.3":
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053"
@@ -2003,39 +1603,6 @@
   resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.1.3.tgz#fbb68696899d7b8c1b9b891eded9c04fe2cd5529"
   integrity sha512-g697J3WxV/Zytemz8aTuKjTGYtta9+02kva3C1xc7KXB8GdbfE1akGJIsZLyY/FSh2QrnE+fiB7vmWU3XNcb6A==
 
-"@types/babel__core@^7.1.14":
-  version "7.1.19"
-  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz"
-  integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
-"@types/babel__generator@*":
-  version "7.6.4"
-  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz"
-  integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
-  dependencies:
-    "@babel/types" "^7.0.0"
-
-"@types/babel__template@*":
-  version "7.4.1"
-  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz"
-  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.17.1"
-  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.1.tgz"
-  integrity sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
 "@types/component-emitter@^1.2.10":
   version "1.2.11"
   resolved "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz"
@@ -2082,13 +1649,6 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
-"@types/graceful-fs@^4.1.3":
-  version "4.1.5"
-  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"
-  integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/html-minifier-terser@^6.0.0":
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35"
@@ -2101,25 +1661,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"
-  integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
-
-"@types/istanbul-lib-report@*":
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
-  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "*"
-
-"@types/istanbul-reports@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"
-  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
-  dependencies:
-    "@types/istanbul-lib-report" "*"
-
 "@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
@@ -2150,11 +1691,6 @@
   resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/prettier@^2.1.5":
-  version "2.6.4"
-  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.4.tgz"
-  integrity sha512-fOwvpvQYStpb/zHMx0Cauwywu9yLDmzWiiQBC7gJyq5tYLUXFZvDG7VK1B7WBxxjBJNKFOZ0zLoOQn8vmATbhw==
-
 "@types/resolve@1.17.1":
   version "1.17.1"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
@@ -2162,28 +1698,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/stack-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz"
-  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
-
 "@types/trusted-types@^2.0.2":
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756"
   integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg==
 
-"@types/yargs-parser@*":
-  version "21.0.0"
-  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"
-  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
-
-"@types/yargs@^17.0.8":
-  version "17.0.10"
-  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz"
-  integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yauzl@^2.9.1":
   version "2.10.0"
   resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"
@@ -2191,52 +1710,6 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/scope-manager@5.31.0":
-  version "5.31.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz"
-  integrity sha512-8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg==
-  dependencies:
-    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/visitor-keys" "5.31.0"
-
-"@typescript-eslint/types@5.31.0":
-  version "5.31.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz"
-  integrity sha512-/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g==
-
-"@typescript-eslint/typescript-estree@5.31.0":
-  version "5.31.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz"
-  integrity sha512-3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw==
-  dependencies:
-    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/visitor-keys" "5.31.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@^5.10.0":
-  version "5.31.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz"
-  integrity sha512-kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.31.0"
-    "@typescript-eslint/types" "5.31.0"
-    "@typescript-eslint/typescript-estree" "5.31.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
-
-"@typescript-eslint/visitor-keys@5.31.0":
-  version "5.31.0"
-  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz"
-  integrity sha512-ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg==
-  dependencies:
-    "@typescript-eslint/types" "5.31.0"
-    eslint-visitor-keys "^3.3.0"
-
 "@ungap/event-target@0.2.3":
   version "0.2.3"
   resolved "https://registry.npmjs.org/@ungap/event-target/-/event-target-0.2.3.tgz"
@@ -2367,19 +1840,19 @@
   resolved "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.0.2.tgz"
   integrity sha512-E2P4oXSaWDqTZNbmKZFVLrNN/siVN78YkEqs7pHryWerrlZR9bBFLWdJwRoguX45Ru6HxIflzKl4vQvwRMwm5g==
 
-"@vuelidate/core@2.0.0-alpha.42":
-  version "2.0.0-alpha.42"
-  resolved "https://registry.npmjs.org/@vuelidate/core/-/core-2.0.0-alpha.42.tgz"
-  integrity sha512-yLp5/5IkwNZP8214TqEuexlFLGoEZybEad2OZu/heOYPnERm6tgiWHZltc0USCuQ1JVZ2EJuPRHmqMl/G/N7tw==
+"@vuelidate/core@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.0.tgz#dfe73ba3f997646e07bd4da4f327fe53c29782cb"
+  integrity sha512-xIFgdQlScO0aaSZ0wTGPJh8YcTMNAj5veI8yPgiAyxOT+GV7vNQFiU1vpYWCL4cklkkhYvRRSC2OEX7YOZNmPQ==
   dependencies:
-    vue-demi "^0.12.0"
+    vue-demi "^0.13.11"
 
-"@vuelidate/validators@2.0.0-alpha.30":
-  version "2.0.0-alpha.30"
-  resolved "https://registry.npmjs.org/@vuelidate/validators/-/validators-2.0.0-alpha.30.tgz"
-  integrity sha512-XH0oIU1+6bTZ1Kd1RNf7AMDsAahj1hUjLhbFUIrDhKIUKMFvG4658pqYATePNqhAegENFA+RDAPhsDXV/MB2wQ==
+"@vuelidate/validators@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@vuelidate/validators/-/validators-2.0.0.tgz#1ddd86c6c81b2cfbb5720961e951cc53ec0a80be"
+  integrity sha512-fQQcmDWfz7pyH5/JPi0Ng2GEgNK1pUHn/Z/j5rG/Q+HwhgIXvJblTPcZwKOj1ABL7V4UVuGKECvZCDHNGOwdrg==
   dependencies:
-    vue-demi "^0.12.0"
+    vue-demi "^0.13.11"
 
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
@@ -2624,13 +2097,6 @@ ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
   integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
-ansi-escapes@^4.2.1:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
 ansi-html-community@0.0.8:
   version "0.0.8"
   resolved "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
@@ -2670,17 +2136,12 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
-ansi-styles@^5.0.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"
-  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
-
 ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"
   integrity sha512-3iF4FIKdxaVYT3JqQuY3Wat/T2t7TRbbQ94Fu50ZUCbLy4TFbTzr90NOHQodQkNqmeEGCw8WbeP78WNi6SKYUA==
 
-anymatch@^3.0.3, anymatch@~3.1.2:
+anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -2860,19 +2321,6 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-jest@^28.1.2, babel-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz"
-  integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
-  dependencies:
-    "@jest/transform" "^28.1.3"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^28.1.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
 babel-loader@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.0.tgz#839e9ae88aea930864ef9ec0f356dfca96ecf238"
@@ -2895,27 +2343,6 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-istanbul@^6.1.1:
-  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==
-  dependencies:
-    "@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-jest-hoist@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz"
-  integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.1.14"
-    "@types/babel__traverse" "^7.0.6"
-
 babel-plugin-lodash@3.3.4:
   version "3.3.4"
   resolved "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.4.tgz"
@@ -2927,7 +2354,7 @@ babel-plugin-lodash@3.3.4:
     lodash "^4.17.10"
     require-package-name "^2.0.1"
 
-babel-plugin-polyfill-corejs2@^0.3.0, babel-plugin-polyfill-corejs2@^0.3.1:
+babel-plugin-polyfill-corejs2@^0.3.0:
   version "0.3.2"
   resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz"
   integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
@@ -2945,7 +2372,7 @@ babel-plugin-polyfill-corejs2@^0.3.3:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.0, babel-plugin-polyfill-corejs3@^0.5.2:
+babel-plugin-polyfill-corejs3@^0.5.0:
   version "0.5.3"
   resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz"
   integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
@@ -2961,7 +2388,7 @@ babel-plugin-polyfill-corejs3@^0.6.0:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
     core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0, babel-plugin-polyfill-regenerator@^0.3.1:
+babel-plugin-polyfill-regenerator@^0.3.0:
   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==
@@ -2975,32 +2402,6 @@ babel-plugin-polyfill-regenerator@^0.4.1:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.3.3"
 
-babel-preset-current-node-syntax@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"
-  integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
-  dependencies:
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-bigint" "^7.8.3"
-    "@babel/plugin-syntax-class-properties" "^7.8.3"
-    "@babel/plugin-syntax-import-meta" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-    "@babel/plugin-syntax-numeric-separator" "^7.8.3"
-    "@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-top-level-await" "^7.8.3"
-
-babel-preset-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz"
-  integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
-  dependencies:
-    babel-plugin-jest-hoist "^28.1.3"
-    babel-preset-current-node-syntax "^1.0.0"
-
 babel-register@^6.26.0:
   version "6.26.0"
   resolved "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz"
@@ -3192,13 +2593,6 @@ browserslist@^4.20.2, browserslist@^4.21.3:
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.5"
 
-bser@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"
-  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
-  dependencies:
-    node-int64 "^0.4.0"
-
 buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
@@ -3286,7 +2680,7 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.0.0, camelcase@^6.2.0:
+camelcase@^6.0.0:
   version "6.3.0"
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
@@ -3364,11 +2758,6 @@ chalk@~0.4.0:
     has-color "~0.1.0"
     strip-ansi "~0.1.0"
 
-char-regex@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
-  integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
-
 check-error@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
@@ -3412,16 +2801,6 @@ chromedriver@^107.0.3:
     proxy-from-env "^1.1.0"
     tcp-port-used "^1.0.1"
 
-ci-info@^3.2.0:
-  version "3.3.2"
-  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz"
-  integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==
-
-cjs-module-lexer@^1.0.0:
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz"
-  integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
-
 clean-css@^5.2.2:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.1.tgz#d0610b0b90d125196a2894d35366f734e5d7aa32"
@@ -3473,11 +2852,6 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-co@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
-  integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
-
 co@~3.0.6:
   version "3.0.6"
   resolved "https://registry.npmjs.org/co/-/co-3.0.6.tgz"
@@ -3488,11 +2862,6 @@ coalescy@1.0.0:
   resolved "https://registry.yarnpkg.com/coalescy/-/coalescy-1.0.0.tgz#4b065846b836361ada6c4b4a4abf4bc1cac31bf1"
   integrity sha512-OmRR46eVfyaXZYI7Ai5/vnLHjWhhh99sugx+UTsmVhwaYzARb+Tcdit59/HkVxF8KdqJG5NN8ClUhzQXS3Hh+w==
 
-collect-v8-coverage@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"
-  integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
-
 color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
@@ -3608,7 +2977,7 @@ content-type@~1.0.4:
   resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.1, convert-source-map@^1.7.0:
   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==
@@ -3625,7 +2994,7 @@ cookie@0.4.2, cookie@~0.4.1:
   resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.22.1:
+core-js-compat@^3.20.2, core-js-compat@^3.21.0:
   version "3.24.1"
   resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz"
   integrity sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==
@@ -3804,7 +3173,7 @@ debug@2.6.8:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -3838,11 +3207,6 @@ decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-dedent@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"
-  integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
-
 deep-eql@0.1.3:
   version "0.1.3"
   resolved "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"
@@ -3916,21 +3280,11 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-newline@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"
-  integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
-
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
   integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
 
-diff-sequences@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz"
-  integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
-
 diff@1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"
@@ -4079,11 +3433,6 @@ electron-to-chromium@^1.4.251:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
   integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
-emittery@^0.10.2:
-  version "0.10.2"
-  resolved "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz"
-  integrity sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
@@ -4269,11 +3618,6 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
-escape-string-regexp@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
-
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
@@ -4373,13 +3717,6 @@ eslint-plugin-import@^2.26.0:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-plugin-jest@^26.5.3:
-  version "26.7.0"
-  resolved "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.7.0.tgz"
-  integrity sha512-/YNitdfG3o3cC6juZziAdkk6nfJt01jXVfj4AgaYVLs7bupHzRDL5K+eipdzhDXtQsiqaX1TzfwSuRlEgeln1A==
-  dependencies:
-    "@typescript-eslint/utils" "^5.10.0"
-
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
@@ -4506,47 +3843,6 @@ eslint@^7.32.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-eslint@^8.19.0:
-  version "8.20.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz"
-  integrity sha512-d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA==
-  dependencies:
-    "@eslint/eslintrc" "^1.3.0"
-    "@humanwhocodes/config-array" "^0.9.2"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.2"
-    esquery "^1.4.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.15.0"
-    ignore "^5.2.0"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^4.1.0"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
 espree@^6.0.0:
   version "6.2.1"
   resolved "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"
@@ -4574,15 +3870,6 @@ espree@^9.3.1:
     acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
-espree@^9.3.2:
-  version "9.3.3"
-  resolved "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz"
-  integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==
-  dependencies:
-    acorn "^8.8.0"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"
@@ -4632,7 +3919,7 @@ estree-walker@^1.0.1:
   resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
-estree-walker@^2.0.1, estree-walker@^2.0.2:
+estree-walker@^2.0.2:
   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==
@@ -4662,37 +3949,6 @@ eventsource-polyfill@0.9.6:
   resolved "https://registry.npmjs.org/eventsource-polyfill/-/eventsource-polyfill-0.9.6.tgz"
   integrity sha512-LyMFp2oPDGhum2lMvkjqKZEwWd2/AoXyt8aoyftTBMWwPHNgU+2tdxhTHPluDxoz+z4gNj0uHAPR9nqevATMbg==
 
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    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@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
-  integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
-
-expect@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz"
-  integrity sha512-eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g==
-  dependencies:
-    "@jest/expect-utils" "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-
 express@4.17.3:
   version "4.17.3"
   resolved "https://registry.npmjs.org/express/-/express-4.17.3.tgz"
@@ -4794,13 +4050,6 @@ fastq@^1.6.0:
   dependencies:
     reusify "^1.0.4"
 
-fb-watchman@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"
-  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
-  dependencies:
-    bser "2.1.1"
-
 fd-slicer@~1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
@@ -4979,7 +4228,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2:
+fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -5055,11 +4304,6 @@ get-own-enumerable-property-symbols@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
-get-package-type@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
-  integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
-
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
@@ -5072,11 +4316,6 @@ get-stream@^5.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^6.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==
-
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
@@ -5104,13 +4343,6 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -5151,7 +4383,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.3, glob@^7.1.6, glob@^7.1.7:
   version "7.2.3"
   resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -5184,7 +4416,7 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.15.0, globals@^13.6.0, globals@^13.9.0:
+globals@^13.6.0, globals@^13.9.0:
   version "13.17.0"
   resolved "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"
   integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
@@ -5355,11 +4587,6 @@ html-entities@^2.1.0:
   resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"
   integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
 
-html-escaper@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
-  integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
-
 html-minifier-terser@^6.0.2:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab"
@@ -5477,11 +4704,6 @@ https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
@@ -5554,14 +4776,6 @@ import-lazy@^4.0.0:
   resolved "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz"
   integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
 
-import-local@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"
-  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
-  dependencies:
-    pkg-dir "^4.2.0"
-    resolve-cwd "^3.0.0"
-
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
@@ -5733,11 +4947,6 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-fn@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"
-  integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
-
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
@@ -5789,13 +4998,6 @@ is-plain-object@^5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
-is-reference@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
-  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
-  dependencies:
-    "@types/estree" "*"
-
 is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
@@ -5920,48 +5122,6 @@ isparta@4.x.x:
     source-map "^0.5.0"
     which "^1.0.9"
 
-istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
-  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==
-
-istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
-  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==
-  dependencies:
-    "@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"
-
-istanbul-lib-report@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
-  integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
-  dependencies:
-    istanbul-lib-coverage "^3.0.0"
-    make-dir "^3.0.0"
-    supports-color "^7.1.0"
-
-istanbul-lib-source-maps@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"
-  integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
-  dependencies:
-    debug "^4.1.1"
-    istanbul-lib-coverage "^3.0.0"
-    source-map "^0.6.1"
-
-istanbul-reports@^3.1.3:
-  version "3.1.5"
-  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"
-  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
 istanbul@0.4.5, istanbul@^0.4.0:
   version "0.4.5"
   resolved "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz"
@@ -5992,345 +5152,6 @@ jake@^10.8.5:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
-jest-changed-files@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz"
-  integrity sha512-esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA==
-  dependencies:
-    execa "^5.0.0"
-    p-limit "^3.1.0"
-
-jest-circus@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz"
-  integrity sha512-cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/expect" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    dedent "^0.7.0"
-    is-generator-fn "^2.0.0"
-    jest-each "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    p-limit "^3.1.0"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-cli@^28.1.2:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz"
-  integrity sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==
-  dependencies:
-    "@jest/core" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    exit "^0.1.2"
-    graceful-fs "^4.2.9"
-    import-local "^3.0.2"
-    jest-config "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    prompts "^2.0.1"
-    yargs "^17.3.1"
-
-jest-config@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz"
-  integrity sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    babel-jest "^28.1.3"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    deepmerge "^4.2.2"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-circus "^28.1.3"
-    jest-environment-node "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-runner "^28.1.3"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    micromatch "^4.0.4"
-    parse-json "^5.2.0"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    strip-json-comments "^3.1.1"
-
-jest-diff@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz"
-  integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==
-  dependencies:
-    chalk "^4.0.0"
-    diff-sequences "^28.1.1"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
-jest-docblock@^28.1.1:
-  version "28.1.1"
-  resolved "https://registry.npmjs.org/jest-docblock/-/jest-docblock-28.1.1.tgz"
-  integrity sha512-3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA==
-  dependencies:
-    detect-newline "^3.0.0"
-
-jest-each@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz"
-  integrity sha512-arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    jest-util "^28.1.3"
-    pretty-format "^28.1.3"
-
-jest-environment-node@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz"
-  integrity sha512-ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    jest-mock "^28.1.3"
-    jest-util "^28.1.3"
-
-jest-get-type@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz"
-  integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
-
-jest-haste-map@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz"
-  integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/graceful-fs" "^4.1.3"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
-    micromatch "^4.0.4"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.2"
-
-jest-leak-detector@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz"
-  integrity sha512-WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA==
-  dependencies:
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
-jest-matcher-utils@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz"
-  integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    pretty-format "^28.1.3"
-
-jest-message-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz"
-  integrity sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^28.1.3"
-    "@types/stack-utils" "^2.0.0"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    micromatch "^4.0.4"
-    pretty-format "^28.1.3"
-    slash "^3.0.0"
-    stack-utils "^2.0.3"
-
-jest-mock@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz"
-  integrity sha512-o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-
-jest-pnp-resolver@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"
-  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
-
-jest-regex-util@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz"
-  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
-
-jest-resolve-dependencies@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz"
-  integrity sha512-qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA==
-  dependencies:
-    jest-regex-util "^28.0.2"
-    jest-snapshot "^28.1.3"
-
-jest-resolve@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz"
-  integrity sha512-Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ==
-  dependencies:
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-pnp-resolver "^1.2.2"
-    jest-util "^28.1.3"
-    jest-validate "^28.1.3"
-    resolve "^1.20.0"
-    resolve.exports "^1.1.0"
-    slash "^3.0.0"
-
-jest-runner@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz"
-  integrity sha512-GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA==
-  dependencies:
-    "@jest/console" "^28.1.3"
-    "@jest/environment" "^28.1.3"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    emittery "^0.10.2"
-    graceful-fs "^4.2.9"
-    jest-docblock "^28.1.1"
-    jest-environment-node "^28.1.3"
-    jest-haste-map "^28.1.3"
-    jest-leak-detector "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-resolve "^28.1.3"
-    jest-runtime "^28.1.3"
-    jest-util "^28.1.3"
-    jest-watcher "^28.1.3"
-    jest-worker "^28.1.3"
-    p-limit "^3.1.0"
-    source-map-support "0.5.13"
-
-jest-runtime@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz"
-  integrity sha512-NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw==
-  dependencies:
-    "@jest/environment" "^28.1.3"
-    "@jest/fake-timers" "^28.1.3"
-    "@jest/globals" "^28.1.3"
-    "@jest/source-map" "^28.1.2"
-    "@jest/test-result" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    chalk "^4.0.0"
-    cjs-module-lexer "^1.0.0"
-    collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
-    glob "^7.1.3"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-mock "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-resolve "^28.1.3"
-    jest-snapshot "^28.1.3"
-    jest-util "^28.1.3"
-    slash "^3.0.0"
-    strip-bom "^4.0.0"
-
-jest-snapshot@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz"
-  integrity sha512-4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg==
-  dependencies:
-    "@babel/core" "^7.11.6"
-    "@babel/generator" "^7.7.2"
-    "@babel/plugin-syntax-typescript" "^7.7.2"
-    "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^28.1.3"
-    "@jest/transform" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/babel__traverse" "^7.0.6"
-    "@types/prettier" "^2.1.5"
-    babel-preset-current-node-syntax "^1.0.0"
-    chalk "^4.0.0"
-    expect "^28.1.3"
-    graceful-fs "^4.2.9"
-    jest-diff "^28.1.3"
-    jest-get-type "^28.0.2"
-    jest-haste-map "^28.1.3"
-    jest-matcher-utils "^28.1.3"
-    jest-message-util "^28.1.3"
-    jest-util "^28.1.3"
-    natural-compare "^1.4.0"
-    pretty-format "^28.1.3"
-    semver "^7.3.5"
-
-jest-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz"
-  integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-validate@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz"
-  integrity sha512-SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    camelcase "^6.2.0"
-    chalk "^4.0.0"
-    jest-get-type "^28.0.2"
-    leven "^3.1.0"
-    pretty-format "^28.1.3"
-
-jest-watcher@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz"
-  integrity sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==
-  dependencies:
-    "@jest/test-result" "^28.1.3"
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    ansi-escapes "^4.2.1"
-    chalk "^4.0.0"
-    emittery "^0.10.2"
-    jest-util "^28.1.3"
-    string-length "^4.0.1"
-
 jest-worker@^26.2.1:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
@@ -6349,15 +5170,6 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"
-  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
 js-base64@^2.1.9:
   version "2.6.4"
   resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"
@@ -6599,11 +5411,6 @@ kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-kleur@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
-  integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
-
 klona@^2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
@@ -6963,20 +5770,13 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.2:
   version "3.1.0"
   resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
-makeerror@1.0.12:
-  version "1.0.12"
-  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz"
-  integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
-  dependencies:
-    tmpl "1.0.5"
-
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
@@ -6987,27 +5787,6 @@ map-obj@^4.0.0:
   resolved "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"
   integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==
 
-marked-mfm@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.npmjs.org/marked-mfm/-/marked-mfm-0.5.0.tgz"
-  integrity sha512-nRazH80nu7gVEDeORQWCWehY3v7fofC4usKdY/d6mckxfRY4PrPNLM3iGpVedpij9ktmesWAtY7SpCLq/BxP4Q==
-  dependencies:
-    "@babel/core" "^7.18.6"
-    "@babel/preset-env" "^7.18.6"
-    "@rollup/plugin-babel" "^5.3.1"
-    "@rollup/plugin-commonjs" "^22.0.1"
-    babel-jest "^28.1.2"
-    eslint "^8.19.0"
-    eslint-config-standard "^17.0.0"
-    eslint-plugin-jest "^26.5.3"
-    jest-cli "^28.1.2"
-    rollup "^2.76.0"
-
-marked@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.2.tgz#1d2075ad6cdfe42e651ac221c32d949a26c0672a"
-  integrity sha512-JjBTFTAvuTgANXx82a5vzK9JLSMoV6V3LBVn4Uhdso6t7vXrGx7g1Cd2r6NYSsxrYbQGFCMqBDhFHyK5q2UvcQ==
-
 mathml-tag-names@^2.1.3:
   version "2.1.3"
   resolved "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"
@@ -7114,11 +5893,6 @@ mimic-fn@^1.0.0:
   resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
-  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
-
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
@@ -7307,11 +6081,6 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-int64@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"
-  integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
-
 node-releases@^2.0.6:
   version "2.0.6"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"
@@ -7372,13 +6141,6 @@ normalize-url@1.9.1:
     query-string "^4.1.0"
     sort-keys "^1.0.0"
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
 nth-check@^2.0.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
@@ -7468,13 +6230,6 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-onetime@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
-  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
-  dependencies:
-    mimic-fn "^2.1.0"
-
 opn@4.0.2:
   version "4.0.2"
   resolved "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"
@@ -7542,13 +6297,6 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
-
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"
@@ -7624,7 +6372,7 @@ parse-json@^4.0.0:
     error-ex "^1.3.1"
     json-parse-better-errors "^1.0.1"
 
-parse-json@^5.0.0, parse-json@^5.2.0:
+parse-json@^5.0.0:
   version "5.2.0"
   resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -7676,7 +6424,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -7737,7 +6485,7 @@ picocolors@^1.0.0:
   resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -7764,7 +6512,7 @@ pinkie@^2.0.0:
   resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
   integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
-pirates@^4.0.4, pirates@^4.0.5:
+pirates@^4.0.5:
   version "4.0.5"
   resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"
   integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
@@ -7776,7 +6524,7 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+pkg-dir@^4.1.0:
   version "4.2.0"
   resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
@@ -7976,16 +6724,6 @@ pretty-error@^4.0.0:
     lodash "^4.17.20"
     renderkid "^3.0.0"
 
-pretty-format@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz"
-  integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    ansi-regex "^5.0.1"
-    ansi-styles "^5.0.0"
-    react-is "^18.0.0"
-
 private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.npmjs.org/private/-/private-0.1.8.tgz"
@@ -8001,14 +6739,6 @@ progress@^2.0.0:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-prompts@^2.0.1:
-  version "2.4.2"
-  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
-  integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
@@ -8151,11 +6881,6 @@ raw-loader@0.5.1:
   resolved "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz"
   integrity sha512-sf7oGoLuaYAScB4VGr0tzetsYlS8EJH6qnTCfQ/WVEa89hALQ4RQfCKt5xCyPQKPDUbVUAIP1QsxAwfAjlDp7Q==
 
-react-is@^18.0.0:
-  version "18.2.0"
-  resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz"
-  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
@@ -8288,7 +7013,7 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
-regexpp@^3.0.0, regexpp@^3.1.0, regexpp@^3.2.0:
+regexpp@^3.0.0, regexpp@^3.1.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -8365,13 +7090,6 @@ requires-port@^1.0.0:
   resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
-resolve-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
-  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
-  dependencies:
-    resolve-from "^5.0.0"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"
@@ -8387,17 +7105,12 @@ resolve-from@^5.0.0:
   resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
-resolve.exports@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz"
-  integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
-
 resolve@1.1.x:
   version "1.1.7"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
   integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0:
   version "1.22.1"
   resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -8448,13 +7161,6 @@ rollup@^2.43.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^2.76.0:
-  version "2.77.2"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.77.2.tgz"
-  integrity sha512-m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g==
-  optionalDependencies:
-    fsevents "~2.3.2"
-
 run-parallel@^1.1.9:
   version "1.2.0"
   resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
@@ -8572,7 +7278,7 @@ semver@^7.2.1, semver@^7.3.4, semver@^7.3.6, semver@^7.3.8:
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^7.3.5, semver@^7.3.7:
+semver@^7.3.5:
   version "7.3.7"
   resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
@@ -8674,7 +7380,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -8698,11 +7404,6 @@ sinon@2.4.1:
     text-encoding "0.6.4"
     type-detect "^4.0.0"
 
-sisteransi@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
-  integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
-
 slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
@@ -8787,14 +7488,6 @@ source-list-map@^2.0.0:
   resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-support@^0.4.15:
   version "0.4.18"
   resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"
@@ -8870,13 +7563,6 @@ sprintf-js@~1.0.2:
   resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-stack-utils@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz"
-  integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
-  dependencies:
-    escape-string-regexp "^2.0.0"
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
@@ -8901,14 +7587,6 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"
   integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
-string-length@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz"
-  integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
-  dependencies:
-    char-regex "^1.0.2"
-    strip-ansi "^6.0.0"
-
 string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
@@ -9009,21 +7687,11 @@ strip-bom@^3.0.0:
   resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
   integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
-strip-bom@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"
-  integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
-
 strip-comments@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
   integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
 
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
 strip-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
@@ -9194,14 +7862,6 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
-
 supports-hyperlinks@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
@@ -9259,14 +7919,6 @@ tempy@^0.6.0:
     type-fest "^0.16.0"
     unique-string "^2.0.0"
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 terser-webpack-plugin@^5.1.3:
   version "5.3.6"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
@@ -9288,15 +7940,6 @@ terser@^5.0.0, terser@^5.10.0, terser@^5.14.1:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-test-exclude@^6.0.0:
-  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==
-  dependencies:
-    "@istanbuljs/schema" "^0.1.2"
-    glob "^7.1.4"
-    minimatch "^3.0.4"
-
 text-encoding@0.6.4:
   version "0.6.4"
   resolved "https://registry.npmjs.org/text-encoding/-/text-encoding-0.6.4.tgz"
@@ -9319,11 +7962,6 @@ tmp@^0.2.1:
   dependencies:
     rimraf "^3.0.0"
 
-tmpl@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz"
-  integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
-
 to-fast-properties@^1.0.3:
   version "1.0.3"
   resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"
@@ -9378,11 +8016,6 @@ tsconfig-paths@^3.14.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.8.1:
-  version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
-  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-
 tslib@^2.0.1:
   version "2.4.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
@@ -9393,13 +8026,6 @@ tslib@^2.0.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
-tsutils@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
-  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
-  dependencies:
-    tslib "^1.8.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
@@ -9419,7 +8045,7 @@ type-detect@0.1.1:
   resolved "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"
   integrity sha512-5rqszGVwYgBoDkIm2oUtvkfZMQ0vk29iDMU0W2qCa3rG0vPDNczCMT4hV/bLBgLg8k8ri6+u3Zbt+S/14eMzlA==
 
-type-detect@4.0.8, type-detect@^4.0.0, type-detect@^4.0.5:
+type-detect@^4.0.0, type-detect@^4.0.5:
   version "4.0.8"
   resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
@@ -9439,11 +8065,6 @@ type-fest@^0.20.2:
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-type-fest@^0.21.3:
-  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==
-
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz"
@@ -9602,15 +8223,6 @@ v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-v8-to-istanbul@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"
-  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
-  dependencies:
-    "@jridgewell/trace-mapping" "^0.3.12"
-    "@types/istanbul-lib-coverage" "^2.0.1"
-    convert-source-map "^1.6.0"
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
@@ -9629,10 +8241,10 @@ void-elements@^2.0.0:
   resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
   integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
-vue-demi@^0.12.0:
-  version "0.12.5"
-  resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz"
-  integrity sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==
+vue-demi@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
+  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
 
 vue-eslint-parser@^9.0.1:
   version "9.1.0"
@@ -9707,13 +8319,6 @@ vuex@4.0.2:
   dependencies:
     "@vue/devtools-api" "^6.0.0-beta.11"
 
-walker@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz"
-  integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
-  dependencies:
-    makeerror "1.0.12"
-
 watchpack@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
@@ -10056,14 +8661,6 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
-  dependencies:
-    imurmurhash "^0.1.4"
-    signal-exit "^3.0.7"
-
 write-file-atomic@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
@@ -10134,11 +8731,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
-  version "21.0.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
-
 yargs@^15.3.1:
   version "15.4.1"
   resolved "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"
@@ -10169,19 +8761,6 @@ yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.3.1:
-  version "17.5.1"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz"
-  integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.0.0"
-
 yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
@@ -10189,8 +8768,3 @@ yauzl@^2.10.0:
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
-
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==

From b8faee5d6d4afcf38c02947c0d393a1883d0256c Mon Sep 17 00:00:00 2001
From: Sean Meininger <sean.meininger@pm.me>
Date: Sat, 26 Nov 2022 00:15:12 -0800
Subject: [PATCH 12/35] added maintainer code

---
 src/components/status/status.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index cf729c63..8b8b2add 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -302,10 +302,12 @@
     position: relative;
     width: 100%;
     display: flex;
+    flex-wrap: wrap;
+    justify-content: left;
     margin-top: var(--status-margin, $status-margin);
 
     > * {
-      max-width: 4em;
+      min-width: fit-content;
       flex: 1;
     }
   }

From 7860c885c4eb22bdf9af49619c96478a96aa94d7 Mon Sep 17 00:00:00 2001
From: darkkirb <lotte@chir.rs>
Date: Sat, 26 Nov 2022 20:57:04 +0000
Subject: [PATCH 13/35] Add link to RSS feed to the profile (#234)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Today I learned that akkoma and mastodon (and potentially other activitypub services) offer RSS/Atom feeds for user profiles at `[user profile url].rss`. This PR adds a direct link to the feed because I haven’t seen anything link to the feed on either mastodon-fe or pleroma-fe

Co-authored-by: Charlotte 🦝 Delenk <lotte@chir.rs>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/234
Co-authored-by: darkkirb <lotte@chir.rs>
Co-committed-by: darkkirb <lotte@chir.rs>
---
 src/components/user_card/user_card.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c850e53b..2eefbad8 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -67,6 +67,17 @@
                   icon="external-link-alt"
                 />
               </a>
+              <a
+                v-if="isOtherUser"
+                :href="user.statusnet_profile_url + '.rss'"
+                target="_blank"
+                class="button-unstyled external-link-button"
+              >
+                <FAIcon
+                  class="icon"
+                  icon="rss"
+                />
+              </a>
               <AccountActions
                 v-if="isOtherUser && loggedIn"
                 :user="user"

From 0a01a2bdf0b4a643f2b86e823c5d2cec8d1431b9 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 28 Nov 2022 12:08:18 +0000
Subject: [PATCH 14/35] Add post expiry inputs

---
 index.html                                         |  1 +
 src/components/settings_modal/tabs/profile_tab.js  |  7 +++++--
 .../settings_modal/tabs/profile_tab.scss           |  4 ++++
 src/components/settings_modal/tabs/profile_tab.vue | 14 ++++++++++++++
 src/i18n/en.json                                   |  2 ++
 .../entity_normalizer/entity_normalizer.service.js |  1 +
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 5581c894..5f8735ea 100644
--- a/index.html
+++ b/index.html
@@ -11,6 +11,7 @@
     <link rel="stylesheet" href="/static/mfm.css">
     <!--server-generated-meta-->
     <link rel="icon" type="image/png" href="/favicon.png">
+    <link rel="manifest" href="/manifest.json">
   </head>
   <body class="hidden">
     <noscript>To use Akkoma, please enable JavaScript.</noscript>
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index b69cf2f1..c29e8d2a 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -43,7 +43,9 @@ const ProfileTab = {
       bannerPreview: null,
       background: null,
       backgroundPreview: null,
-      emailLanguage: this.$store.state.users.currentUser.language || ''
+      emailLanguage: this.$store.state.users.currentUser.language || '',
+      newPostTTLDays: this.$store.state.users.currentUser.status_ttl_days,
+      expirePosts: this.$store.state.users.currentUser.status_ttl_days !== null,
     }
   },
   components: {
@@ -123,7 +125,8 @@ const ProfileTab = {
         display_name: this.newName,
         fields_attributes: this.newFields.filter(el => el != null),
         bot: this.bot,
-        show_role: this.showRole
+        show_role: this.showRole,
+        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1
         /* eslint-enable camelcase */
       }
 
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 201f1a76..8b9a35e1 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -4,6 +4,10 @@
     margin: 0;
   }
 
+  .expire-posts-days {
+    margin-left: 1em;
+  }
+
   .visibility-tray {
     padding-top: 5px;
   }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 642d54ca..8748b685 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -89,6 +89,20 @@
           {{ $t('settings.bot') }}
         </Checkbox>
       </p>
+      <p>
+        <Checkbox v-model="expirePosts">
+          {{ $t('settings.expire_posts_enabled') }}
+        </Checkbox>
+        <input
+          v-model="newPostTTLDays"
+          :disabled="!expirePosts"
+          type="number"
+          min="1"
+          max="730"
+          class="expire-posts-days"
+          :placeholder="$t('settings.expire_posts_input_placeholder')"
+        />
+      </p>
       <p>
         <interface-language-switcher
           :prompt-text="$t('settings.email_language')"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 2de13ace..c47dd70d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -536,6 +536,8 @@
         "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
         "expert_mode": "Show advanced",
         "export_theme": "Save preset",
+        "expire_posts_enabled": "Delete posts after a set amount of days",
+        "expire_posts_input_placeholder": "Number of days",
         "file_export_import": {
             "backup_restore": "Settings backup",
             "backup_settings": "Backup settings to file",
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 689afb8b..465d6fad 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -90,6 +90,7 @@ export const parseUser = (data) => {
     output.bot = data.bot
     if (data.akkoma) {
       output.instance = data.akkoma.instance
+      output.status_ttl_days = data.akkoma.status_ttl_days
     }
 
     if (data.pleroma) {

From c669701762fe5c470269ed58f70fab0f6489202b Mon Sep 17 00:00:00 2001
From: Karl Prieb <karl@prieb.me>
Date: Tue, 29 Nov 2022 18:04:33 -0300
Subject: [PATCH 15/35] add a left margin on search bar

---
 src/components/search_bar/search_bar.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 222f57ba..831c47ae 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -73,6 +73,7 @@
 
   .search-bar-input {
     flex: 1 0 auto;
+    margin-left: 0.5em;
   }
 
   .cancel-search {

From 6af1df8befc31af5e55ca90a1d84bc57ab7a71b2 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 2 Dec 2022 11:27:24 +0000
Subject: [PATCH 16/35] Add logo files

---
 config/index.js     |   5 +++
 static/logo-512.png | Bin 0 -> 18688 bytes
 static/logo.svg     | 103 ++++++++++++++------------------------------
 3 files changed, 38 insertions(+), 70 deletions(-)
 create mode 100755 static/logo-512.png
 mode change 100644 => 100755 static/logo.svg

diff --git a/config/index.js b/config/index.js
index 443c4a67..4a21e718 100644
--- a/config/index.js
+++ b/config/index.js
@@ -38,6 +38,11 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
+     '/manifest.json': {
+        target,
+        changeOrigin: true,
+        cookieDomainRewrite: 'localhost'
+      },
       '/api': {
         target,
         changeOrigin: true,
diff --git a/static/logo-512.png b/static/logo-512.png
new file mode 100755
index 0000000000000000000000000000000000000000..02d36e7ab91556da3572e2cf2879e61ec3bc79f7
GIT binary patch
literal 18688
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
TF}&OabR2`HtDnm{r-UW|@S{GM

literal 0
HcmV?d00001

diff --git a/static/logo.svg b/static/logo.svg
old mode 100644
new mode 100755
index 68e647e6..01ddbadb
--- a/static/logo.svg
+++ b/static/logo.svg
@@ -1,71 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg4485"
-   width="512"
-   height="512"
-   viewBox="0 0 512 512"
-   sodipodi:docname="logo.svg"
-   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
-  <metadata
-     id="metadata4491">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4489" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1274"
-     inkscape:window-height="1410"
-     id="namedview4487"
-     showgrid="false"
-     inkscape:zoom="1.2636719"
-     inkscape:cx="305.99333"
-     inkscape:cy="304.30809"
-     inkscape:window-x="1280"
-     inkscape:window-y="22"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="g4612"
-     inkscape:document-rotation="0" />
-  <g
-     id="g4612">
-    <g
-       id="g850"
-       transform="matrix(0.99659595,0,0,0.99659595,0.37313949,0.87143746)">
-      <path
-         style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.175879"
-         d="m 194.75841,124.65165 a 20.449443,20.449443 0 0 0 -20.44944,20.44945 v 242.24725 h 65.28091 v -262.6967 z"
-         id="path4497" />
-      <path
-         style="fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 272.6236,124.65165 V 256 h 45.61799 a 20.449443,20.449443 0 0 0 20.44944,-20.44945 v -110.8989 z"
-         id="path4516" />
-      <path
-         style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 272.6236,322.06744 v 65.28091 h 45.61799 a 20.449443,20.449443 0 0 0 20.44944,-20.44945 v -44.83146 z"
-         id="path4516-5" />
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #462d7a;
+      }
+
+      .cls-2 {
+        stroke: #2c1e50;
+      }
+
+      .cls-2, .cls-3 {
+        stroke-miterlimit: 10;
+      }
+
+      .cls-3 {
+        stroke: #fff;
+      }
+    </style>
+  </defs>
+  <g id="Layer_9" data-name="Layer 9">
+    <path class="cls-2" d="M269.3,197.19c-5.77-11.54-85.59,16.83-154.76,27.39-21.09,3.22-38.13,4.31-47.3,4.75-.74,2.91-1.76,7.02-2.87,11.97-1.93,8.6-2.89,12.89-2.6,13.78,3.3,9.95,59.73-.88,99.18-7.64,32.67-5.6,115.14-18.96,114.61-30.77-.03-.69-1.11-4.01-3.27-10.65-1.78-5.47-2.67-8.2-2.98-8.83Z"/>
   </g>
-</svg>
+  <g id="Layer_6" data-name="Layer 6">
+    <path class="cls-1" d="M115.2,131.89c6.26-6.54,20.19-20.63,42.39-26.14,15.79-3.92,28.51-1.28,33.51,0,83.72,21.41,116.03,201.78,77.79,226.32-10.28,6.6-26.86,2.7-36.77-3.3-32.63-19.78-29.3-72.87-44.44-73.73-5.11-.29-7.15,5.8-20.91,24.94-19.63,27.3-31.49,43.44-49.21,50.87-2.53,1.06-26.91,12.07-41.84,1.23-38.55-28-2.96-155.84,39.49-200.18Zm56.31,10.45c-27.39-.52-46.38,38.21-37.98,54.55,10.09,19.62,65.5,18.26,74.77-3.3,7.21-16.78-11.38-50.77-36.79-51.24Z"/>
+  </g>
+  <g id="Layer_4" data-name="Layer 4">
+    <path d="M68.93,86.51c-6.55,27.74,252.45,113.97,267.56,89.66,9.24-14.87-64.9-83.62-163.53-97.57-39.06-5.52-100.95-5.14-104.03,7.91Z"/>
+  </g>
+  <g id="Layer_5" data-name="Layer 5">
+    <path class="cls-3" d="M138.96,93.76c.41-5.25,6.51-5.74,28.85-19.42,26.97-16.51,28.85-22.38,56.86-40.83,30.07-19.81,48.46-31.94,54.82-26.61,9.72,8.15-25.18,43.33-21.31,99.35,.87,12.61,3.12,17.79-.86,23.01-18.25,23.95-120.07-13.68-118.35-35.5Z"/>
+  </g>
+</svg>
\ No newline at end of file

From e132814478344eb096ee5fbdb75913b6eab97022 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 2 Dec 2022 11:56:15 +0000
Subject: [PATCH 17/35] Register serviceworker

---
 src/main.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main.js b/src/main.js
index e4a793f6..a7d9da83 100644
--- a/src/main.js
+++ b/src/main.js
@@ -51,6 +51,17 @@ const persistedStateOptions = {
 };
 
 (async () => {
+  if ('serviceWorker' in navigator) {
+    // declaring scope manually
+    navigator.serviceWorker.register('/sw.js', {scope: '/'}).then((registration) => {
+      console.log('Service worker registration succeeded:', registration);
+    }, /*catch*/ (error) => {
+      console.error(`Service worker registration failed: ${error}`);
+    });
+  } else {
+    console.error('Service workers are not supported.');
+  }
+
   let storageError = false
   const plugins = [pushNotifications]
   try {

From f8f5e1c89b924996a56f015a1a2b722c87f5fb23 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 2 Dec 2022 11:57:45 +0000
Subject: [PATCH 18/35] fix SW path

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index a7d9da83..1fec81a2 100644
--- a/src/main.js
+++ b/src/main.js
@@ -53,7 +53,7 @@ const persistedStateOptions = {
 (async () => {
   if ('serviceWorker' in navigator) {
     // declaring scope manually
-    navigator.serviceWorker.register('/sw.js', {scope: '/'}).then((registration) => {
+    navigator.serviceWorker.register('/sw-pleroma.js', {scope: '/'}).then((registration) => {
       console.log('Service worker registration succeeded:', registration);
     }, /*catch*/ (error) => {
       console.error(`Service worker registration failed: ${error}`);

From a3e490edcd3ac676af0703326f79eb6a14d133b5 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 2 Dec 2022 12:00:30 +0000
Subject: [PATCH 19/35] use cutout of 512 logo

---
 static/logo-512.png | Bin 18688 -> 18994 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/static/logo-512.png b/static/logo-512.png
index 02d36e7ab91556da3572e2cf2879e61ec3bc79f7..c8397e35a1a2a240f419a202efb5677160e534e0 100755
GIT binary patch
literal 18994
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
Q34A^j7n2zMOBAp8Z@K~PkN^Mx

literal 18688
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
TF}&OabR2`HtDnm{r-UW|@S{GM


From 337a30fe01f854c7dd7ff2501619316ff1303a80 Mon Sep 17 00:00:00 2001
From: astra akari <nocebo@noreply.akkoma>
Date: Sat, 3 Dec 2022 07:12:55 +0000
Subject: [PATCH 20/35] remove whitespace between scope selector icons

when i originally wrote this, for reasons unclear to the present me, i used literal whitespaces to space out the icons on the scope selector
this causes strange inconsistencies in spacing depending on the font being used
akkoma also did not include the whitespace when adding the local-only scope, resulting in even weirder spacing
this corrects all of that by removing the whitespaces and using css instead
---
 src/components/scope_selector/scope_selector.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index 6dbf7cb4..64c34fb1 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -16,7 +16,6 @@
         class="fa-scale-110 fa-old-padding"
       />
     </button>
-    {{ ' ' }}
     <button
       v-if="showPrivate"
       class="button-unstyled scope"
@@ -30,7 +29,6 @@
         class="fa-scale-110 fa-old-padding"
       />
     </button>
-    {{ ' ' }}
     <button
       v-if="showUnlisted"
       class="button-unstyled scope"
@@ -44,7 +42,6 @@
         class="fa-scale-110 fa-old-padding"
       />
     </button>
-    {{ ' ' }}
     <button
       v-if="showPublic"
       class="button-unstyled scope"
@@ -87,6 +84,7 @@
     min-width: 1.3em;
     min-height: 1.3em;
     text-align: center;
+    margin-right: 0.4em;
 
     &.selected svg {
       color: $fallback--lightText;

From eb492954225c29a2d86fef433ef880be6b4da9d7 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Sun, 4 Dec 2022 17:31:41 +0000
Subject: [PATCH 21/35] Add hashtag following button (#244)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/244
---
 src/components/timeline/timeline.js  | 25 +++++++++++++++++--
 src/components/timeline/timeline.vue | 30 ++++++++++++++++++++++
 src/i18n/en.json                     |  4 ++-
 src/main.js                          |  4 ++-
 src/modules/tags.js                  | 37 ++++++++++++++++++++++++++++
 src/services/api/api.service.js      | 31 ++++++++++++++++++++++-
 6 files changed, 126 insertions(+), 5 deletions(-)
 create mode 100644 src/modules/tags.js

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index b033e60e..cdb35e08 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -6,11 +6,13 @@ import TimelineMenuTabs from '../timeline_menu_tabs/timeline_menu_tabs.vue'
 import TimelineQuickSettings from './timeline_quick_settings.vue'
 import { debounce, throttle, keyBy } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faCircleNotch, faCog } from '@fortawesome/free-solid-svg-icons'
+import { faCircleNotch, faCog, faPlus, faMinus } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faCircleNotch,
-  faCog
+  faCog,
+  faPlus,
+  faMinus
 )
 
 const Timeline = {
@@ -90,6 +92,15 @@ const Timeline = {
     },
     showPanelNavShortcuts () {
       return this.$store.getters.mergedConfig.showPanelNavShortcuts
+    },
+    currentUser () {
+      return this.$store.state.users.currentUser
+    },
+    tagData () {
+      return this.$store.state.tags.tags[this.tag]
+    },
+    tagFollowed () {
+      return this.$store.state.tags.tags[this.tag]?.following
     }
   },
   created () {
@@ -118,6 +129,10 @@ const Timeline = {
     }
     window.addEventListener('keydown', this.handleShortKey)
     setTimeout(this.determineVisibleStatuses, 250)
+
+    if (this.tag) {
+      this.$store.dispatch('getTag', this.tag)
+    }
   },
   unmounted () {
     window.removeEventListener('scroll', this.handleScroll)
@@ -232,6 +247,12 @@ const Timeline = {
     }, 200),
     handleVisibilityChange () {
       this.unfocused = document.hidden
+    },
+    followTag (tag) {
+      return this.$store.dispatch('followTag', tag)
+    },
+    unfollowTag (tag) {
+      return this.$store.dispatch('unfollowTag', tag)
     }
   },
   watch: {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index d75114df..9302cce6 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -21,6 +21,36 @@
         {{ $t('timeline.up_to_date') }}
       </div>
       <TimelineQuickSettings v-if="!embedded" />
+      <div
+        v-if="currentUser && tag !== undefined && tagData && !tagFollowed"
+        class="followTag"
+      >
+        <button
+          class="button-default"
+          :title="$t('timeline.follow_tag')"
+          @click="followTag(tag)"
+        >
+          <FAIcon
+            size="sm"
+            icon="plus"
+          />
+        </button>
+      </div>
+      <div
+        v-if="currentUser && tag !== undefined && tagData && tagFollowed"
+        class="followTag"
+      >
+        <button
+          class="button-default"
+          :title="$t('timeline.unfollow_tag')"
+          @click="unfollowTag(tag)"
+        >
+          <FAIcon
+            size="sm"
+            icon="minus"
+          />
+        </button>
+      </div>
     </div>
     <div :class="classes.body">
       <div
diff --git a/src/i18n/en.json b/src/i18n/en.json
index c47dd70d..4c79ac4c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1055,7 +1055,9 @@
         "show_new": "Show new",
         "socket_broke": "Realtime connection lost: CloseEvent code {0}",
         "socket_reconnected": "Realtime connection established",
-        "up_to_date": "Up-to-date"
+        "up_to_date": "Up-to-date",
+        "follow_tag": "Follow hashtag",
+        "unfollow_tag": "Unfollow hashtag"
     },
     "toast": {
         "no_translation_target_set": "No translation target language set - this may fail. Please set a target language in your settings."
diff --git a/src/main.js b/src/main.js
index 1fec81a2..01a44c96 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,6 +21,7 @@ import postStatusModule from './modules/postStatus.js'
 import announcementsModule from './modules/announcements.js'
 import editStatusModule from './modules/editStatus.js'
 import statusHistoryModule from './modules/statusHistory.js'
+import tagModule from './modules/tags.js'
 
 import { createI18n } from 'vue-i18n'
 
@@ -96,7 +97,8 @@ const persistedStateOptions = {
       postStatus: postStatusModule,
       announcements: announcementsModule,
       editStatus: editStatusModule,
-      statusHistory: statusHistoryModule
+      statusHistory: statusHistoryModule,
+      tags: tagModule
     },
     plugins,
     strict: false // Socket modifies itself, let's ignore this for now.
diff --git a/src/modules/tags.js b/src/modules/tags.js
new file mode 100644
index 00000000..cff54b7d
--- /dev/null
+++ b/src/modules/tags.js
@@ -0,0 +1,37 @@
+import { merge } from 'lodash'
+
+const tags = {
+  state: {
+    // Contains key = id, value = number of trackers for this poll
+    tags: {}
+  },
+  mutations: {
+    setTag (state, { name, data }) {
+      state.tags[name] = data
+    }
+  },
+  actions: {
+    getTag ({ rootState, commit }, tagName) {
+      return rootState.api.backendInteractor.getHashtag({ tag: tagName }).then(tag => {
+        commit('setTag', { name: tagName, data: tag })
+        return tag
+      })
+    },
+    followTag (store, tagName) {
+      return store.rootState.api.backendInteractor.followHashtag({ tag: tagName })
+        .then((resp) => {
+          store.commit('setTag', { name: tagName, data: resp })
+          return resp
+        })
+    },
+    unfollowTag ({ rootState, commit }, tag) {
+      return rootState.api.backendInteractor.unfollowHashtag({ tag })
+        .then((resp) => {
+          commit('setTag', { name: tag, data: resp })
+          return resp
+        })
+    }
+  }
+}
+
+export default tags
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index aeb43661..9e6f39f2 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -108,6 +108,9 @@ const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements
 const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 const AKKOMA_SETTING_PROFILE_URL = (name) => `/api/v1/akkoma/frontend_settings/pleroma-fe/${name}`
 const AKKOMA_SETTING_PROFILE_LIST = `/api/v1/akkoma/frontend_settings/pleroma-fe`
+const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}`
+const MASTODON_FOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/follow`
+const MASTODON_UNFOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/unfollow`
 
 const oldfetch = window.fetch
 
@@ -1549,6 +1552,29 @@ const listSettingsProfiles = ({ credentials }) => {
   })
 }
 
+const getHashtag = ({ tag, credentials }) => {
+  return promisedRequest({
+    url: MASTODON_TAG_URL(tag),
+    credentials
+  })
+}
+
+const followHashtag = ({ tag, credentials }) => {
+  return promisedRequest({
+    url: MASTODON_FOLLOW_TAG_URL(tag),
+    method: 'POST',
+    credentials
+  })
+}
+
+const unfollowHashtag = ({ tag, credentials }) => {
+  return promisedRequest({
+    url: MASTODON_UNFOLLOW_TAG_URL(tag),
+    method: 'POST',
+    credentials
+  })
+}
+
 export const getMastodonSocketURI = ({ credentials, stream, args = {} }) => {
   return Object.entries({
     ...(credentials
@@ -1784,7 +1810,10 @@ const apiService = {
   getReports,
   updateReportStates,
   addNoteToReport,
-  deleteNoteFromReport
+  deleteNoteFromReport,
+  getHashtag,
+  followHashtag,
+  unfollowHashtag
 }
 
 export default apiService

From b68e968bf971bed7fe7c9e6e48c5c4df97ac47ab Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 6 Dec 2022 15:26:16 +0000
Subject: [PATCH 22/35] Add ability to include custom CSS

---
 index.html        | 1 +
 static/custom.css | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 static/custom.css

diff --git a/index.html b/index.html
index 5f8735ea..79613dd2 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
     <link rel="stylesheet" href="/static/font/tiresias.css">
     <link rel="stylesheet" href="/static/font/css/lato.css">
     <link rel="stylesheet" href="/static/mfm.css">
+    <link rel="stylesheet" href="/static/custom.css">
     <!--server-generated-meta-->
     <link rel="icon" type="image/png" href="/favicon.png">
     <link rel="manifest" href="/manifest.json">
diff --git a/static/custom.css b/static/custom.css
new file mode 100644
index 00000000..93f380f0
--- /dev/null
+++ b/static/custom.css
@@ -0,0 +1,4 @@
+/* THIS IS A PLACEHOLDER FILE
+   place a css file at $static_dir/static/custom.css
+   to apply custom styles to your frontend
+*/

From 17e574b173cab2ab3f426e9f7ae49cce9081fac8 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 6 Dec 2022 15:55:39 +0000
Subject: [PATCH 23/35] Move theme apply/reset to new row

Fixes #225
---
 .../settings_modal/settings_modal.scss        |  4 +++
 .../settings_modal/settings_modal.vue         | 13 ++++----
 .../tabs/theme_tab/theme_tab.scss             |  5 ++--
 .../tabs/theme_tab/theme_tab.vue              | 30 ++++++++++---------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 70b63360..15dae7fd 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -76,6 +76,10 @@
       position: absolute;
       right: 20px;
       padding-right: 10px;
+
+      @media all and (max-width: 800px) {
+        display: none;
+      }
     }
   }
 }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 03c9978e..7cd493e4 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -44,6 +44,10 @@
       <div class="panel-body">
         <SettingsModalContent v-if="modalOpenedOnce" />
       </div>
+      <span
+        id="unscrolled-content"
+        class="extra-content"
+      />
       <div class="panel-footer settings-footer">
         <Popover
           class="export"
@@ -53,7 +57,7 @@
           :bound-to="{ x: 'container' }"
           remove-padding
         >
-          <template v-slot:trigger>
+          <template #trigger>
             <button
               class="btn button-default"
               :title="$t('general.close')"
@@ -65,7 +69,7 @@
               />
             </button>
           </template>
-          <template v-slot:content="{close}">
+          <template #content="{close}">
             <div class="dropdown-menu">
               <button
                 class="button-default dropdown-item dropdown-item-icon"
@@ -103,14 +107,11 @@
 
         <Checkbox
           :model-value="!!expertLevel"
+          class="expertMode"
           @update:modelValue="expertLevel = Number($event)"
         >
           {{ $t("settings.expert_mode") }}
         </Checkbox>
-        <span
-          id="unscrolled-content"
-          class="extra-content"
-        />
         <button
           v-if="currentUser"
           class="button-default logout-button"
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index bad6f51b..0427e42f 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -284,7 +284,6 @@
     box-shadow: none;
     background: transparent;
     color: var(--faint, $fallback--faint);
-    align-self: stretch;
   }
 
   .theme-color-cl,
@@ -318,11 +317,11 @@
 
 .extra-content {
   .apply-container {
+    padding-left: 15vw;
     display: flex;
     flex-direction: row;
-    justify-content: space-around;
+    justify-content: space-evenly;
     flex-grow: 1;
-
     .btn {
       flex-grow: 1;
       min-height: 2em;
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
index 8dc64901..39b72478 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.vue
@@ -958,20 +958,22 @@
       v-if="isActive"
       to="#unscrolled-content"
     >
-      <div class="apply-container">
-        <button
-          class="btn button-default submit"
-          :disabled="!themeValid"
-          @click="setCustomTheme"
-        >
-          {{ $t('general.apply') }}
-        </button>
-        <button
-          class="btn button-default"
-          @click="clearAll"
-        >
-          {{ $t('settings.style.switcher.reset') }}
-        </button>
+      <div class="panel-body settings-footer">
+        <div class="apply-container">
+          <button
+            class="btn button-default submit"
+            :disabled="!themeValid"
+            @click="setCustomTheme"
+          >
+            {{ $t('general.apply') }}
+          </button>
+          <button
+            class="btn button-default"
+            @click="clearAll"
+          >
+            {{ $t('settings.style.switcher.reset') }}
+          </button>
+        </div>
       </div>
     </teleport>
   </div>

From abc75c360b60270346111587c2dbddcd26d74820 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 7 Dec 2022 11:01:58 +0000
Subject: [PATCH 24/35] Ensure only content gets clipped

---
 src/components/status/status.scss             |  4 ++
 src/components/status/status.vue              | 37 ++++++++++---------
 .../status_content/status_content.vue         |  1 -
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 8b8b2add..cd65b890 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -42,6 +42,10 @@
     display: flex;
     padding: var(--status-margin, $status-margin);
 
+    .content {
+      overflow: hidden;
+    }
+
     > * {
       min-width: 0;
     }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 24f64248..c9ce4a8a 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -352,22 +352,25 @@
             </div>
           </div>
 
-          <StatusContent
-            ref="content"
-            :status="status"
-            :no-heading="noHeading"
-            :highlight="highlight"
-            :focused="isFocused"
-            :controlled-showing-tall="controlledShowingTall"
-            :controlled-expanding-subject="controlledExpandingSubject"
-            :controlled-showing-long-subject="controlledShowingLongSubject"
-            :controlled-toggle-showing-tall="controlledToggleShowingTall"
-            :controlled-toggle-expanding-subject="controlledToggleExpandingSubject"
-            :controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject"
-            @mediaplay="addMediaPlaying($event)"
-            @mediapause="removeMediaPlaying($event)"
-            @parseReady="setHeadTailLinks"
-          />
+          <div class="content">
+            <StatusContent
+              ref="content"
+              class="status-content"
+              :status="status"
+              :no-heading="noHeading"
+              :highlight="highlight"
+              :focused="isFocused"
+              :controlled-showing-tall="controlledShowingTall"
+              :controlled-expanding-subject="controlledExpandingSubject"
+              :controlled-showing-long-subject="controlledShowingLongSubject"
+              :controlled-toggle-showing-tall="controlledToggleShowingTall"
+              :controlled-toggle-expanding-subject="controlledToggleExpandingSubject"
+              :controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject"
+              @mediaplay="addMediaPlaying($event)"
+              @mediapause="removeMediaPlaying($event)"
+              @parseReady="setHeadTailLinks"
+            />
+          </div>
 
           <div
             v-if="inConversation && !isPreview && replies && replies.length"
@@ -534,6 +537,6 @@
   </div>
 </template>
 
-<script src="./status.js" ></script>
+<script src="./status.js"></script>
 
 <style src="./status.scss" lang="scss"></style>
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 245cd6e9..ab13141e 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -68,7 +68,6 @@
 .StatusContent {
   flex: 1;
   min-width: 0;
-  overflow: hidden;
 
   img, video {
     &.emoji {

From d3280c4ab3be5be8df3088f0a980d65fa64962de Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Wed, 7 Dec 2022 22:31:29 +0000
Subject: [PATCH 25/35] Add issue template

---
 ISSUE | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 ISSUE

diff --git a/ISSUE b/ISSUE
new file mode 100644
index 00000000..92947ce1
--- /dev/null
+++ b/ISSUE
@@ -0,0 +1,25 @@
+---
+
+name: "Issue"
+about: "Something isn't working as expected"
+
+---
+
+## Your setup
+
+Frontend version:
+ [] stable 
+ [] develop
+ [] custom (please elaborate)
+
+## What were you trying to do?
+
+## What did you expect to happen?
+
+## What actually happened?
+
+## Relative severity (does this prevent you from using the software as normal?)
+
+[] High - I cannot use the software
+[] Medium - I cannot use it as easily as I'd like
+[] Low - I can get by
\ No newline at end of file

From 1dd7a89544a4cc88590db08710486a43745796e9 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 7 Dec 2022 22:31:38 +0000
Subject: [PATCH 26/35] Translated using Weblate (German)

Currently translated at 93.9% (967 of 1029 strings)

Co-authored-by: Johann <johann@qwertqwefsday.eu>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/de/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/de.json | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 6ce2a03e..17ad220b 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -135,7 +135,7 @@
         },
         "scope_in_timeline": {
             "direct": "Direkt",
-            "local": "Lokal - nur deine eigene Instanz kann diesen Beitrag sehen",
+            "local": "Lokal - nur deine eigene Instanz kann diese Nachricht sehen",
             "private": "Nur an Folgende",
             "public": "Öffentlich",
             "unlisted": "Nicht gelistet"
@@ -345,10 +345,10 @@
         },
         "content_warning": "Inhaltswarnung (optional)",
         "default": "Sitze gerade im Hofbräuhaus",
-        "direct_warning_to_all": "Dieser Beitrag wird für alle erwähnten Benutzer sichtbar sein.",
-        "direct_warning_to_first_only": "Dieser Beitrag wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
+        "direct_warning_to_all": "Diese Nachricht wird für alle erwähnten Benutzer sichtbar sein.",
+        "direct_warning_to_first_only": "Diese Nachricht wird für alle Benutzer, die am Anfang der Nachricht erwähnt wurden, sichtbar sein.",
         "edit_remote_warning": "Änderungen könnten auf manchen Instanzen nicht sichtbar sein!",
-        "edit_status": "Beitrag ändern",
+        "edit_status": "Nachricht bearbeiten",
         "edit_unsupported_warning": "Umfragen und Erwähnungen werden durch die Bearbeitung nicht geändert.",
         "empty_status_error": "Eine Nachricht ohne Text und ohne Anhänge kann nicht gesendet werden",
         "media_description": "Medienbeschreibung",
@@ -360,17 +360,17 @@
         "preview": "Vorschau",
         "preview_empty": "Leer",
         "scope": {
-            "direct": "Direkt - Beitrag nur an erwähnte Profile",
-            "local": "Lokal - diesen Beitrag nicht föderieren",
-            "private": "Nur Follower - Beitrag nur für Follower sichtbar",
-            "public": "Öffentlich - Beitrag an öffentliche Zeitleisten",
+            "direct": "Direkt - Nachricht nur an erwähnte Profile",
+            "local": "Lokal - diese Nachricht nicht föderieren",
+            "private": "Nur Follower - Nachricht nur für Follower sichtbar",
+            "public": "Öffentlich - Nachricht an öffentliche Zeitleisten",
             "unlisted": "Nicht gelistet - Nicht in öffentlichen Zeitleisten anzeigen"
         },
         "scope_notice": {
             "local": "Dieser Bericht ist auf anderen Instanzen nicht sichbar",
-            "private": "Dieser Beitrag wird nur für deine Follower sichtbar sein",
-            "public": "Dieser Beitrag wird für alle sichtbar sein",
-            "unlisted": "Dieser Beitrag wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
+            "private": "Diese Nachricht wird nur für deine Follower sichtbar sein",
+            "public": "Diese Nachricht wird für alle sichtbar sein",
+            "unlisted": "Diese Nachricht wird weder in der öffentlichen Zeitleiste noch im gesamten bekannten Netzwerk sichtbar sein"
         }
     },
     "registration": {
@@ -465,10 +465,10 @@
         "confirm_dialogs": "Bestätigung erforderlich für:",
         "confirm_dialogs_approve_follow": "Annehmen einer Followanfrage",
         "confirm_dialogs_block": "Jemanden blockieren",
-        "confirm_dialogs_delete": "Löschen eines Beitrages",
+        "confirm_dialogs_delete": "Löschen einer Nachricht",
         "confirm_dialogs_deny_follow": "Ablehnen einer Followanfrage",
         "confirm_dialogs_mute": "Jemanden stummschalten",
-        "confirm_dialogs_repeat": "Wiederholen eines Beitrages",
+        "confirm_dialogs_repeat": "Wiederholen einer Nachricht",
         "confirm_dialogs_unfollow": "Folgen beenden",
         "confirm_new_password": "Neues Passwort bestätigen",
         "confirmation_dialogs": "Bestätigungs-Einstellungen",
@@ -535,7 +535,7 @@
         "hide_media_previews": "Verstecke Vorschau von Medien",
         "hide_muted_posts": "Verberge Beiträge stummgeschalteter Nutzer",
         "hide_muted_threads": "Stummgeschaltete Unterhaltungen ausblenden",
-        "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)",
+        "hide_post_stats": "Nachrichtenstatistiken verbergen (z.B. die Anzahl der Favoriten)",
         "hide_shoutbox": "Shoutbox der Instanz verbergen",
         "hide_site_favicon": "Favicon der Instanz im Top-Panel nicht anzeigen",
         "hide_site_name": "Instanznamen im Top-Panel nicht anzeigen",
@@ -562,7 +562,7 @@
         "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")",
         "mascot": "Mastodon-FE-Maskottchen",
         "max_depth_in_thread": "Maximale Tiefe, bis zu der Unterhaltungen standardmäßig angezeigt werden",
-        "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Beitrag",
+        "max_thumbnails": "Maximale Anzahl von Vorschaubildern pro Nachricht (leer = keine Beschränkung)",
         "mention_link_bolden_you": "eigene Erwähnungen hervorheben",
         "mention_link_display": "Erwähungs-Links anzeigen",
         "mention_link_display_full": "immer als vollständige Namen (z. B. {'@'}foo{'@'}example.org)",
@@ -638,7 +638,7 @@
         "panelRadius": "Panel",
         "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
         "play_videos_in_modal": "Videos in größerem Medienfenster abspielen",
-        "post_status_content_type": "Standard-Beitragsart",
+        "post_status_content_type": "Standard-Format für Nachrichten",
         "posts": "Beiträge",
         "preload_images": "Bilder vorausladen",
         "presets": "Voreinstellungen",
@@ -656,7 +656,7 @@
         "remove_alias": "Dieses Pseudonym entfernen",
         "remove_backup": "Entfernen",
         "render_mfm": "Misskey-Markdown darstellen",
-        "render_mfm_on_hover": "MFM-Animationen pausieren, solange sich der Mauszeiger nicht über dem Beitrag befindet",
+        "render_mfm_on_hover": "MFM-Animationen pausieren, solange sich der Mauszeiger nicht über der Nachricht befindet",
         "replies_in_timeline": "Antworten in der Zeitleiste",
         "reply_visibility_all": "Alle Antworten zeigen",
         "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge",
@@ -680,7 +680,7 @@
         "security": "Sicherheit",
         "security_tab": "Sicherheit",
         "sensitive_by_default": "Alle Beiträge standardmäßig als heikel markieren",
-        "sensitive_if_subject": "Bilder automatisch als heikel markieren, wenn der Beitrag eine Inhaltswarnung hat",
+        "sensitive_if_subject": "Bilder automatisch als heikel markieren, wenn die Nachricht eine Inhaltswarnung hat",
         "set_new_avatar": "Setze einen neuen Avatar",
         "set_new_mascot": "Neues Maskottchen einstellen",
         "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil",
@@ -758,8 +758,8 @@
                 "components": {
                     "input": "Eingabefelder",
                     "interface": "Oberfläche",
-                    "post": "Beitragstext",
-                    "postCode": "Dicktengleicher Text in einem Beitrag (Rich-Text)"
+                    "post": "Nachrichtentext",
+                    "postCode": "nichtproportionaler Text in einer Nachricht (Rich-Text)"
                 },
                 "custom": "Benutzerdefiniert",
                 "family": "Schriftname",
@@ -790,7 +790,7 @@
                 "component": "Komponente",
                 "components": {
                     "avatar": "Benutzer-Avatar (in der Profilansicht)",
-                    "avatarStatus": "Benutzer-Avatar (in der Beitragsanzeige)",
+                    "avatarStatus": "Benutzer-Avatar (in der Nachrichtenanzeige)",
                     "button": "Schaltfläche",
                     "buttonHover": "Schaltfläche (hover)",
                     "buttonPressed": "Schaltfläche (gedrückt)",
@@ -861,7 +861,7 @@
         "tooltipRadius": "Tooltips/Warnungen",
         "translation_language": "Sprache für automatische Übersetzungen",
         "tree_advanced": "Weitere Knöpfe zum Öffnen und Schließen von Antworten anzeigen",
-        "tree_fade_ancestors": "Vorgänger des aktuellen Beitrags schwach darstellen",
+        "tree_fade_ancestors": "Vorgänger der aktuellen Nachricht schwach darstellen",
         "type_domains_to_mute": "Tippe die Domains ein, die du stummschalten willst",
         "upload_a_photo": "Lade ein Foto hoch",
         "useStreamingApi": "Empfange Posts und Benachrichtigungen in Echtzeit",
@@ -888,14 +888,14 @@
         "wordfilter": "Wortfilter"
     },
     "status": {
-        "ancestor_follow": "Zeige {numReplies} andere Antwort unter diesem Beitrag | Zeige {numReplies} andere Antworten unter diesem Beitrag",
+        "ancestor_follow": "Zeige {numReplies} andere Antwort unter dieser Nachricht | Zeige {numReplies} andere Antworten unter dieser Nachricht",
         "ancestor_follow_with_icon": "{icon} {text}",
         "attachment_stop_flash": "Flash-Player stoppen",
         "bookmark": "Lesezeichen setzen",
         "collapse_attachments": "Anhänge einklappen",
-        "copy_link": "Beitragslink kopieren",
-        "delete": "Lösche Beitrag",
-        "delete_confirm": "Möchtest du diese Beitrag wirklich löschen?",
+        "copy_link": "Link zur Nachricht kopieren",
+        "delete": "Lösche Nachricht",
+        "delete_confirm": "Möchtest du diese Nachricht wirklich löschen?",
         "delete_confirm_accept_button": "Ja, löschen",
         "delete_confirm_cancel_button": "Nein, behalten",
         "delete_confirm_title": "Löschen bestätigen",
@@ -909,7 +909,7 @@
         "hide_attachment": "Anhänge verbergen",
         "hide_content": "Inhalt verbergen",
         "hide_full_subject": "Vollständige Inhaltswarnung verbergen",
-        "many_attachments": "Beitrag hat {number} Anhang | Beitrag hat {number} Anhänge",
+        "many_attachments": "Nachricht hat {number} Anhang | Nachricht hat {number} Anhänge",
         "mentions": "Erwähnungen",
         "move_down": "Anhang nach rechts verschieben",
         "move_up": "Anhang nach links verschieben",
@@ -921,7 +921,7 @@
         "pinned": "Angeheftet",
         "plus_more": "+{number} mehr",
         "remove_attachment": "Anhang entfernen",
-        "repeat_confirm": "Beitrag wirklich wiederholen?",
+        "repeat_confirm": "Nachricht wirklich wiederholen?",
         "repeat_confirm_accept_button": "Ja, wiederholen",
         "repeat_confirm_cancel_button": "Nein, nicht wiederholen",
         "repeat_confirm_title": "Wiederholen bestätigen",
@@ -930,15 +930,15 @@
         "replies_list_with_others": "Zeige noch {numReplies} Antwort | Zeige noch {numReplies} Antworten",
         "reply_to": "Antworten auf",
         "show_all_attachments": "Alle Anhänge anzeigen",
-        "show_all_conversation": "Ganzes Gespräch anzeigen (noch {numStatus} Beitrag) | Ganzes Gespräch anzeigen (noch {numStatus} Beiträge)",
+        "show_all_conversation": "Ganzes Gespräch anzeigen (noch {numStatus} Nachricht) | Ganzes Gespräch anzeigen (noch {numStatus} Nachrichten)",
         "show_all_conversation_with_icon": "{icon} {text}",
         "show_attachment_description": "Vorschau-Beschreibung (Anhang öffnen für vollständige Beschreibung)",
         "show_attachment_in_modal": "Anhang in einem Fenster anzeigen",
         "show_content": "Inhalt anzeigen",
         "show_full_subject": "Vollständige Inhaltswarnung anzeigen",
         "show_only_conversation_under_this": "Nur Antworten auf diesen Bericht anzeigen",
-        "status_deleted": "Dieser Beitrag wurde gelöscht",
-        "status_unavailable": "Beitrag nicht verfügbar",
+        "status_deleted": "Diese Nachricht wurde gelöscht",
+        "status_unavailable": "Nachricht nicht verfügbar",
         "thread_follow": "Zeige noch {numStatus} Antwort | Zeige noch {numStatus} Antworten",
         "thread_follow_with_icon": "{icon} {text}",
         "thread_hide": "Diese Unterhaltung stummschalten",
@@ -979,10 +979,10 @@
         "collapse": "Einklappen",
         "conversation": "Unterhaltung",
         "error": "Fehler beim Lesen der Timeline: {0}",
-        "load_older": "Lade ältere Beiträge",
-        "no_more_statuses": "Keine weiteren Beiträge",
-        "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder Direktnachricht markiert und kann nicht wiederholt oder zitiert werden",
-        "no_statuses": "Keine Beiträge",
+        "load_older": "Lade ältere Nachrichten",
+        "no_more_statuses": "Keine weiteren Nachrichten",
+        "no_retweet_hint": "Die Nachricht ist als nur-für-Follower oder Direktnachricht markiert und kann nicht wiederholt oder zitiert werden",
+        "no_statuses": "Keine Nachrichten",
         "reload": "Neu laden",
         "repeated": "wiederholte",
         "show_new": "Zeige Neuere",
@@ -1094,7 +1094,7 @@
         "replies": "Mit Antworten",
         "report": "Melden",
         "show_repeats": "Geteilte Beiträge anzeigen",
-        "statuses": "Beiträge",
+        "statuses": "Nachrichten",
         "subscribe": "Folgen",
         "unblock": "Entblocken",
         "unblock_progress": "Entblocken…",

From d9d6b1e80bab76af2c045e070b8f01074f0f5331 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 7 Dec 2022 22:31:39 +0000
Subject: [PATCH 27/35] Translated using Weblate (Spanish)

Currently translated at 89.2% (918 of 1029 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: taretka <info@tarteka.net>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/es.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 2a973db5..35383124 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -409,6 +409,8 @@
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Su cuenta ha sido registrada y se ha enviado un correo electrónico a su dirección. Por favor revise el correo electrónico para completar el registro.",
+        "awaiting_email_confirmation_title": "En espera de confirmación por correo electrónico",
         "bio": "Biografía",
         "bio_placeholder": "p. ej.\nHola, soy un ejemplo.\nAquí puedes poner algo representativo tuyo... o no.",
         "captcha": "CAPTCHA",
@@ -422,6 +424,8 @@
         "reason_placeholder": "Los registros de esta instancia son aprobados manualmente.\nComéntanos por qué quieres registrarte aquí.",
         "register": "Registrarse",
         "registration": "Registro",
+        "request_sent": "Su solicitud de registro ha sido enviada para su aprobación. Recibirá un correo electrónico cuando se apruebe su cuenta.",
+        "request_sent_title": "Solicitud de registro enviada",
         "token": "Token de invitación",
         "username_placeholder": "p. ej. akko",
         "validations": {
@@ -664,6 +668,7 @@
         "notification_visibility_likes": "Favoritos",
         "notification_visibility_mentions": "Menciones",
         "notification_visibility_moves": "Usuario Migrado",
+        "notification_visibility_polls": "Encuestas finalizadas en las que has participado",
         "notification_visibility_repeats": "Repeticiones (Repeats)",
         "notifications": "Notificaciones",
         "nsfw_clickthrough": "Habilitar la ocultación de la imagen de vista previa del enlace y el adjunto para los estados NSFW por defecto",
@@ -672,7 +677,9 @@
         "panelRadius": "Paneles",
         "pause_on_unfocused": "Parar la transmisión cuando no estés en foco",
         "play_videos_in_modal": "Reproducir los vídeos en un marco emergente",
-        "post_status_content_type": "Formato de publicación",
+        "post_look_feel": "Aspecto de las publicaciones",
+        "post_status_content_type": "Formato predeterminado de publicación",
+        "posts": "Publicaciones",
         "preload_images": "Precargar las imágenes",
         "presets": "Por defecto",
         "profile_background": "Imagen de fondo del perfil",
@@ -686,6 +693,9 @@
         "profile_tab": "Perfil",
         "radii_help": "Establezca el redondeo de las esquinas de la interfaz (en píxeles)",
         "refresh_token": "Actualizar el token",
+        "remove_alias": "Eliminar este alias",
+        "remove_backup": "Eliminar",
+        "render_mfm": "Renderizar Markdown de Misskey",
         "replies_in_timeline": "Réplicas en la línea temporal",
         "reply_visibility_all": "Mostrar todas las réplicas",
         "reply_visibility_following": "Solo mostrar réplicas para mí o usuarios a los que sigo",
@@ -710,10 +720,24 @@
         "security_tab": "Seguridad",
         "sensitive_by_default": "Identificar las publicaciones como sensibles de forma predeterminada",
         "set_new_avatar": "Cambiar avatar",
+        "set_new_mascot": "Fijar nueva mascota",
         "set_new_profile_background": "Cambiar el fondo del perfil",
         "set_new_profile_banner": "Cambiar la cabecera del perfil",
         "setting_changed": "La configuración es diferente a la predeterminada",
+        "setting_server_side": "Esta configuración está vinculada a su perfil y afecta a todas las sesiones y clientes",
         "settings": "Ajustes",
+        "settings_profile": "Ajustes de Perfiles",
+        "settings_profile_creation": "Crear nuevo perfil",
+        "settings_profile_creation_new_name_label": "Nombre",
+        "settings_profile_creation_submit": "Crear",
+        "settings_profile_currently": "Actualmente usando {nombre} (versión: {versión})",
+        "settings_profile_delete": "Eliminar",
+        "settings_profile_delete_confirm": "¿Realmente quieres eliminar este perfil?",
+        "settings_profile_force_sync": "Sincronizar",
+        "settings_profile_in_use": "En uso",
+        "settings_profile_use": "Usar",
+        "settings_profiles_show": "Mostrar todos los perfiles de configuración",
+        "settings_profiles_unshow": "Ocultar todos los perfiles de configuración",
         "show_admin_badge": "Mostrar la insignia de \"Administrador/a\" en mi perfil",
         "show_moderator_badge": "Mostrar la insignia de \"Moderador/a\" en mi perfil",
         "stop_gifs": "Iniciar GIFs al pasar el ratón",

From e8ee31afed8d9e445bcce474b1bdf99606b50120 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 7 Dec 2022 22:31:39 +0000
Subject: [PATCH 28/35] Translated using Weblate (English)

Currently translated at 100.0% (1033 of 1033 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/en.json | 142 +++++++++++++++++++++++------------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4c79ac4c..32785561 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -165,72 +165,72 @@
         "moves": "User migrates"
     },
     "languages": {
-        "bg": "Bulgarian",
-        "en": "English",
         "ar": "Arabic",
         "az": "Azerbaijani",
-        "zh": "Chinese",
+        "bg": "Bulgarian",
         "cs": "Czech",
         "da": "Danish",
-        "nl": "Dutch",
-        "eo": "Esperanto",
-        "fi": "Finnish",
-        "fr": "French",
         "de": "German",
         "el": "Greek",
+        "en": "English",
+        "eo": "Esperanto",
+        "es": "Spanish",
+        "fa": "Persian",
+        "fi": "Finnish",
+        "fr": "French",
+        "ga": "Irish",
         "he": "Hebrew",
         "hi": "Hindi",
         "hu": "Hungarian",
         "id": "Indonesian",
-        "ga": "Irish",
         "it": "Italian",
         "ja": "Japanese",
         "ko": "Korean",
-        "fa": "Persian",
+        "lt": "Lithuanian",
+        "lv": "Latvian",
+        "nl": "Dutch",
         "pl": "Polish",
         "pt": "Portuguese",
         "ru": "Russian",
         "sk": "Slovak",
-        "es": "Spanish",
         "sv": "Swedish",
         "tr": "Turkish",
-        "uk": "Ukrainian",
-        "lt": "Lithuanian",
-        "lv": "Latvian",
         "translated_from": {
-            "bg": "Translated from @:languages.bg",
-            "en": "Translated from @:languages.en",
             "ar": "Translated from @:languages.ar",
             "az": "Translated from @:languages.az",
-            "zh": "Translated from @:languages.zh",
+            "bg": "Translated from @:languages.bg",
             "cs": "Translated from @:languages.cs",
             "da": "Translated from @:languages.da",
-            "nl": "Translated from @:languages.nl",
-            "eo": "Translated from @:languages.eo",
-            "fi": "Translated from @:languages.fi",
-            "fr": "Translated from @:languages.fr",
             "de": "Translated from @:languages.de",
             "el": "Translated from @:languages.el",
+            "en": "Translated from @:languages.en",
+            "eo": "Translated from @:languages.eo",
+            "es": "Translated from @:languages.es",
+            "fa": "Translated from @:languages.fa",
+            "fi": "Translated from @:languages.fi",
+            "fr": "Translated from @:languages.fr",
+            "ga": "Translated from @:languages.ga",
             "he": "Translated from @:languages.he",
             "hi": "Translated from @:languages.hi",
             "hu": "Translated from @:languages.hu",
             "id": "Translated from @:languages.id",
-            "ga": "Translated from @:languages.ga",
             "it": "Translated from @:languages.it",
             "ja": "Translated from @:languages.ja",
             "ko": "Translated from @:languages.ko",
-            "fa": "Translated from @:languages.fa",
+            "lt": "Translated from @:languages.lt",
+            "lv": "Translated from @:languages.lv",
+            "nl": "Translated from @:languages.nl",
             "pl": "Translated from @:languages.pl",
             "pt": "Translated from @:languages.pt",
             "ru": "Translated from @:languages.ru",
             "sk": "Translated from @:languages.sk",
-            "es": "Translated from @:languages.es",
             "sv": "Translated from @:languages.sv",
             "tr": "Translated from @:languages.tr",
             "uk": "Translated from @:languages.uk",
-            "lt": "Translated from @:languages.lt",
-            "lv": "Translated from @:languages.lv"
-        }
+            "zh": "Translated from @:languages.zh"
+        },
+        "uk": "Ukrainian",
+        "zh": "Chinese"
     },
     "lists": {
         "create": "Create",
@@ -254,15 +254,15 @@
         "hint": "Log in to join the discussion",
         "login": "Log in",
         "logout": "Log out",
+        "logout_confirm": "Are you sure you want to log out?",
+        "logout_confirm_accept_button": "Log out",
+        "logout_confirm_cancel_button": "Cancel",
+        "logout_confirm_title": "Log out",
         "password": "Password",
         "placeholder": "myusername",
         "recovery_code": "Recovery code",
         "register": "Register",
-        "username": "Username",
-        "logout_confirm_cancel_button": "Cancel",
-        "logout_confirm_accept_button": "Log out",
-        "logout_confirm": "Are you sure you want to log out?",
-        "logout_confirm_title": "Log out"
+        "username": "Username"
     },
     "media_modal": {
         "counter": "{current} / {total}",
@@ -271,30 +271,30 @@
         "previous": "Previous"
     },
     "moderation": {
-      "moderation": "Moderation",
-      "reports": {
-        "no_reports": "No reports to show",
-        "add_note": "Add note",
-        "close": "Close",
-        "delete_note": "Delete",
-        "delete_note_accept": "Yes, delete it",
-        "delete_note_cancel": "No, keep it",
-        "delete_note_confirm": "Are you sure you want to delete this note?",
-        "delete_note_title": "Confirm deletion",
-        "no_content": "No description given",
-        "note_placeholder": "Leave a note...",
-        "notes": "{ count } note | { count } notes",
-        "reopen": "Reopen",
-        "report": "Report on",
-        "reports": "Reports",
-        "resolve": "Resolve",
-        "show_closed": "Show closed",
-        "statuses": "{ count } status | { count } statuses",
-        "tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions",
-        "tags": "Set post restrictions"
-      },
-      "statuses": "Statuses",
-      "users": "Users"
+        "moderation": "Moderation",
+        "reports": {
+            "add_note": "Add note",
+            "close": "Close",
+            "delete_note": "Delete",
+            "delete_note_accept": "Yes, delete it",
+            "delete_note_cancel": "No, keep it",
+            "delete_note_confirm": "Are you sure you want to delete this note?",
+            "delete_note_title": "Confirm deletion",
+            "no_content": "No description given",
+            "no_reports": "No reports to show",
+            "note_placeholder": "Leave a note",
+            "notes": "{ count } note | { count } notes",
+            "reopen": "Reopen",
+            "report": "Report on",
+            "reports": "Reports",
+            "resolve": "Resolve",
+            "show_closed": "Show closed",
+            "statuses": "{ count } post| { count } posts",
+            "tag_policy_notice": "Enable the TagPolicy MRF to set post restrictions",
+            "tags": "Set post restrictions"
+        },
+        "statuses": "Posts",
+        "users": "Users"
     },
     "nav": {
         "about": "About",
@@ -409,8 +409,8 @@
         }
     },
     "registration": {
-        "awaiting_email_confirmation_title": "Awaiting email confirmation",
         "awaiting_email_confirmation": "Your account has been registered and an email has been sent to your address. Please check the email to complete registration.",
+        "awaiting_email_confirmation_title": "Awaiting email confirmation",
         "bio": "Bio",
         "bio_placeholder": "e.g.\nHi! Welcome to my bio.\nI love watching anime and playing games. I hope we can be friends!",
         "captcha": "CAPTCHA",
@@ -535,9 +535,9 @@
         "enable_web_push_notifications": "Enable web push notifications",
         "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
         "expert_mode": "Show advanced",
-        "export_theme": "Save preset",
         "expire_posts_enabled": "Delete posts after a set amount of days",
         "expire_posts_input_placeholder": "Number of days",
+        "export_theme": "Save preset",
         "file_export_import": {
             "backup_restore": "Settings backup",
             "backup_settings": "Backup settings to file",
@@ -731,18 +731,18 @@
         "setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
         "settings": "Settings",
         "settings_profile": "Settings Profiles",
-        "settings_profile_currently": "Currently using {name} (version: {version})",
-        "settings_profiles_show": "Show all settings profiles",
-        "settings_profiles_unshow": "Hide all settings profiles",
-        "settings_profile_in_use": "In use",
         "settings_profile_creation": "Create new profile",
-        "settings_profile_creation_submit": "Create",
         "settings_profile_creation_new_name_label": "Name",
-        "settings_profile_use": "Use",
+        "settings_profile_creation_submit": "Create",
+        "settings_profile_currently": "Currently using {name} (version: {version})",
         "settings_profile_delete": "Delete",
         "settings_profile_delete_confirm": "Do you really want to delete this profile?",
         "settings_profile_force_sync": "Synchronize",
+        "settings_profile_in_use": "In use",
+        "settings_profile_use": "Use",
         "settings_profiles_refresh": "Reload settings profiles",
+        "settings_profiles_show": "Show all settings profiles",
+        "settings_profiles_unshow": "Hide all settings profiles",
         "show_admin_badge": "Show \"Admin\" badge in my profile",
         "show_moderator_badge": "Show \"Moderator\" badge in my profile",
         "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
@@ -943,10 +943,10 @@
         "wordfilter": "Wordfilter"
     },
     "settings_profile": {
-      "synchronizing": "Synchronizing setting profile \"{profile}\"...",
-      "synchronized": "Synchronized settings!",
-      "synchronization_error": "Could not synchronize settings: {err}",
-      "creating": "Creating new setting profile \"{profile}\"..."
+        "creating": "Creating new setting profile \"{profile}\"...",
+        "synchronization_error": "Could not synchronize settings: {err}",
+        "synchronized": "Synchronized settings!",
+        "synchronizing": "Synchronizing setting profile \"{profile}\"..."
     },
     "status": {
         "ancestor_follow": "See {numReplies} other reply under this post | See {numReplies} other replies under this post",
@@ -1046,6 +1046,7 @@
         "collapse": "Collapse",
         "conversation": "Conversation",
         "error": "Error fetching timeline: {0}",
+        "follow_tag": "Follow hashtag",
         "load_older": "Load older posts",
         "no_more_statuses": "No more posts",
         "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated or quoted",
@@ -1055,9 +1056,8 @@
         "show_new": "Show new",
         "socket_broke": "Realtime connection lost: CloseEvent code {0}",
         "socket_reconnected": "Realtime connection established",
-        "up_to_date": "Up-to-date",
-        "follow_tag": "Follow hashtag",
-        "unfollow_tag": "Unfollow hashtag"
+        "unfollow_tag": "Unfollow hashtag",
+        "up_to_date": "Up-to-date"
     },
     "toast": {
         "no_translation_target_set": "No translation target language set - this may fail. Please set a target language in your settings."
@@ -1140,7 +1140,6 @@
         "followers": "Followers",
         "following": "Following!",
         "follows_you": "Follows you!",
-        "requested_by": "Has requested to follow you",
         "hidden": "Hidden",
         "hide_repeats": "Hide repeats",
         "highlight": {
@@ -1167,6 +1166,7 @@
         "remove_follower": "Remove follower",
         "replies": "With Replies",
         "report": "Report",
+        "requested_by": "Has requested to follow you",
         "show_repeats": "Show repeats",
         "statuses": "Posts",
         "subscribe": "Subscribe",

From 3d732d1d283be156c119a7125f38f5b687bf8deb Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 7 Dec 2022 22:31:39 +0000
Subject: [PATCH 29/35] Translated using Weblate (Indonesian)

Currently translated at 59.4% (614 of 1033 strings)

Translated using Weblate (Indonesian)

Currently translated at 53.0% (548 of 1033 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: t1 <taaa@fedora.email>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/id/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/id.json | 299 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 234 insertions(+), 65 deletions(-)

diff --git a/src/i18n/id.json b/src/i18n/id.json
index 109d268c..a1cfe7c1 100644
--- a/src/i18n/id.json
+++ b/src/i18n/id.json
@@ -3,6 +3,7 @@
         "mrf": {
             "federation": "Federasi",
             "keyword": {
+                "ftl_removal": "Penghapusan dari Linimasa \"Jaringan Yang Dikenal\"",
                 "is_replaced_by": "→",
                 "reject": "Tolak"
             },
@@ -10,28 +11,57 @@
             "simple": {
                 "accept": "Terima",
                 "accept_desc": "Instansi ini hanya menerima pesan dari instansi-instansi berikut:",
+                "ftl_removal": "Penghapusan dari Linimasa \"Jaringan Yang Dikenal\"",
+                "ftl_removal_desc": "Instansi ini menghapus instansi berikut dari linimasa \"Jaringan Yang Dikenal\":",
+                "instance": "Instansi",
+                "media_nsfw": "Media diatur sebagai sensitif secara paksa",
+                "media_nsfw_desc": "Instansi ini secara paksa menandai media pada postingan dari instansi berikut sebagai sensitif:",
                 "media_removal": "Penghapusan Media",
                 "media_removal_desc": "Instansi ini menghapus media dari postingan yang berasal dari instansi-instansi berikut:",
+                "not_applicable": "Tidak berlaku",
                 "quarantine": "Karantina",
-                "quarantine_desc": "Instansi ini hanya akan mengirim postingan publik ke instansi-instansi berikut:",
+                "quarantine_desc": "Instansi ini tidak akan mengirim postingan publik ke instansi berikut:",
+                "reason": "Alasan",
                 "reject": "Tolak",
-                "reject_desc": "Instansi ini tidak akan menerima pesan dari instansi-instansi berikut:"
+                "reject_desc": "Instansi ini tidak akan menerima pesan dari instansi-instansi berikut:",
+                "simple_policies": "Kebijakan khusus instansi"
             }
         },
         "staff": "Staf"
     },
+    "announcements": {
+        "all_day_prompt": "Ini adalah acara sepanjang hari",
+        "cancel_edit_action": "Batal",
+        "close_error": "Tutup",
+        "delete_action": "Hapus",
+        "edit_action": "Sunting",
+        "end_time_display": "Berakhir pada {time}",
+        "end_time_prompt": "Waktu berakhir: ",
+        "inactive_message": "Pengumuman ini nonaktif",
+        "mark_as_read_action": "Tandai sebagai dibaca",
+        "page_header": "Pengumuman",
+        "post_action": "Posting",
+        "post_error": "Kesalahan: {error}",
+        "post_form_header": "Posting pengumuman",
+        "post_placeholder": "Isi pengumuman",
+        "published_time_display": "Diterbitkan pada {time}",
+        "start_time_display": "Dimulai pada {time}",
+        "start_time_prompt": "Waktu mulai: ",
+        "submit_edit_action": "Kirim",
+        "title": "Pengumuman"
+    },
     "chats": {
         "chats": "Obrolan",
         "delete": "Hapus",
-        "delete_confirm": "Apakah Anda benar-benar ingin menghapus pesan ini?",
-        "empty_chat_list_placeholder": "Anda belum memiliki obrolan. Buat sbeuah obrolan baru!",
+        "delete_confirm": "Apakah kamu benar-benar ingin menghapus pesan ini?",
+        "empty_chat_list_placeholder": "Kamu belum memiliki obrolan. Mulai obrolan baru!",
         "empty_message_error": "Tidak dapat memposting pesan yang kosong",
         "error_loading_chat": "Sesuatu yang salah terjadi ketika memuat obrolan.",
         "error_sending_message": "Sesuatu yang salah terjadi ketika mengirim pesan.",
         "message_user": "Kirim Pesan ke {nickname}",
         "more": "Lebih banyak",
         "new": "Obrolan Baru",
-        "you": "Anda:"
+        "you": "Kamu:"
     },
     "display_date": {
         "today": "Hari Ini"
@@ -40,7 +70,7 @@
         "mute": "Bisukan",
         "mute_progress": "Membisukan…",
         "unmute": "Berhenti membisukan",
-        "unmute_progress": "Memberhentikan pembisuan…"
+        "unmute_progress": "Menghentikan pembisuan…"
     },
     "emoji": {
         "add_emoji": "Sisipkan emoji",
@@ -51,16 +81,17 @@
         "load_all_hint": "Memuat {saneAmount} emoji pertama, memuat semua emoji dapat menyebabkan masalah performa.",
         "search_emoji": "Cari emoji",
         "stickers": "Stiker",
-        "unicode": "Emoji unicode"
+        "unicode": "Emoji Unicode"
     },
     "errors": {
-        "storage_unavailable": "Pleroma tidak dapat mengakses penyimpanan browser. Login Anda atau pengaturan lokal Anda tidak akan tersimpan dan masalah yang tidak terduga dapat terjadi. Coba mengaktifkan kuki."
+        "storage_unavailable": "Pleroma tidak dapat mengakses penyimpanan browser. Login kamu atau pengaturan lokal kamu tidak akan tersimpan dan masalah yang tidak terduga dapat terjadi. Coba aktifkan kuki."
     },
     "exporter": {
         "export": "Ekspor",
-        "processing": "Memproses, Anda akan segera diminta untuk mengunduh berkas Anda"
+        "processing": "Memproses, kamu akan segera diminta untuk mengunduh berkas kamu"
     },
     "features_panel": {
+        "media_proxy": "Proxy media",
         "text_limit": "Batas teks",
         "title": "Fitur-fitur",
         "upload_limit": "Batas unggahan"
@@ -96,6 +127,12 @@
             "admin": "Admin",
             "moderator": "Moderator"
         },
+        "scope_in_timeline": {
+            "direct": "Langsung",
+            "local": "Lokal - hanya instansi kamu yang dapat melihat postingan ini",
+            "private": "Hanya pengikut",
+            "public": "Publik"
+        },
         "show_less": "Tampilkan lebih sedikit",
         "show_more": "Tampilkan lebih banyak",
         "submit": "Kirim",
@@ -118,68 +155,154 @@
         "load_older": "Muat interaksi yang lebih tua",
         "moves": "Pengguna yang bermigrasi"
     },
+    "languages": {
+        "ar": "Arab",
+        "az": "Azerbaijan",
+        "bg": "Bulgaria",
+        "cs": "Ceko",
+        "da": "Denmark",
+        "de": "Jerman",
+        "el": "Yunani",
+        "en": "Inggris",
+        "eo": "Esperanto",
+        "es": "Spanyol",
+        "fa": "Persia",
+        "fi": "Finlandia",
+        "fr": "Prancis",
+        "ga": "Irlandia",
+        "he": "Ibrani",
+        "hi": "Hindi",
+        "hu": "Hongaria",
+        "id": "Indonesia",
+        "it": "Italia",
+        "ja": "Jepang",
+        "ko": "Korea",
+        "lt": "Lithuania",
+        "lv": "Latvia",
+        "nl": "Belanda",
+        "pl": "Polandia",
+        "pt": "Portugal",
+        "ru": "Rusia",
+        "sk": "Slovakia",
+        "sv": "Swedia",
+        "tr": "Turki",
+        "translated_from": {
+            "ar": "Diterjemahkan dari @:languages.ar",
+            "bg": "Diterjemahkan dari @:languages.bg",
+            "en": "Diterjemahkan dari @:languages.en"
+        },
+        "uk": "Ukraina",
+        "zh": "Tionghoa"
+    },
+    "lists": {
+        "create": "Buat",
+        "delete": "Hapus daftar",
+        "lists": "Daftar",
+        "new": "Buat Daftar",
+        "save": "Simpan perubahan",
+        "search": "Telusuri pengguna",
+        "title": "Judul daftar"
+    },
     "login": {
         "authentication_code": "Kode otentikasi",
         "description": "Masuk dengan OAuth",
         "enter_recovery_code": "Masukkan kode pemulihan",
         "enter_two_factor_code": "Masukkan kode dua-faktor",
         "heading": {
+            "recovery": "Pemulihan dua-faktor",
             "totp": "Otentikasi dua-faktor"
         },
         "hint": "Masuk untuk ikut berdiskusi",
         "login": "Masuk",
         "logout": "Keluar",
+        "logout_confirm": "Apa kamu yakin ingin keluar?",
+        "logout_confirm_accept_button": "Keluar",
+        "logout_confirm_cancel_button": "Batal",
+        "logout_confirm_title": "Keluar",
         "password": "Kata sandi",
-        "placeholder": "contoh: lain",
+        "placeholder": "namapenggunaku",
         "recovery_code": "Kode pemulihan",
         "register": "Daftar",
         "username": "Nama pengguna"
     },
     "media_modal": {
-        "next": "Selanjutnya",
-        "previous": "Sebelum"
+        "counter": "{current} / {total}",
+        "hide": "Tutup penampil media",
+        "next": "Berikutnya",
+        "previous": "Sebelumnya"
+    },
+    "moderation": {
+        "moderation": "Moderasi",
+        "reports": {
+            "add_note": "Tambahkan catatan",
+            "close": "Tutup",
+            "delete_note": "Hapus",
+            "delete_note_accept": "Ya, hapus",
+            "delete_note_cancel": "Tidak, kembalikan",
+            "delete_note_confirm": "Apa kamu yakin ingin menghapus catatan ini?",
+            "delete_note_title": "Konfirmasi penghapusan",
+            "no_content": "Tak diberikan keterangan",
+            "no_reports": "Tak ada laporan",
+            "note_placeholder": "Tinggalkan catatan...",
+            "reopen": "Buka kembali",
+            "reports": "Laporan",
+            "resolve": "Selesaikan",
+            "show_closed": "Tampilkan yang telah ditutup"
+        },
+        "statuses": "Status",
+        "users": "Pengguna"
     },
     "nav": {
         "about": "Tentang",
         "administration": "Administrasi",
+        "announcements": "Pengumuman",
         "back": "Kembali",
+        "bubble_timeline_description": "Postingan dari instansi yang dekat dengan instansimu, yang direkomendasikan oleh admin kamu",
         "chats": "Obrolan",
         "dms": "Pesan langsung",
         "friend_requests": "Ingin mengikuti",
         "home_timeline": "Linimasa beranda",
+        "home_timeline_description": "Postingan dari orang yang kamu ikuti",
         "interactions": "Interaksi",
+        "lists": "Daftar",
         "mentions": "Sebutan",
+        "moderation": "Moderasi",
         "preferences": "Preferensi",
+        "public_timeline_description": "Postingan publik dari instansi ini",
         "public_tl": "Linimasa publik",
-        "search": "Cari",
+        "search": "Penelusuran",
         "timeline": "Linimasa",
         "timelines": "Linimasa",
-        "user_search": "Pencarian Pengguna"
+        "twkn": "Jaringan Yang Dikenal",
+        "twkn_timeline_description": "Postingan dari seluruh jaringan",
+        "user_search": "Penelusuran Pengguna"
     },
     "notifications": {
-        "broken_favorite": "Status tak diketahui, mencarinya…",
+        "broken_favorite": "Postingan tak dikenal, mencarinya…",
         "error": "Terjadi kesalahan ketika memuat notifikasi: {0}",
-        "favorited_you": "memfavoritkan status Anda",
-        "follow_request": "ingin mengikuti Anda",
-        "followed_you": "mengikuti Anda",
+        "favorited_you": "memfavoritkan postinganmu",
+        "follow_request": "ingin mengikuti kamu",
+        "followed_you": "mengikuti kamu",
         "load_older": "Muat notifikasi yang lebih lama",
         "migrated_to": "bermigrasi ke",
         "no_more_notifications": "Tidak ada notifikasi lagi",
         "notifications": "Notifikasi",
+        "poll_ended": "japat telah berakhir",
         "reacted_with": "bereaksi dengan {0}",
         "read": "Dibaca!",
-        "repeated_you": "mengulangi status Anda"
+        "repeated_you": "mengulangi postinganmu"
     },
     "password_reset": {
+        "check_email": "Periksa surelmu untuk mendapatkan tautan yang digunakan untuk mengatur ulang kata sandimu.",
         "forgot_password": "Lupa kata sandi?",
-        "instruction": "Masukkan surel atau nama pengguna Anda. Kami akan mengirimkan Anda tautan untuk mengatur ulang kata sandi.",
-        "password_reset": "Pengatur-ulangan kata sandi",
-        "password_reset_disabled": "Pengatur-ulangan kata sandi dinonaktifkan. Hubungi administrator instansi Anda.",
-        "password_reset_required": "Anda harus mengatur ulang kata sandi Anda untuk masuk.",
-        "password_reset_required_but_mailer_is_disabled": "Anda harus mengatur ulang kata sandi, tetapi pengatur-ulangan kata sandi dinonaktifkan. Silakan hubungi administrator instansi Anda.",
-        "placeholder": "Surel atau nama pengguna Anda",
+        "instruction": "Masukkan surel atau nama pengguna kamu. Kami akan mengirimkan kamu tautan untuk mengatur ulang kata sandi.",
+        "password_reset": "Pengatur ulangan kata sandi",
+        "password_reset_disabled": "Pengatur-ulangan kata sandi dinonaktifkan. Silakan hubungi administrator instansi kamu.",
+        "password_reset_required": "Kamu harus mengatur ulang kata sandi kamu untuk masuk.",
+        "password_reset_required_but_mailer_is_disabled": "Kamu harus mengatur ulang kata sandi, tetapi pengatur-ulangan kata sandi dinonaktifkan. Silakan hubungi administrator instansimu.",
+        "placeholder": "Surel atau nama pengguna kamu",
         "return_home": "Kembali ke halaman beranda",
-        "too_many_requests": "Anda telah mencapai batas percobaan, coba lagi nanti."
+        "too_many_requests": "Kamu telah mencapai batas percobaan, coba lagi nanti."
     },
     "polls": {
         "add_option": "Tambahkan opsi",
@@ -190,67 +313,83 @@
         "not_enough_options": "Terlalu sedikit opsi yang unik pada japat",
         "option": "Opsi",
         "people_voted_count": "{count} orang memilih | {count} orang memilih",
+        "single_choice": "",
         "type": "Jenis japat",
         "vote": "Pilih",
         "votes": "suara",
         "votes_count": "{count} suara | {count} suara"
     },
     "post_status": {
-        "account_not_locked_warning": "Akun Anda tidak {0}. Siapapun dapat mengikuti Anda untuk melihat postingan hanya-pengikut Anda.",
+        "account_not_locked_warning": "Akun kamu tidak {0}. Siapapun dapat mengikuti kamu untuk melihat postingan hanya-pengikut kamu.",
         "account_not_locked_warning_link": "terkunci",
         "attachments_sensitive": "Tandai lampiran sebagai sensitif",
         "content_type": {
             "text/bbcode": "BBCode",
             "text/html": "HTML",
             "text/markdown": "Markdown",
-            "text/plain": "Teks biasa"
+            "text/plain": "Teks biasa",
+            "text/x.misskeymarkdown": "MFM"
         },
-        "content_warning": "Subyek (opsional)",
-        "default": "Baru saja mendarat di L.A.",
+        "content_warning": "Peringatan Konten (opsional)",
+        "default": "Baru saja tiba di Luna Nova Academy",
         "direct_warning_to_all": "Postingan ini akan terlihat oleh pengguna yang disebutkan.",
         "direct_warning_to_first_only": "Postingan ini akan terlihat oleh pengguna yang disebutkan di awal pesan.",
-        "empty_status_error": "Tidak dapat memposting status kosong tanpa berkas",
+        "edit_remote_warning": "Perubahan yang dibuat pada postingan ini mungkin tidak terlihat pada beberapa instansi!",
+        "edit_status": "Sunting Status",
+        "edit_unsupported_warning": "Japat dan sebutan tidak bisa diubah dengan menyunting.",
+        "empty_status_error": "Tidak dapat memposting tanpa isi atau berkas",
         "media_description": "Keterangan media",
         "media_description_error": "Gagal memperbarui media, coba lagi",
-        "new_status": "Posting status baru",
+        "media_not_sensitive_warning": "Kamu memasang Peringatan Konten, namun lampirannya tidak ditandai sebagai sensitif!",
+        "new_status": "Posting",
         "post": "Posting",
         "posting": "Memposting",
         "preview": "Pratinjau",
         "preview_empty": "Kosong",
         "scope": {
             "direct": "Langsung - posting hanya kepada pengguna yang disebut",
+            "local": "Lokal - postingan tidak akan difederasi",
             "private": "Hanya-pengikut - posting hanya kepada pengikut",
             "public": "Publik - posting ke linimasa publik"
         },
         "scope_notice": {
-            "private": "Postingan ini akan terlihat hanya oleh pengikut Anda",
-            "public": "Postingan ini akan terlihat oleh siapa saja"
+            "local": "Postingan ini tidak akan terlihat di instansi lain",
+            "private": "Postingan ini akan terlihat hanya oleh pengikut kamu",
+            "public": "Postingan ini akan terlihat oleh siapa saja",
+            "unlisted": "Postingan ini tidak akan terlihat di Linimasa Publik dan Jaringan Yang Dikenal"
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "Akunmu telah terdaftar dan sebuah surel telah dikirimkan ke alamat kamu. Harap periksa surel untuk menyelesaikan pendaftaran.",
+        "awaiting_email_confirmation_title": "Menunggu konfirmasi surel",
         "bio": "Bio",
-        "bio_placeholder": "contoh.\nHai, aku Lain.\nAku seorang putri anime yang tinggal di pinggiran kota Jepang. Kamu mungkin mengenal aku dari Wired.",
+        "bio_placeholder": "cth.\nHai! Selamat datang di bioku.\nAku suka menonton anime dan bermain game. Semoga kita bisa berteman!",
         "captcha": "CAPTCHA",
         "email": "Surel",
-        "fullname_placeholder": "contoh. Lain Iwakura",
+        "email_language": "Dalam bahasa apa kamu ingin menerima surel dari server ini?",
+        "fullname_placeholder": "cth. Atsuko Kagari",
         "new_captcha": "Klik gambarnya untuk mendapatkan captcha baru",
         "password_confirm": "Konfirmasi kata sandi",
         "reason": "Alasan mendaftar",
-        "reason_placeholder": "Instansi ini menerima pendaftaran secara manual.\nBeritahu administrasinya mengapa Anda ingin mendaftar.",
+        "reason_placeholder": "Instansi ini menerima pendaftaran secara manual.\nBeritahu administrasinya mengapa kamu ingin mendaftar.",
         "register": "Daftar",
         "registration": "Pendaftaran",
+        "request_sent": "Permintaan pendaftaran kamu telah dikirim untuk diperiksa. Kamu akan menerima surel saat akunmu diterima.",
+        "request_sent_title": "Permintaan pendaftaran dikirim",
         "token": "Token undangan",
-        "username_placeholder": "contoh. lain",
+        "username_placeholder": "cth. akko",
         "validations": {
             "email_required": "tidak boleh kosong",
             "fullname_required": "tidak boleh kosong",
+            "password_confirmation_match": "harus sama dengan kata sandi",
             "password_confirmation_required": "tidak boleh kosong",
             "password_required": "tidak boleh kosong",
             "username_required": "tidak boleh kosong"
         }
     },
     "remote_user_resolver": {
-        "error": "Tidak ditemukan."
+        "error": "Tidak ditemukan.",
+        "searching_for": "Mencari"
     },
     "search": {
         "hashtags": "Tagar",
@@ -263,6 +402,12 @@
         "select_all": "Pilih semua"
     },
     "settings": {
+        "account_backup": "Pencadangan akun",
+        "account_backup_description": "Ini memungkinkan kamu untuk mengunduh arsip yang berisi informasi tentang akun dan postingan kamu, namun belum bisa diimpor ke akun Pleroma.",
+        "account_privacy": "Privasi",
+        "add_backup": "Buat cadangan baru",
+        "added_backup": "Cadangan baru ditambahkan.",
+        "allow_following_move": "Ikuti otomatis apabila akun yang diikuti pindah",
         "app_name": "Nama aplikasi",
         "attachmentRadius": "Lampiran",
         "attachments": "Lampiran",
@@ -271,9 +416,10 @@
         "avatarRadius": "Avatar",
         "avatar_size_instruction": "Ukuran minimum gambar avatar yang disarankan adalah 150x150 piksel.",
         "background": "Latar belakang",
+        "backup_not_ready": "Cadangan ini belum siap.",
         "bio": "Bio",
         "block_export": "Ekspor blokiran",
-        "block_export_button": "Ekspor blokiran Anda menjadi berkas csv",
+        "block_export_button": "Ekspor blokiranmu menjadi berkas csv",
         "block_import": "Impor blokiran",
         "block_import_error": "Terjadi kesalahan ketika mengimpor blokiran",
         "blocks_imported": "Blokiran diimpor! Pemrosesannya mungkin memakan sedikit waktu.",
@@ -285,24 +431,47 @@
         "cOrange": "Jingga (Favorit)",
         "cRed": "Merah (Batal)",
         "change_email": "Ubah surel",
-        "change_email_error": "Ada masalah ketika mengubah surel Anda.",
+        "change_email_error": "Ada masalah ketika mengubah surel kamu.",
         "change_password": "Ubah kata sandi",
-        "change_password_error": "Ada masalah ketika mengubah kata sandi Anda.",
+        "change_password_error": "Ada masalah ketika mengubah kata sandi kamu.",
         "changed_email": "Surel berhasil diubah!",
         "changed_password": "Kata sandi berhasil diubah!",
         "chatMessageRadius": "Pesan obrolan",
+        "checkboxRadius": "Kotak centang",
         "composing": "Menulis",
+        "confirm_dialogs": "Perlukan konfirmasi sebelum:",
+        "confirm_dialogs_approve_follow": "Menerima permintaan mengikuti",
+        "confirm_dialogs_block": "Memblokir seseorang",
+        "confirm_dialogs_delete": "Menghapus postingan",
+        "confirm_dialogs_deny_follow": "Menolak permintaan mengikuti",
+        "confirm_dialogs_mute": "Membisukan seseorang",
+        "confirm_dialogs_repeat": "Mengulangi postingan",
+        "confirm_dialogs_unfollow": "Berhenti mengikuti seseorang",
         "confirm_new_password": "Konfirmasi kata sandi baru",
+        "conversation_display": "Gaya tampilan obrolan",
         "current_password": "Kata sandi saat ini",
         "data_import_export_tab": "Impor / ekspor data",
         "delete_account": "Hapus akun",
-        "delete_account_description": "Hapus data Anda secara permanen dan menonaktifkan akun Anda.",
-        "delete_account_error": "Ada masalah ketika menghapus akun Anda. Jika ini terus terjadi harap hubungi adminstrator instansi Anda.",
-        "delete_account_instructions": "Ketik kata sandi Anda pada input di bawah untuk mengkonfirmasi penghapusan akun.",
+        "delete_account_description": "Hapus data kamu secara permanen dan nonaktifkan akunmu.",
+        "delete_account_error": "Ada masalah ketika menghapus akun kamu. Jika ini terus terjadi harap hubungi adminstrator instansi kamu.",
+        "delete_account_instructions": "Ketik kata sandi kamu pada input di bawah untuk mengonfirmasi penghapusan akun.",
+        "discoverable": "Izinkan penelusuran akun ini pada hasil pencarian dan layanan lainnya",
         "domain_mutes": "Domain",
+        "download_backup": "Unduh",
+        "email_language": "Bahasa yang digunakan untuk menerima surel dari server ini",
         "emoji_reactions_on_timeline": "Tampilkan reaksi emoji pada linimasa",
         "enable_web_push_notifications": "Aktifkan notifikasi push web",
-        "enter_current_password_to_confirm": "Masukkan kata sandi Anda saat ini untuk mengkonfirmasi identitas Anda",
+        "enter_current_password_to_confirm": "Masukkan kata sandi kamu saat ini untuk mengonfirmasi identitas kamu",
+        "expire_posts_enabled": "Hapus postingan setelah jumlah hari yang ditentukan",
+        "expire_posts_input_placeholder": "Jumlah hari",
+        "file_export_import": {
+            "backup_restore": "Pencadangan pengaturan",
+            "backup_settings": "Cadangkan pengaturan ke berkas",
+            "backup_settings_theme": "Cadangkan pengaturan dan tema ke berkas",
+            "errors": {
+                "file_slightly_new": "Versi minor berkas berbeda, beberapa pengaturan mungkin tidak termuat"
+            }
+        },
         "filtering": "Penyaringan",
         "follow_import_error": "Terjadi kesalahan ketika mengimpor pengikut",
         "fun": "Seru",
@@ -312,17 +481,17 @@
         "hide_follows_count_description": "Jangan tampilkan jumlah mengikuti",
         "hide_follows_description": "Jangan tampilkan siapa yang saya ikuti",
         "hide_muted_posts": "Sembunyikan postingan-postingan dari pengguna yang dibisukan",
-        "hide_post_stats": "Sembunyikan statistik postingan (contoh. jumlah favorit)",
+        "hide_post_stats": "Sembunyikan statistik postingan (seperti jumlah favorit)",
         "hide_shoutbox": "Sembunyikan kotak suara instansi",
-        "hide_user_stats": "Sembunyikan statistik pengguna (contoh. jumlah pengikut)",
+        "hide_user_stats": "Sembunyikan statistik pengguna (seperti jumlah pengikut)",
         "hide_wallpaper": "Sembunyikan latar belakang instansi",
         "import_blocks_from_a_csv_file": "Impor blokiran dari berkas csv",
         "instance_default": "(bawaan: {value})",
         "instance_default_simple": "(bawaan)",
         "interface": "Antarmuka",
         "interfaceLanguage": "Bahasa antarmuka",
-        "invalid_theme_imported": "Berkas yang dipilih bukan sebuah tema yang didukung Pleroma. Tidak ada perbuahan yang dibuat pada tema Anda.",
-        "limited_availability": "Tidak tersedia di browser Anda",
+        "invalid_theme_imported": "Berkas yang dipilih bukan sebuah tema yang didukung Pleroma. Tidak ada perubahan yang dibuat pada tema kamu.",
+        "limited_availability": "Tidak tersedia di browser kamu",
         "links": "Tautan",
         "loop_video": "Ulang-ulang video",
         "loop_video_silent_only": "Ulang-ulang video tanpa suara (seperti \"gif\" Mastodon)",
@@ -333,17 +502,17 @@
             "generate_new_recovery_codes": "Hasilkan kode pemulihan baru",
             "otp": "OTP",
             "recovery_codes": "Kode pemulihan.",
-            "recovery_codes_warning": "Tulis kode-kode nya atau simpan mereka di tempat yang aman - jika tidak Anda tidak akan melihat mereka lagi. Jika Anda tidak dapat mengakses aplikasi 2FA Anda dan kode pemulihan Anda hilang Anda tidak akan bisa mengakses akun Anda.",
+            "recovery_codes_warning": "Tulis kodenya atau simpan mereka di tempat yang aman - jika tidak kamu tidak akan melihat mereka lagi. Jika kamu tidak dapat mengakses aplikasi 2FA kamu dan kode pemulihanmu hilang, kamu tidak akan bisa mengakses akun kamu.",
             "scan": {
                 "title": "Pindai"
             },
             "setup_otp": "Siapkan OTP",
             "title": "Otentikasi Dua-faktor",
             "verify": {
-                "desc": "Untuk mengaktifkan otentikasi dua-faktor, masukkan kode dari aplikasi dua-faktor Anda:"
+                "desc": "Untuk mengaktifkan otentikasi dua-faktor, masukkan kode dari aplikasi dua-faktor kamu:"
             },
             "waiting_a_recovery_codes": "Menerima kode cadangan…",
-            "warning_of_generate_new_codes": "Ketika Anda menghasilkan kode pemulihan baru, kode lama Anda berhenti bekerja."
+            "warning_of_generate_new_codes": "Ketika kamu menghasilkan kode pemulihan baru, kode lama kamu berhenti bekerja."
         },
         "more_settings": "Lebih banyak pengaturan",
         "mutes_and_blocks": "Bisuan dan Blokiran",
@@ -378,8 +547,8 @@
         "save": "Simpan perubahan",
         "saving_err": "Terjadi kesalahan ketika menyimpan pengaturan",
         "saving_ok": "Pengaturan disimpan",
-        "search_user_to_block": "Cari siapa yang Anda ingin blokir",
-        "search_user_to_mute": "Cari siapa yang ingin Anda bisukan",
+        "search_user_to_block": "Cari siapa yang ingin kamu blokir",
+        "search_user_to_mute": "Cari siapa yang ingin kamu bisukan",
         "security": "Keamanan",
         "security_tab": "Keamanan",
         "set_new_avatar": "Tetapkan avatar baru",
@@ -447,9 +616,9 @@
             "switcher": {
                 "help": {
                     "fe_upgraded": "Mesin tema PleromaFE diperbarui setelah pembaruan versi.",
-                    "future_version_imported": "Berkas yang Anda impor dibuat pada versi FE yang lebih baru.",
-                    "older_version_imported": "Berkas yang Anda impor dibuat pada versi FE yang lebih lama.",
-                    "upgraded_from_v2": "PleromaFE telah diperbarui, tema dapat terlihat sedikit berbeda dari apa yang Anda ingat."
+                    "future_version_imported": "Berkas yang kamu impor dibuat pada versi FE yang lebih baru.",
+                    "older_version_imported": "Berkas yang kamu impor dibuat pada versi FE yang lebih lama.",
+                    "upgraded_from_v2": "PleromaFE telah diperbarui, tema dapat terlihat sedikit berbeda dari apa yang kamu ingat."
                 },
                 "load_theme": "Muat tema",
                 "use_snapshot": "Versi lama",
@@ -481,7 +650,7 @@
     },
     "status": {
         "delete": "Hapus status",
-        "delete_confirm": "Apakah Anda benar-benar ingin menghapus status ini?",
+        "delete_confirm": "Apakah kamu benar-benar ingin menghapus postingan ini?",
         "favorites": "Favorit",
         "hide_content": "",
         "mute_conversation": "Bisukan percakapan",
@@ -524,7 +693,7 @@
         "conversation": "Percakapan",
         "error": "Terjadi kesalahan memuat linimasa: {0}",
         "no_more_statuses": "Tidak ada status lagi",
-        "no_retweet_hint": "Postingan ditandai sebagai hanya-pengikut atau langsung dan tidak dapat diulang",
+        "no_retweet_hint": "Postingan ditandai sebagai hanya-pengikut atau langsung dan tidak dapat diulang atau dikutip",
         "no_statuses": "Tidak ada status",
         "reload": "Muat ulang",
         "repeated": "diulangi"
@@ -576,10 +745,10 @@
         "followees": "Mengikuti",
         "followers": "Pengikut",
         "following": "Diikuti!",
-        "follows_you": "Mengikuti Anda!",
+        "follows_you": "Mengikuti kamu!",
         "hidden": "Disembunyikan",
         "hide_repeats": "Sembunyikan ulangan",
-        "its_you": "Ini Anda!",
+        "its_you": "Ini kamu!",
         "media": "Media",
         "mention": "Sebut",
         "message": "Kirimkan pesan",
@@ -599,14 +768,14 @@
         "timeline_title": "Linimasa pengguna"
     },
     "user_reporting": {
-        "add_comment_description": "Laporan ini akan dikirim ke moderator instansi Anda. Anda dapat menyediakan penjelasan mengapa Anda melaporkan akun ini di bawah:",
+        "add_comment_description": "Laporan ini akan dikirim ke moderator instansi kamu. Kamu dapat menyediakan penjelasan mengapa kamu melaporkan akun ini di bawah:",
         "additional_comments": "Komentar tambahan",
         "forward_description": "Akun ini berada di server lain. Kirim salinan dari laporannya juga?",
-        "generic_error": "Sebuah kesalahan terjadi ketika memproses permintaan Anda.",
+        "generic_error": "Sebuah kesalahan terjadi ketika memproses permintaan kamu.",
         "submit": "Kirim",
         "title": "Melaporkan {0}"
     },
     "who_to_follow": {
         "more": "Lebih banyak"
     }
-}
\ No newline at end of file
+}

From dfc4e0a02690912c271d6d6a346eca6fb0e05dfc Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 7 Dec 2022 22:31:39 +0000
Subject: [PATCH 30/35] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 99.8% (1031 of 1033 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index c81787b6..5f315172 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -283,13 +283,18 @@
             "no_content": "説明なし",
             "no_reports": "通報なし",
             "note_placeholder": "メモ",
-            "notes": "メモ",
+            "notes": "{count}件",
             "reopen": "再開",
             "report": "通報：",
             "reports": "通報",
             "resolve": "完了",
-            "show_closed": "完了した通報を表示"
-        }
+            "show_closed": "完了した通報を表示",
+            "statuses": "{count}件",
+            "tag_policy_notice": "TagPolicyのMRFをONにしてください",
+            "tags": "ポスト制限を付ける"
+        },
+        "statuses": "ポスト",
+        "users": "ユーザー"
     },
     "nav": {
         "about": "このインスタンスについて",
@@ -404,6 +409,8 @@
         }
     },
     "registration": {
+        "awaiting_email_confirmation": "あなたにメールが送られました。メールをご覧くださって、リンクをクリックしてください",
+        "awaiting_email_confirmation_title": "メール確認中",
         "bio": "プロフィール",
         "bio_placeholder": "例:\nこんにちは。私は玲音。\n私はアニメのキャラクターで、日本の郊外に住んでいます。私をWiredで見たことがあるかもしれません。",
         "captcha": "CAPTCHA",
@@ -417,6 +424,8 @@
         "reason_placeholder": "このインスタンスは、新規登録を手動で受け付けています。\n登録したい理由を、インスタンスの管理者に教えてください。",
         "register": "登録",
         "registration": "登録",
+        "request_sent": "登録リクエストを送りました。登録受け入れたらメールが届きます。",
+        "request_sent_title": "登録リクエストを送りました",
         "token": "招待トークン",
         "username_placeholder": "例: lain",
         "validations": {
@@ -526,6 +535,8 @@
         "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
         "enter_current_password_to_confirm": "あなたのアイデンティティを証明するため、現在のパスワードを入力してください",
         "expert_mode": "詳細設定を表示",
+        "expire_posts_enabled": "自動削除",
+        "expire_posts_input_placeholder": "日数",
         "export_theme": "保存",
         "file_export_import": {
             "backup_restore": "設定をバックアップ",
@@ -1035,6 +1046,7 @@
         "collapse": "たたむ",
         "conversation": "スレッド",
         "error": "タイムラインの読み込みに失敗しました: {0}",
+        "follow_tag": "タグをフォロー",
         "load_older": "古い投稿",
         "no_more_statuses": "これで終わりです",
         "no_retweet_hint": "投稿を「フォロワーのみ」または「ダイレクト」にすると、リピートできなくなります",
@@ -1044,6 +1056,7 @@
         "show_new": "読み込み",
         "socket_broke": "コード{0}によりリアルタイム接続が切断されました",
         "socket_reconnected": "リアルタイム接続が確立されました",
+        "unfollow_tag": "タグのフォローを解除",
         "up_to_date": "最新"
     },
     "toast": {

From 9079ac4afaed531e7c10d3f98f9403175eaffe8c Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Wed, 7 Dec 2022 22:31:49 +0000
Subject: [PATCH 31/35] Update 'ISSUE_TEMPLATE.md'

---
 ISSUE => ISSUE_TEMPLATE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename ISSUE => ISSUE_TEMPLATE.md (100%)

diff --git a/ISSUE b/ISSUE_TEMPLATE.md
similarity index 100%
rename from ISSUE
rename to ISSUE_TEMPLATE.md

From 40e86998e63459c2a834d1c0687a725558baab4d Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Wed, 7 Dec 2022 22:37:52 +0000
Subject: [PATCH 32/35] Update 'ISSUE_TEMPLATE.md'

---
 ISSUE_TEMPLATE.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 92947ce1..313ba180 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -20,6 +20,6 @@ Frontend version:
 
 ## Relative severity (does this prevent you from using the software as normal?)
 
-[] High - I cannot use the software
-[] Medium - I cannot use it as easily as I'd like
-[] Low - I can get by
\ No newline at end of file
+[] I cannot use the software
+[] I cannot use it as easily as I'd like
+[] I can manage
\ No newline at end of file

From 6c7e691aea27f7b773f35270e25fad9ba8f848ec Mon Sep 17 00:00:00 2001
From: Sol Fisher Romanoff <sol@solfisher.com>
Date: Thu, 8 Dec 2022 20:24:21 +0200
Subject: [PATCH 33/35] Add YAML bug and feat templates

---
 .gitea/issue_template/bug.yml  | 49 ++++++++++++++++++++++++++++++++++
 .gitea/issue_template/feat.yml | 29 ++++++++++++++++++++
 ISSUE_TEMPLATE.md              | 25 -----------------
 3 files changed, 78 insertions(+), 25 deletions(-)
 create mode 100644 .gitea/issue_template/bug.yml
 create mode 100644 .gitea/issue_template/feat.yml
 delete mode 100644 ISSUE_TEMPLATE.md

diff --git a/.gitea/issue_template/bug.yml b/.gitea/issue_template/bug.yml
new file mode 100644
index 00000000..92f96625
--- /dev/null
+++ b/.gitea/issue_template/bug.yml
@@ -0,0 +1,49 @@
+name: "Bug report"
+about: "Something isn't working as expected"
+title: "[bug] "
+body:
+  - type: markdown
+    attributes:
+      value: "Thanks for taking the time to file this bug report! Please try to be as specific and detailed as you can, so we can track down the issue and fix it as soon as possible."
+  - type: input
+    id: version
+    attributes:
+      label: "Version"
+      description: "Which version of pleroma-fe are you running? If running develop, specify the commit hash."
+      placeholder: "e.g. 2022.11, 40e86998e6"
+  - type: textarea
+    id: attempt
+    attributes:
+      label: "What were you trying to do?"
+      validations:
+        required: true
+  - type: textarea
+    id: expectation
+    attributes:
+      label: "What did you expect to happen?"
+      validations:
+        required: true
+  - type: textarea
+    id: reality
+    attributes:
+      label: "What actually happened?"
+      validations:
+        required: true
+  - type: dropdown
+    id: severity
+    attributes:
+      label: "Severity"
+      description: "Does this issue prevent you from using the software as normal?"
+      options:
+        - "I cannot use the software"
+        - "I cannot use it as easily as I'd like"
+        - "I can manage"
+      validations:
+        required: true
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: "Have you searched for this issue?"
+      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev) or [the issue tracker](https://akkoma.dev/AkkomaGang/pleroma-fe/issues)."
+      options:
+        - label: "I have double-checked and have not found this issue mentioned anywhere."
diff --git a/.gitea/issue_template/feat.yml b/.gitea/issue_template/feat.yml
new file mode 100644
index 00000000..9f583be3
--- /dev/null
+++ b/.gitea/issue_template/feat.yml
@@ -0,0 +1,29 @@
+name: "Feature request"
+about: "I'd like something to be added to pleroma-fe"
+title: "[feat] "
+body:
+  - type: markdown
+    attributes:
+      value: "Thanks for taking the time to request a new feature! Please be as concise and clear as you can in your proposal, so we could understand what you're going for."
+  - type: textarea
+    id: idea
+    attributes:
+      label: "The idea"
+      description: "What do you think you should be able to do in pleroma-fe?"
+      validations:
+        required: true
+  - type: textarea
+    id: reason
+    attributes:
+      label: "The reasoning"
+      description: "Why would this be a worthwhile feature? Does it solve any problems? Have people talked about wanting it?"
+      validations:
+        required: true
+  - type: checkboxes
+    id: searched
+    attributes:
+      label: "Have you searched for this feature request?"
+      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev), [the issue tracker](https://akkoma.dev/AkkomaGang/pleroma-fe/issues), or the one for [the backend](https://akkoma.dev/AkkomaGang/akkoma/issues)."
+      options:
+        - label: "I have double-checked and have not found this feature request mentioned anywhere."
+        - label: "This feature is related to the pleroma-fe Akkoma frontend specifically, and not the backend."
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
deleted file mode 100644
index 313ba180..00000000
--- a/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-
-name: "Issue"
-about: "Something isn't working as expected"
-
----
-
-## Your setup
-
-Frontend version:
- [] stable 
- [] develop
- [] custom (please elaborate)
-
-## What were you trying to do?
-
-## What did you expect to happen?
-
-## What actually happened?
-
-## Relative severity (does this prevent you from using the software as normal?)
-
-[] I cannot use the software
-[] I cannot use it as easily as I'd like
-[] I can manage
\ No newline at end of file

From e3e8b19df3ee433fb41b86330c7a174ebafb4491 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sat, 10 Dec 2022 00:17:33 +0000
Subject: [PATCH 34/35] fix ES translation having weird o in a key

---
 src/i18n/es.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 35383124..28b8c675 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -730,7 +730,7 @@
         "settings_profile_creation": "Crear nuevo perfil",
         "settings_profile_creation_new_name_label": "Nombre",
         "settings_profile_creation_submit": "Crear",
-        "settings_profile_currently": "Actualmente usando {nombre} (versión: {versión})",
+        "settings_profile_currently": "Actualmente usando {nombre} (versión: {version})",
         "settings_profile_delete": "Eliminar",
         "settings_profile_delete_confirm": "¿Realmente quieres eliminar este perfil?",
         "settings_profile_force_sync": "Sincronizar",

From 9bf310d5090df86bdb2c4682831ba07d5b95a17c Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Sat, 10 Dec 2022 14:51:08 +0000
Subject: [PATCH 35/35] bump version

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

diff --git a/package.json b/package.json
index 19a7e186..e712cffd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "3.2.0",
+  "version": "3.5.0",
   "description": "A frontend for Akkoma instances",
   "author": "Roger Braun <roger@rogerbraun.net>",
   "private": true,