From cfe5b64b17ab230ab475ab0c9d7ca8dd8eba5cf6 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Sat, 29 Jul 2023 21:14:42 +0100
Subject: [PATCH 01/36] #489: Created UI and functionality for searching
 players and displaying results

---
 api-request.ts                     |   6 +-
 components/Search.vue              |  25 ------
 components/search/SearchBar.vue    | 136 +++++++++++++++++++++++++++++
 components/search/SearchResult.vue |  64 ++++++++++++++
 constants/Endpoints.ts             |   3 +
 layouts/default.vue                |   1 +
 ps2alerts-constants                |   2 +-
 7 files changed, 209 insertions(+), 28 deletions(-)
 delete mode 100644 components/Search.vue
 create mode 100644 components/search/SearchBar.vue
 create mode 100644 components/search/SearchResult.vue

diff --git a/api-request.ts b/api-request.ts
index c1baaf78..9c00754e 100644
--- a/api-request.ts
+++ b/api-request.ts
@@ -1,4 +1,4 @@
-import axios, { AxiosInstance } from 'axios'
+import axios, { AxiosInstance, CancelTokenSource } from 'axios'
 import { CommonApiParamsInterface } from '~/interfaces/CommonApiParmsInterface'
 
 export default class ApiRequest {
@@ -13,11 +13,13 @@ export default class ApiRequest {
 
   public async get<T>(
     endpoint: string,
-    params?: CommonApiParamsInterface
+    params?: CommonApiParamsInterface,
+    cancelToken?: CancelTokenSource
   ): Promise<T> {
     return await this.client
       .get(endpoint, {
         params,
+        cancelToken: cancelToken?.token,
       })
       .then((response) => {
         // console.log('Api Client Request', { endpoint, params, response })
diff --git a/components/Search.vue b/components/Search.vue
deleted file mode 100644
index 242f12ea..00000000
--- a/components/Search.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--<template>-->
-<!--  <form class="w-full">-->
-<!--    <div class="flex items-center  py-2">-->
-<!--      <input-->
-<!--        class="appearance-none bg-transparent border-none w-full text-gray-700 mr-3 py-1 px-2 leading-tight focus:outline-none"-->
-<!--        type="text"-->
-<!--        placeholder="Maelstrome26 (DOESN'T WORK YET!)"-->
-<!--        aria-label="Full name"-->
-<!--      >-->
-<!--      <button-->
-<!--        class="flex-shrink-0 bg-red-500 hover:bg-red-700 border-red-500 hover:border-red-700 text-sm border-4 text-white py-1 px-2 rounded"-->
-<!--        type="button"-->
-<!--      >-->
-<!--        Search-->
-<!--      </button>-->
-<!--    </div>-->
-<!--  </form>-->
-<!--</template>-->
-
-<!--<script lang="ts">-->
-<!--import { defineComponent } from "vue";-->
-<!--export default defineComponent({-->
-<!--  name: "Search"-->
-<!--});-->
-<!--</script>-->
diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
new file mode 100644
index 00000000..a3c4e499
--- /dev/null
+++ b/components/search/SearchBar.vue
@@ -0,0 +1,136 @@
+<template>
+  <section
+    id="search"
+    class="mb-2 pt-2 lg:px-0 lg:pb-0 border-b-2 border-red-700 mx-auto lg:w-full sm:w-3/4 lg:border-b-0"
+  >
+    <div
+      class="bg-tint rounded lg:rounded-bl-none text-base text-center relative"
+    >
+      <div class="tag section">Search</div>
+      <form class="w-full">
+        <div class="p-2">
+          <input
+            v-model="searchTerm"
+            class="appearance-none border border-solid border-transparent w-full text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
+            type="text"
+            placeholder="Search player or outfit name / tag"
+            aria-label="Full name"
+            @keyup="search"
+          />
+        </div>
+      </form>
+      <div id="results" class="mb-2 px-2">
+        <SearchResult
+          v-for="result in results"
+          :key="result.name"
+          :result="result"
+        />
+      </div>
+      <div v-show="loading" class="text-center">
+        <i class="fas fa-spinner fa-spin"></i> Loading...
+      </div>
+      {{ error.message }}
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { CancelToken } from 'axios'
+import ApiRequest from '~/api-request'
+import SearchResult from '~/components/search/SearchResult.vue'
+import { Endpoints } from '@/constants/Endpoints'
+import { PS2AlertsSearchResultInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
+
+export default defineComponent({
+  name: 'SearchBar',
+  components: { SearchResult },
+  data: () => {
+    return {
+      results: [] as PS2AlertsSearchResultInterface[],
+      loading: false,
+      error: { message: '' },
+      searchTerm: '',
+      apiRequest: new ApiRequest(),
+      source: CancelToken.source(),
+    }
+  },
+  methods: {
+    async search(criteria: KeyboardEvent): Promise<void> {
+      const target = criteria.target as HTMLInputElement
+      const searchTerm = target.value
+      if (this.searchTerm === '') {
+        this.results = []
+        return
+      }
+
+      this.loading = true
+
+      // If a request is in flight, cancel it
+      if (this.source) {
+        this.source.cancel('Canceled due to new request')
+      }
+
+      // Re-initialize the token
+      this.source = CancelToken.source()
+
+      console.log('Searching for', searchTerm)
+
+      this.error = { message: '' }
+
+      try {
+        const results: PS2AlertsSearchResultInterface[] =
+          await this.apiRequest.get(
+            `${Endpoints.SEARCH}?searchTerm=${searchTerm}`,
+            { sortBy: 'name', order: 'asc' },
+            this.source
+          )
+
+        console.log('Results', results)
+
+        if (!results || results.length === 0) {
+          this.error = { message: 'No results found' }
+          return
+        }
+
+        // Parse the results into a format the frontend understands
+        results.map((result) => {
+          if (result.character) {
+            result.name = result.character.name
+            result.type = 'player' // Yay for consistency
+            result.faction = result.character.faction
+            result.world = result.character.world
+          } else if (result.outfit) {
+            result.name = result.outfit.name
+            result.type = 'outfit'
+            result.faction = result.outfit.faction
+            result.world = result.outfit.world
+          }
+
+          return result
+        })
+
+        console.log('Results parsed', results)
+        this.results = results
+        this.loading = false
+      } catch (error) {
+        if (!axios.isCancel(error)) {
+          console.error(error)
+        }
+      }
+    },
+  },
+})
+</script>
+
+<style scoped lang="scss">
+#search {
+  .tag {
+    margin: 0;
+  }
+}
+
+#results {
+  margin-bottom: 1px; // Gotta love CSS
+}
+</style>
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
new file mode 100644
index 00000000..5f5e1bdc
--- /dev/null
+++ b/components/search/SearchResult.vue
@@ -0,0 +1,64 @@
+<template>
+  <div
+    class="my-2 py-2 text-center border-gray-500 cursor-pointer hover"
+    :class="classes"
+  >
+    <p class="m-0">{{ formattedName }}</p>
+    <p class="text-xs text-gray-400 font-semibold">
+      {{ formattedType }} | {{ result.world | worldName }}
+    </p>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+import { FactionBgClassString } from '~/constants/FactionBgClass'
+import { FactionBorderClassString } from '~/constants/FactionBorderClass'
+import { PS2AlertsSearchResultInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
+export default defineComponent({
+  name: 'SearchResult',
+  props: {
+    result: {
+      type: Object as () => PS2AlertsSearchResultInterface,
+      default: () => {
+        return {}
+      },
+    },
+  },
+  computed: {
+    formattedName(): string {
+      if (this.result.type === 'player' && this.result.character) {
+        if (this.result.character.outfit?.tag) {
+          return `[${this.result.character.outfit.tag}] ${this.result.character.name}`
+        }
+        return this.result.character.name
+      }
+
+      if (this.result.type === 'outfit' && this.result.outfit) {
+        if (this.result.outfit.tag) {
+          return `[${this.result.outfit.tag}] ${this.result.outfit.name}`
+        }
+        return this.result.outfit.name
+      }
+      return 'UNKNOWN TYPE!'
+    },
+    formattedType(): string {
+      if (!this.result.type) {
+        console.error("Type wasn't sent in!")
+        return 'ERROR!'
+      }
+      return (
+        this.result.type.charAt(0).toUpperCase() + this.result.type.slice(1)
+      )
+    },
+    classes(): string[] {
+      return [
+        FactionBorderClassString(this.result.faction),
+        FactionBgClassString(this.result.faction),
+      ]
+    },
+  },
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/constants/Endpoints.ts b/constants/Endpoints.ts
index 02833f34..76ade3ae 100644
--- a/constants/Endpoints.ts
+++ b/constants/Endpoints.ts
@@ -82,6 +82,9 @@ export const Endpoints = {
   // 3rd party
   OUTFIT_TRACKER_OUTFIT_LOGO:
     'https://outfit-tracker.com/outfit-logo/{outfitId}.png',
+
+  // Searches
+  SEARCH: '/search',
 }
 
 export const CensusEndpoints = {
diff --git a/layouts/default.vue b/layouts/default.vue
index 4b5271b0..0b7b5845 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -6,6 +6,7 @@
         <client-only>
           <Header />
           <Navigation class="block lg:hidden" />
+          <SearchBar />
           <RealTimeMonitor />
           <LazyFooter class="hidden lg:block" />
         </client-only>
diff --git a/ps2alerts-constants b/ps2alerts-constants
index b1a84140..8cb5b250 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit b1a84140d35e40b4ed23fca6f289226ecf1cf327
+Subproject commit 8cb5b250c676335fb7eca6b39d8861326cf653d4

From 4c60ea6864cf73c535f4c86b7f8cde86603b20d3 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Sun, 30 Jul 2023 12:21:53 +0100
Subject: [PATCH 02/36] #489: Created UI and functionality for searching
 players and displaying results

---
 components/search/SearchBar.vue       | 161 ++++++++++++++++++++------
 components/search/SearchResult.vue    |  67 ++++++-----
 constants/Endpoints.ts                |   2 +-
 interfaces/CommonApiParmsInterface.ts |   1 +
 nuxt.config.js                        |   1 +
 5 files changed, 166 insertions(+), 66 deletions(-)

diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index a3c4e499..7ac4147a 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -8,15 +8,17 @@
     >
       <div class="tag section">Search</div>
       <form class="w-full">
-        <div class="p-2">
+        <div class="p-2 flex items-center">
           <input
             v-model="searchTerm"
-            class="appearance-none border border-solid border-transparent w-full text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
+            class="mr-2 appearance-none border border-solid border-transparent w-full text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
             type="text"
-            placeholder="Search player or outfit name / tag"
+            placeholder="e.g. DIG, Maelstrome"
             aria-label="Full name"
-            @keyup="search"
           />
+          <button class="btn" :disabled="loading" @click="search">
+            <font-awesome-icon :icon="['fas', 'search']"></font-awesome-icon>
+          </button>
         </div>
       </form>
       <div id="results" class="mb-2 px-2">
@@ -36,31 +38,109 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue'
-import { CancelToken } from 'axios'
+import axios from 'axios'
 import ApiRequest from '~/api-request'
 import SearchResult from '~/components/search/SearchResult.vue'
 import { Endpoints } from '@/constants/Endpoints'
-import { PS2AlertsSearchResultInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
+import {
+  SearchCharacterInterface,
+  SearchOutfitInterface,
+  SearchResultComponentInterface,
+} from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
 
 export default defineComponent({
   name: 'SearchBar',
   components: { SearchResult },
   data: () => {
     return {
-      results: [] as PS2AlertsSearchResultInterface[],
+      results: [] as SearchResultComponentInterface[],
       loading: false,
       error: { message: '' },
       searchTerm: '',
       apiRequest: new ApiRequest(),
-      source: CancelToken.source(),
+      source: axios.CancelToken.source(),
     }
   },
   methods: {
+    parseResults(
+      characterResults: SearchCharacterInterface[],
+      outfitResults: SearchOutfitInterface[]
+    ): (SearchCharacterInterface | SearchOutfitInterface)[] {
+      const searchTermLower = this.searchTerm.toLowerCase()
+
+      characterResults.forEach((result) => {
+        let score = 0
+
+        // Higher weight for exact matches
+        if (result.character.name.toLowerCase() === searchTermLower) {
+          score = 100
+        } else {
+          // Lower weight for partial matches
+          const searchTermRegex = new RegExp(searchTermLower, 'i')
+
+          if (result.character.name.match(searchTermRegex)) {
+            score = 5
+          }
+        }
+
+        result.matchScore = score
+        result.type = 'player'
+        result.faction = result.character.faction
+
+        if (result.character.outfit?.tag) {
+          result.name = `[${result.character.outfit.tag}] ${result.character.name}`
+        } else {
+          result.name = result.character.name
+        }
+      })
+
+      // Sort Characters by score
+      characterResults.sort((a, b) =>
+        this.searchScores(a.matchScore, b.matchScore)
+      )
+
+      outfitResults.forEach((result) => {
+        let score = 0
+
+        // Higher weight for exact matches on tag and name
+        if (
+          result.outfit.tag?.toLowerCase() === searchTermLower ||
+          result.outfit.name.toLowerCase() === searchTermLower
+        ) {
+          score = 100
+        } else {
+          // Lower weight for partial matches
+          const searchTermRegex = new RegExp(searchTermLower, 'i')
+
+          if (result.outfit.tag?.match(searchTermRegex)) {
+            score = 20
+          } else if (result.outfit.name.match(searchTermRegex)) {
+            score = 10
+          }
+        }
+
+        result.matchScore = score
+        result.type = 'outfit'
+        result.faction = result.outfit.faction
+
+        if (result.outfit.tag) {
+          result.name = `[${result.outfit.tag}] ${result.outfit.name}`
+        } else {
+          result.name = result.outfit.name
+        }
+      })
+
+      return [...characterResults, ...outfitResults].sort((a, b) =>
+        this.searchScores(a.matchScore, b.matchScore)
+      )
+    },
     async search(criteria: KeyboardEvent): Promise<void> {
       const target = criteria.target as HTMLInputElement
       const searchTerm = target.value
-      if (this.searchTerm === '') {
-        this.results = []
+
+      this.results = []
+
+      if (this.searchTerm === '' || this.loading) {
         return
       }
 
@@ -72,43 +152,47 @@ export default defineComponent({
       }
 
       // Re-initialize the token
-      this.source = CancelToken.source()
+      this.source = axios.CancelToken.source()
 
       console.log('Searching for', searchTerm)
 
       this.error = { message: '' }
 
       try {
-        const results: PS2AlertsSearchResultInterface[] =
-          await this.apiRequest.get(
-            `${Endpoints.SEARCH}?searchTerm=${searchTerm}`,
-            { sortBy: 'name', order: 'asc' },
+        const characterPromise: Promise<SearchCharacterInterface[]> =
+          this.apiRequest.get(
+            Endpoints.SEARCH.replace('{type}', 'characters'),
+            { searchTerm: this.searchTerm },
+            this.source
+          )
+        const outfitPromise: Promise<SearchOutfitInterface[]> =
+          this.apiRequest.get(
+            Endpoints.SEARCH.replace('{type}', 'outfits'),
+            { searchTerm: this.searchTerm },
             this.source
           )
 
-        console.log('Results', results)
+        const searchResults = await Promise.all([
+          characterPromise,
+          outfitPromise,
+        ])
 
-        if (!results || results.length === 0) {
-          this.error = { message: 'No results found' }
+        const characterResults: SearchCharacterInterface[] = searchResults[0]
+        const outfitResults: SearchOutfitInterface[] = searchResults[1]
+
+        console.log('characterResults', characterResults)
+        console.log('outfitResults', outfitResults)
+
+        if (characterResults.length === 0 && outfitResults.length === 0) {
+          this.error = { message: 'No results found!' }
           return
         }
 
-        // Parse the results into a format the frontend understands
-        results.map((result) => {
-          if (result.character) {
-            result.name = result.character.name
-            result.type = 'player' // Yay for consistency
-            result.faction = result.character.faction
-            result.world = result.character.world
-          } else if (result.outfit) {
-            result.name = result.outfit.name
-            result.type = 'outfit'
-            result.faction = result.outfit.faction
-            result.world = result.outfit.world
-          }
-
-          return result
-        })
+        // Parse the results into a SearchResult component friendly format
+        const results: SearchResultComponentInterface[] = this.parseResults(
+          characterResults,
+          outfitResults
+        )
 
         console.log('Results parsed', results)
         this.results = results
@@ -116,9 +200,18 @@ export default defineComponent({
       } catch (error) {
         if (!axios.isCancel(error)) {
           console.error(error)
+          this.error = {
+            message: `An error occurred while searching! Message: ${error}`,
+          }
         }
       }
     },
+    searchScores(a: number | undefined, b: number | undefined): number {
+      if (a && b) {
+        return b - a
+      }
+      return 0
+    },
   },
 })
 </script>
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index 5f5e1bdc..09c26947 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,12 +1,14 @@
 <template>
   <div
-    class="my-2 py-2 text-center border-gray-500 cursor-pointer hover"
+    class="my-2 py-2 text-center cursor-pointer hover border"
     :class="classes"
   >
-    <p class="m-0">{{ formattedName }}</p>
-    <p class="text-xs text-gray-400 font-semibold">
-      {{ formattedType }} | {{ result.world | worldName }}
-    </p>
+    <NuxtLink :to="link">
+      <p class="m-0">{{ result.name }}</p>
+      <p class="text-xs text-gray-400 font-semibold">
+        {{ result.type | ucFirst }} | {{ result.world | worldName }}
+      </p></NuxtLink
+    >
   </div>
 </template>
 
@@ -14,51 +16,54 @@
 import { defineComponent } from 'vue'
 import { FactionBgClassString } from '~/constants/FactionBgClass'
 import { FactionBorderClassString } from '~/constants/FactionBorderClass'
-import { PS2AlertsSearchResultInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
+import {
+  SearchCharacterInterface,
+  SearchOutfitInterface,
+} from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
+import { Faction } from '~/ps2alerts-constants/faction'
+
 export default defineComponent({
   name: 'SearchResult',
   props: {
     result: {
-      type: Object as () => PS2AlertsSearchResultInterface,
+      type: Object as () => SearchCharacterInterface | SearchOutfitInterface,
       default: () => {
         return {}
       },
     },
   },
   computed: {
-    formattedName(): string {
-      if (this.result.type === 'player' && this.result.character) {
-        if (this.result.character.outfit?.tag) {
-          return `[${this.result.character.outfit.tag}] ${this.result.character.name}`
-        }
-        return this.result.character.name
+    characterResult(): SearchCharacterInterface | undefined {
+      return this.result.type === 'player'
+        ? (this.result as SearchCharacterInterface)
+        : undefined
+    },
+    outfitResult(): SearchOutfitInterface | undefined {
+      return this.result.type === 'outfit'
+        ? (this.result as SearchOutfitInterface)
+        : undefined
+    },
+    link(): string {
+      if (this.characterResult) {
+        return `/player/${this.characterResult.character.id}`
       }
 
-      if (this.result.type === 'outfit' && this.result.outfit) {
-        if (this.result.outfit.tag) {
-          return `[${this.result.outfit.tag}] ${this.result.outfit.name}`
-        }
-        return this.result.outfit.name
-      }
-      return 'UNKNOWN TYPE!'
-    },
-    formattedType(): string {
-      if (!this.result.type) {
-        console.error("Type wasn't sent in!")
-        return 'ERROR!'
+      if (this.outfitResult) {
+        return `/outfit/${this.outfitResult.outfit.id}`
       }
-      return (
-        this.result.type.charAt(0).toUpperCase() + this.result.type.slice(1)
-      )
+
+      throw new Error('Unexpected result type')
     },
     classes(): string[] {
+      const faction = this.result.faction
+
       return [
-        FactionBorderClassString(this.result.faction),
         FactionBgClassString(this.result.faction),
+        faction !== Faction.NS_OPERATIVES
+          ? FactionBorderClassString(this.result.faction)
+          : 'border-gray-300',
       ]
     },
   },
 })
 </script>
-
-<style scoped lang="scss"></style>
diff --git a/constants/Endpoints.ts b/constants/Endpoints.ts
index 76ade3ae..7e46f753 100644
--- a/constants/Endpoints.ts
+++ b/constants/Endpoints.ts
@@ -84,7 +84,7 @@ export const Endpoints = {
     'https://outfit-tracker.com/outfit-logo/{outfitId}.png',
 
   // Searches
-  SEARCH: '/search',
+  SEARCH: '/search/{type}',
 }
 
 export const CensusEndpoints = {
diff --git a/interfaces/CommonApiParmsInterface.ts b/interfaces/CommonApiParmsInterface.ts
index b56b516f..74748a6c 100644
--- a/interfaces/CommonApiParmsInterface.ts
+++ b/interfaces/CommonApiParmsInterface.ts
@@ -11,4 +11,5 @@ export interface CommonApiParamsInterface {
   pageSize?: number
   bracket?: Bracket
   ps2AlertsEventType?: Ps2AlertsEventType
+  [key: string]: any
 }
diff --git a/nuxt.config.js b/nuxt.config.js
index bb069673..2995bc72 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -180,6 +180,7 @@ export default {
         'faQuestionCircle',
         'faRankingStar',
         'faRepeat',
+        'faSearch',
         'faStar',
         'faSync',
         'faTasks',

From d3b851f53885f48e6d3615915d9b790eae1f9b7f Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Sun, 30 Jul 2023 21:58:39 +0100
Subject: [PATCH 03/36] #489: Updated results to use new search system and also
 updated formatting of the name to show monospaced outfit tag

---
 components/search/SearchBar.vue    | 91 +++++++++++++++++-------------
 components/search/SearchResult.vue | 12 ++--
 ps2alerts-constants                |  2 +-
 3 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 7ac4147a..db86f018 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -6,37 +6,41 @@
     <div
       class="bg-tint rounded lg:rounded-bl-none text-base text-center relative"
     >
-      <div class="tag section">Search</div>
-      <form class="w-full">
-        <div class="p-2 flex items-center">
+      <div class="tag section">
+        Search <span class="label red">New in v4.5!</span>
+      </div>
+      <div class="p-2">
+        <div class="flex items-center">
           <input
             v-model="searchTerm"
             class="mr-2 appearance-none border border-solid border-transparent w-full text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
             type="text"
             placeholder="e.g. DIG, Maelstrome"
             aria-label="Full name"
+            @keyup="search"
           />
-          <button class="btn" :disabled="loading" @click="search">
-            <font-awesome-icon :icon="['fas', 'search']"></font-awesome-icon>
+          <button class="btn p-0" :disabled="loading" @click="clear">
+            <font-awesome-icon :icon="['fas', 'xmark']"></font-awesome-icon>
           </button>
         </div>
-      </form>
-      <div id="results" class="mb-2 px-2">
-        <SearchResult
-          v-for="result in results"
-          :key="result.name"
-          :result="result"
-        />
-      </div>
-      <div v-show="loading" class="text-center">
-        <i class="fas fa-spinner fa-spin"></i> Loading...
+        <div id="results" class="mb-2">
+          <SearchResult
+            v-for="result in results"
+            :key="result.name"
+            :result="result"
+          />
+        </div>
+        <div v-show="loading" class="text-center">
+          <i class="fas fa-spinner fa-spin"></i> Loading...
+        </div>
+        {{ error.message }}
       </div>
-      {{ error.message }}
     </div>
   </section>
 </template>
 
 <script lang="ts">
+/* eslint-disable import/no-named-as-default-member */
 import { defineComponent } from 'vue'
 import axios from 'axios'
 import ApiRequest from '~/api-request'
@@ -86,12 +90,8 @@ export default defineComponent({
         result.matchScore = score
         result.type = 'player'
         result.faction = result.character.faction
-
-        if (result.character.outfit?.tag) {
-          result.name = `[${result.character.outfit.tag}] ${result.character.name}`
-        } else {
-          result.name = result.character.name
-        }
+        result.name = result.character.name
+        result.tag = result.character?.outfit?.tag ?? undefined
       })
 
       // Sort Characters by score
@@ -119,28 +119,45 @@ export default defineComponent({
           }
         }
 
+        // If there's a space on the end of the string, rank them lower (e.g. 'Dignity of War Tactical ')
+        if (searchTermLower.endsWith(' ')) {
+          score = score / 2
+        }
+
         result.matchScore = score
         result.type = 'outfit'
         result.faction = result.outfit.faction
-
-        if (result.outfit.tag) {
-          result.name = `[${result.outfit.tag}] ${result.outfit.name}`
-        } else {
-          result.name = result.outfit.name
-        }
+        result.name = result.outfit.name
+        result.tag = result.outfit.tag
       })
 
       return [...characterResults, ...outfitResults].sort((a, b) =>
         this.searchScores(a.matchScore, b.matchScore)
       )
     },
+    clear() {
+      this.searchTerm = ''
+      this.results = []
+      this.error = { message: '' }
+    },
     async search(criteria: KeyboardEvent): Promise<void> {
       const target = criteria.target as HTMLInputElement
       const searchTerm = target.value
 
       this.results = []
 
-      if (this.searchTerm === '' || this.loading) {
+      if (this.loading) {
+        if (this.source) {
+          this.source.cancel('Canceled due to new request')
+          console.log('Canceled due to new request')
+        }
+      }
+
+      // If less than 3 chars are entered, don't search and tell the user
+      if (this.searchTerm.length < 3) {
+        this.error = {
+          message: 'Please enter at least 3 chars.',
+        }
         return
       }
 
@@ -180,22 +197,18 @@ export default defineComponent({
         const characterResults: SearchCharacterInterface[] = searchResults[0]
         const outfitResults: SearchOutfitInterface[] = searchResults[1]
 
-        console.log('characterResults', characterResults)
-        console.log('outfitResults', outfitResults)
-
         if (characterResults.length === 0 && outfitResults.length === 0) {
           this.error = { message: 'No results found!' }
+          this.loading = false
           return
         }
 
-        // Parse the results into a SearchResult component friendly format
-        const results: SearchResultComponentInterface[] = this.parseResults(
-          characterResults,
-          outfitResults
-        )
+        // Limit the results to the top 5 so we're not rendering a million things
+        characterResults.splice(5)
+        outfitResults.splice(5)
 
-        console.log('Results parsed', results)
-        this.results = results
+        // Parse the results into a SearchResult component friendly format
+        this.results = this.parseResults(characterResults, outfitResults)
         this.loading = false
       } catch (error) {
         if (!axios.isCancel(error)) {
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index 09c26947..46d49cc3 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -4,11 +4,14 @@
     :class="classes"
   >
     <NuxtLink :to="link">
-      <p class="m-0">{{ result.name }}</p>
+      <p class="m-0">
+        <span v-if="result.tag" class="font-mono">[{{ result.tag }}]</span>
+        {{ result.name }}
+      </p>
       <p class="text-xs text-gray-400 font-semibold">
         {{ result.type | ucFirst }} | {{ result.world | worldName }}
-      </p></NuxtLink
-    >
+      </p>
+    </NuxtLink>
   </div>
 </template>
 
@@ -19,6 +22,7 @@ import { FactionBorderClassString } from '~/constants/FactionBorderClass'
 import {
   SearchCharacterInterface,
   SearchOutfitInterface,
+  SearchResultComponentInterface,
 } from '~/ps2alerts-constants/interfaces/PS2AlertsSearchResultInterface'
 import { Faction } from '~/ps2alerts-constants/faction'
 
@@ -26,7 +30,7 @@ export default defineComponent({
   name: 'SearchResult',
   props: {
     result: {
-      type: Object as () => SearchCharacterInterface | SearchOutfitInterface,
+      type: Object as () => SearchResultComponentInterface,
       default: () => {
         return {}
       },
diff --git a/ps2alerts-constants b/ps2alerts-constants
index 8e524ad0..bee47b69 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit 8e524ad0fffe65fc49d6df323bcf0e22d1023260
+Subproject commit bee47b69c09c9ad45806ec68533c4b8530bb91d3

From 54c3354420a620c36412c6f32c010dc92798c08e Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 15:09:39 +0100
Subject: [PATCH 04/36] #489: Added initial player hello world page

---
 assets/css/tailwind.scss        | 12 ++++++
 components/search/SearchBar.vue |  6 ++-
 pages/index.vue                 |  3 +-
 pages/player/_player.vue        | 72 +++++++++++++++++++++++++++++++++
 4 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 pages/player/_player.vue

diff --git a/assets/css/tailwind.scss b/assets/css/tailwind.scss
index 5fe7eddf..e91f1a86 100644
--- a/assets/css/tailwind.scss
+++ b/assets/css/tailwind.scss
@@ -60,6 +60,18 @@ body {
 .border-tint {
   border: 1px solid #5d6265;
 }
+.text-vs {
+  color: rgba(107, 70, 193, 1)
+}
+.text-nc {
+  color: rgba(43, 108, 176, 1)
+}
+.text-tr {
+  color: rgba(197, 48, 48, 1)
+}
+.text-nso {
+  color: rgba(134, 148, 167, 1)
+}
 .outofplay {
   @apply bg-gray-800;
   background: repeating-linear-gradient(
diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index db86f018..772277fc 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -42,7 +42,7 @@
 <script lang="ts">
 /* eslint-disable import/no-named-as-default-member */
 import { defineComponent } from 'vue'
-import axios from 'axios'
+import axios, { CancelTokenSource } from 'axios'
 import ApiRequest from '~/api-request'
 import SearchResult from '~/components/search/SearchResult.vue'
 import { Endpoints } from '@/constants/Endpoints'
@@ -62,7 +62,7 @@ export default defineComponent({
       error: { message: '' },
       searchTerm: '',
       apiRequest: new ApiRequest(),
-      source: axios.CancelToken.source(),
+      source: axios.CancelToken.source() as CancelTokenSource,
     }
   },
   methods: {
@@ -180,12 +180,14 @@ export default defineComponent({
           this.apiRequest.get(
             Endpoints.SEARCH.replace('{type}', 'characters'),
             { searchTerm: this.searchTerm },
+            // @ts-ignore it's valid yet not valid :shrug:
             this.source
           )
         const outfitPromise: Promise<SearchOutfitInterface[]> =
           this.apiRequest.get(
             Endpoints.SEARCH.replace('{type}', 'outfits'),
             { searchTerm: this.searchTerm },
+            // @ts-ignore it's valid yet not valid :shrug:
             this.source
           )
 
diff --git a/pages/index.vue b/pages/index.vue
index 96baeadd..a3950077 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -6,8 +6,7 @@
         <h1 class="text-title">Statistics</h1>
         <p class="mb-2 text-lg">
           Data collected since <b>4th January 2021 02:00 UTC</b> unless
-          otherwise stated.<br />Data is updated every 15 minutes except
-          victories (instant).
+          otherwise stated.<br />Data is updated every 15 minutes.
         </p>
       </div>
     </div>
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
new file mode 100644
index 00000000..f6d98143
--- /dev/null
+++ b/pages/player/_player.vue
@@ -0,0 +1,72 @@
+<template>
+  <section id="profiles-player">
+    <div v-if="!loaded" class="text-center">
+      <h1>Loading...</h1>
+    </div>
+    <div v-if="loaded">
+      <div class="col-span-12 text-center">
+        <h1 class="text-4xl" :class="factionClass">
+          <span
+            v-if="player.character.outfit && player.character.outfit.tag"
+            class="font-mono"
+            >[{{ player.character.outfit.tag }}]</span
+          >
+          {{ player.character.name }}
+        </h1>
+      </div>
+      <div class="col-span-12"><div class=""></div></div>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import ApiRequest from '~/api-request'
+import { Endpoints } from '~/constants/Endpoints'
+import factionShortName from '~/filters/FactionShortName'
+import { GlobalCharacterAggregateInterface } from '~/ps2alerts-constants/interfaces/api-responses/GlobalCharacterAggregateInterface'
+
+export default Vue.extend({
+  name: 'Player',
+  data() {
+    return {
+      loaded: false,
+      player: {} as GlobalCharacterAggregateInterface,
+    }
+  },
+  computed: {
+    factionClass() {
+      return `text-${factionShortName(
+        this.player.character.faction
+      ).toLowerCase()}`
+    },
+  },
+  created() {
+    this.reset()
+    this.init(this.$route.params.player.toString())
+  },
+  methods: {
+    reset() {
+      this.loaded = false
+    },
+    async init(characterId: string): Promise<void> {
+      await this.pull(characterId)
+    },
+    async pull(characterId: string): Promise<void> {
+      await new ApiRequest()
+        .get<GlobalCharacterAggregateInterface>(
+          Endpoints.AGGREGATES_GLOBAL_CHARACTER_SINGLE.replace(
+            '{character}',
+            characterId
+          )
+        )
+        .then((character) => {
+          this.player = character
+          this.loaded = true
+          console.log('loaded!')
+          console.log(character)
+        })
+    },
+  },
+})
+</script>

From f1c6bd8819842a8411b360cbe6b73333f9943bde Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 15:10:06 +0100
Subject: [PATCH 05/36] #489: Added initial player hello world page

---
 ps2alerts-constants | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ps2alerts-constants b/ps2alerts-constants
index bee47b69..396dbc2d 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit bee47b69c09c9ad45806ec68533c4b8530bb91d3
+Subproject commit 396dbc2d58f284d877f7ddb008aa566962ee6794

From 605f28cb46db6cfbce46e92298c1fdc4fca2c554 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 18:34:06 +0100
Subject: [PATCH 06/36] Added start of player profile page, adding in logos for
 server factionm and outfit

---
 assets/css/tailwind.scss             |   8 +-
 components/alert/AlertResult.vue     |   9 ++-
 components/outfitwars/TeamLogo.vue   |   2 +-
 components/profiles/ProfileLogos.vue | 109 +++++++++++++++++++++++++++
 filters/FactionTextClass.ts          |  19 +++++
 filters/WorldImage.ts                |  10 +++
 nuxt.config.js                       |   3 +
 pages/player/_player.vue             |  27 +++++--
 8 files changed, 173 insertions(+), 14 deletions(-)
 create mode 100644 components/profiles/ProfileLogos.vue
 create mode 100644 filters/FactionTextClass.ts
 create mode 100644 filters/WorldImage.ts

diff --git a/assets/css/tailwind.scss b/assets/css/tailwind.scss
index e91f1a86..3c8475ac 100644
--- a/assets/css/tailwind.scss
+++ b/assets/css/tailwind.scss
@@ -403,6 +403,10 @@ select {
   @apply bg-red-600 text-white text-xs font-semibold px-1 py-0.5 rounded;
   line-height: 1.5rem;
 
+  &:hover {
+    @apply bg-red-500;
+  }
+
   &.green {
     @apply bg-green-600;
 
@@ -420,10 +424,10 @@ select {
   }
 
   &.gray {
-    @apply bg-gray-500;
+    @apply bg-gray-600;
 
     &:hover {
-      @apply bg-gray-600;
+      @apply bg-gray-500;
     }
   }
 
diff --git a/components/alert/AlertResult.vue b/components/alert/AlertResult.vue
index be75303c..1d204c0b 100644
--- a/components/alert/AlertResult.vue
+++ b/components/alert/AlertResult.vue
@@ -2,7 +2,7 @@
   <div class="col-span-12">
     <div class="text-center">
       <div v-if="alert.ps2AlertsEventType !== OUTFIT_WARS_AUG_2022">
-        <h1 class="text-4xl">Alert #{{ alert.instanceId }}</h1>
+        <h1 class="text-title">Alert #{{ alert.instanceId }}</h1>
       </div>
       <div
         v-if="
@@ -17,8 +17,10 @@
       </div>
     </div>
     <div v-if="alert.state === 2" class="mb-2 text-center">
-      <h2 class="text-4xl">
-        {{ victorText }}
+      <h2 class="text-3xl">
+        <span :class="alert.result.victor | factionTextClass">{{
+          victorText
+        }}</span>
         <v-tooltip v-if="alert.result && alert.result.draw" bottom>
           <template #activator="{ on, attrs }">
             <font-awesome-icon
@@ -105,6 +107,7 @@ import factionOrTeamName from '~/filters/FactionOrTeamName'
 import { Team } from '~/ps2alerts-constants/outfitwars/team'
 import Countdown from '~/components/Countdown.vue'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
+import factionTextClass from '~/filters/FactionTextClass'
 
 export default Vue.extend({
   name: 'AlertResult',
diff --git a/components/outfitwars/TeamLogo.vue b/components/outfitwars/TeamLogo.vue
index 1aef8f88..90d1c331 100644
--- a/components/outfitwars/TeamLogo.vue
+++ b/components/outfitwars/TeamLogo.vue
@@ -5,7 +5,7 @@
         class="absolute inset-0 m-auto"
         :class="loser ? rounding + ' grayscale opacity-40' : rounding"
         :src="outfitId | outfitImage"
-        :alt="outfitFaction | factionShortName"
+        alt="Outfit logo"
         @error="imageUrlAlt"
       />
     </div>
diff --git a/components/profiles/ProfileLogos.vue b/components/profiles/ProfileLogos.vue
new file mode 100644
index 00000000..a14cb41e
--- /dev/null
+++ b/components/profiles/ProfileLogos.vue
@@ -0,0 +1,109 @@
+<template>
+  <div class="col-span-12 lg:col-span-4 lg:col-start-5">
+    <div class="flex justify-center items-end gap-4 mb-2">
+      <div class="w-1/3">
+        <img
+          alt="Server Logo"
+          :src="world | worldImage"
+          class="mx-auto mb-2 w-full"
+        />
+        <div class="text-center">
+          <b>{{ world | worldName }}</b
+          ><br />
+          <span class="text-sm label gray">Server</span>
+        </div>
+      </div>
+      <div class="w-1/3">
+        <img
+          alt="Faction Logo"
+          :src="faction | factionImage"
+          class="mx-auto mb-2 w-full"
+        />
+        <div class="text-center" :class="faction | factionTextClass">
+          <b>{{ faction | factionName }}</b
+          ><br />
+          <span class="text-sm label gray">Faction</span>
+        </div>
+      </div>
+      <div class="w-1/3">
+        <NuxtLink :to="outfitLink" :disabled="!isInOutfit">
+          <img
+            v-if="outfit.id"
+            :alt="faction | factionShortName"
+            :src="outfit.id | outfitImage"
+            class="mx-auto mb-2 w-full"
+            @error="outfitImageAlt"
+          />
+        </NuxtLink>
+        <div class="text-center">
+          <NuxtLink :to="outfitLink" :disabled="!isInOutfit">
+            <span class="font-bold">
+              <span v-if="outfit.tag" class="font-mono mr-1"
+                >[{{ outfit.tag }}]</span
+              >{{ outfit.name }}</span
+            ><br />
+            <span class="text-sm label gray mr-2">Outfit</span
+            ><span v-if="isInOutfit" class="label default"
+              ><font-awesome-icon :icon="['fas', 'link']"></font-awesome-icon>
+              Stats</span
+            >
+          </NuxtLink>
+          <a
+            v-if="outfitLogoMissing && isInOutfit"
+            href="https://www.outfit-tracker.com/outfit/edit/37509488620604883"
+            target="_blank"
+            class="text-red-400 text-sm"
+            >Upload your logo!</a
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import factionImage from '~/filters/FactionImage'
+import { PS2AlertsOutfitInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsOutfitInterface'
+
+export default Vue.extend({
+  name: 'ProfileLogos',
+  components: {},
+  props: {
+    outfit: {
+      type: Object as () => PS2AlertsOutfitInterface,
+      required: true,
+    },
+    faction: {
+      type: Number,
+      required: true,
+    },
+    world: {
+      type: Number,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      outfitLogoMissing: false,
+    }
+  },
+  computed: {
+    isInOutfit(): boolean {
+      console.log(parseInt(this.outfit.id, 10))
+      return parseInt(this.outfit.id, 10) > 4
+    },
+    outfitLink(): string {
+      return `/outfit/${this.outfit.id}`
+    },
+  },
+  methods: {
+    outfitImageAlt(event: Event) {
+      if (event.target) {
+        ;(event.target as HTMLImageElement).src = factionImage(this.faction)
+        this.outfitLogoMissing = true
+      }
+    },
+  },
+})
+</script>
diff --git a/filters/FactionTextClass.ts b/filters/FactionTextClass.ts
new file mode 100644
index 00000000..81cf7b34
--- /dev/null
+++ b/filters/FactionTextClass.ts
@@ -0,0 +1,19 @@
+import Vue from 'vue'
+import { Faction } from '~/ps2alerts-constants/faction'
+
+const factionTextClass = Vue.filter('factionTextClass', (value: Faction) => {
+  switch (value) {
+    case Faction.VANU_SOVEREIGNTY:
+      return 'text-vs'
+    case Faction.NEW_CONGLOMERATE:
+      return 'text-nc'
+    case Faction.TERRAN_REPUBLIC:
+      return 'text-tr'
+    case Faction.NS_OPERATIVES:
+      return 'text-nso'
+    default:
+      return 'text-gray-600'
+  }
+})
+
+export default factionTextClass
diff --git a/filters/WorldImage.ts b/filters/WorldImage.ts
new file mode 100644
index 00000000..ee73db24
--- /dev/null
+++ b/filters/WorldImage.ts
@@ -0,0 +1,10 @@
+import Vue from 'vue'
+import { World } from '~/ps2alerts-constants/world'
+import worldNameFilter from '~/filters/WorldName'
+
+const worldImage = Vue.filter('worldImage', (value: World): string => {
+  const worldName = worldNameFilter(value)
+  return `/img/worlds/${worldName}.png`
+})
+
+export default worldImage
diff --git a/nuxt.config.js b/nuxt.config.js
index 2995bc72..deea0139 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -103,6 +103,7 @@ export default {
     { src: '@/filters/FactionName', mode: 'client' },
     { src: '@/filters/FactionOrTeamName', mode: 'client' },
     { src: '@/filters/FactionShortName', mode: 'client' },
+    { src: '@/filters/FactionTextClass', mode: 'client' },
     { src: '@/filters/ItemShortName', mode: 'client' },
     { src: '@/filters/OrdinalSuffix', mode: 'client' },
     { src: '@/filters/OutfitImage', mode: 'client' },
@@ -112,6 +113,7 @@ export default {
     { src: '@/filters/UcFirst', mode: 'client' },
     { src: '@/filters/VehicleFaction', mode: 'client' },
     { src: '@/filters/WorldName', mode: 'client' },
+    { src: '@/filters/WorldImage', mode: 'client' },
     { src: '@/filters/ZoneName', mode: 'client' },
     { src: '@/plugins/NumeralFilter', mode: 'client' },
   ],
@@ -171,6 +173,7 @@ export default {
         'faGun',
         'faHourglass',
         'faInfoCircle',
+        'faLink',
         'faMap',
         'faPause',
         'faPlay',
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index f6d98143..804a7ccc 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -3,9 +3,9 @@
     <div v-if="!loaded" class="text-center">
       <h1>Loading...</h1>
     </div>
-    <div v-if="loaded">
+    <div v-if="loaded" class="grid grid-cols-12 gap-2">
       <div class="col-span-12 text-center">
-        <h1 class="text-4xl" :class="factionClass">
+        <h1 class="text-title" :class="factionTextClass">
           <span
             v-if="player.character.outfit && player.character.outfit.tag"
             class="font-mono"
@@ -14,7 +14,15 @@
           {{ player.character.name }}
         </h1>
       </div>
-      <div class="col-span-12"><div class=""></div></div>
+      <ProfileLogos
+        :outfit="player.character.outfit"
+        :faction="player.character.faction"
+        :world="player.world"
+      />
+      <div class="col-span-12 2xl:col-span-5 md:col-span-6 card">
+        <div class="tag section">Details</div>
+      </div>
+      <div class="col-span-12 lg:col-span-7 md:col-span-6">Kill stats</div>
     </div>
   </section>
 </template>
@@ -23,22 +31,25 @@
 import Vue from 'vue'
 import ApiRequest from '~/api-request'
 import { Endpoints } from '~/constants/Endpoints'
-import factionShortName from '~/filters/FactionShortName'
 import { GlobalCharacterAggregateInterface } from '~/ps2alerts-constants/interfaces/api-responses/GlobalCharacterAggregateInterface'
+import factionTextClass from '~/filters/FactionTextClass'
+import ProfileLogos from '~/components/profiles/ProfileLogos.vue'
 
 export default Vue.extend({
   name: 'Player',
+  components: {
+    ProfileLogos,
+  },
   data() {
     return {
       loaded: false,
       player: {} as GlobalCharacterAggregateInterface,
+      outfitLogoMissing: false,
     }
   },
   computed: {
-    factionClass() {
-      return `text-${factionShortName(
-        this.player.character.faction
-      ).toLowerCase()}`
+    factionTextClass(): string {
+      return factionTextClass(this.player.character.faction)
     },
   },
   created() {

From e7a0c4cfb9425614e8158d51c0be272b767749cb Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 18:34:13 +0100
Subject: [PATCH 07/36] Constants

---
 ps2alerts-constants | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ps2alerts-constants b/ps2alerts-constants
index 396dbc2d..a701d39f 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit 396dbc2d58f284d877f7ddb008aa566962ee6794
+Subproject commit a701d39f03a9b921a001ad987c37d9bc3a09acfc

From d8e0749e7f2c220e62acfd0fd544d8e704a51d67 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 18:59:52 +0100
Subject: [PATCH 08/36] Added further polish to SearchBar

---
 components/search/SearchBar.vue | 54 ++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 772277fc..2048f712 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -7,7 +7,7 @@
       class="bg-tint rounded lg:rounded-bl-none text-base text-center relative"
     >
       <div class="tag section">
-        Search <span class="label red">New in v4.5!</span>
+        Search <span class="label green">New in v4.5!</span>
       </div>
       <div class="p-2">
         <div class="flex items-center">
@@ -19,8 +19,23 @@
             aria-label="Full name"
             @keyup="search"
           />
-          <button class="btn p-0" :disabled="loading" @click="clear">
-            <font-awesome-icon :icon="['fas', 'xmark']"></font-awesome-icon>
+          <button
+            id="clearButton"
+            class="btn"
+            :disabled="loading || !searchTerm"
+            @click="clear"
+          >
+            <font-awesome-icon
+              v-show="!loading"
+              :icon="['fas', 'xmark']"
+              fixed-width
+            ></font-awesome-icon>
+            <font-awesome-icon
+              v-show="loading"
+              :icon="['fas', 'sync']"
+              class="animate-spin"
+              fixed-width
+            ></font-awesome-icon>
           </button>
         </div>
         <div id="results" class="mb-2">
@@ -30,9 +45,6 @@
             :result="result"
           />
         </div>
-        <div v-show="loading" class="text-center">
-          <i class="fas fa-spinner fa-spin"></i> Loading...
-        </div>
         {{ error.message }}
       </div>
     </div>
@@ -139,13 +151,13 @@ export default defineComponent({
       this.searchTerm = ''
       this.results = []
       this.error = { message: '' }
+      this.loading = false
+      if (this.source) {
+        this.source.cancel('Canceled due to clearing')
+        console.log('Cancelled request due to clearing')
+      }
     },
-    async search(criteria: KeyboardEvent): Promise<void> {
-      const target = criteria.target as HTMLInputElement
-      const searchTerm = target.value
-
-      this.results = []
-
+    async search(): Promise<void> {
       if (this.loading) {
         if (this.source) {
           this.source.cancel('Canceled due to new request')
@@ -153,11 +165,20 @@ export default defineComponent({
         }
       }
 
+      this.loading = false
+
+      // If user deleted everything, reset
+      if (this.searchTerm.length === 0) {
+        this.clear()
+        return
+      }
+
       // If less than 3 chars are entered, don't search and tell the user
       if (this.searchTerm.length < 3) {
         this.error = {
-          message: 'Please enter at least 3 chars.',
+          message: 'Please enter at least 3 characters',
         }
+        this.results = []
         return
       }
 
@@ -171,8 +192,6 @@ export default defineComponent({
       // Re-initialize the token
       this.source = axios.CancelToken.source()
 
-      console.log('Searching for', searchTerm)
-
       this.error = { message: '' }
 
       try {
@@ -200,6 +219,7 @@ export default defineComponent({
         const outfitResults: SearchOutfitInterface[] = searchResults[1]
 
         if (characterResults.length === 0 && outfitResults.length === 0) {
+          this.results = []
           this.error = { message: 'No results found!' }
           this.loading = false
           return
@@ -238,6 +258,10 @@ export default defineComponent({
   }
 }
 
+#clearButton {
+  padding: 0.5rem 0.75rem;
+}
+
 #results {
   margin-bottom: 1px; // Gotta love CSS
 }

From 06bd80524d3f845cb07e1bea654446a800f31ca7 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 22:47:21 +0100
Subject: [PATCH 09/36] #489: Added AlertsInvolved component showing a list of
 all alerts involved by the Player / Outfit

---
 components/profiles/ProfileAlertsInvolved.vue | 201 ++++++++++++++++++
 components/profiles/ProfileCombatMetrics.vue  |  26 +++
 components/profiles/ProfileLogos.vue          | 100 +++++----
 components/search/SearchBar.vue               |  16 --
 constants/DataTableConfig.ts                  |   6 +
 constants/Endpoints.ts                        |   2 +
 filters/DateTimeFormat.ts                     |   4 +-
 filters/ZoneName.ts                           |   2 +-
 .../profiles/ProfileMetricsInterface.ts       |  16 ++
 pages/player/_player.vue                      | 107 +++++++++-
 10 files changed, 399 insertions(+), 81 deletions(-)
 create mode 100644 components/profiles/ProfileAlertsInvolved.vue
 create mode 100644 components/profiles/ProfileCombatMetrics.vue
 create mode 100644 interfaces/profiles/ProfileMetricsInterface.ts

diff --git a/components/profiles/ProfileAlertsInvolved.vue b/components/profiles/ProfileAlertsInvolved.vue
new file mode 100644
index 00000000..91e4493d
--- /dev/null
+++ b/components/profiles/ProfileAlertsInvolved.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="col-span-12 lg:col-span-4 lg:col-start-5">
+    {{ statistics.alerts.length }} Alerts
+
+    <v-data-table
+      class="datatable"
+      item-key="instanceDetails.instanceId"
+      :headers="headers"
+      :items="parsedData"
+      v-bind="tableConfig"
+    >
+      <template #item.instance="{ item }">
+        <NuxtLink
+          :to="`/alert/${item.instanceDetails.instanceId}`"
+          class="text-red-500"
+        >
+          {{ item.instanceDetails.instanceId }}
+        </NuxtLink>
+      </template>
+      <template #item.victor="{ item }">
+        <span
+          v-if="item.victor === player.character.faction"
+          class="label green"
+          >Yes</span
+        >
+        <span v-else class="label">No</span>
+        <span class="label" :class="item.victor | factionShortName">{{
+          item.victor | factionShortName
+        }}</span>
+      </template>
+      <template #item.outfit="{ item }">
+        <NuxtLink :to="`/outfit/${item.outfit.id}`" class="text-red-500">
+          <span v-if="item.outfit.tag" class="font-mono"
+            >[{{ item.outfit.tag }}]</span
+          >
+          {{ item.outfit.name }}
+        </NuxtLink>
+      </template>
+    </v-data-table>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { ProfileMetricsInterface } from '~/interfaces/profiles/ProfileMetricsInterface'
+import { ProfileAlertsConfig } from '~/constants/DataTableConfig'
+import { GlobalCharacterAggregateInterface } from '~/ps2alerts-constants/interfaces/api-responses/GlobalCharacterAggregateInterface'
+import { dateTimeFormat } from '~/filters/DateTimeFormat'
+import zoneNameFilter from '~/filters/ZoneName'
+import factionShortName from '~/filters/FactionShortName'
+
+export default Vue.extend({
+  name: 'ProfileAlertsInvolved',
+  components: {},
+  props: {
+    statistics: {
+      type: Object as () => ProfileMetricsInterface,
+      required: true,
+    },
+    player: {
+      type: Object as () => GlobalCharacterAggregateInterface,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      parsedData: {} as any,
+      tableConfig: ProfileAlertsConfig,
+      headers: [
+        {
+          text: 'ID',
+          align: 'left',
+          sortable: true,
+          value: 'instance',
+        },
+        {
+          text: 'Date',
+          align: 'left',
+          sortable: false,
+          value: 'instanceDetails.timeEnded',
+        },
+        {
+          text: 'Cont',
+          align: 'left',
+          sortable: true,
+          value: 'cont',
+        },
+        {
+          text: 'Victor',
+          align: 'left',
+          sortable: true,
+          value: 'victor',
+        },
+        {
+          text: 'Outfit',
+          align: 'left',
+          value: 'outfit',
+        },
+        {
+          text: 'BR',
+          align: 'middle',
+          filterable: false,
+          value: 'character.adjustedBattleRank',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Kills',
+          align: 'middle',
+          filterable: false,
+          value: 'kills',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Deaths',
+          align: 'middle',
+          filterable: false,
+          value: 'deaths',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'KD',
+          align: 'middle',
+          filterable: false,
+          value: 'kd',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'HS',
+          align: 'middle',
+          filterable: false,
+          value: 'headshots',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'HSR%',
+          align: 'middle',
+          filterable: false,
+          value: 'hsr',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'TKs',
+          align: 'middle',
+          filterable: false,
+          value: 'teamKills',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'TKed',
+          align: 'middle',
+          filterable: false,
+          value: 'teamKilled',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Sui',
+          align: 'middle',
+          filterable: false,
+          value: 'suicides',
+          cellClass: 'text-center',
+        },
+      ],
+    }
+  },
+  computed: {},
+  created(): void {
+    this.parsedData = this.parseForTable(this.statistics)
+  },
+  methods: {
+    factionShortName,
+    parseForTable(stats: ProfileMetricsInterface): any {
+      return stats.alerts.map((alert) => {
+        return {
+          ...alert,
+          kills: alert.kills ?? 0,
+          deaths: alert.deaths ?? 0,
+          headshots: alert.headshots ?? 0,
+          teamKills: alert.teamKills ?? 0,
+          teamKilled: alert.teamKilled ?? 0,
+          suicides: alert.suicides ?? 0,
+          instanceDetails: {
+            ...alert.instanceDetails,
+            timeEnded: alert.instanceDetails?.timeEnded
+              ? dateTimeFormat(alert.instanceDetails.timeEnded)
+              : 'Ongoing',
+          },
+          cont: alert.instanceDetails?.zone
+            ? zoneNameFilter(alert.instanceDetails.zone)
+            : 'Unknown',
+          victor: alert.instanceDetails?.result?.victor ?? null,
+          outfit: alert.character.outfit,
+          // All the brackets
+          // 1 is used instead of 0 to prevent division by zero
+          kd: ((alert.kills ?? 1) / (alert.deaths ?? 1)).toFixed(2),
+          hsr: (((alert.headshots ?? 1) / (alert.kills ?? 1)) * 100).toFixed(2),
+        }
+      })
+    },
+  },
+})
+</script>
diff --git a/components/profiles/ProfileCombatMetrics.vue b/components/profiles/ProfileCombatMetrics.vue
new file mode 100644
index 00000000..9953c31c
--- /dev/null
+++ b/components/profiles/ProfileCombatMetrics.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="col-span-12 lg:col-span-4 lg:col-start-5">
+    Combat stats component
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { ProfileMetricsInterface } from '~/interfaces/profiles/ProfileMetricsInterface'
+
+export default Vue.extend({
+  name: 'ProfileCombatMetrics',
+  components: {},
+  props: {
+    statistics: {
+      type: Object as () => ProfileMetricsInterface,
+      required: true,
+    },
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+  methods: {},
+})
+</script>
diff --git a/components/profiles/ProfileLogos.vue b/components/profiles/ProfileLogos.vue
index a14cb41e..1b324ba8 100644
--- a/components/profiles/ProfileLogos.vue
+++ b/components/profiles/ProfileLogos.vue
@@ -1,61 +1,59 @@
 <template>
-  <div class="col-span-12 lg:col-span-4 lg:col-start-5">
-    <div class="flex justify-center items-end gap-4 mb-2">
-      <div class="w-1/3">
-        <img
-          alt="Server Logo"
-          :src="world | worldImage"
-          class="mx-auto mb-2 w-full"
-        />
-        <div class="text-center">
-          <b>{{ world | worldName }}</b
-          ><br />
-          <span class="text-sm label gray">Server</span>
-        </div>
+  <div class="flex justify-center items-end gap-4 mb-2">
+    <div class="w-1/3">
+      <img
+        alt="Server Logo"
+        :src="world | worldImage"
+        class="mx-auto mb-2 w-full"
+      />
+      <div class="text-center">
+        <b>{{ world | worldName }}</b
+        ><br />
+        <span class="text-sm label gray">Server</span>
+      </div>
+    </div>
+    <div class="w-1/3">
+      <img
+        alt="Faction Logo"
+        :src="faction | factionImage"
+        class="mx-auto mb-2 w-full"
+      />
+      <div class="text-center" :class="faction | factionTextClass">
+        <b>{{ faction | factionName }}</b
+        ><br />
+        <span class="text-sm label gray">Faction</span>
       </div>
-      <div class="w-1/3">
+    </div>
+    <div class="w-1/3">
+      <NuxtLink :to="outfitLink" :disabled="!isInOutfit">
         <img
-          alt="Faction Logo"
-          :src="faction | factionImage"
+          v-if="outfit.id"
+          :alt="faction | factionShortName"
+          :src="outfit.id | outfitImage"
           class="mx-auto mb-2 w-full"
+          @error="outfitImageAlt"
         />
-        <div class="text-center" :class="faction | factionTextClass">
-          <b>{{ faction | factionName }}</b
-          ><br />
-          <span class="text-sm label gray">Faction</span>
-        </div>
-      </div>
-      <div class="w-1/3">
+      </NuxtLink>
+      <div class="text-center">
         <NuxtLink :to="outfitLink" :disabled="!isInOutfit">
-          <img
-            v-if="outfit.id"
-            :alt="faction | factionShortName"
-            :src="outfit.id | outfitImage"
-            class="mx-auto mb-2 w-full"
-            @error="outfitImageAlt"
-          />
-        </NuxtLink>
-        <div class="text-center">
-          <NuxtLink :to="outfitLink" :disabled="!isInOutfit">
-            <span class="font-bold">
-              <span v-if="outfit.tag" class="font-mono mr-1"
-                >[{{ outfit.tag }}]</span
-              >{{ outfit.name }}</span
-            ><br />
-            <span class="text-sm label gray mr-2">Outfit</span
-            ><span v-if="isInOutfit" class="label default"
-              ><font-awesome-icon :icon="['fas', 'link']"></font-awesome-icon>
-              Stats</span
-            >
-          </NuxtLink>
-          <a
-            v-if="outfitLogoMissing && isInOutfit"
-            href="https://www.outfit-tracker.com/outfit/edit/37509488620604883"
-            target="_blank"
-            class="text-red-400 text-sm"
-            >Upload your logo!</a
+          <span class="font-bold">
+            <span v-if="outfit.tag" class="font-mono mr-1"
+              >[{{ outfit.tag }}]</span
+            >{{ outfit.name }}</span
+          ><br />
+          <span class="text-sm label gray mr-2">Outfit</span
+          ><span v-if="isInOutfit" class="label default"
+            ><font-awesome-icon :icon="['fas', 'link']"></font-awesome-icon>
+            Stats</span
           >
-        </div>
+        </NuxtLink>
+        <a
+          v-if="outfitLogoMissing && isInOutfit"
+          href="https://www.outfit-tracker.com/outfit/edit/37509488620604883"
+          target="_blank"
+          class="text-red-400 text-sm"
+          >Upload your logo!</a
+        >
       </div>
     </div>
   </div>
diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 2048f712..15b21dcd 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -90,13 +90,6 @@ export default defineComponent({
         // Higher weight for exact matches
         if (result.character.name.toLowerCase() === searchTermLower) {
           score = 100
-        } else {
-          // Lower weight for partial matches
-          const searchTermRegex = new RegExp(searchTermLower, 'i')
-
-          if (result.character.name.match(searchTermRegex)) {
-            score = 5
-          }
         }
 
         result.matchScore = score
@@ -120,15 +113,6 @@ export default defineComponent({
           result.outfit.name.toLowerCase() === searchTermLower
         ) {
           score = 100
-        } else {
-          // Lower weight for partial matches
-          const searchTermRegex = new RegExp(searchTermLower, 'i')
-
-          if (result.outfit.tag?.match(searchTermRegex)) {
-            score = 20
-          } else if (result.outfit.name.match(searchTermRegex)) {
-            score = 10
-          }
         }
 
         // If there's a space on the end of the string, rank them lower (e.g. 'Dignity of War Tactical ')
diff --git a/constants/DataTableConfig.ts b/constants/DataTableConfig.ts
index fa180ac2..0bee06e4 100644
--- a/constants/DataTableConfig.ts
+++ b/constants/DataTableConfig.ts
@@ -92,3 +92,9 @@ export const StatisticsFacilityServerMetricsLeaderboardConfig = {
   'multi-sort': true,
   'must-sort': false,
 }
+
+export const ProfileAlertsConfig = {
+  ...DataTableConfig,
+  'sort-by': ['instance'],
+  'sort-desc': [true],
+}
diff --git a/constants/Endpoints.ts b/constants/Endpoints.ts
index 7e46f753..9dfc8dea 100644
--- a/constants/Endpoints.ts
+++ b/constants/Endpoints.ts
@@ -28,6 +28,8 @@ export const Endpoints = {
   AGGREGATES_INSTANCE_CHARACTER: '/aggregates/instance/{instance}/character',
   AGGREGATES_INSTANCE_CHARACTER_SINGLE:
     '/aggregates/instance/{instance}/character/{character}',
+  AGGREGATES_INSTANCE_CHARACTER_ALL:
+    '/aggregates/instance/character/{character}',
   AGGREGATES_INSTANCE_COMBAT_HISTORY:
     '/aggregates/instance/{instance}/combat-history',
   AGGREGATES_INSTANCE_FACILITY: '/aggregates/instance/{instance}/facility',
diff --git a/filters/DateTimeFormat.ts b/filters/DateTimeFormat.ts
index 9cc74c36..87e2a805 100644
--- a/filters/DateTimeFormat.ts
+++ b/filters/DateTimeFormat.ts
@@ -2,11 +2,11 @@ import Vue from 'vue'
 import { DATE_TIME_FORMAT, TIME_FORMAT } from '@/constants/Time'
 import { formatDateTime, utcDate } from '~/utilities/TimeHelper'
 
-const dateTimeFormat = Vue.filter('dateTimeFormat', (date: string) => {
+export const dateTimeFormat = Vue.filter('dateTimeFormat', (date: string) => {
   return formatDateTime(utcDate(new Date(date)), DATE_TIME_FORMAT)
 })
 
-const dateTimeFormatShort = Vue.filter(
+export const dateTimeFormatShort = Vue.filter(
   'dateTimeFormatShort',
   (date: string) => {
     return formatDateTime(utcDate(new Date(date)), TIME_FORMAT)
diff --git a/filters/ZoneName.ts b/filters/ZoneName.ts
index f53fd3f8..5f721cfb 100644
--- a/filters/ZoneName.ts
+++ b/filters/ZoneName.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { Zone } from '@/ps2alerts-constants/zone'
 
-const zoneNameFilter = Vue.filter('zoneName', (value: Zone) => {
+export const zoneNameFilter = Vue.filter('zoneName', (value: Zone) => {
   switch (value) {
     case Zone.INDAR:
       return 'Indar'
diff --git a/interfaces/profiles/ProfileMetricsInterface.ts b/interfaces/profiles/ProfileMetricsInterface.ts
new file mode 100644
index 00000000..289c9866
--- /dev/null
+++ b/interfaces/profiles/ProfileMetricsInterface.ts
@@ -0,0 +1,16 @@
+import { PS2AlertsFactionKillDataInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsFactionKillDataInterface'
+import { InstanceCharacterInterface } from '~/ps2alerts-constants/interfaces/api-responses/InstanceCharacterInterface'
+import { CombatMetricsInterface } from '~/ps2alerts-constants/interfaces/CombatMetricsInterface'
+
+interface ProfileCommonMetricsInterface extends CombatMetricsInterface {
+  kd: number // Calculated
+  hsr: number // Calculated
+  factionKills: PS2AlertsFactionKillDataInterface
+}
+
+export interface ProfileMetricsInterface {
+  totals: ProfileCommonMetricsInterface
+  averages: ProfileCommonMetricsInterface
+  lastXAlertsPerformance: ProfileCommonMetricsInterface
+  alerts: InstanceCharacterInterface[]
+}
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index 804a7ccc..1f6324cf 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -14,15 +14,23 @@
           {{ player.character.name }}
         </h1>
       </div>
-      <ProfileLogos
-        :outfit="player.character.outfit"
-        :faction="player.character.faction"
-        :world="player.world"
-      />
-      <div class="col-span-12 2xl:col-span-5 md:col-span-6 card">
-        <div class="tag section">Details</div>
+      <div class="col-span-12 grid grid-cols-12">
+        <div class="col-span-12 lg:col-span-4 lg:col-start-5">
+          <ProfileLogos
+            :outfit="player.character.outfit"
+            :faction="player.character.faction"
+            :world="player.world"
+          />
+        </div>
+      </div>
+      <div class="col-span-12 2xl:col-span-4 md:col-span-6 card">
+        <div class="tag section">Combat Stats</div>
+        <ProfileCombatMetrics :statistics="statistics" />
+      </div>
+      <div class="col-span-12 card">
+        <div class="tag section">Alerts Involved</div>
+        <ProfileAlertsInvolved :statistics="statistics" :player="player" />
       </div>
-      <div class="col-span-12 lg:col-span-7 md:col-span-6">Kill stats</div>
     </div>
   </section>
 </template>
@@ -33,17 +41,24 @@ import ApiRequest from '~/api-request'
 import { Endpoints } from '~/constants/Endpoints'
 import { GlobalCharacterAggregateInterface } from '~/ps2alerts-constants/interfaces/api-responses/GlobalCharacterAggregateInterface'
 import factionTextClass from '~/filters/FactionTextClass'
+import ProfileAlertsInvolved from '~/components/profiles/ProfileAlertsInvolved.vue'
 import ProfileLogos from '~/components/profiles/ProfileLogos.vue'
+import ProfileCombatMetrics from '~/components/profiles/ProfileCombatMetrics.vue'
+import { ProfileMetricsInterface } from '~/interfaces/profiles/ProfileMetricsInterface'
+import { InstanceCharacterInterface } from '~/ps2alerts-constants/interfaces/api-responses/InstanceCharacterInterface'
 
 export default Vue.extend({
   name: 'Player',
   components: {
+    ProfileAlertsInvolved,
     ProfileLogos,
+    ProfileCombatMetrics,
   },
   data() {
     return {
       loaded: false,
       player: {} as GlobalCharacterAggregateInterface,
+      statistics: {} as ProfileMetricsInterface,
       outfitLogoMissing: false,
     }
   },
@@ -73,10 +88,80 @@ export default Vue.extend({
         )
         .then((character) => {
           this.player = character
-          this.loaded = true
-          console.log('loaded!')
-          console.log(character)
         })
+
+      await this.createMetrics(this.player)
+      this.loaded = true
+    },
+    async createMetrics(
+      character: GlobalCharacterAggregateInterface
+    ): Promise<void> {
+      this.statistics = {
+        totals: {
+          kills: 0,
+          deaths: 0,
+          kd: 0,
+          headshots: 0,
+          hsr: 0,
+          teamKills: 0,
+          teamKilled: 0,
+          suicides: 0,
+          factionKills: {
+            vs: {
+              vs: 0,
+              nc: 0,
+              tr: 0,
+              nso: 0,
+            },
+          },
+        },
+        averages: {
+          kills: 0,
+          deaths: 0,
+          kd: 0,
+          headshots: 0,
+          hsr: 0,
+          teamKills: 0,
+          teamKilled: 0,
+          suicides: 0,
+          factionKills: {
+            vs: {
+              vs: 0,
+              nc: 0,
+              tr: 0,
+              nso: 0,
+            },
+          },
+        },
+        lastXAlertsPerformance: {
+          kills: 0,
+          deaths: 0,
+          kd: 0,
+          headshots: 0,
+          hsr: 0,
+          teamKills: 0,
+          teamKilled: 0,
+          suicides: 0,
+          factionKills: {
+            vs: {
+              vs: 0,
+              nc: 0,
+              tr: 0,
+              nso: 0,
+            },
+          },
+        },
+        alerts: await new ApiRequest()
+          .get<InstanceCharacterInterface[]>(
+            `${Endpoints.AGGREGATES_INSTANCE_CHARACTER_ALL.replace(
+              '{character}',
+              character.character.id
+            )}?getDetails=true`
+          )
+          .then((alerts) => {
+            return alerts
+          }),
+      }
     },
   },
 })

From c30fa62fb0005c2a3a1dce89fd50bb55860a039c Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 31 Jul 2023 23:10:03 +0100
Subject: [PATCH 10/36] #489: Fixed sorting logic for search

---
 components/search/SearchBar.vue    | 40 ++++++++++++++----------------
 components/search/SearchResult.vue |  1 +
 ps2alerts-constants                |  2 +-
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 15b21dcd..2fa3ba8e 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -84,7 +84,7 @@ export default defineComponent({
     ): (SearchCharacterInterface | SearchOutfitInterface)[] {
       const searchTermLower = this.searchTerm.toLowerCase()
 
-      characterResults.forEach((result) => {
+      characterResults.map((result) => {
         let score = 0
 
         // Higher weight for exact matches
@@ -97,25 +97,24 @@ export default defineComponent({
         result.faction = result.character.faction
         result.name = result.character.name
         result.tag = result.character?.outfit?.tag ?? undefined
+        return result
       })
 
       // Sort Characters by score
-      characterResults.sort((a, b) =>
-        this.searchScores(a.matchScore, b.matchScore)
-      )
+      characterResults.sort((a, b) => b.matchScore - a.matchScore)
 
-      outfitResults.forEach((result) => {
+      outfitResults.map((result) => {
         let score = 0
 
         // Higher weight for exact matches on tag and name
-        if (
-          result.outfit.tag?.toLowerCase() === searchTermLower ||
-          result.outfit.name.toLowerCase() === searchTermLower
-        ) {
+        // This also handles trolls who name outfits after tags e.g. the outfit "DIGT"
+        if (result.outfit.tag?.toLowerCase() === searchTermLower) {
           score = 100
+        } else if (result.outfit.name.toLowerCase() === searchTermLower) {
+          score = 75
         }
 
-        // If there's a space on the end of the string, rank them lower (e.g. 'Dignity of War Tactical ')
+        // If there's a space on the end of the string, rank them lower (e.g. 'Dignity of War Tactical ') to punish trolling
         if (searchTermLower.endsWith(' ')) {
           score = score / 2
         }
@@ -125,10 +124,17 @@ export default defineComponent({
         result.faction = result.outfit.faction
         result.name = result.outfit.name
         result.tag = result.outfit.tag
+        return result
       })
 
-      return [...characterResults, ...outfitResults].sort((a, b) =>
-        this.searchScores(a.matchScore, b.matchScore)
+      outfitResults.sort((a, b) => b.matchScore - a.matchScore)
+
+      // Trim results to top 5 results
+      outfitResults = outfitResults.slice(0, 5)
+      characterResults = characterResults.slice(0, 5)
+
+      return [...characterResults, ...outfitResults].sort(
+        (a, b) => b.matchScore - a.matchScore
       )
     },
     clear() {
@@ -209,10 +215,6 @@ export default defineComponent({
           return
         }
 
-        // Limit the results to the top 5 so we're not rendering a million things
-        characterResults.splice(5)
-        outfitResults.splice(5)
-
         // Parse the results into a SearchResult component friendly format
         this.results = this.parseResults(characterResults, outfitResults)
         this.loading = false
@@ -225,12 +227,6 @@ export default defineComponent({
         }
       }
     },
-    searchScores(a: number | undefined, b: number | undefined): number {
-      if (a && b) {
-        return b - a
-      }
-      return 0
-    },
   },
 })
 </script>
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index 46d49cc3..c647f754 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -2,6 +2,7 @@
   <div
     class="my-2 py-2 text-center cursor-pointer hover border"
     :class="classes"
+    :score="result.matchScore"
   >
     <NuxtLink :to="link">
       <p class="m-0">
diff --git a/ps2alerts-constants b/ps2alerts-constants
index a701d39f..9aad37ee 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit a701d39f03a9b921a001ad987c37d9bc3a09acfc
+Subproject commit 9aad37ee2218396dbc272a8916a712518157ab81

From 98b3da0c66f188b43accc35d9d9404fa99ee8c9e Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Wed, 2 Aug 2023 17:48:26 +0100
Subject: [PATCH 11/36] Updated chartJS library and the victories timeline to
 the new format. Closes #319

---
 components/BarChart.js                        |   30 -
 components/LineChart.js                       |   30 -
 .../victories/VictoriesTimeline.vue           |  145 +-
 nuxt.config.js                                |    1 +
 package.json                                  |   10 +-
 plugins/chart.js                              |   44 +
 yarn.lock                                     | 3924 ++++++++++-------
 7 files changed, 2332 insertions(+), 1852 deletions(-)
 delete mode 100644 components/BarChart.js
 delete mode 100644 components/LineChart.js
 create mode 100644 plugins/chart.js

diff --git a/components/BarChart.js b/components/BarChart.js
deleted file mode 100644
index f1e82493..00000000
--- a/components/BarChart.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable import/named */
-import { Bar, mixins } from 'vue-chartjs'
-import 'chartjs-plugin-annotation'
-const { reactiveProp } = mixins
-
-export default {
-  extends: Bar,
-  mixins: [reactiveProp],
-  props: {
-    chartData: {
-      type: Object,
-      default: null,
-    },
-    options: {
-      type: Object,
-      default: null,
-    },
-  },
-  mounted() {
-    // this.chartData is created in the mixin.
-    // If you want to pass options please create a local options object
-    this.renderChart(this.chartData, this.options)
-  },
-  watch: {
-    options() {
-      console.log('chart updated')
-      this.update()
-    },
-  },
-}
diff --git a/components/LineChart.js b/components/LineChart.js
deleted file mode 100644
index 56b1b80c..00000000
--- a/components/LineChart.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/* eslint-disable import/named */
-import { Line, mixins } from 'vue-chartjs'
-import 'chartjs-plugin-annotation'
-const { reactiveProp } = mixins
-
-export default {
-  extends: Line,
-  mixins: [reactiveProp],
-  props: {
-    chartData: {
-      type: Object,
-      default: null,
-    },
-    options: {
-      type: Object,
-      default: null,
-    },
-  },
-  mounted() {
-    // this.chartData is created in the mixin.
-    // If you want to pass options please create a local options object
-    this.renderChart(this.chartData, this.options)
-  },
-  watch: {
-    options() {
-      console.log('chart updated')
-      this.update()
-    },
-  },
-}
diff --git a/components/statistics/victories/VictoriesTimeline.vue b/components/statistics/victories/VictoriesTimeline.vue
index a42f2e73..f72eb6df 100644
--- a/components/statistics/victories/VictoriesTimeline.vue
+++ b/components/statistics/victories/VictoriesTimeline.vue
@@ -21,12 +21,11 @@
             @time-granularity-changed="updateTimeGranularity"
           />
         </div>
-
-        <line-chart
+        <LineChart
           :chart-data="dataCollection"
-          :options="chartOptions"
-          style="width: 100%; height: 350px"
-        ></line-chart>
+          :chart-options="chartOptions"
+          :styles="{ width: '100%', height: '350px' }"
+        ></LineChart>
       </div>
       <div v-if="!loaded" class="flex justify-center place-items-center h-full">
         <h1 class="mb-4">Loading...</h1>
@@ -38,10 +37,9 @@
 <script lang="ts">
 /* eslint-disable import/no-named-as-default-member */
 import Vue, { PropOptions } from 'vue'
-import { differenceInDays, formatISO } from 'date-fns'
+import { differenceInDays } from 'date-fns'
 import { GlobalVictoriesAggregateResponseInterface } from '~/interfaces/aggregates/global/GlobalVictoriesAggregateResponseInterface'
 import { FactionMetricsInterface } from '~/interfaces/FactionMetricsInterface'
-import LineChart from '~/components/LineChart'
 import { DATE_FORMAT_ISO, TIME_GRANULARITY } from '@/constants/Time'
 import { World } from '@/ps2alerts-constants/world'
 import { Bracket } from '@/ps2alerts-constants/bracket'
@@ -64,7 +62,6 @@ export default Vue.extend({
     FilterBracket,
     CountdownSpinner,
     FilterWorld,
-    LineChart,
   },
   props: {
     rawData: {
@@ -99,53 +96,46 @@ export default Vue.extend({
       chartOptions: {
         responsive: true,
         maintainAspectRatio: false,
-        tooltips: {
-          mode: 'x',
+        interaction: {
+          intersect: false,
+          mode: 'index',
+        },
+        plugins: {
+          legend: {
+            labels: {
+              color: '#fff',
+            },
+          },
+          datalabels: {
+            display: false,
+          },
         },
         scales: {
-          xAxes: [
-            {
-              type: 'time',
-              time: {
-                unit: TIME_GRANULARITY.WEEK,
-              },
-              min: formatDateTime(
-                utcDate(new Date('2021-01-04')),
-                DATE_FORMAT_ISO
-              ),
-              max: formatDateTime(utcDate(new Date()), DATE_FORMAT_ISO),
-              ticks: {
-                fontColor: '#fff',
-                source: 'labels',
-              },
-              gridLines: {
-                display: true,
-                color: '#444b52',
-              },
-              scaleLabel: {
-                display: false,
-              },
+          x: {
+            type: 'timeseries',
+            distribution: 'linear',
+            time: {
+              unit: TIME_GRANULARITY.WEEK,
             },
-          ],
-          yAxes: [
-            {
-              ticks: {
-                fontColor: '#fff',
-              },
-              gridLines: {
-                color: '#718096',
-              },
-              scaleLabel: {
-                display: true,
-                labelString: 'Victories',
-                fontColor: '#fff',
-              },
+            min: formatDateTime(
+              utcDate(new Date('2021-01-04')),
+              DATE_FORMAT_ISO
+            ),
+            max: formatDateTime(utcDate(new Date()), DATE_FORMAT_ISO),
+            ticks: {
+              color: '#fff',
+            },
+            grid: {
+              color: '#50565d',
+            },
+          },
+          y: {
+            ticks: {
+              color: '#fff',
+            },
+            grid: {
+              color: '#7b8694',
             },
-          ],
-        },
-        legend: {
-          labels: {
-            fontColor: '#fff',
           },
         },
       },
@@ -165,10 +155,6 @@ export default Vue.extend({
       this.render()
     },
     selectedTimeOption(): void {
-      console.log(
-        'VictoriesTimeline: Time option changed to',
-        this.selectedTimeOption
-      )
       this.render()
     },
   },
@@ -277,33 +263,30 @@ export default Vue.extend({
       this.worldCounts = worldCounts
     },
     buildCollection() {
-      const times: string[] = []
-      const vsData: number[] = []
-      const ncData: number[] = []
-      const trData: number[] = []
-      const drawData: number[] = []
+      const vsData: { x: string; y: number }[] = []
+      const ncData: { x: string; y: number }[] = []
+      const trData: { x: string; y: number }[] = []
+      const drawData: { x: string; y: number }[] = []
 
       for (const [key, row] of Object.entries(this.totalCounts)) {
-        times.push(formatISO(new Date(key)))
         const rowTyped = row as FactionMetricsInterface
-        vsData.push(rowTyped.vs)
-        ncData.push(rowTyped.nc)
-        trData.push(rowTyped.tr)
-        drawData.push(rowTyped.draws)
+        vsData.push({ x: key, y: rowTyped.vs })
+        ncData.push({ x: key, y: rowTyped.nc })
+        trData.push({ x: key, y: rowTyped.tr })
+        drawData.push({ x: key, y: rowTyped.draws })
       }
 
       const commonDatasetOptions = {
-        pointBorderWidth: 2,
-        pointHoverBorderWidth: 4,
-        lineTension: 0,
+        pointBorderWidth: 3,
+        pointHoverBorderWidth: 5,
       }
 
       this.dataCollection = {
-        labels: times,
         datasets: [
           {
             ...commonDatasetOptions,
             label: 'VS',
+            backgroundColor: '#6B46C1',
             borderColor: '#6B46C1',
             data: vsData,
             pointStyle: 'circle',
@@ -311,28 +294,25 @@ export default Vue.extend({
           {
             ...commonDatasetOptions,
             label: 'TR',
+            backgroundColor: '#9b2c2c',
             borderColor: '#9b2c2c',
             data: trData,
             pointStyle: 'rect',
-            pointBorderWidth: 2,
-            pointHoverBorderWidth: 4,
           },
           {
             ...commonDatasetOptions,
             label: 'NC',
+            backgroundColor: '#2b6cb0',
             borderColor: '#2b6cb0',
             data: ncData,
-            pointStyle: 'triangle',
-            pointBorderWidth: 2,
-            pointHoverBorderWidth: 4,
+            pointStyle: 'rectRot',
           },
           {
             ...commonDatasetOptions,
             label: 'Draws',
+            backgroundColor: '#4a5568',
             borderColor: '#4a5568',
             data: drawData,
-            pointBorderWidth: 2,
-            pointHoverBorderWidth: 4,
           },
         ],
       }
@@ -342,18 +322,11 @@ export default Vue.extend({
       const objectKeys = Object.keys(this.totalCounts)
 
       // For some reason Object.keys puts the result in reverse of actuality...
-      const firstObject = objectKeys[objectKeys.length - 1]
-      const firstObjectDate = formatISO(new Date(firstObject))
-
-      const lastObject = objectKeys[0]
-      const lastObjectDate = formatISO(new Date(lastObject))
-      this.chartOptions.scales.xAxes[0].min = firstObjectDate
-      this.chartOptions.scales.xAxes[0].max = lastObjectDate
+      this.chartOptions.scales.x.min = objectKeys[0]
+      this.chartOptions.scales.x.max = objectKeys[objectKeys.length - 1]
 
       // Change unit based off data type
-      this.chartOptions.scales.xAxes[0].time.unit = this.selectedTimeOption
-
-      // console.log('chartOptions', this.chartOptions.scales.xAxes[0])
+      this.chartOptions.scales.x.time.unit = this.selectedTimeOption
     },
     updateWorld(world: World) {
       this.selectedWorld = world
diff --git a/nuxt.config.js b/nuxt.config.js
index deea0139..171e8101 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -116,6 +116,7 @@ export default {
     { src: '@/filters/WorldImage', mode: 'client' },
     { src: '@/filters/ZoneName', mode: 'client' },
     { src: '@/plugins/NumeralFilter', mode: 'client' },
+    { src: '@/plugins/chart.js', mode: 'client' },
   ],
 
   // Auto import components (https://go.nuxtjs.dev/config-components)
diff --git a/package.json b/package.json
index 06ef3705..3ebe3b42 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ps2alerts-website",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "private": true,
   "license": "GNU",
   "scripts": {
@@ -25,16 +25,18 @@
     "@nuxtjs/google-gtag": "^1.0.4",
     "@svgdotjs/svg.filter.js": "^3.0.8",
     "@svgdotjs/svg.js": "^3.1.2",
-    "chart.js": "2.9.4",
-    "chartjs-plugin-annotation": "^0.5.7",
+    "chart.js": "^3.8.0",
+    "chartjs-adapter-date-fns": "^3.0.0",
+    "chartjs-plugin-datalabels": "^2.2.0",
     "core-js": "^3.30.2",
     "date-fns": "^2.30.0",
     "date-fns-tz": "^2.0.0",
+    "hchs-vue-charts": "^1.2.8",
     "leaflet": "^1.9.4",
     "memory-fs": "^0.5.0",
     "nuxt": "^2.16.3",
     "nuxt-leaflet": "^0.0.27",
-    "vue-chartjs": "^3.5.1",
+    "vue-chartjs": "^4.1.1",
     "vue-numeral-filter": "^2.0.0",
     "vue2-leaflet": "^2.7.1",
     "vuejs-datatable": "^2.0.0-alpha.7",
diff --git a/plugins/chart.js b/plugins/chart.js
new file mode 100644
index 00000000..80b424da
--- /dev/null
+++ b/plugins/chart.js
@@ -0,0 +1,44 @@
+import Vue from 'vue'
+import { Line, Pie, Bar } from 'vue-chartjs/legacy'
+import 'chartjs-adapter-date-fns'
+import ChartDataLabels from 'chartjs-plugin-datalabels'
+
+import {
+  Chart as ChartJS,
+  Title,
+  Tooltip,
+  Legend,
+  BarElement,
+  CategoryScale,
+  LinearScale,
+  LineElement,
+  PointElement,
+  ArcElement,
+  TimeSeriesScale,
+} from 'chart.js'
+
+ChartJS.register(
+  Title,
+  Tooltip,
+  Legend,
+  PointElement,
+  BarElement,
+  LineElement,
+  ArcElement,
+  CategoryScale,
+  TimeSeriesScale,
+  LinearScale,
+  ChartDataLabels
+)
+
+Vue.component('LineChart', {
+  extends: Line,
+})
+
+Vue.component('PieChart', {
+  extends: Pie,
+})
+
+Vue.component('BarChart', {
+  extends: Bar,
+})
diff --git a/yarn.lock b/yarn.lock
index dd4c9ba3..e9ce08e2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,309 +2,294 @@
 # yarn lockfile v1
 
 
+"@aashutoshrathi/word-wrap@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+  integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
+"@alloc/quick-lru@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
+  integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
+
 "@ampproject/remapping@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.8.3":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
-  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.5.tgz#234d98e1551960604f1246e6475891a570ad5658"
+  integrity sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==
   dependencies:
-    "@babel/highlight" "^7.18.6"
+    "@babel/highlight" "^7.22.5"
 
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.0", "@babel/compat-data@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
-  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
+"@babel/compat-data@^7.22.5", "@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+  integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
 
-"@babel/core@^7.12.16", "@babel/core@^7.19.0", "@babel/core@^7.21.3":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
-  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
+"@babel/core@^7.12.16", "@babel/core@^7.19.0", "@babel/core@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.9.tgz#bd96492c68822198f33e8a256061da3cf391f58f"
+  integrity sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.4"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.4"
-    "@babel/types" "^7.21.4"
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-transforms" "^7.22.9"
+    "@babel/helpers" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.8"
+    "@babel/types" "^7.22.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.2"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
 "@babel/eslint-parser@^7.12.16", "@babel/eslint-parser@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz#d79e822050f2de65d7f368a076846e7184234af7"
-  integrity sha512-kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg==
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.9.tgz#75f8aa978d1e76c87cc6f26c1ea16ae58804d390"
+  integrity sha512-xdMkt39/nviO/4vpVdrEYPwXCsYIXSSAr6mC7WQsNIlGnuxKyKE7GZjalcnbSWiC4OXGNNN3UQPeHfjSC6sTDA==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
-    semver "^6.3.0"
+    semver "^6.3.1"
 
-"@babel/generator@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
-  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
+"@babel/generator@^7.22.7", "@babel/generator@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.9.tgz#572ecfa7a31002fa1de2a9d91621fd895da8493d"
+  integrity sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==
   dependencies:
-    "@babel/types" "^7.21.4"
+    "@babel/types" "^7.22.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
-  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
   dependencies:
-    "@babel/types" "^7.18.6"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
-  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz#a3f4758efdd0190d8927fcffd261755937c71878"
+  integrity sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
-  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
+"@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz#f9d0a7aaaa7cd32a3f31c9316a69f5a9bcacb892"
+  integrity sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==
   dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-validator-option" "^7.21.0"
-    browserslist "^4.21.3"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-validator-option" "^7.22.5"
+    browserslist "^4.21.9"
     lru-cache "^5.1.1"
-    semver "^6.3.0"
-
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18"
-  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-member-expression-to-functions" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5"
-  integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
+    semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.5", "@babel/helper-create-class-features-plugin@^7.22.6":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.9.tgz#c36ea240bb3348f942f08b0fbe28d6d979fab236"
+  integrity sha512-Pwyi89uO4YrGKxL/eNJ8lfEH55DnRloGPOseaA8NFNL6jAUnn+KccaISiFazCj5IolPPDjGSdzQzXVzODVRqUQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6"
+  integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
     regexpu-core "^5.3.1"
+    semver "^6.3.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.3":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
-  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-define-polyfill-provider@^0.4.2":
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7"
+  integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
-    semver "^6.1.2"
-
-"@babel/helper-environment-visitor@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
-  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
-
-"@babel/helper-explode-assignable-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
-  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
-  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
-  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
-  dependencies:
-    "@babel/types" "^7.21.0"
-
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
-  integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
-  dependencies:
-    "@babel/types" "^7.21.4"
 
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
-  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-simple-access" "^7.20.2"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/helper-validator-identifier" "^7.19.1"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.2"
-    "@babel/types" "^7.21.2"
-
-"@babel/helper-optimise-call-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
-  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
-  dependencies:
-    "@babel/types" "^7.18.6"
+"@babel/helper-environment-visitor@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+  integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
-  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
-
-"@babel/helper-remap-async-to-generator@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
-  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
+"@babel/helper-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-wrap-function" "^7.18.9"
-    "@babel/types" "^7.18.9"
-
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
-  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-member-expression-to-functions" "^7.20.7"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
-  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
-  dependencies:
-    "@babel/types" "^7.20.0"
-
-"@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
-"@babel/helper-string-parser@^7.19.4":
-  version "7.19.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
-  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-option@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
-  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
-
-"@babel/helper-wrap-function@^7.18.9":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
-  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
   dependencies:
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/template" "^7.18.10"
-    "@babel/traverse" "^7.20.5"
-    "@babel/types" "^7.20.5"
+    "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+  integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+  integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+  dependencies:
+    "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
-  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+  integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-validator-identifier" "^7.22.5"
+
+"@babel/helper-optimise-call-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+  integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-remap-async-to-generator@^7.22.5":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
+  integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-wrap-function" "^7.22.9"
+
+"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
+  integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-member-expression-to-functions" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+
+"@babel/helper-simple-access@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
+"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+  integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+  integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helper-wrap-function@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.9.tgz#189937248c45b0182c1dcf32f3444ca153944cb9"
+  integrity sha512-sZ+QzfauuUEfxSEjKFmi3qDSHgLsTPK/pEpoD/qonZKOtTPTLbf59oabPQ4rKekt9lFcj/hTZaOhWwFYrgjk+Q==
+  dependencies:
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/template" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/helpers@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.6.tgz#8e61d3395a4f0c5a8060f309fb008200969b5ecd"
+  integrity sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/template" "^7.22.5"
+    "@babel/traverse" "^7.22.6"
+    "@babel/types" "^7.22.5"
+
+"@babel/highlight@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.5.tgz#aa6c05c5407a67ebce408162b7ede789b4d22031"
+  integrity sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
-  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
+"@babel/parser@^7.1.0", "@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.7.tgz#df8cf085ce92ddbdbf668a7f186ce848c9036cae"
+  integrity sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
-  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
+  integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
-  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
+  integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
-
-"@babel/plugin-proposal-async-generator-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
-  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
-  dependencies:
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.5"
 
 "@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
@@ -314,57 +299,16 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
-  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-class-static-block" "^7.14.5"
-
-"@babel/plugin-proposal-decorators@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz#70e0c89fdcd7465c97593edb8f628ba6e4199d63"
-  integrity sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/plugin-syntax-decorators" "^7.21.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
-  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
-  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
-  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
-  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
+"@babel/plugin-proposal-decorators@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.7.tgz#9b5b73c2e404f0869ef8a8a53765f8203c5467a7"
+  integrity sha512-omXqPF7Onq4Bb7wHxXjM3jSMSJvUUbvDvmmds7KI5n9Cq6Ln5I05I1W2nRlRof1rGdiUxJrxwe285WF96XlBXQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.22.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/plugin-syntax-decorators" "^7.22.5"
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
   version "7.18.6"
@@ -374,34 +318,7 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
-  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
-  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0":
+"@babel/plugin-proposal-optional-chaining@^7.21.0":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -418,17 +335,22 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
-  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+  version "7.21.0-placeholder-for-preset-env.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+  integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+
+"@babel/plugin-proposal-private-property-in-object@^7.21.11":
+  version "7.21.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     "@babel/helper-create-class-features-plugin" "^7.21.0"
     "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
@@ -457,12 +379,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz#d2b3f31c3e86fa86e16bb540b7660c55bd7d0e78"
-  integrity sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==
+"@babel/plugin-syntax-decorators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz#329fe2907c73de184033775637dbbc507f09116a"
+  integrity sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
@@ -478,12 +400,26 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@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"
-  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+"@babel/plugin-syntax-import-assertions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+  integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
+  integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
@@ -493,11 +429,11 @@
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-jsx@^7.2.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
-  integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+  integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
@@ -555,301 +491,434 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+  integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
-  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
+"@babel/plugin-transform-arrow-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+  integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
   dependencies:
-    "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-remap-async-to-generator" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
-  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+"@babel/plugin-transform-async-generator-functions@^7.22.7":
+  version "7.22.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.7.tgz#053e76c0a903b72b573cb1ab7d6882174d460a1b"
+  integrity sha512-7HmE7pk/Fmke45TODvxvkxRMV9RazV+ZZzhOL9AG8G29TLrr3jkjwF7uJfxZ30EoXpO+LJkq4oA8NjO2DTnEDg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-transform-block-scoping@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
-  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
+"@babel/plugin-transform-async-to-generator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+  integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-remap-async-to-generator" "^7.22.5"
 
-"@babel/plugin-transform-classes@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
-  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+  integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-replace-supers" "^7.20.7"
-    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz#8bfc793b3a4b2742c0983fadc1480d843ecea31b"
+  integrity sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
+  integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz#3e40c46f048403472d6f4183116d5e46b1bff5ba"
+  integrity sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
+  integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.6"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+"@babel/plugin-transform-computed-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+  integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/template" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/template" "^7.22.5"
 
-"@babel/plugin-transform-destructuring@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
-  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
+"@babel/plugin-transform-destructuring@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz#d3aca7438f6c26c78cdd0b0ba920a336001b27cc"
+  integrity sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
-  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+"@babel/plugin-transform-dotall-regex@^7.22.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+  integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
-  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+  integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
-  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+"@babel/plugin-transform-dynamic-import@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz#d6908a8916a810468c4edff73b5b75bda6ad393e"
+  integrity sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-transform-for-of@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+  integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
-  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+"@babel/plugin-transform-export-namespace-from@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz#57c41cb1d0613d22f548fddd8b288eedb9973a5b"
+  integrity sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
-  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+"@babel/plugin-transform-for-of@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
+  integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
-  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+"@babel/plugin-transform-function-name@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+  integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-amd@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
-  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
+"@babel/plugin-transform-json-strings@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz#14b64352fdf7e1f737eed68de1a1468bd2a77ec0"
+  integrity sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==
   dependencies:
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
+"@babel/plugin-transform-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+  integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-modules-systemjs@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
-  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
+"@babel/plugin-transform-logical-assignment-operators@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz#66ae5f068fd5a9a5dc570df16f56c2a8462a9d6c"
+  integrity sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-transform-modules-umd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
-  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+  integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
-  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+"@babel/plugin-transform-modules-amd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
+  integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-new-target@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
-  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+"@babel/plugin-transform-modules-commonjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz#7d9875908d19b8c0536085af7b053fd5bd651bfa"
+  integrity sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-simple-access" "^7.22.5"
 
-"@babel/plugin-transform-object-super@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
-  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+"@babel/plugin-transform-modules-systemjs@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz#18c31410b5e579a0092638f95c896c2a98a5d496"
+  integrity sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/helper-replace-supers" "^7.18.6"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
 
-"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
-  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
+"@babel/plugin-transform-modules-umd@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+  integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-property-literals@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
-  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+  integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-regenerator@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+"@babel/plugin-transform-new-target@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+  integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz#f8872c65776e0b552e0849d7596cddd416c3e381"
+  integrity sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
+
+"@babel/plugin-transform-numeric-separator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz#57226a2ed9e512b9b446517ab6fa2d17abb83f58"
+  integrity sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
+
+"@babel/plugin-transform-object-rest-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz#9686dc3447df4753b0b2a2fae7e8bc33cdc1f2e1"
+  integrity sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==
+  dependencies:
+    "@babel/compat-data" "^7.22.5"
+    "@babel/helper-compilation-targets" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.22.5"
+
+"@babel/plugin-transform-object-super@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+  integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-replace-supers" "^7.22.5"
+
+"@babel/plugin-transform-optional-catch-binding@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz#842080be3076703be0eaf32ead6ac8174edee333"
+  integrity sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+
+"@babel/plugin-transform-optional-chaining@^7.22.5", "@babel/plugin-transform-optional-chaining@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.6.tgz#4bacfe37001fe1901117672875e931d439811564"
+  integrity sha512-Vd5HiWml0mDVtcLHIoEU5sw6HOUW/Zk0acLs/SAeuLzkGNOPc9DB4nkUajemhCmTIz3eiaKREZn2hQQqF79YTg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+
+"@babel/plugin-transform-parameters@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
+  integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-methods@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
+  integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-private-property-in-object@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz#07a77f28cbb251546a43d175a1dda4cf3ef83e32"
+  integrity sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.22.5"
+    "@babel/helper-create-class-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-transform-property-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+  integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-regenerator@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz#cd8a68b228a5f75fa01420e8cc2fc400f0fc32aa"
+  integrity sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.22.5"
     regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
-  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
+"@babel/plugin-transform-reserved-words@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+  integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-runtime@^7.21.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa"
-  integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA==
+"@babel/plugin-transform-runtime@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.9.tgz#a87b11e170cbbfb018e6a2bf91f5c6e533b9e027"
+  integrity sha512-9KjBH61AGJetCPYp/IEyLEp47SyybZb0nDRpBvmtEkm+rUIwxdlKpyNHI1TmsGkeuLclJdleQHRZ8XLBnnh8CQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.21.4"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    semver "^6.3.0"
+    "@babel/helper-module-imports" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.4"
+    babel-plugin-polyfill-corejs3 "^0.8.2"
+    babel-plugin-polyfill-regenerator "^0.5.1"
+    semver "^6.3.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
-  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+  integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-spread@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
-  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+"@babel/plugin-transform-spread@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+  integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
 
-"@babel/plugin-transform-sticky-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
-  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+"@babel/plugin-transform-sticky-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+  integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-template-literals@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
-  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+"@babel/plugin-transform-template-literals@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+  integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
-  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+  integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+"@babel/plugin-transform-unicode-escapes@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz#ce0c248522b1cb22c7c992d88301a5ead70e806c"
+  integrity sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/plugin-transform-unicode-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
-  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+"@babel/plugin-transform-unicode-property-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
+  integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
 
-"@babel/preset-env@^7.20.2":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58"
-  integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
+"@babel/plugin-transform-unicode-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+  integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
   dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
-    "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-class-static-block" "^7.21.0"
-    "@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.20.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
-    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
-    "@babel/plugin-proposal-optional-chaining" "^7.21.0"
-    "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
+  integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+    "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/preset-env@^7.22.9":
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.9.tgz#57f17108eb5dfd4c5c25a44c1977eba1df310ac7"
+  integrity sha512-wNi5H/Emkhll/bqPjsjQorSykrlfY5OWakd6AulLvMEytpKasMVUpVy8RL4qBIBs5Ac6/5i0/Rv0b/Fg6Eag/g==
+  dependencies:
+    "@babel/compat-data" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-plugin-utils" "^7.22.5"
+    "@babel/helper-validator-option" "^7.22.5"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+    "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
     "@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.20.0"
+    "@babel/plugin-syntax-import-assertions" "^7.22.5"
+    "@babel/plugin-syntax-import-attributes" "^7.22.5"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@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"
@@ -859,50 +928,67 @@
     "@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.20.7"
-    "@babel/plugin-transform-async-to-generator" "^7.20.7"
-    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.21.0"
-    "@babel/plugin-transform-classes" "^7.21.0"
-    "@babel/plugin-transform-computed-properties" "^7.20.7"
-    "@babel/plugin-transform-destructuring" "^7.21.3"
-    "@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.21.0"
-    "@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.20.11"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
-    "@babel/plugin-transform-modules-systemjs" "^7.20.11"
-    "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
-    "@babel/plugin-transform-new-target" "^7.18.6"
-    "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.21.3"
-    "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.20.5"
-    "@babel/plugin-transform-reserved-words" "^7.18.6"
-    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.20.7"
-    "@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.10"
-    "@babel/plugin-transform-unicode-regex" "^7.18.6"
+    "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+    "@babel/plugin-transform-arrow-functions" "^7.22.5"
+    "@babel/plugin-transform-async-generator-functions" "^7.22.7"
+    "@babel/plugin-transform-async-to-generator" "^7.22.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
+    "@babel/plugin-transform-block-scoping" "^7.22.5"
+    "@babel/plugin-transform-class-properties" "^7.22.5"
+    "@babel/plugin-transform-class-static-block" "^7.22.5"
+    "@babel/plugin-transform-classes" "^7.22.6"
+    "@babel/plugin-transform-computed-properties" "^7.22.5"
+    "@babel/plugin-transform-destructuring" "^7.22.5"
+    "@babel/plugin-transform-dotall-regex" "^7.22.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.22.5"
+    "@babel/plugin-transform-dynamic-import" "^7.22.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
+    "@babel/plugin-transform-export-namespace-from" "^7.22.5"
+    "@babel/plugin-transform-for-of" "^7.22.5"
+    "@babel/plugin-transform-function-name" "^7.22.5"
+    "@babel/plugin-transform-json-strings" "^7.22.5"
+    "@babel/plugin-transform-literals" "^7.22.5"
+    "@babel/plugin-transform-logical-assignment-operators" "^7.22.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.22.5"
+    "@babel/plugin-transform-modules-amd" "^7.22.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.22.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.22.5"
+    "@babel/plugin-transform-modules-umd" "^7.22.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+    "@babel/plugin-transform-new-target" "^7.22.5"
+    "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.5"
+    "@babel/plugin-transform-numeric-separator" "^7.22.5"
+    "@babel/plugin-transform-object-rest-spread" "^7.22.5"
+    "@babel/plugin-transform-object-super" "^7.22.5"
+    "@babel/plugin-transform-optional-catch-binding" "^7.22.5"
+    "@babel/plugin-transform-optional-chaining" "^7.22.6"
+    "@babel/plugin-transform-parameters" "^7.22.5"
+    "@babel/plugin-transform-private-methods" "^7.22.5"
+    "@babel/plugin-transform-private-property-in-object" "^7.22.5"
+    "@babel/plugin-transform-property-literals" "^7.22.5"
+    "@babel/plugin-transform-regenerator" "^7.22.5"
+    "@babel/plugin-transform-reserved-words" "^7.22.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.22.5"
+    "@babel/plugin-transform-spread" "^7.22.5"
+    "@babel/plugin-transform-sticky-regex" "^7.22.5"
+    "@babel/plugin-transform-template-literals" "^7.22.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.22.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.22.5"
+    "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-regex" "^7.22.5"
+    "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.21.4"
-    babel-plugin-polyfill-corejs2 "^0.3.3"
-    babel-plugin-polyfill-corejs3 "^0.6.0"
-    babel-plugin-polyfill-regenerator "^0.4.1"
-    core-js-compat "^3.25.1"
-    semver "^6.3.0"
+    "@babel/types" "^7.22.5"
+    babel-plugin-polyfill-corejs2 "^0.4.4"
+    babel-plugin-polyfill-corejs3 "^0.8.2"
+    babel-plugin-polyfill-regenerator "^0.5.1"
+    core-js-compat "^3.31.0"
+    semver "^6.3.1"
 
 "@babel/preset-modules@^0.1.5":
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
-  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6.tgz#31bcdd8f19538437339d17af00d177d854d9d458"
+  integrity sha512-ID2yj6K/4lKfhuU3+EX4UvNbIt7eACFbHmNUjzA+ep+B5971CknnA/9DEWKbRokfbbtblxxxXFJJrH47UEAMVg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -915,277 +1001,296 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+"@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.6", "@babel/runtime@^7.8.4":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438"
+  integrity sha512-wDb5pWm4WDdF6LFUde3Jl8WzPA+3ZbxYqkC6xAXuD3irdEHN1k0NfTRrJD8ZD378SJ61miMLCqIOXYhd8x+AJQ==
   dependencies:
     regenerator-runtime "^0.13.11"
 
 "@babel/standalone@^7.19.0":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.21.4.tgz#f1a7131775df87c526cc393c36d013acd2b3c609"
-  integrity sha512-Rw4nGqH/iyVeYxARKcz7iGP+njkPsVqJ45TmXMONoGoxooWjXCAs+CUcLeAZdBGCLqgaPvHKCYvIaDT2Iq+KfA==
-
-"@babel/template@^7.18.10", "@babel/template@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
-  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-
-"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
-  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
-  dependencies:
-    "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.4"
-    "@babel/types" "^7.21.4"
+  version "7.22.9"
+  resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.22.9.tgz#8ac034a30867dc50ff5a7904d771832edcd7a192"
+  integrity sha512-RRUFpN2WiHaczMqIhmy7VoruvSw+c3NSq6BczondQ6elJXtKzr9cAWWsWWZvtZ/rYFQpoQlch5VxQe4aWTt8LA==
+
+"@babel/template@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+  integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/parser" "^7.22.5"
+    "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.22.6", "@babel/traverse@^7.22.8":
+  version "7.22.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.8.tgz#4d4451d31bc34efeae01eac222b514a77aa4000e"
+  integrity sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==
+  dependencies:
+    "@babel/code-frame" "^7.22.5"
+    "@babel/generator" "^7.22.7"
+    "@babel/helper-environment-visitor" "^7.22.5"
+    "@babel/helper-function-name" "^7.22.5"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.22.7"
+    "@babel/types" "^7.22.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.4.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
-  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
+"@babel/types@^7.0.0", "@babel/types@^7.19.0", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.4.4":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.5.tgz#cd93eeaab025880a3a47ec881f4b096a5b786fbe"
+  integrity sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==
   dependencies:
-    "@babel/helper-string-parser" "^7.19.4"
-    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.5"
     to-fast-properties "^2.0.0"
 
-"@csstools/cascade-layer-name-parser@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.1.tgz#5957adeb71be8159e543d37a9c48e124dcd6c32e"
-  integrity sha512-SAAi5DpgJJWkfTvWSaqkgyIsTawa83hMwKrktkj6ra2h+q6ZN57vOGZ6ySHq6RSo+CbP64fA3aPChPBRDDUgtw==
-
-"@csstools/color-helpers@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-1.0.0.tgz#7097722a51da1e9e622345ca000261f1ae6e8f58"
-  integrity sha512-tgqtiV8sU/VaWYjOB3O7PWs7HR/MmOLl2kTYRW2qSsTSEniJq7xmyAYFB1LPpXvvQcE5u2ih2dK9fyc8BnrAGQ==
+"@csstools/cascade-layer-name-parser@^1.0.3", "@csstools/cascade-layer-name-parser@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.4.tgz#3ff490b84660dc0592b4315029f22908f3de0577"
+  integrity sha512-zXMGsJetbLoXe+gjEES07MEGjL0Uy3hMxmnGtVBrRpVKr5KV9OgCB09zr/vLrsEtoVQTgJFewxaU8IYSAE4tjg==
 
-"@csstools/color-helpers@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-2.0.0.tgz#4ac578cb00b4e853b94f2250267d85ba957c4fc9"
-  integrity sha512-VcPjEnp07RNgz/D+oI2uIALg+IPCSl6mj0XhA3pl3F2bM2B95vgzatExmmzSg/X0zkh+R2v+jFY/J2pV/bnwpw==
+"@csstools/color-helpers@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-3.0.0.tgz#b64a9d86663b6d843b169f5da300f78c0242efc2"
+  integrity sha512-rBODd1rY01QcenD34QxbQxLc1g+Uh7z1X/uzTHNQzJUnFCT9/EZYI7KWq+j0YfWMXJsRJ8lVkqBcB0R/qLr+yg==
 
-"@csstools/css-calc@^1.0.0", "@csstools/css-calc@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.0.1.tgz#c478dbfb2c10e22741b261b2a64998960d69bfc7"
-  integrity sha512-VBI8X0bmStfc85wWTa2bsbnlBQxgW4FmJ0Ts9ar9UqytE6kii3yg6GO+wpgzht2oK5Qlbpkm1Fy2kcqVmu6f3Q==
+"@csstools/css-calc@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.3.tgz#75e07eec075f1f3df0ce25575dab3d63da2bd680"
+  integrity sha512-7mJZ8gGRtSQfQKBQFi5N0Z+jzNC0q8bIkwojP1W0w+APzEqHu5wJoGVsvKxVnVklu9F8tW1PikbBRseYnAdv+g==
 
-"@csstools/css-color-parser@^1.0.0", "@csstools/css-color-parser@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.1.0.tgz#717d544aa5c5f77e3fb71e77f1500338c1ee7436"
-  integrity sha512-jRpIhjThaH8jxuJ8Q1H+jai/dekP5952kzLHTuN+rPI48eF2esf/18TMb3N/HtEgmnybhfiwUO6Ph2OkHi3jpA==
+"@csstools/css-color-parser@^1.2.2":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.2.3.tgz#0cd0f72c50894a623ae09f19e30bbfb298769f59"
+  integrity sha512-YaEnCoPTdhE4lPQFH3dU4IEk8S+yCnxS88wMv45JzlnMfZp57hpqA6qf2gX8uv7IJTJ/43u6pTQmhy7hCjlz7g==
   dependencies:
-    "@csstools/color-helpers" "^2.0.0"
-    "@csstools/css-calc" "^1.0.1"
+    "@csstools/color-helpers" "^3.0.0"
+    "@csstools/css-calc" "^1.1.3"
 
-"@csstools/css-parser-algorithms@^2.0.0", "@csstools/css-parser-algorithms@^2.0.1", "@csstools/css-parser-algorithms@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.1.0.tgz#c0a605b0218790faeb5911f240964891c6031501"
-  integrity sha512-KP8TicdXpUyeB1NMlbHud/1l39xvLGvqNFWMpG4qC6H1zs9SadGUHe5SO92n/659sDW9aGDvm9AMru0DZkN1Bw==
+"@csstools/css-parser-algorithms@^2.3.0", "@csstools/css-parser-algorithms@^2.3.1":
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz#ec4fc764ba45d2bb7ee2774667e056aa95003f3a"
+  integrity sha512-xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA==
 
-"@csstools/css-tokenizer@^2.0.0", "@csstools/css-tokenizer@^2.0.1", "@csstools/css-tokenizer@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.0.tgz#fee4de3d444db3ce9007f3af6474af8ba3e4b930"
-  integrity sha512-dtqFyoJBHUxGi9zPZdpCKP1xk8tq6KPHJ/NY4qWXiYo6IcSGwzk3L8x2XzZbbyOyBs9xQARoGveU2AsgLj6D2A==
+"@csstools/css-tokenizer@^2.1.1", "@csstools/css-tokenizer@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz#9d70e6dcbe94e44c7400a2929928db35c4de32b5"
+  integrity sha512-wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA==
 
-"@csstools/media-query-list-parser@^2.0.0", "@csstools/media-query-list-parser@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.2.tgz#36058f8ff6a28274e7dfe32e48431e1de97c2fbb"
-  integrity sha512-8V6JD8Av1HttuClYr1ZBu0LRVe5Nnz4qrv8RppO8mobsX/USBHZy5JQOXYIlpOVhl46nzkx3X5cfH6CqUghjrQ==
+"@csstools/media-query-list-parser@^2.1.2", "@csstools/media-query-list-parser@^2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.3.tgz#4471ebd436a22019378fe9c8ac8c0f30c4fbb796"
+  integrity sha512-ATul1u+pic4aVpstgueqxEv4MsObEbszAxfTXpx9LHaeD3LAh+wFqdCteyegWmjk0k5rkSCAvIOaJe9U3DD09w==
 
-"@csstools/postcss-cascade-layers@^3.0.1":
+"@csstools/postcss-cascade-layers@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-4.0.0.tgz#21f8556de640f9f9ccfb950c49a886280fe5497e"
+  integrity sha512-dVPVVqQG0FixjM9CG/+8eHTsCAxRKqmNh6H69IpruolPlnEF1611f2AoLK8TijTSAsqBSclKd4WHs1KUb/LdJw==
+  dependencies:
+    "@csstools/selector-specificity" "^3.0.0"
+    postcss-selector-parser "^6.0.13"
+
+"@csstools/postcss-color-function@^3.0.1":
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-3.0.1.tgz#d839386e90428b448e3f75276bc01d516e852a0d"
-  integrity sha512-dD8W98dOYNOH/yX4V4HXOhfCOnvVAg8TtsL+qCGNoKXuq5z2C/d026wGWgySgC8cajXXo/wNezS31Glj5GcqrA==
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-3.0.1.tgz#2f688783f9e8b2496bd0df6edbfb47b8300f01af"
+  integrity sha512-+vrvCQeUifpMeyd42VQ3JPWGQ8cO19+TnGbtfq1SDSgZzRapCQO4aK9h/jhMOKPnxGzbA57oS0aHgP/12N9gSQ==
   dependencies:
-    "@csstools/selector-specificity" "^2.0.2"
-    postcss-selector-parser "^6.0.10"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
 
-"@csstools/postcss-color-function@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-2.2.0.tgz#b9251d5dd13e56c5893a220c32008ac5af4b009f"
-  integrity sha512-4z3k3p35Gmv4ZDX79OytvhwYx6Hz+y3hitikw2F+XG1yhSjalXoMCV04atgLjc/ThLg+Hwnp1pxhQ2G07UHknQ==
+"@csstools/postcss-color-mix-function@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.1.tgz#51c5656bcbee9d02d00d10ddcdb0a55486573fd4"
+  integrity sha512-Z5cXkLiccKIVcUTe+fAfjUD7ZUv0j8rq3dSoBpM6I49dcw+50318eYrwUZa3nyb4xNx7ntNNUPmesAc87kPE2Q==
   dependencies:
-    "@csstools/css-color-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.1.0"
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
 
-"@csstools/postcss-color-mix-function@^1.0.0":
+"@csstools/postcss-exponential-functions@^1.0.0":
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-1.0.0.tgz#8d65782527eefc7228ea6fb9b6fa936e52b9b4ad"
-  integrity sha512-JuI8SKpE/XIpfmvALcxvk6flaq36KCJwqQgZ958Jz189r1diQZADq+7xFmjcv+B0vHQ4nSa92gGExtzOZ1iiUg==
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.0.tgz#2e558ad2856e0c737d9cb98a5d91cfe8d785c9f6"
+  integrity sha512-FPndJ/7oGlML7/4EhLi902wGOukO0Nn37PjwOQGc0BhhjQPy3np3By4d3M8s9Cfmp9EHEKgUHRN2DQ5HLT/hTw==
   dependencies:
-    "@csstools/css-color-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.1.0"
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/css-calc" "^1.1.3"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
 
-"@csstools/postcss-font-format-keywords@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-2.0.2.tgz#d798d96f4af6cddcfee459f598c976e6011042d2"
-  integrity sha512-iKYZlIs6JsNT7NKyRjyIyezTCHLh4L4BBB3F5Nx7Dc4Z/QmBgX+YJFuUSar8IM6KclGiAUFGomXFdYxAwJydlA==
+"@csstools/postcss-font-format-keywords@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-3.0.0.tgz#9ca3a3ca67122862addf8a1c0c61a6db02dea1cc"
+  integrity sha512-ntkGj+1uDa/u6lpjPxnkPcjJn7ChO/Kcy08YxctOZI7vwtrdYvFhmE476dq8bj1yna306+jQ9gzXIG/SWfOaRg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-gradients-interpolation-method@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-3.0.1.tgz#e5237dd765f951c1f4b113d29c4bd2438db5dc33"
-  integrity sha512-sCfFSzL5HRb/GhrGuTEi8IRrxp2bUeKakyXvuXzuBBxL0L2X8kZAljQwkuRkd0W/wIWTsQG/E72REb5XMmRfrA==
+"@csstools/postcss-gradients-interpolation-method@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.1.tgz#abbe5ec9992b850c4330da2f1b57e73d2f5f5086"
+  integrity sha512-IHeFIcksjI8xKX7PWLzAyigM3UvJdZ4btejeNa7y/wXxqD5dyPPZuY55y8HGTrS6ETVTRqfIznoCPtTzIX7ygQ==
   dependencies:
-    "@csstools/css-color-parser" "^1.1.0"
-    "@csstools/css-parser-algorithms" "^2.1.0"
-    "@csstools/css-tokenizer" "^2.1.0"
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
 
-"@csstools/postcss-hwb-function@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-2.2.0.tgz#80ee5780b88994b1128ad67f98d468798413b7d7"
-  integrity sha512-7gDPKacr3KhonzEyj4dzAEcetFJbN+JVPZXtANpf9SAVUHDUK+cCw7367uRlXnCeAoTdmRAyBk3agg2+snFxAw==
+"@csstools/postcss-hwb-function@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.1.tgz#72f47fae09e0dc48be4bd94cab15e6e98cc6de00"
+  integrity sha512-FYe2K8EOYlL1BUm2HTXVBo6bWAj0xl4khOk6EFhQHy/C5p3rlr8OcetzQuwMeNQ3v25nB06QTgqUHoOUwoEqhA==
   dependencies:
-    "@csstools/css-color-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.1.0"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
 
-"@csstools/postcss-ic-unit@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-2.0.2.tgz#5a5e481c53977deec3d63793788eec924d4c5f7d"
-  integrity sha512-N84qGTJkfLTPj2qOG5P4CIqGjpZBbjOEMKMn+UjO5wlb9lcBTfBsxCF0lQsFdWJUzBHYFOz19dL66v71WF3Pig==
+"@csstools/postcss-ic-unit@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.0.tgz#bbc55170d880daa3cc096ee160e8f2492a48e881"
+  integrity sha512-FH3+zfOfsgtX332IIkRDxiYLmgwyNk49tfltpC6dsZaO4RV2zWY6x9VMIC5cjvmjlDO7DIThpzqaqw2icT8RbQ==
   dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-is-pseudo-class@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-3.1.1.tgz#81b0f3ba388bf3c8966e1a4413e1839beef7960e"
-  integrity sha512-hhiacuby4YdUnnxfCYCRMBIobyJImozf0u+gHSbQ/tNOdwvmrZtVROvgW7zmfYuRkHVDNZJWZslq2v5jOU+j/A==
+"@csstools/postcss-is-pseudo-class@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.0.tgz#954c489cf207a7cfeaf4d96d39fac50757dc48cf"
+  integrity sha512-0I6siRcDymG3RrkNTSvHDMxTQ6mDyYE8awkcaHNgtYacd43msl+4ZWDfQ1yZQ/viczVWjqJkLmPiRHSgxn5nZA==
   dependencies:
-    "@csstools/selector-specificity" "^2.0.0"
-    postcss-selector-parser "^6.0.10"
+    "@csstools/selector-specificity" "^3.0.0"
+    postcss-selector-parser "^6.0.13"
 
-"@csstools/postcss-logical-float-and-clear@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-float-and-clear/-/postcss-logical-float-and-clear-1.0.1.tgz#d255ea7aad18880930b63d8a04164f56182f2ecf"
-  integrity sha512-eO9z2sMLddvlfFEW5Fxbjyd03zaO7cJafDurK4rCqyRt9P7aaWwha0LcSzoROlcZrw1NBV2JAp2vMKfPMQO1xw==
+"@csstools/postcss-logical-float-and-clear@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-float-and-clear/-/postcss-logical-float-and-clear-2.0.0.tgz#15e1b5d16dce01ad1e676167d0909e3958234eb5"
+  integrity sha512-Wki4vxsF6icRvRz8eF9bPpAvwaAt0RHwhVOyzfoFg52XiIMjb6jcbHkGxwpJXP4DVrnFEwpwmrz5aTRqOW82kg==
 
-"@csstools/postcss-logical-resize@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-resize/-/postcss-logical-resize-1.0.1.tgz#826d3de929d7d786c32c2c118f78e813a1c2cdec"
-  integrity sha512-x1ge74eCSvpBkDDWppl+7FuD2dL68WP+wwP2qvdUcKY17vJksz+XoE1ZRV38uJgS6FNUwC0AxrPW5gy3MxsDHQ==
+"@csstools/postcss-logical-resize@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-resize/-/postcss-logical-resize-2.0.0.tgz#751bd5aab335c9973e346e3edacb2a0a16fa8296"
+  integrity sha512-lCQ1aX8c5+WI4t5EoYf3alTzJNNocMqTb+u1J9CINdDhFh1fjovqK+0aHalUHsNstZmzFPNzIkU4Mb3eM9U8SA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-logical-viewport-units@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-1.0.2.tgz#b968c57e1459429b48b24e2c250ca0904d71df6e"
-  integrity sha512-nnKFywBqRMYjv5jyjSplD/nbAnboUEGFfdxKw1o34Y1nvycgqjQavhKkmxbORxroBBIDwC5y6SfgENcPPUcOxQ==
+"@csstools/postcss-logical-viewport-units@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.1.tgz#2921034d11d60ea7340ebe795bb4fe60f32ebbae"
+  integrity sha512-R5s19SscS7CHoxvdYNMu2Y3WDwG4JjdhsejqjunDB1GqfzhtHSvL7b5XxCkUWqm2KRl35hI6kJ4HEaCDd/3BXg==
   dependencies:
-    "@csstools/css-tokenizer" "^2.0.0"
+    "@csstools/css-tokenizer" "^2.2.0"
 
-"@csstools/postcss-media-minmax@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.0.tgz#c9978e3ae65b389d149f66cf0c266b2627cd2ec5"
-  integrity sha512-qXHZ0QVDszKf4SsLazOEzFl+m+IkhHOigqMy/gHNIzAtqB3XeBQUa+dTi1ROmQBDH1HXktGwy+tafFBg9UoaxA==
+"@csstools/postcss-media-minmax@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.6.tgz#ed4cac86640c2dd4c3aa2ec491afc28527a10151"
+  integrity sha512-BmwKkqEzzQz6D+5ctoacsiGrq4kVgd1PMEPwkwdR0qFaL2C2nguGsWG87xEw+HIts/2yxhIPTm7Jp3DQq+wn3Q==
   dependencies:
-    "@csstools/css-calc" "^1.0.1"
-    "@csstools/css-parser-algorithms" "^2.1.0"
-    "@csstools/css-tokenizer" "^2.1.0"
-    "@csstools/media-query-list-parser" "^2.0.2"
+    "@csstools/css-calc" "^1.1.3"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/media-query-list-parser" "^2.1.3"
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-1.0.1.tgz#fd6a8e50c2d6d46a5c95b6cdc5563a091fa2f0fa"
-  integrity sha512-V9yQqXdje6OfqDf6EL5iGOpi6N0OEczwYK83rql9UapQwFEryXlAehR5AqH8QqLYb6+y31wUXK6vMxCp0920Zg==
+"@csstools/postcss-media-queries-aspect-ratio-number-values@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.1.tgz#00d30e83e0b1e82a09ab890dcef80cc41be1ab8c"
+  integrity sha512-UvMYxXT3R011whbxzRwLx7d7eNGyVsnZo7waAmf10ZGnT34XidY+rsdFnk6OdFwuG6FYqw3/tptQEAZOmUgvLw==
   dependencies:
-    "@csstools/css-parser-algorithms" "^2.0.0"
-    "@csstools/css-tokenizer" "^2.0.0"
-    "@csstools/media-query-list-parser" "^2.0.0"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/media-query-list-parser" "^2.1.3"
 
-"@csstools/postcss-nested-calc@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-2.0.2.tgz#a0857650ef88b1aa7b094c7ea8ea1378c35695e0"
-  integrity sha512-jbwrP8rN4e7LNaRcpx3xpMUjhtt34I9OV+zgbcsYAAk6k1+3kODXJBf95/JMYWhu9g1oif7r06QVUgfWsKxCFw==
+"@csstools/postcss-nested-calc@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-3.0.0.tgz#b9069f5e1c2ea08de3840a5922e39af4e0ecf4b1"
+  integrity sha512-HsB66aDWAouOwD/GcfDTS0a7wCuVWaTpXcjl5VKP0XvFxDiU+r0T8FG7xgb6ovZNZ+qzvGIwRM+CLHhDgXrYgQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-normalize-display-values@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-2.0.1.tgz#35dc188c5b4713cf902959fe3c8ce613fcb7543e"
-  integrity sha512-TQT5g3JQ5gPXC239YuRK8jFceXF9d25ZvBkyjzBGGoW5st5sPXFVQS8OjYb9IJ/K3CdfK4528y483cgS2DJR/w==
+"@csstools/postcss-normalize-display-values@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-3.0.0.tgz#de995eeafe217ac1854a7135b1db44c57487e9ea"
+  integrity sha512-6Nw55PRXEKEVqn3bzA8gRRPYxr5tf5PssvcE5DRA/nAxKgKtgNZMCHCSd1uxTCWeyLnkf6h5tYRSB0P1Vh/K/A==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-oklab-function@^2.2.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-2.2.0.tgz#4f9c91736316eb881d932681ae566a38af554a39"
-  integrity sha512-5QMtgn9IWpeTbbt8DwLvr41CQRJef2fKhznTFQI1Og/v3zr/uKYu+aSKZEEaoZnO9OophM4YJnkVJne3CqvJDQ==
+"@csstools/postcss-oklab-function@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.1.tgz#2e33ed1761ce78d59a9156f1201a52fda7c75899"
+  integrity sha512-3TIz+dCPlQPzz4yAEYXchUpfuU2gRYK4u1J+1xatNX85Isg4V+IbLyppblWLV4Vb6npFF8qsHN17rNuxOIy/6w==
   dependencies:
-    "@csstools/css-color-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.1.0"
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
 
-"@csstools/postcss-progressive-custom-properties@^2.0.0", "@csstools/postcss-progressive-custom-properties@^2.1.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-2.1.1.tgz#82df9314451db63bf7f4975a4d32f148e85db490"
-  integrity sha512-6p8eO5+j+9hn4h2Klr9dbmya0GIb9SRrnPaCxqR1muVlV1waAZq6YkmlApEwXrox9qxggSwGZD5TnLRIY9f7WA==
+"@csstools/postcss-progressive-custom-properties@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.0.tgz#bb86ae4bb7f2206b0cf6e9b8f0bfc191f67271d8"
+  integrity sha512-2/D3CCL9DN2xhuUTP8OKvKnaqJ1j4yZUxuGLsCUOQ16wnDAuMLKLkflOmZF5tsPh/02VPeXRmqIN+U595WAulw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-scope-pseudo-class@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-2.0.2.tgz#6325e1e3b321093c59b008ec670bb772e17f06fe"
-  integrity sha512-6Pvo4uexUCXt+Hz5iUtemQAcIuCYnL+ePs1khFR6/xPgC92aQLJ0zGHonWoewiBE+I++4gXK3pr+R1rlOFHe5w==
+"@csstools/postcss-relative-color-syntax@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.1.tgz#b7e928fdef9366e1060e2bf4d95cab605855446b"
+  integrity sha512-9B8br/7q0bjD1fV3yE22izjc7Oy5hDbDgwdFEz207cdJHYC9yQneJzP3H+/w3RgC7uyfEVhyyhkGRx5YAfJtmg==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
 
-"@csstools/postcss-stepped-value-functions@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-2.1.0.tgz#8ca134a7f70e00b14f5796fb32ed33a656ba0b1b"
-  integrity sha512-CkEo9BF8fQeMoXW3biXjlgTLY7PA4UFihn6leq7hPoRzIguLUI0WZIVgsITGXfX8LXmkhCSTjXO2DLYu/LUixQ==
+"@csstools/postcss-scope-pseudo-class@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-3.0.0.tgz#23f32181b7de9a33e7c7c71f7620b78284955b82"
+  integrity sha512-GFNVsD97OuEcfHmcT0/DAZWAvTM/FFBDQndIOLawNc1Wq8YqpZwBdHa063Lq+Irk7azygTT+Iinyg3Lt76p7rg==
   dependencies:
-    "@csstools/css-calc" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.0.1"
+    postcss-selector-parser "^6.0.13"
 
-"@csstools/postcss-text-decoration-shorthand@^2.2.1":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-2.2.2.tgz#75539827b56905f7c2e8273c0358cc6fec5ca72d"
-  integrity sha512-aR9l/V7p0SkdrIyBysqlQWIbGXeGC7U4ccBAIlWMpVpG/MsGhxs1JvdBpjim4UDF3U+1VmF+MbvZFb7dL+d7XA==
+"@csstools/postcss-stepped-value-functions@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.1.tgz#c337a8ae09bec13cdf6c95f63a58b407f6965557"
+  integrity sha512-y1sykToXorFE+5cjtp//xAMWEAEple0kcZn2QhzEFIZDDNvGOCp5JvvmmPGsC3eDlj6yQp70l9uXZNLnimEYfA==
+  dependencies:
+    "@csstools/css-calc" "^1.1.3"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+
+"@csstools/postcss-text-decoration-shorthand@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.0.tgz#468800a47fcb4760df8c60bbf1ba7999f44b4dd4"
+  integrity sha512-BAa1MIMJmEZlJ+UkPrkyoz3DC7kLlIl2oDya5yXgvUrelpwxddgz8iMp69qBStdXwuMyfPx46oZcSNx8Z0T2eA==
   dependencies:
-    "@csstools/color-helpers" "^1.0.0"
+    "@csstools/color-helpers" "^3.0.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-trigonometric-functions@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-2.1.0.tgz#5a489975d445b9e79c6cb5f0f01ae711ec86639d"
-  integrity sha512-Ly7YczO+QdnByYeGqlppJoA2Tb2vsFfj5gSrszPTXJ+/4g3nnEZnG0VSeTK/WA8y7fzyL/qVNkkdEeOnruNWFQ==
+"@csstools/postcss-trigonometric-functions@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.1.tgz#06148aa8624b69a6573adb40ed27d3d019875caa"
+  integrity sha512-hW+JPv0MPQfWC1KARgvJI6bisEUFAZWSvUNq/khGCupYV/h6Z9R2ZFz0Xc633LXBst0ezbXpy7NpnPurSx5Klw==
   dependencies:
-    "@csstools/css-calc" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.0.1"
+    "@csstools/css-calc" "^1.1.3"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
 
-"@csstools/postcss-unset-value@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-2.0.1.tgz#67091dd6cff556bff896c95053eb070cc6b21c25"
-  integrity sha512-oJ9Xl29/yU8U7/pnMJRqAZd4YXNCfGEdcP4ywREuqm/xMqcgDNDppYRoCGDt40aaZQIEKBS79LytUDN/DHf0Ew==
+"@csstools/postcss-unset-value@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-3.0.0.tgz#6d2f08140b41d3e70d805ccd2baaf64a6f59fdac"
+  integrity sha512-P0JD1WHh3avVyKKRKjd0dZIjCEeaBer8t1BbwGMUDtSZaLhXlLNBqZ8KkqHzYWXOJgHleXAny2/sx8LYl6qhEA==
 
-"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.1", "@csstools/selector-specificity@^2.0.2":
+"@csstools/selector-specificity@^2.0.0":
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
   integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
 
+"@csstools/selector-specificity@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247"
+  integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==
+
 "@discoveryjs/json-ext@0.5.7":
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
@@ -1198,19 +1303,19 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.4.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.5.0.tgz#f6f729b02feee2c749f57e334b7a1b5f40a81724"
-  integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1":
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8"
+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==
 
-"@eslint/eslintrc@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.0.2.tgz#01575e38707add677cf73ca1589abba8da899a02"
-  integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
+"@eslint/eslintrc@^2.1.1":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93"
+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.5.1"
+    espree "^9.6.0"
     globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
@@ -1218,10 +1323,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.37.0":
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.37.0.tgz#cf1b5fa24217fe007f6487a26d765274925efa7d"
-  integrity sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==
+"@eslint/js@^8.46.0":
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6"
+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==
 
 "@fortawesome/fontawesome-common-types@6.4.0":
   version "6.4.0"
@@ -1276,10 +1381,10 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.11.8":
-  version "0.11.8"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9"
-  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
+"@humanwhocodes/config-array@^0.11.10":
+  version "0.11.10"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.10.tgz#5a3ffe32cc9306365fb3fd572596cd602d5e12d2"
+  integrity sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
@@ -1305,18 +1410,10 @@
     local-or-home-npmrc "^1.1.0"
     registry-url "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
-  dependencies:
-    "@jridgewell/set-array" "^1.0.0"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
-  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
@@ -1327,28 +1424,33 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
-"@jridgewell/source-map@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
-  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13":
+"@jridgewell/sourcemap-codec@1.4.14":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.15":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
 "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.17"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
-  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
   dependencies:
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
@@ -1408,40 +1510,41 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@nuxt/babel-preset-app@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.16.3.tgz#223c98c6799b7ca293fece960b5db59eb9c0115e"
-  integrity sha512-FZnQUnnXvGTXPnnwAMa9gRmSu16Wn796NffzwBzKQHoKVkal2HJcZ+D7/EnqeqVd8dFijFCrdquEj1WoastUSA==
+"@nuxt/babel-preset-app@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.17.1.tgz#481ac0f47c873c89c16d6de4e72d0319f1654326"
+  integrity sha512-V/6ELr8n7VQtBefJcT6K5KRPp5NxUFTCVHcZmrY8d4tyd6ad1WKp8uQGF6+cYKRzpEyMLn8yvu0+lD0CzraOrw==
   dependencies:
-    "@babel/compat-data" "^7.21.0"
-    "@babel/core" "^7.21.3"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/compat-data" "^7.22.9"
+    "@babel/core" "^7.22.9"
+    "@babel/helper-compilation-targets" "^7.22.9"
+    "@babel/helper-module-imports" "^7.22.5"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
-    "@babel/plugin-proposal-decorators" "^7.21.0"
+    "@babel/plugin-proposal-decorators" "^7.22.7"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
     "@babel/plugin-proposal-optional-chaining" "^7.21.0"
     "@babel/plugin-proposal-private-methods" "^7.18.6"
-    "@babel/plugin-transform-runtime" "^7.21.0"
-    "@babel/preset-env" "^7.20.2"
-    "@babel/runtime" "^7.21.0"
+    "@babel/plugin-proposal-private-property-in-object" "^7.21.11"
+    "@babel/plugin-transform-runtime" "^7.22.9"
+    "@babel/preset-env" "^7.22.9"
+    "@babel/runtime" "^7.22.6"
     "@vue/babel-preset-jsx" "^1.4.0"
-    core-js "^3.19.0"
-    core-js-compat "^3.29.1"
+    core-js "^3.31.1"
+    core-js-compat "^3.31.1"
     regenerator-runtime "^0.13.11"
 
-"@nuxt/builder@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.16.3.tgz#7c30bbf00c7c9a7d27d24a24414f2a20fd00f0d6"
-  integrity sha512-yQWqr1YnlgOyqT/au1rgORAL3BkH2gJ4Dn2o5DDUGZQZLnkhEAYB5WblTk8e78xENhjfzIYF3pqzxMhMqNxqBw==
+"@nuxt/builder@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.17.1.tgz#c42dcf07697cd83a499260dd3978f15331141320"
+  integrity sha512-gW0zkpxpYwrcYHLyDY6pGlL647WFEX3kCFvd/dhb64X+piHCusXuzAL0O7fh+/+MpV+Tbt7VUQ/nhxjlXraIHA==
   dependencies:
-    "@nuxt/devalue" "^2.0.0"
-    "@nuxt/utils" "2.16.3"
-    "@nuxt/vue-app" "2.16.3"
-    "@nuxt/webpack" "2.16.3"
+    "@nuxt/devalue" "^2.0.2"
+    "@nuxt/utils" "2.17.1"
+    "@nuxt/vue-app" "2.17.1"
+    "@nuxt/webpack" "2.17.1"
     chalk "^4.1.2"
     chokidar "^3.5.3"
-    consola "^2.15.3"
+    consola "^3.2.3"
     fs-extra "^10.1.0"
     glob "^8.1.0"
     hash-sum "^2.0.0"
@@ -1451,21 +1554,21 @@
     serialize-javascript "^6.0.1"
     upath "^2.0.1"
 
-"@nuxt/cli@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.16.3.tgz#ef211391daaacceef508cdb1ab4d8dfc616923f7"
-  integrity sha512-zml8eW+1MkSquGwL8ywyb6T8N5tPpt85Zl9imxcyR79lukcnzmfIhlz4o25rEtrpii5wKTbebmHE7vldJcu/bA==
+"@nuxt/cli@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.17.1.tgz#0ccdaa277981ce32833f445c6a6846bcf3d80470"
+  integrity sha512-YLrs8dHtHGfnz86Rrl2KegtgOTKU4nJPUZDsRctbsuwqMJimkFn06Tj+n01fBXH9uHUREEStDx5on6O1NsCicw==
   dependencies:
-    "@nuxt/config" "2.16.3"
-    "@nuxt/utils" "2.16.3"
+    "@nuxt/config" "2.17.1"
+    "@nuxt/utils" "2.17.1"
     boxen "^5.1.2"
     chalk "^4.1.2"
     compression "^1.7.4"
     connect "^3.7.0"
-    consola "^2.15.3"
+    consola "^3.2.3"
     crc "^4.3.2"
     defu "^6.1.2"
-    destr "^1.2.2"
+    destr "^2.0.0"
     execa "^5.1.1"
     exit "^0.1.2"
     fs-extra "^10.1.0"
@@ -1475,9 +1578,9 @@
     minimist "^1.2.8"
     opener "1.5.2"
     pretty-bytes "^5.6.0"
-    semver "^7.3.8"
+    semver "^7.5.4"
     serve-static "^1.15.0"
-    std-env "^3.3.2"
+    std-env "^3.3.3"
     upath "^2.0.1"
     wrap-ansi "^7.0.0"
 
@@ -1495,39 +1598,39 @@
     upath "^2.0.1"
     vue-template-compiler "^2.6.14"
 
-"@nuxt/config@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.16.3.tgz#88addc90535a120ed32ef53f4c2a1cb09a662809"
-  integrity sha512-hBvr5/b5CS6UdXPgB8q/jvQHS0Bprf+b0hknL6ks4EkxhtNKM1Et3a0s3V3Gh/odLkkJ9yrtihFF+CymzBm6ew==
+"@nuxt/config@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.17.1.tgz#f44d73a535394eea756bd291187bbd7b799886e1"
+  integrity sha512-yn9XbBdIKgRkHP7pRzYAgZY/j5GRSV2KM42nXFNDaBWbv6X619Y4fbhrabi+0y2o6EG93n1BvgIfcHzwbEAaKw==
   dependencies:
-    "@nuxt/utils" "2.16.3"
-    consola "^2.15.3"
+    "@nuxt/utils" "2.17.1"
+    consola "^3.2.3"
     defu "^6.1.2"
-    destr "^1.2.2"
-    dotenv "^16.0.3"
+    destr "^2.0.0"
+    dotenv "^16.3.1"
     lodash "^4.17.21"
-    rc9 "^2.0.1"
-    std-env "^3.3.2"
-    ufo "^1.1.1"
-
-"@nuxt/core@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.16.3.tgz#185860c73a980285e895106cb506db2a7f7891da"
-  integrity sha512-74351lKHZUxg3LxgtxUOCfTn6RHZZ4KtLKkGVr1YBkEuk/EtsOtkGUZI6psDk0RkXmxBtRk075neMfmaD7RAlQ==
-  dependencies:
-    "@nuxt/config" "2.16.3"
-    "@nuxt/server" "2.16.3"
-    "@nuxt/utils" "2.16.3"
-    consola "^2.15.3"
+    rc9 "^2.1.1"
+    std-env "^3.3.3"
+    ufo "^1.1.2"
+
+"@nuxt/core@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.17.1.tgz#061e79995033fc8554b68c1dc319353e31b61a9f"
+  integrity sha512-FQhJ4KM3taMfS+rZGtEsHt06EGKBDquDGS5rGqhXHBCMeFPR0lq90S0bojaaOVhRIQ8CsKXuDTBt5M2oiaesMQ==
+  dependencies:
+    "@nuxt/config" "2.17.1"
+    "@nuxt/server" "2.17.1"
+    "@nuxt/utils" "2.17.1"
+    consola "^3.2.3"
     fs-extra "^10.1.0"
     hable "^3.0.0"
     hash-sum "^2.0.0"
     lodash "^4.17.21"
 
-"@nuxt/devalue@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-2.0.0.tgz#c7bd7e9a516514e612d5d2e511ffc399e0eac322"
-  integrity sha512-YBI/6o2EBz02tdEJRBK8xkt3zvOFOWlLBf7WKYGBsSYSRtjjgrqPe2skp6VLLmKx5WbHHDNcW+6oACaurxGzeA==
+"@nuxt/devalue@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-2.0.2.tgz#5749f04df13bda4c863338d8dabaf370f45ef7c7"
+  integrity sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==
 
 "@nuxt/friendly-errors-webpack-plugin@^2.5.2":
   version "2.5.2"
@@ -1539,20 +1642,20 @@
     error-stack-parser "^2.0.0"
     string-width "^4.2.3"
 
-"@nuxt/generator@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.16.3.tgz#a3467d474eed7ab1db85e21dea75c18015871576"
-  integrity sha512-I0dvArAHOpru66quBSpZYl6urrc8rbs7MzNS33qq55qJZ8vtvm3pTYJgpeHm7CrmCcWEP/GLxLUvSUShtwkfzQ==
+"@nuxt/generator@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.17.1.tgz#a74e7e5b438c6bd67c708154e28df4e42a473509"
+  integrity sha512-nOabIOBW6ET57p+HsZurzgvraPxt933s4lgYc+I0k15QLvdrqHqGgW3HpFlbhhxBaFOP1KqdKCfz4rn/iszMKg==
   dependencies:
-    "@nuxt/utils" "2.16.3"
+    "@nuxt/utils" "2.17.1"
     chalk "^4.1.2"
-    consola "^2.15.3"
+    consola "^3.2.3"
     defu "^6.1.2"
     devalue "^2.0.1"
     fs-extra "^10.1.0"
     html-minifier "^4.0.0"
     node-html-parser "^6.1.5"
-    ufo "^1.1.1"
+    ufo "^1.1.2"
 
 "@nuxt/kit@3.0.0-rc.13", "@nuxt/kit@^3.0.0-rc.9":
   version "3.0.0-rc.13"
@@ -1630,17 +1733,17 @@
     unimport "^0.7.0"
     untyped "^0.5.0"
 
-"@nuxt/server@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.16.3.tgz#c95c7975c0194d767d794a42de6f8b6c14456ebb"
-  integrity sha512-BN2yqUGytFlM77B0J8os8lnqNQcTT0qDC2lllglrM5F6KPv5rhKyN5khMNPruO5u2vf2JNkXIaUrJYNc4bzKpQ==
+"@nuxt/server@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.17.1.tgz#7451ce85249f66e56a86df9c9bc15f3642aa69b6"
+  integrity sha512-dlUqR7r6+sdX1HkDgLghjDU/yLVvZdEK5OsT1bGbGzqMdlPPx0q1nvTrA+pyKsN9xnJarZqiKZahh6lBSKy+Cg==
   dependencies:
-    "@nuxt/utils" "2.16.3"
-    "@nuxt/vue-renderer" "2.16.3"
+    "@nuxt/utils" "2.17.1"
+    "@nuxt/vue-renderer" "2.17.1"
     "@nuxtjs/youch" "^4.2.3"
     compression "^1.7.4"
     connect "^3.7.0"
-    consola "^2.15.3"
+    consola "^3.2.3"
     etag "^1.8.1"
     fresh "^0.5.2"
     fs-extra "^10.1.0"
@@ -1651,7 +1754,7 @@
     serve-placeholder "^2.0.1"
     serve-static "^1.15.0"
     server-destroy "^1.0.1"
-    ufo "^1.1.1"
+    ufo "^1.1.2"
 
 "@nuxt/telemetry@^1.4.1":
   version "1.4.1"
@@ -1677,11 +1780,11 @@
     std-env "^3.3.1"
 
 "@nuxt/types@^2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/types/-/types-2.16.3.tgz#0b5b51109dc8e8513ec30a2c057d6ce94e9127eb"
-  integrity sha512-55c5zU4JaAvyOqFxKGRNhPhBXfxptTLH0ypBXiALUojN15ZAhSjo3AqhtunZUqufBSuCEJtKD+fsBM/Fwvz+0A==
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/types/-/types-2.17.1.tgz#64d6eca5975aca2f31e46a3e7021f20a94f2ebca"
+  integrity sha512-7xRaSzRHWOrESmzRR2v7aNOd85/NlzdtIesLa7mDF+4Tv18lT9+eNHRuhiH2FKqt4j+/EKVxMl1Gvdzf4lO9Lg==
   dependencies:
-    "@types/babel__core" "7.20.0"
+    "@types/babel__core" "7.20.1"
     "@types/compression" "1.7.2"
     "@types/connect" "3.4.35"
     "@types/etag" "1.8.1"
@@ -1691,7 +1794,7 @@
     "@types/node" "^16"
     "@types/optimize-css-assets-webpack-plugin" "5.0.5"
     "@types/pug" "2.0.6"
-    "@types/serve-static" "1.15.1"
+    "@types/serve-static" "1.15.2"
     "@types/terser-webpack-plugin" "4.2.1"
     "@types/webpack" "4.41.33"
     "@types/webpack-bundle-analyzer" "3.9.5"
@@ -1707,31 +1810,31 @@
     ts-loader "^8.0.17"
     typescript "~4.2"
 
-"@nuxt/utils@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.16.3.tgz#2cac10aed3c58cb2531d7dd72086e109e087c375"
-  integrity sha512-M0W1v4gZDMXyt1MnCoDijIvoV7Xu8NwdbHqWB9gyxIGvoycjNmWWu6yT4LkymZx2c2JUxWTVp6VoUKUWW5P46Q==
+"@nuxt/utils@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.17.1.tgz#648e354f4f2a35fd77f3cdb11676382d94a5d4ae"
+  integrity sha512-6wzFb13zMgQnIS/HQ0uA04iKfme1aIGJVk7rLlEeyDqCjNqsGmzn4QNn3CTNqS7G6KY1Vtc8RHlbXFHHEu3vdw==
   dependencies:
-    consola "^2.15.3"
+    consola "^3.2.3"
     create-require "^1.1.1"
     fs-extra "^10.1.0"
     hash-sum "^2.0.0"
-    jiti "^1.18.2"
+    jiti "^1.19.1"
     lodash "^4.17.21"
     proper-lockfile "^4.1.2"
-    semver "^7.3.8"
+    semver "^7.5.4"
     serialize-javascript "^6.0.1"
-    signal-exit "^3.0.7"
-    ua-parser-js "^1.0.34"
-    ufo "^1.1.1"
+    signal-exit "^4.0.2"
+    ua-parser-js "^1.0.35"
+    ufo "^1.1.2"
 
-"@nuxt/vue-app@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.16.3.tgz#aee071c2da23633cde180ba663544ae97bace2f4"
-  integrity sha512-Lacweyb3K0tRcHKIYVbAkGEptnXy0aNzXVF/n0niTMqtyWQ16pp2md3Ab0vcYXZf8Ya1Yy1NB8FhPqPYjG8OtA==
+"@nuxt/vue-app@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.17.1.tgz#3f78d017c91330d126cc6d2ef94854fa4bada7a3"
+  integrity sha512-r9+2XkK9BqAOZUplG3Yjqvrynfzn2rrWCwWTwjoUbNHSpeoR9WajyUySXjPOsBRVQdIgvl4o2it5p2OBDGsa2g==
   dependencies:
-    node-fetch-native "^1.0.2"
-    ufo "^1.1.1"
+    node-fetch-native "^1.2.0"
+    ufo "^1.1.2"
     unfetch "^5.0.0"
     vue "^2.7.10"
     vue-client-only "^2.1.0"
@@ -1741,38 +1844,38 @@
     vue-template-compiler "^2.7.14"
     vuex "^3.6.2"
 
-"@nuxt/vue-renderer@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.16.3.tgz#1f004ace66d84956860702d9f4e2fd85f4026796"
-  integrity sha512-w46NiRZaAOU55S2UyTzGJqO7alO2YGgPFfy3HVOA5iXdNnpHwIBeVUIPLpmv6qByWxyu4OAOQu6pDURTWtaJdA==
+"@nuxt/vue-renderer@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.17.1.tgz#6d8e3321b755afa85707d330b0a3c55d5bb07ae1"
+  integrity sha512-qAfqaKxsJe06wZs7t/XZNQ2Y0nE4AmsnU58ks+/5+lrJShQrHayzwFJKND6KbRgp8TpeDQQdRaU3ln/sOQGipA==
   dependencies:
-    "@nuxt/devalue" "^2.0.0"
-    "@nuxt/utils" "2.16.3"
-    consola "^2.15.3"
+    "@nuxt/devalue" "^2.0.2"
+    "@nuxt/utils" "2.17.1"
+    consola "^3.2.3"
     defu "^6.1.2"
     fs-extra "^10.1.0"
     lodash "^4.17.21"
     lru-cache "^5.1.1"
-    ufo "^1.1.1"
+    ufo "^1.1.2"
     vue "^2.7.10"
     vue-meta "^2.4.0"
     vue-server-renderer "^2.7.14"
 
-"@nuxt/webpack@2.16.3":
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.16.3.tgz#4754f77f94978c06eb8f4c356f6bdd5ff9a14d16"
-  integrity sha512-VHXTMQj+8bUaaeIZKH4z2Ip/TnO4GuvpFV6GL7D+wjGMB+qeSsTPlWS7/FQxOt86uKEzpMz9w4jPJTYzgLV6pg==
+"@nuxt/webpack@2.17.1":
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.17.1.tgz#147df3fdd10f7041abbd63b63f2bcaec505e5352"
+  integrity sha512-862dGUOPyUGZ2a5uMe83v15/6CTovoiw5i5p1B6S714Qb6jvSpEEECJxpq7zCpR/WvRs73Dtw+2oCuRptuPSBA==
   dependencies:
-    "@babel/core" "^7.21.3"
-    "@nuxt/babel-preset-app" "2.16.3"
+    "@babel/core" "^7.22.9"
+    "@nuxt/babel-preset-app" "2.17.1"
     "@nuxt/friendly-errors-webpack-plugin" "^2.5.2"
-    "@nuxt/utils" "2.16.3"
+    "@nuxt/utils" "2.17.1"
     babel-loader "^8.3.0"
     cache-loader "^4.1.0"
-    caniuse-lite "^1.0.30001467"
-    consola "^2.15.3"
+    caniuse-lite "^1.0.30001515"
+    consola "^3.2.3"
     css-loader "^5.2.7"
-    cssnano "^5.1.15"
+    cssnano "^6.0.1"
     eventsource-polyfill "^0.9.6"
     extract-css-chunks-webpack-plugin "^4.9.0"
     file-loader "^6.2.0"
@@ -1785,19 +1888,19 @@
     optimize-css-assets-webpack-plugin "^6.0.1"
     pify "^5.0.0"
     pnp-webpack-plugin "^1.7.0"
-    postcss "^8.4.21"
+    postcss "^8.4.26"
     postcss-import "^15.1.0"
     postcss-import-resolver "^2.0.0"
     postcss-loader "^4.3.0"
-    postcss-preset-env "^8.0.1"
+    postcss-preset-env "^9.0.0"
     postcss-url "^10.1.3"
-    semver "^7.3.8"
-    std-env "^3.3.2"
+    semver "^7.5.4"
+    std-env "^3.3.3"
     style-resources-loader "^1.5.0"
     terser-webpack-plugin "^4.2.3"
     thread-loader "^3.0.4"
     time-fix-plugin "^2.0.7"
-    ufo "^1.1.1"
+    ufo "^1.1.2"
     upath "^2.0.1"
     url-loader "^4.1.1"
     vue-loader "^15.10.1"
@@ -1805,9 +1908,9 @@
     vue-template-compiler "^2.7.14"
     watchpack "^2.4.0"
     webpack "^4.46.0"
-    webpack-bundle-analyzer "^4.8.0"
-    webpack-dev-middleware "^5.3.3"
-    webpack-hot-middleware "^2.25.3"
+    webpack-bundle-analyzer "^4.9.0"
+    webpack-dev-middleware "^5.0.0"
+    webpack-hot-middleware "^2.25.4"
     webpack-node-externals "^3.0.0"
     webpackbar "^5.0.2"
 
@@ -1951,9 +2054,9 @@
     "@svgdotjs/svg.js" "^3.1.1"
 
 "@svgdotjs/svg.js@^3.1.1", "@svgdotjs/svg.js@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@svgdotjs/svg.js/-/svg.js-3.1.2.tgz#acd62ebc5a6ef5b3a70e4a3912ce643a150c56e7"
-  integrity sha512-0ZCWTiuRjCXT2SUoVDiu+8DLuRQlkxZbO680Y2QkV7jNsULzJajrx6A3MxA/IBQg6UGV5csgPZ8w7U57hZSK+A==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@svgdotjs/svg.js/-/svg.js-3.2.0.tgz#6baa8cef6778a93818ac18faa2055222e60aa644"
+  integrity sha512-Tr8p+QVP7y+QT1GBlq1Tt57IvedVH8zCPoYxdHLX0Oof3a/PqnC/tXAkVufv1JQJfsDHlH/UrjcDfgxSofqSNA==
 
 "@tootallnate/once@1":
   version "1.1.2"
@@ -1965,10 +2068,10 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
-"@types/babel__core@7.20.0":
-  version "7.20.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
-  integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
+"@types/babel__core@7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
+  integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
   dependencies:
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
@@ -1992,11 +2095,11 @@
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
-  version "7.18.3"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d"
-  integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf"
+  integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==
   dependencies:
-    "@babel/types" "^7.3.0"
+    "@babel/types" "^7.20.7"
 
 "@types/body-parser@*":
   version "1.19.2"
@@ -2006,13 +2109,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/chart.js@^2.7.55":
-  version "2.9.37"
-  resolved "https://registry.yarnpkg.com/@types/chart.js/-/chart.js-2.9.37.tgz#8af70862b154fedf938b5b87debdb3a70f6e3208"
-  integrity sha512-9bosRfHhkXxKYfrw94EmyDQcdjMaQPkU1fH2tDxu8DWXxf1mjzWQAV4laJF51ZbC2ycYwNDvIm1rGez8Bug0vg==
-  dependencies:
-    moment "^2.10.2"
-
 "@types/clean-css@*":
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/@types/clean-css/-/clean-css-4.2.6.tgz#48b427285b2b654751a9bbc6f7d35e6173dec8d2"
@@ -2044,9 +2140,9 @@
     "@types/json-schema" "*"
 
 "@types/estree@*", "@types/estree@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
-  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
+  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
 
 "@types/etag@1.8.1":
   version "1.8.1"
@@ -2056,13 +2152,14 @@
     "@types/node" "*"
 
 "@types/express-serve-static-core@^4.17.33":
-  version "4.17.33"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543"
-  integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==
+  version "4.17.35"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz#c95dd4424f0d32e525d23812aa8ab8e4d3906c4f"
+  integrity sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
+    "@types/send" "*"
 
 "@types/express@*":
   version "4.17.17"
@@ -2100,17 +2197,22 @@
     "@types/relateurl" "*"
     "@types/uglify-js" "*"
 
+"@types/http-errors@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65"
+  integrity sha512-/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ==
+
 "@types/http-proxy@^1.17.5":
-  version "1.17.10"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.10.tgz#e576c8e4a0cc5c6a138819025a88e167ebb38d6c"
-  integrity sha512-Qs5aULi+zV1bwKAg5z1PWnDXWmsn+LxIvUGv6E2+OOMYhclZMO+OXd9pYVf2gLykf2I7IV2u7oTHwChPNsvJ7g==
+  version "1.17.11"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.11.tgz#0ca21949a5588d55ac2b659b69035c84bd5da293"
+  integrity sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==
   dependencies:
     "@types/node" "*"
 
 "@types/json-schema@*", "@types/json-schema@^7.0.4", "@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.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
-  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+  integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
@@ -2134,20 +2236,25 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
+"@types/mime@^1":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
+  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
-  version "18.15.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f"
-  integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==
+  version "20.4.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.5.tgz#9dc0a5cb1ccce4f7a731660935ab70b9c00a5d69"
+  integrity sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==
 
 "@types/node@^16":
-  version "16.18.23"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.23.tgz#b6e934fe427eb7081d0015aad070acb3373c3c90"
-  integrity sha512-XAMpaw1s1+6zM+jn2tmw8MyaRDIJfXxqmIQIS0HfoGYPuf7dUWeiUKopwq13KFX9lEp1+THGtlaaYx39Nxr58g==
+  version "16.18.39"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.39.tgz#aa39a1a87a40ef6098ee69689a1acb0c1b034832"
+  integrity sha512-8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -2187,15 +2294,24 @@
   integrity sha512-QSvevZ+IRww2ldtfv1QskYsqVVVwCKQf1XbwtcyyoRvLIQzfyPhj/C+3+PKzSDRdiyejaiLgnq//XTkleorpLg==
 
 "@types/semver@^7.3.12":
-  version "7.3.13"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91"
-  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
+  version "7.5.0"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.0.tgz#591c1ce3a702c45ee15f47a42ade72c2fd78978a"
+  integrity sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==
+
+"@types/send@*":
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.1.tgz#ed4932b8a2a805f1fe362a70f4e62d0ac994e301"
+  integrity sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==
+  dependencies:
+    "@types/mime" "^1"
+    "@types/node" "*"
 
-"@types/serve-static@*", "@types/serve-static@1.15.1":
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
-  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
+"@types/serve-static@*", "@types/serve-static@1.15.2":
+  version "1.15.2"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.2.tgz#3e5419ecd1e40e7405d34093f10befb43f63381a"
+  integrity sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==
   dependencies:
+    "@types/http-errors" "*"
     "@types/mime" "*"
     "@types/node" "*"
 
@@ -2261,94 +2377,94 @@
     source-map "^0.6.0"
 
 "@typescript-eslint/eslint-plugin@^5.4.0":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.57.1.tgz#d1ab162a3cd2671b8a1c9ddf6e2db73b14439735"
-  integrity sha512-1MeobQkQ9tztuleT3v72XmY0XuKXVXusAhryoLuU5YZ+mXoYKZP9SQ7Flulh1NX4DTjpGTc2b/eMu4u7M7dhnQ==
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
-    "@typescript-eslint/scope-manager" "5.57.1"
-    "@typescript-eslint/type-utils" "5.57.1"
-    "@typescript-eslint/utils" "5.57.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
 "@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.57.1.tgz#da521391f16379b396896b120919c63f24fa78c2"
-  integrity sha512-5F5s8mpM1Y0RQ5iWzKQPQm5cmhARgcMfUwyHX1ZZFL8Tm0PyzyQ+9jgYSMaW74XXvpDg9/KdmMICLlwNwKtO7w==
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz#14559bf73383a308026b427a4a6129bae2146741"
+  integrity sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==
   dependencies:
-    "@typescript-eslint/utils" "5.57.1"
+    "@typescript-eslint/utils" "5.62.0"
 
 "@typescript-eslint/parser@^5.4.0":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.57.1.tgz#af911234bd4401d09668c5faf708a0570a17a748"
-  integrity sha512-hlA0BLeVSA/wBPKdPGxoVr9Pp6GutGoY380FEhbVi0Ph4WNe8kLvqIRx76RSQt1lynZKfrXKs0/XeEk4zZycuA==
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.57.1"
-    "@typescript-eslint/types" "5.57.1"
-    "@typescript-eslint/typescript-estree" "5.57.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.57.1":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.57.1.tgz#5d28799c0fc8b501a29ba1749d827800ef22d710"
-  integrity sha512-N/RrBwEUKMIYxSKl0oDK5sFVHd6VI7p9K5MyUlVYAY6dyNb/wHUqndkTd3XhpGlXgnQsBkRZuu4f9kAHghvgPw==
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
   dependencies:
-    "@typescript-eslint/types" "5.57.1"
-    "@typescript-eslint/visitor-keys" "5.57.1"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
 
-"@typescript-eslint/type-utils@5.57.1":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.57.1.tgz#235daba621d3f882b8488040597b33777c74bbe9"
-  integrity sha512-/RIPQyx60Pt6ga86hKXesXkJ2WOS4UemFrmmq/7eOyiYjYv/MUSHPlkhU6k9T9W1ytnTJueqASW+wOmW4KrViw==
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.57.1"
-    "@typescript-eslint/utils" "5.57.1"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.57.1":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.57.1.tgz#d9989c7a9025897ea6f0550b7036027f69e8a603"
-  integrity sha512-bSs4LOgyV3bJ08F5RDqO2KXqg3WAdwHCu06zOqcQ6vqbTJizyBhuh1o1ImC69X4bV2g1OJxbH71PJqiO7Y1RuA==
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
-"@typescript-eslint/typescript-estree@5.57.1":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.57.1.tgz#10d9643e503afc1ca4f5553d9bbe672ea4050b71"
-  integrity sha512-A2MZqD8gNT0qHKbk2wRspg7cHbCDCk2tcqt6ScCFLr5Ru8cn+TCfM786DjPhqwseiS+PrYwcXht5ztpEQ6TFTw==
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
   dependencies:
-    "@typescript-eslint/types" "5.57.1"
-    "@typescript-eslint/visitor-keys" "5.57.1"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.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.57.1":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.57.1.tgz#0f97b0bbd88c2d5e2036869f26466be5f4c69475"
-  integrity sha512-kN6vzzf9NkEtawECqze6v99LtmDiUJCVpvieTFA1uL7/jDghiJGubGZ5csicYHU1Xoqb3oH/R5cN5df6W41Nfg==
+"@typescript-eslint/utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.57.1"
-    "@typescript-eslint/types" "5.57.1"
-    "@typescript-eslint/typescript-estree" "5.57.1"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     eslint-scope "^5.1.1"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.57.1":
-  version "5.57.1"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.57.1.tgz#585e5fa42a9bbcd9065f334fd7c8a4ddfa7d905e"
-  integrity sha512-RjQrAniDU0CEk5r7iphkm731zKlFiUjvcBS2yHAg8WWqFMCaCrD0rKEVOMUyMMcbGPZ0bPp56srkGWrgfZqLRA==
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
   dependencies:
-    "@typescript-eslint/types" "5.57.1"
+    "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.4.0":
@@ -2639,10 +2755,10 @@ acorn@^6.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.0, acorn@^8.8.1, acorn@^8.8.2:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.0.4, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+  integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
 
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
@@ -2685,14 +2801,14 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-keywords@^5.0.0:
+ajv-keywords@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2702,7 +2818,7 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.0:
+ajv@^8.0.0, ajv@^8.9.0:
   version "8.12.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
   integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
@@ -2871,6 +2987,17 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
+array.prototype.findlastindex@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz#bc229aef98f6bd0533a2bc61ff95209875526c9b"
+  integrity sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.1.3"
+
 array.prototype.flat@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2"
@@ -2902,6 +3029,18 @@ array.prototype.reduce@^1.0.5:
     es-array-method-boxes-properly "^1.0.0"
     is-string "^1.0.7"
 
+arraybuffer.prototype.slice@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
+  integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -3017,9 +3156,9 @@ aws4@^1.8.0:
   integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
 axios-retry@^3.1.9:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.4.0.tgz#f464dbe9408e5aa78fa319afd38bb69b533d8854"
-  integrity sha512-VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.6.0.tgz#3bf6edbce42e526a3f7ac70b1891b645adb4c301"
+  integrity sha512-jtH4qWTKZ2a17dH6tjq52Y1ssNV0lKge6/Z9Lw67s9Wt01nGTg4hg7/LJBGYfDci44NTANJQlCPHPOT/TSFm9w==
   dependencies:
     "@babel/runtime" "^7.15.4"
     is-retry-allowed "^2.2.0"
@@ -3046,29 +3185,29 @@ babel-loader@^8.3.0:
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-plugin-polyfill-corejs2@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
-  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+babel-plugin-polyfill-corejs2@^0.4.4:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c"
+  integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==
   dependencies:
-    "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    semver "^6.1.1"
+    "@babel/compat-data" "^7.22.6"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
-  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs3@^0.8.2:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52"
+  integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
-    core-js-compat "^3.25.1"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
+    core-js-compat "^3.31.0"
 
-babel-plugin-polyfill-regenerator@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
-  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-regenerator@^0.5.1:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326"
+  integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    "@babel/helper-define-polyfill-provider" "^0.4.2"
 
 balanced-match@^1.0.0:
   version "1.0.2"
@@ -3260,15 +3399,15 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
-  version "4.21.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
-  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+browserslist@^4.0.0, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9:
+  version "4.21.10"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
+  integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
   dependencies:
-    caniuse-lite "^1.0.30001449"
-    electron-to-chromium "^1.4.284"
-    node-releases "^2.0.8"
-    update-browserslist-db "^1.0.10"
+    caniuse-lite "^1.0.30001517"
+    electron-to-chromium "^1.4.477"
+    node-releases "^2.0.13"
+    update-browserslist-db "^1.0.11"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -3498,17 +3637,17 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001467:
-  version "1.0.30001474"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz#13b6fe301a831fe666cce8ca4ef89352334133d5"
-  integrity sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001515, caniuse-lite@^1.0.30001517:
+  version "1.0.30001518"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
+  integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
-chalk@5.2.0, chalk@^5.0.1:
+chalk@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.2.0.tgz#249623b7d66869c673699fb66d65723e54dfcfb3"
   integrity sha512-ree3Gqw/nazQAPuJJEy+avdl7QfZMcUvmHIKgEZkGL+xOBzRvup5Hxo6LHuMceSxOabuJLJm5Yp/92R9eMmMvA==
@@ -3530,12 +3669,17 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^5.0.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385"
+  integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chart.js@2.9.4, chart.js@^2.4.0:
+chart.js@^2.3.0:
   version "2.9.4"
   resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz#0827f9563faffb2dc5c06562f8eb10337d5b9684"
   integrity sha512-B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A==
@@ -3543,6 +3687,16 @@ chart.js@2.9.4, chart.js@^2.4.0:
     chartjs-color "^2.1.0"
     moment "^2.10.2"
 
+chart.js@^3.8.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.9.1.tgz#3abf2c775169c4c71217a107163ac708515924b8"
+  integrity sha512-Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w==
+
+chartjs-adapter-date-fns@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chartjs-adapter-date-fns/-/chartjs-adapter-date-fns-3.0.0.tgz#c25f63c7f317c1f96f9a7c44bd45eeedb8a478e5"
+  integrity sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==
+
 chartjs-color-string@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
@@ -3558,12 +3712,10 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.6.0"
     color-convert "^1.9.3"
 
-chartjs-plugin-annotation@^0.5.7:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/chartjs-plugin-annotation/-/chartjs-plugin-annotation-0.5.7.tgz#1bf0e30199a6a9ff9889ce0f37a1e755a80d10bf"
-  integrity sha512-tKN5KLc69unyZGTvSdhVQEyAOhVNnSkFCCgefZhO4UaqFfABZGFU/d9p6WM2KB0eXFs/rR3Jayh7dvyASC7K0A==
-  dependencies:
-    chart.js "^2.4.0"
+chartjs-plugin-datalabels@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.2.0.tgz#369578e131d743c2e34b5fbe2d3f9335f6639b8f"
+  integrity sha512-14ZU30lH7n89oq+A4bWaJPnAG8a7ZTk7dKf48YAzMvJjQtjrgg5Dpk9f+LbjCF6bpx3RAGTeL13IXpKQYyRvlw==
 
 "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.1, chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
@@ -3747,7 +3899,7 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -3763,9 +3915,9 @@ colord@^2.9.1:
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
 colorette@^2.0.10, colorette@^2.0.19:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
-  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
 
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
@@ -3775,9 +3927,9 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
     delayed-stream "~1.0.0"
 
 commander@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.0.tgz#71797971162cd3cf65f0b9d24eb28f8d303acdf1"
-  integrity sha512-zS5PnTI22FIRM6ylNW8G4Ap0IEOyk62fhLSD0+uHRT9McRCLGpkVNvao4bjimpK/GShynyQkFFxHhwMcETmduA==
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+  integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
 commander@^2.19.0, commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
@@ -3859,6 +4011,11 @@ consola@^2.15.0, consola@^2.15.3, consola@^2.6.0:
   resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
+consola@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f"
+  integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==
+
 console-browserify@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -3928,17 +4085,17 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
-core-js-compat@^3.25.1, core-js-compat@^3.29.1:
-  version "3.30.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.0.tgz#99aa2789f6ed2debfa1df3232784126ee97f4d80"
-  integrity sha512-P5A2h/9mRYZFIAP+5Ab8ns6083IyVpSclU74UNvbGVQ8VM7n3n3/g2yF3AkKQ9NXz2O+ioxLbEWKnDtgsFamhg==
+core-js-compat@^3.31.0, core-js-compat@^3.31.1:
+  version "3.32.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.32.0.tgz#f41574b6893ab15ddb0ac1693681bd56c8550a90"
+  integrity sha512-7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw==
   dependencies:
-    browserslist "^4.21.5"
+    browserslist "^4.21.9"
 
-core-js@^3.19.0, core-js@^3.2.1, core-js@^3.30.2:
-  version "3.30.2"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.2.tgz#6528abfda65e5ad728143ea23f7a14f0dcf503fc"
-  integrity sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg==
+core-js@^3.2.1, core-js@^3.30.2, core-js@^3.31.1:
+  version "3.32.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.0.tgz#7643d353d899747ab1f8b03d2803b0312a0fb3b6"
+  integrity sha512-rd4rYZNlF3WuoYuRIDEmbR/ga9CeuWX9U05umAvgrrZoHY4Z++cp/xwPQMvUpBB4Ag6J8KfD80G0zwCyaSxDww==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -4039,25 +4196,25 @@ crypto-browserify@^3.11.0:
     randombytes "^2.0.0"
     randomfill "^1.0.3"
 
-css-blank-pseudo@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-5.0.2.tgz#3df5cd950f64de960974da05e76954fd3d7442f9"
-  integrity sha512-aCU4AZ7uEcVSUzagTlA9pHciz7aWPKA/YzrEkpdSopJ2pvhIxiQ5sYeMz1/KByxlIo4XBdvMNJAVKMg/GRnhfw==
+css-blank-pseudo@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-6.0.0.tgz#2bc6f812a5f60296c04c55b1696bad4300dcdbcc"
+  integrity sha512-VbfLlOWO7sBHBTn6pwDQzc07Z0SDydgDBfNfCE0nvrehdBNv9RKsuupIRa/qal0+fBZhAALyQDPMKz5lnvcchw==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.13"
 
 css-declaration-sorter@^6.3.1:
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad"
-  integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71"
+  integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==
 
-css-has-pseudo@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-5.0.2.tgz#8798118c705d858b7aeb9d839a39edd901c1cc83"
-  integrity sha512-q+U+4QdwwB7T9VEW/LyO6CFrLAeLqOykC5mDqJXc7aKZAhDbq7BvGT13VGJe+IwBfdN2o3Xdw2kJ5IxwV1Sc9Q==
+css-has-pseudo@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-6.0.0.tgz#b8c8f39a19bc83c5be59fd251510a7e443c47968"
+  integrity sha512-X+r+JBuoO37FBOWVNhVJhxtSBUFHgHbrcc0CjFT28JEdOw1qaDwABv/uunyodUuSy2hMPe9j/HjssxSlvUmKjg==
   dependencies:
-    "@csstools/selector-specificity" "^2.0.1"
-    postcss-selector-parser "^6.0.10"
+    "@csstools/selector-specificity" "^3.0.0"
+    postcss-selector-parser "^6.0.13"
     postcss-value-parser "^4.2.0"
 
 css-loader@^5.0.0, css-loader@^5.2.7:
@@ -4076,10 +4233,10 @@ css-loader@^5.0.0, css-loader@^5.2.7:
     schema-utils "^3.0.0"
     semver "^7.3.5"
 
-css-prefers-color-scheme@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-8.0.2.tgz#a0671f54eb19ed0d30b952574c0af11ec355fb6d"
-  integrity sha512-OvFghizHJ45x7nsJJUSYLyQNTzsCU8yWjxAc/nhPQg1pbs18LMoET8N3kOweFDPy0JV0OSXN2iqRFhPBHYOeMA==
+css-prefers-color-scheme@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-9.0.0.tgz#7e9b74062655ea15490e359cb456a3b9f4c93327"
+  integrity sha512-03QGAk/FXIRseDdLb7XAiu6gidQ0Nd8945xuM7VFVPpc6goJsG9uIO8xQjTxwbPdPIIV4o4AJoOJyt8gwDl67g==
 
 css-select@^4.1.3:
   version "4.3.0"
@@ -4111,15 +4268,31 @@ css-tree@^1.1.2, css-tree@^1.1.3:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
+css-tree@^2.2.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
+  dependencies:
+    mdn-data "2.0.30"
+    source-map-js "^1.0.1"
+
+css-tree@~2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
+  dependencies:
+    mdn-data "2.0.28"
+    source-map-js "^1.0.1"
+
 css-what@^6.0.1, css-what@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
-cssdb@^7.5.3:
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.5.3.tgz#6bbd0c6a935919d7f78b8a3ce098faacda01ae8a"
-  integrity sha512-NQNRhrEnS6cW+RU/foLphb6xI/MDA70bI3Cy6VxJU8ilxgyTYz1X9zUzFGVTG5nGPylcKAGIt/UNc4deT56lQQ==
+cssdb@^7.7.0:
+  version "7.7.0"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.7.0.tgz#8a62f1c825c019134e7830729f050c29e3eca95e"
+  integrity sha512-1hN+I3r4VqSNQ+OmMXxYexnumbOONkSil0TWMebVXHtzYW4tRRPovUNHPHj2d4nrgOuYJ8Vs3XwvywsuwwXNNA==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -4161,12 +4334,52 @@ cssnano-preset-default@^5.2.14:
     postcss-svgo "^5.1.0"
     postcss-unique-selectors "^5.1.1"
 
+cssnano-preset-default@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz#2a93247140d214ddb9f46bc6a3562fa9177fe301"
+  integrity sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==
+  dependencies:
+    css-declaration-sorter "^6.3.1"
+    cssnano-utils "^4.0.0"
+    postcss-calc "^9.0.0"
+    postcss-colormin "^6.0.0"
+    postcss-convert-values "^6.0.0"
+    postcss-discard-comments "^6.0.0"
+    postcss-discard-duplicates "^6.0.0"
+    postcss-discard-empty "^6.0.0"
+    postcss-discard-overridden "^6.0.0"
+    postcss-merge-longhand "^6.0.0"
+    postcss-merge-rules "^6.0.1"
+    postcss-minify-font-values "^6.0.0"
+    postcss-minify-gradients "^6.0.0"
+    postcss-minify-params "^6.0.0"
+    postcss-minify-selectors "^6.0.0"
+    postcss-normalize-charset "^6.0.0"
+    postcss-normalize-display-values "^6.0.0"
+    postcss-normalize-positions "^6.0.0"
+    postcss-normalize-repeat-style "^6.0.0"
+    postcss-normalize-string "^6.0.0"
+    postcss-normalize-timing-functions "^6.0.0"
+    postcss-normalize-unicode "^6.0.0"
+    postcss-normalize-url "^6.0.0"
+    postcss-normalize-whitespace "^6.0.0"
+    postcss-ordered-values "^6.0.0"
+    postcss-reduce-initial "^6.0.0"
+    postcss-reduce-transforms "^6.0.0"
+    postcss-svgo "^6.0.0"
+    postcss-unique-selectors "^6.0.0"
+
 cssnano-utils@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
-cssnano@^5.0.2, cssnano@^5.1.15:
+cssnano-utils@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.0.tgz#d1da885ec04003ab19505ff0e62e029708d36b08"
+  integrity sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==
+
+cssnano@^5.0.2:
   version "5.1.15"
   resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf"
   integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==
@@ -4175,6 +4388,14 @@ cssnano@^5.0.2, cssnano@^5.1.15:
     lilconfig "^2.0.3"
     yaml "^1.10.2"
 
+cssnano@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.1.tgz#87c38c4cd47049c735ab756d7e77ac3ca855c008"
+  integrity sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==
+  dependencies:
+    cssnano-preset-default "^6.0.1"
+    lilconfig "^2.1.0"
+
 csso@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
@@ -4182,6 +4403,13 @@ csso@^4.2.0:
   dependencies:
     css-tree "^1.1.2"
 
+csso@^5.0.5:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
+  integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
+  dependencies:
+    css-tree "~2.2.0"
+
 csstype@^3.1.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b"
@@ -4200,9 +4428,9 @@ currently-unhandled@^0.4.1:
     array-find-index "^1.0.1"
 
 cyclist@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
-  integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3"
+  integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -4250,9 +4478,9 @@ debug@^3.1.0, debug@^3.2.7:
     ms "^2.1.1"
 
 decache@^4.6.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.1.tgz#5928bfab97a6fcf22a65047a3d07999af36efaf0"
-  integrity sha512-ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.2.tgz#c1df1325a2f36d53922e08f33380f083148199cd"
+  integrity sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw==
   dependencies:
     callsite "^1.0.0"
 
@@ -4294,7 +4522,7 @@ deepmerge@^4.2.2:
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
-define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4:
+define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5"
   integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
@@ -4360,9 +4588,9 @@ depd@~1.1.2:
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da"
+  integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==
   dependencies:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
@@ -4372,6 +4600,11 @@ destr@^1.1.1, destr@^1.2.2:
   resolved "https://registry.yarnpkg.com/destr/-/destr-1.2.2.tgz#7ba9befcafb645a50e76b260449c63927b51e22f"
   integrity sha512-lrbCJwD9saUQrqUfXvl6qoM+QN3W7tLV5pAOs+OqOmopCCz/JkE05MHedJR1xfk4IAnZuJXPVuN5+7jNA2ZCiA==
 
+destr@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.0.tgz#60847d02b211de6e252fc72806f4ec39ec257e7b"
+  integrity sha512-FJ9RDpf3GicEBvzI3jxc2XhHzbqD8p4ANw/1kPsFBfTvP1b7Gn/Lg1vO7R9J4IVgoMbyUmFrFGZafJ1hPZpvlg==
+
 destroy@1.2.0, destroy@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -4469,7 +4702,7 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
-domhandler@^5.0.1, domhandler@^5.0.2:
+domhandler@^5.0.2, domhandler@^5.0.3:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
   integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
@@ -4486,13 +4719,13 @@ domutils@^2.5.2, domutils@^2.8.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==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
+  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
   dependencies:
     dom-serializer "^2.0.0"
     domelementtype "^2.3.0"
-    domhandler "^5.0.1"
+    domhandler "^5.0.3"
 
 dot-case@^3.0.4:
   version "3.0.4"
@@ -4502,10 +4735,10 @@ dot-case@^3.0.4:
     no-case "^3.0.4"
     tslib "^2.0.3"
 
-dotenv@^16.0.2, dotenv@^16.0.3:
-  version "16.0.3"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
-  integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+dotenv@^16.0.2, dotenv@^16.3.1:
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
 
 dotenv@^9.0.2:
   version "9.0.2"
@@ -4545,10 +4778,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.4.284:
-  version "1.4.352"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.352.tgz#be96bd7c2f4b980deebc9338a49a67430a33ed73"
-  integrity sha512-ikFUEyu5/q+wJpMOxWxTaEVk2M1qKqTGKKyfJmod1CPZxKfYnxVS41/GCBQg21ItBpZybyN8sNpRqCUGm+Zc4Q==
+electron-to-chromium@^1.4.477:
+  version "1.4.479"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.479.tgz#ec9f676f23d3a0b0e429bc454d25e0b3253d2118"
+  integrity sha512-ABv1nHMIR8I5n3O3Een0gr6i0mfM+YcTZqjHy3pAYaOjgFG+BMquuKrSyfYf5CbEkLr9uM05RA3pOk4udNB/aQ==
 
 elliptic@^6.5.3:
   version "6.5.4"
@@ -4612,9 +4845,9 @@ entities@^2.0.0:
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 entities@^4.2.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
-  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
 
 env-paths@^2.2.0:
   version "2.2.1"
@@ -4647,18 +4880,19 @@ error-stack-parser@^2.0.0:
   dependencies:
     stackframe "^1.3.4"
 
-es-abstract@^1.19.0, es-abstract@^1.20.4:
-  version "1.21.2"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
-  integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
+es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
+  integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
   dependencies:
     array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.1"
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
     es-set-tostringtag "^2.0.1"
     es-to-primitive "^1.2.1"
     function.prototype.name "^1.1.5"
-    get-intrinsic "^1.2.0"
+    get-intrinsic "^1.2.1"
     get-symbol-description "^1.0.0"
     globalthis "^1.0.3"
     gopd "^1.0.1"
@@ -4678,14 +4912,18 @@ es-abstract@^1.19.0, es-abstract@^1.20.4:
     object-inspect "^1.12.3"
     object-keys "^1.1.1"
     object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
+    regexp.prototype.flags "^1.5.0"
+    safe-array-concat "^1.0.0"
     safe-regex-test "^1.0.0"
     string.prototype.trim "^1.2.7"
     string.prototype.trimend "^1.0.6"
     string.prototype.trimstart "^1.0.6"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
     typed-array-length "^1.0.4"
     unbox-primitive "^1.0.2"
-    which-typed-array "^1.1.9"
+    which-typed-array "^1.1.10"
 
 es-array-method-boxes-properly@^1.0.0:
   version "1.0.0"
@@ -4743,9 +4981,9 @@ escape-string-regexp@^5.0.0:
   integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
 eslint-config-prettier@^8.8.0:
-  version "8.8.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348"
-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b"
+  integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==
 
 eslint-config-standard@^16.0.3:
   version "16.0.3"
@@ -4772,10 +5010,10 @@ eslint-import-resolver-typescript@^2.5.0:
     resolve "^1.22.0"
     tsconfig-paths "^3.14.1"
 
-eslint-module-utils@^2.7.4:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974"
-  integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==
+eslint-module-utils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
   dependencies:
     debug "^3.2.7"
 
@@ -4788,25 +5026,28 @@ eslint-plugin-es@^3.0.0:
     regexpp "^3.0.0"
 
 eslint-plugin-import@^2.25.3, eslint-plugin-import@^2.27.5:
-  version "2.27.5"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"
-  integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==
+  version "2.28.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz#8d66d6925117b06c4018d491ae84469eb3cb1005"
+  integrity sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==
   dependencies:
     array-includes "^3.1.6"
+    array.prototype.findlastindex "^1.2.2"
     array.prototype.flat "^1.3.1"
     array.prototype.flatmap "^1.3.1"
     debug "^3.2.7"
     doctrine "^2.1.0"
     eslint-import-resolver-node "^0.3.7"
-    eslint-module-utils "^2.7.4"
+    eslint-module-utils "^2.8.0"
     has "^1.0.3"
-    is-core-module "^2.11.0"
+    is-core-module "^2.12.1"
     is-glob "^4.0.3"
     minimatch "^3.1.2"
+    object.fromentries "^2.0.6"
+    object.groupby "^1.0.0"
     object.values "^1.1.6"
-    resolve "^1.22.1"
-    semver "^6.3.0"
-    tsconfig-paths "^3.14.1"
+    resolve "^1.22.3"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
 
 eslint-plugin-jest@^25.3.0:
   version "25.7.0"
@@ -4897,10 +5138,10 @@ eslint-scope@^4.0.3:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.0.0, eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-scope@^7.0.0, eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -4940,10 +5181,10 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc"
-  integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
+eslint-visitor-keys@^3.1.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
 
 eslint-webpack-plugin@^2.6.0:
   version "2.7.0"
@@ -4958,26 +5199,26 @@ eslint-webpack-plugin@^2.6.0:
     schema-utils "^3.1.1"
 
 eslint@^8.37.0:
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.37.0.tgz#1f660ef2ce49a0bfdec0b0d698e0b8b627287412"
-  integrity sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==
+  version "8.46.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552"
+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.4.0"
-    "@eslint/eslintrc" "^2.0.2"
-    "@eslint/js" "8.37.0"
-    "@humanwhocodes/config-array" "^0.11.8"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.1"
+    "@eslint/js" "^8.46.0"
+    "@humanwhocodes/config-array" "^0.11.10"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.10.0"
+    ajv "^6.12.4"
     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-visitor-keys "^3.4.0"
-    espree "^9.5.1"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.2"
+    espree "^9.6.1"
     esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
@@ -4985,32 +5226,29 @@ eslint@^8.37.0:
     find-up "^5.0.0"
     glob-parent "^6.0.2"
     globals "^13.19.0"
-    grapheme-splitter "^1.0.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
-    import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
     is-path-inside "^3.0.3"
-    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
     minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
+    optionator "^0.9.3"
     strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
 
-espree@^9.0.0, espree@^9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.1.tgz#4f26a4d5f18905bf4f2e0bd99002aab807e96dd4"
-  integrity sha512-5yxtHSZXRSW5pvv3hAlXM5+/Oswi1AUFqBmbibKb5s6bp3rGIDkyXU6xCoyuuLhijr4SFwPrXRoZjz0AZDN9tg==
+espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
   dependencies:
-    acorn "^8.8.0"
+    acorn "^8.9.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.4.0"
+    eslint-visitor-keys "^3.4.1"
 
 esquery@^1.3.1, esquery@^1.4.0, esquery@^1.4.2:
   version "1.5.0"
@@ -5097,9 +5335,9 @@ execa@^5.1.1:
     strip-final-newline "^2.0.0"
 
 execa@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43"
-  integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-7.2.0.tgz#657e75ba984f42a70f38928cedc87d6f2d4fe4e9"
+  integrity sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==
   dependencies:
     cross-spawn "^7.0.3"
     get-stream "^6.0.1"
@@ -5198,14 +5436,14 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-diff@^1.1.2:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
-  integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+  integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
 
-fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9:
-  version "3.2.12"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
-  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+fast-glob@^3.2.12, fast-glob@^3.2.9, fast-glob@^3.3.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -5496,10 +5734,10 @@ fs-minipass@^2.0.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
-  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+fs-monkey@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747"
+  integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==
 
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
@@ -5544,7 +5782,7 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
-functions-have-names@^1.2.2:
+functions-have-names@^1.2.2, functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -5595,13 +5833,14 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
-  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+  integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
+    has-proto "^1.0.1"
     has-symbols "^1.0.3"
 
 get-port-please@^2.2.0:
@@ -5799,13 +6038,13 @@ globby@^11.0.4, globby@^11.1.0:
     slash "^3.0.0"
 
 globby@^13.1.2:
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff"
-  integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw==
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-13.2.2.tgz#63b90b1bf68619c2135475cbd4e71e66aa090592"
+  integrity sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==
   dependencies:
     dir-glob "^3.0.1"
-    fast-glob "^3.2.11"
-    ignore "^5.2.0"
+    fast-glob "^3.3.0"
+    ignore "^5.2.4"
     merge2 "^1.4.1"
     slash "^4.0.0"
 
@@ -5830,10 +6069,10 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-grapheme-splitter@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
-  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
 
 gzip-size@^6.0.0:
   version "6.0.0"
@@ -5993,6 +6232,14 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hchs-vue-charts@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/hchs-vue-charts/-/hchs-vue-charts-1.2.8.tgz#91fd09224ab38cfd3bac1d2427f0ce5cbd57664f"
+  integrity sha512-hfAaVQ2v65N+R6cmflUuBvs2Th2Nb14sFBcHrq/0snabCEm+Eu1kFjaT3uxJWYdTu8SlpXz4vhOfGaLyajpA6w==
+  dependencies:
+    chart.js "^2.3.0"
+    vue "^2.0.1"
+
 he@1.2.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
@@ -6020,9 +6267,9 @@ hosted-git-info@^4.0.1:
     lru-cache "^6.0.0"
 
 html-entities@^2.1.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
-  integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
+  integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
 
 html-minifier-terser@^5.0.1:
   version "5.1.1"
@@ -6233,11 +6480,11 @@ ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4:
   integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
 immutable@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.0.tgz#eb1738f14ffb39fd068b1dbe1296117484dd34be"
-  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.1.tgz#17988b356097ab0719e2f741d56f3ec6c317f9dc"
+  integrity sha512-lj9cnmB/kVS0QHsJnYKD1uo3o39nrbKxszjnqS9Fr6NB7bZzW45U6WSGBPKXDL/CvDKqDNPA4r3DoDQ8GTxo2A==
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.1.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -6417,10 +6664,10 @@ is-callable@^1.1.3, is-callable@^1.1.4, 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.11.0, is-core-module@^2.5.0, is-core-module@^2.9.0:
-  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==
+is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.12.1, is-core-module@^2.5.0:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
+  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
   dependencies:
     has "^1.0.3"
 
@@ -6631,15 +6878,11 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
     has-symbols "^1.0.2"
 
 is-typed-array@^1.1.10, is-typed-array@^1.1.9:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
-  integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
   dependencies:
-    available-typed-arrays "^1.0.5"
-    call-bind "^1.0.2"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
-    has-tostringtag "^1.0.0"
+    which-typed-array "^1.1.11"
 
 is-typedarray@~1.0.0:
   version "1.0.0"
@@ -6680,6 +6923,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
+
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -6720,21 +6968,16 @@ jest-worker@^27.5.1:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jiti@^1.15.0, jiti@^1.16.0, jiti@^1.16.2, jiti@^1.17.2, jiti@^1.18.2:
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd"
-  integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==
+jiti@^1.15.0, jiti@^1.16.0, jiti@^1.16.2, jiti@^1.18.2, jiti@^1.19.1:
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.19.1.tgz#fa99e4b76a23053e0e7cde098efe1704a14c16f1"
+  integrity sha512-oVhqoRDaBXf7sjkll95LHVS6Myyyb1zaunVwk4Z0+WPSW4gjS0pl01zYKHScTuyEhQsFxV5L4DR5r+YqSyqyyg==
 
 js-base64@^2.4.9:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
   integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
-js-sdsl@^4.1.4:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.4.0.tgz#8b437dbe642daa95760400b602378ed8ffea8430"
-  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -6912,9 +7155,9 @@ koa-static@^5.0.0:
     koa-send "^5.0.0"
 
 koa@^2.12.0:
-  version "2.14.1"
-  resolved "https://registry.yarnpkg.com/koa/-/koa-2.14.1.tgz#defb9589297d8eb1859936e777f3feecfc26925c"
-  integrity sha512-USJFyZgi2l0wDgqkfD27gL4YGno7TfUkcmOe6UOLFOVuN+J7FwnNu4Dydl4CUQzraM1lBAiGed0M9OVJoT0Kqw==
+  version "2.14.2"
+  resolved "https://registry.yarnpkg.com/koa/-/koa-2.14.2.tgz#a57f925c03931c2b4d94b19d2ebf76d3244863fc"
+  integrity sha512-VFI2bpJaodz6P7x2uyLiX6RLYpZmOJqNmoCst/Yyd7hQlszyPwG/I9CQJ63nOtKSxpt5M7NH67V6nJL2BwCl7g==
   dependencies:
     accepts "^1.3.5"
     cache-content-type "^1.0.0"
@@ -6976,7 +7219,7 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-lilconfig@2.1.0, lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.0.6:
+lilconfig@2.1.0, lilconfig@^2.0.3, lilconfig@^2.0.5, lilconfig@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
@@ -6987,9 +7230,9 @@ lines-and-columns@^1.1.6:
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 lint-staged@^13.2.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.2.0.tgz#b7abaf79c91cd36d824f17b23a4ce5209206126a"
-  integrity sha512-GbyK5iWinax5Dfw5obm2g2ccUiZXNGtAS4mCbJ0Lv4rq6iEtfBSjOYdcbOtAIFtM114t0vdpViDDetjVTSd8Vw==
+  version "13.2.3"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-13.2.3.tgz#f899aad6c093473467e9c9e316e3c2d8a28f87a7"
+  integrity sha512-zVVEXLuQIhr1Y7R7YAWx4TZLdvuzk7DnmrsTNL0fax6Z3jrpFcas+vKbzxhhvp6TA55m1SQuWkpzI1qbfDZbAg==
   dependencies:
     chalk "5.2.0"
     cli-truncate "^3.1.0"
@@ -7003,7 +7246,7 @@ lint-staged@^13.2.0:
     object-inspect "^1.12.3"
     pidtree "^0.6.0"
     string-argv "^0.3.1"
-    yaml "^2.2.1"
+    yaml "^2.2.2"
 
 listr2@^5.0.7:
   version "5.0.8"
@@ -7220,12 +7463,12 @@ magic-string@^0.26.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3"
-  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
+magic-string@^0.30.0:
+  version "0.30.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.2.tgz#dcf04aad3d0d1314bc743d076c50feb29b3c7aca"
+  integrity sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==
   dependencies:
-    "@jridgewell/sourcemap-codec" "^1.4.13"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
 
 make-dir@^1.0.0:
   version "1.3.0"
@@ -7312,17 +7555,27 @@ mdn-data@2.0.14:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
+mdn-data@2.0.28:
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
+
+mdn-data@2.0.30:
+  version "2.0.30"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
 memfs@^3.1.2, memfs@^3.4.3:
-  version "3.4.13"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345"
-  integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
+  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
   dependencies:
-    fs-monkey "^1.0.3"
+    fs-monkey "^1.0.4"
 
 memory-fs@^0.4.1:
   version "0.4.1"
@@ -7590,10 +7843,10 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3:
   dependencies:
     yallist "^4.0.0"
 
-minipass@^4.0.0:
-  version "4.2.5"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb"
-  integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
 
 minizlib@^1.3.3:
   version "1.3.3"
@@ -7656,15 +7909,15 @@ mlly@^0.5.14, mlly@^0.5.16:
     pkg-types "^1.0.0"
     ufo "^1.0.0"
 
-mlly@^1.0.0, mlly@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.2.0.tgz#f0f6c2fc8d2d12ea6907cd869066689b5031b613"
-  integrity sha512-+c7A3CV0KGdKcylsI6khWyts/CYrGTrRVo4R/I7u/cUsy0Conxa6LUhiEzVKIw14lc2L5aiO4+SeVe4TeGRKww==
+mlly@^1.0.0, mlly@^1.2.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.4.0.tgz#830c10d63f1f97bd8785377b24dc2a15d972832b"
+  integrity sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==
   dependencies:
-    acorn "^8.8.2"
-    pathe "^1.1.0"
-    pkg-types "^1.0.2"
-    ufo "^1.1.1"
+    acorn "^8.9.0"
+    pathe "^1.1.1"
+    pkg-types "^1.0.3"
+    ufo "^1.1.2"
 
 moment@^2.10.2:
   version "2.29.4"
@@ -7732,7 +7985,7 @@ nan@^2.12.1, nan@^2.13.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
   integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
 
-nanoid@^3.1.23, nanoid@^3.3.4:
+nanoid@^3.1.23, nanoid@^3.3.6:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
@@ -7789,15 +8042,15 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-fetch-native@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.0.2.tgz#de3651399fda89a1a7c0bf6e7c4e9c239e8d0697"
-  integrity sha512-KIkvH1jl6b3O7es/0ShyCgWLcfXxlBrLBbP3rOr23WArC66IMcU4DeZEeYEOwnopYhawLTn7/y+YtmASe8DFVQ==
+node-fetch-native@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.2.0.tgz#13ec6df98f33168958dbfb6945f10aedf42e7ea8"
+  integrity sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==
 
 node-fetch@^2.6.1, node-fetch@^2.6.7:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
-  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.12.tgz#02eb8e22074018e3d5a83016649d04df0e348fba"
+  integrity sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==
   dependencies:
     whatwg-url "^5.0.0"
 
@@ -7859,10 +8112,10 @@ node-object-hash@^1.2.0:
   resolved "https://registry.yarnpkg.com/node-object-hash/-/node-object-hash-1.4.2.tgz#385833d85b229902b75826224f6077be969a9e94"
   integrity sha512-UdS4swXs85fCGWWf6t6DMGgpN/vnlKeSGEQ7hJcrs7PBFoxoKLmibc3QRb7fwiYsjdL7PX8iI/TMSlZ90dgHhQ==
 
-node-releases@^2.0.8:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
-  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+node-releases@^2.0.13:
+  version "2.0.13"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+  integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
 
 node-res@^5.0.1:
   version "5.0.1"
@@ -8027,25 +8280,25 @@ nuxt-leaflet@^0.0.27:
     vue2-leaflet "^2.7.1"
 
 nuxt@^2.16.3:
-  version "2.16.3"
-  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.16.3.tgz#d0338ab9145bc60aa3d927f03d20e439b9adddf4"
-  integrity sha512-KfqOwtsgo2vew+mHNTQZOf23SlUYYnppH65Rj7whmbXJ+J28Rdvx8ccTj0Mir13TVpjUMtxYBq9VWAL6cFZyOA==
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.17.1.tgz#132a8812df48bf2df2fa9c890e63268600d06ce3"
+  integrity sha512-II27v3nRmqsNMT6tNRIodlRPCuIO8RF6NrfsLh7MX0UVI7//HlEG54ivWzxWB2rfqBTDSRxrETPH7NGE+m1H7A==
   dependencies:
-    "@nuxt/babel-preset-app" "2.16.3"
-    "@nuxt/builder" "2.16.3"
-    "@nuxt/cli" "2.16.3"
+    "@nuxt/babel-preset-app" "2.17.1"
+    "@nuxt/builder" "2.17.1"
+    "@nuxt/cli" "2.17.1"
     "@nuxt/components" "^2.2.1"
-    "@nuxt/config" "2.16.3"
-    "@nuxt/core" "2.16.3"
-    "@nuxt/generator" "2.16.3"
+    "@nuxt/config" "2.17.1"
+    "@nuxt/core" "2.17.1"
+    "@nuxt/generator" "2.17.1"
     "@nuxt/loading-screen" "^2.0.4"
     "@nuxt/opencollective" "^0.3.3"
-    "@nuxt/server" "2.16.3"
+    "@nuxt/server" "2.17.1"
     "@nuxt/telemetry" "^1.4.1"
-    "@nuxt/utils" "2.16.3"
-    "@nuxt/vue-app" "2.16.3"
-    "@nuxt/vue-renderer" "2.16.3"
-    "@nuxt/webpack" "2.16.3"
+    "@nuxt/utils" "2.17.1"
+    "@nuxt/vue-app" "2.17.1"
+    "@nuxt/vue-renderer" "2.17.1"
+    "@nuxt/webpack" "2.17.1"
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -8103,16 +8356,36 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
-object.getownpropertydescriptors@^2.0.3:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3"
-  integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==
+object.fromentries@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
+  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
   dependencies:
-    array.prototype.reduce "^1.0.5"
     call-bind "^1.0.2"
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+object.getownpropertydescriptors@^2.0.3:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
+  integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
+  dependencies:
+    array.prototype.reduce "^1.0.5"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.21.2"
+    safe-array-concat "^1.0.0"
+
+object.groupby@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.0.tgz#cb29259cf90f37e7bac6437686c1ea8c916d12a9"
+  integrity sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.21.2"
+    get-intrinsic "^1.2.1"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -8196,17 +8469,17 @@ optimize-css-assets-webpack-plugin@^6.0.1:
     last-call-webpack-plugin "^3.0.0"
     postcss "^8.2.1"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+  integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
   dependencies:
+    "@aashutoshrathi/word-wrap" "^1.2.3"
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
 
 os-browserify@^0.3.0:
   version "0.3.0"
@@ -8486,10 +8759,10 @@ pathe@^0.3.8, pathe@^0.3.9:
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.3.9.tgz#4baff768f37f03e3d9341502865fb93116f65191"
   integrity sha512-6Y6s0vT112P3jD8dGfuS6r+lpa0qqNrLyHPOwvXMnyNTQaYiwgau2DP3aNDsR13xqtGj7rrPo+jFUATpU6/s+g==
 
-pathe@^1.0.0, pathe@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz#e2e13f6c62b31a3289af4ba19886c230f295ec03"
-  integrity sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==
+pathe@^1.0.0, pathe@^1.1.0, pathe@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a"
+  integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==
 
 pbkdf2@^3.0.3:
   version "3.1.2"
@@ -8560,9 +8833,9 @@ pinkie@^2.0.0:
   integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 pirates@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+  integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
 
 pkg-dir@^2.0.0:
   version "2.0.0"
@@ -8594,13 +8867,13 @@ pkg-types@^0.3.5, pkg-types@^0.3.6:
     mlly "^0.5.16"
     pathe "^0.3.9"
 
-pkg-types@^1.0.0, pkg-types@^1.0.1, pkg-types@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.2.tgz#c233efc5210a781e160e0cafd60c0d0510a4b12e"
-  integrity sha512-hM58GKXOcj8WTqUXnsQyJYXdeAPbythQgEF3nTcEo+nkD49chjQ9IKm/QJy9xf6JakXptz86h7ecP2024rrLaQ==
+pkg-types@^1.0.0, pkg-types@^1.0.1, pkg-types@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.3.tgz#988b42ab19254c01614d13f4f65a2cfc7880f868"
+  integrity sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==
   dependencies:
     jsonc-parser "^3.2.0"
-    mlly "^1.1.1"
+    mlly "^1.2.0"
     pathe "^1.1.0"
 
 pluralize@^8.0.0:
@@ -8641,7 +8914,15 @@ postcss-calc@^8.2.3:
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
   integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
   dependencies:
-    postcss-selector-parser "^6.0.9"
+    postcss-selector-parser "^6.0.9"
+    postcss-value-parser "^4.2.0"
+
+postcss-calc@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6"
+  integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==
+  dependencies:
+    postcss-selector-parser "^6.0.11"
     postcss-value-parser "^4.2.0"
 
 postcss-clamp@^4.1.0:
@@ -8651,11 +8932,12 @@ postcss-clamp@^4.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-functional-notation@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-5.0.2.tgz#6d03c928aa3a13487703af86c301bdcd501e7430"
-  integrity sha512-M6ygxWOyd6eWf3sd1Lv8xi4SeF4iBPfJvkfMU4ITh8ExJc1qhbvh/U8Cv/uOvBgUVOMDdScvCdlg8+hREQzs7w==
+postcss-color-functional-notation@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.0.tgz#dcc1b8b6273099c597a790dc484d89e2573f5f17"
+  integrity sha512-kaWTgnhRKFtfMF8H0+NQBFxgr5CGg05WGe07Mc1ld6XHwwRWlqSbHOW0zwf+BtkBQpsdVUu7+gl9dtdvhWMedw==
   dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
     postcss-value-parser "^4.2.0"
 
 postcss-color-hex-alpha@^9.0.2:
@@ -8665,10 +8947,10 @@ postcss-color-hex-alpha@^9.0.2:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-rebeccapurple@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-8.0.2.tgz#c0f2dcf1ef4dd393314920aa181cca8c390a2648"
-  integrity sha512-xWf/JmAxVoB5bltHpXk+uGRoGFwu4WDAR7210el+iyvTdqiKpDhtcT8N3edXMoVJY0WHFMrKMUieql/wRNiXkw==
+postcss-color-rebeccapurple@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.0.tgz#317bf718962c70b779efacf3dc040c56f05d03ce"
+  integrity sha512-RmUFL+foS05AKglkEoqfx+KFdKRVmqUAxlHNz4jLqIi7046drIPyerdl4B6j/RA2BSP8FI8gJcHmLRrwJOMnHw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -8682,6 +8964,16 @@ postcss-colormin@^5.3.1:
     colord "^2.9.1"
     postcss-value-parser "^4.2.0"
 
+postcss-colormin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.0.tgz#d4250652e952e1c0aca70c66942da93d3cdeaafe"
+  integrity sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==
+  dependencies:
+    browserslist "^4.21.4"
+    caniuse-api "^3.0.0"
+    colord "^2.9.1"
+    postcss-value-parser "^4.2.0"
+
 postcss-convert-values@^5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393"
@@ -8690,15 +8982,23 @@ postcss-convert-values@^5.1.3:
     browserslist "^4.21.4"
     postcss-value-parser "^4.2.0"
 
-postcss-custom-media@^9.1.2:
-  version "9.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-9.1.2.tgz#0e9c34b0b5325edc2c5f42f47543cb64d777764b"
-  integrity sha512-osM9g4UKq4XKimAC7RAXroqi3BXpxfwTswAJQiZdrBjWGFGEyxQrY5H2eDWI8F+MEvEUfYDxA8scqi3QWROCSw==
+postcss-convert-values@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz#ec94a954957e5c3f78f0e8f65dfcda95280b8996"
+  integrity sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==
+  dependencies:
+    browserslist "^4.21.4"
+    postcss-value-parser "^4.2.0"
+
+postcss-custom-media@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-10.0.0.tgz#299781f67d043de7d3eaa13923c26c586d9cd57a"
+  integrity sha512-NxDn7C6GJ7X8TsWOa8MbCdq9rLERRLcPfQSp856k1jzMreL8X9M6iWk35JjPRIb9IfRnVohmxAylDRx7n4Rv4g==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.0"
-    "@csstools/css-tokenizer" "^2.0.0"
-    "@csstools/media-query-list-parser" "^2.0.0"
+    "@csstools/cascade-layer-name-parser" "^1.0.3"
+    "@csstools/css-parser-algorithms" "^2.3.0"
+    "@csstools/css-tokenizer" "^2.1.1"
+    "@csstools/media-query-list-parser" "^2.1.2"
 
 postcss-custom-properties@^12.1.8:
   version "12.1.11"
@@ -8707,59 +9007,79 @@ postcss-custom-properties@^12.1.8:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-custom-properties@^13.1.4:
-  version "13.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.1.4.tgz#590e5770137011001602806da51243b6c82c1cde"
-  integrity sha512-iSAdaZrM3KMec8cOSzeTUNXPYDlhqsMJHpt62yrjwG6nAnMtRHPk5JdMzGosBJtqEahDolvD5LNbcq+EZ78o5g==
+postcss-custom-properties@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.0.tgz#53361280a9ec57c2ac448c0877ba25c4978241ee"
+  integrity sha512-q4VgtIKSy5+KcUvQ0WxTjDy9DZjQ5VCXAZ9+tT9+aPMbA0z6s2t1nMw0QHszru1ib5ElkXl9JUpYYU37VVUs7g==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.0"
-    "@csstools/css-tokenizer" "^2.0.0"
+    "@csstools/cascade-layer-name-parser" "^1.0.4"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
     postcss-value-parser "^4.2.0"
 
-postcss-custom-selectors@^7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.2.tgz#e100e9dd628d969a651d7d310cdfd25b27b58d4b"
-  integrity sha512-jX7VlE3jrgfBIOfxiGNRFq81xUoHSZhvxhQurzE7ZFRv+bUmMwB7/XnA0nNlts2CwNtbXm4Ozy0ZAYKHlCRmBQ==
+postcss-custom-selectors@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.4.tgz#5980972353119af0d9725bdcccad46be8cfc9011"
+  integrity sha512-TU2xyUUBTlpiLnwyE2ZYMUIYB41MKMkBZ8X8ntkqRDQ8sdBLhFFsPgNcOliBd5+/zcK51C9hRnSE7hKUJMxQSw==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.0"
-    "@csstools/css-tokenizer" "^2.0.0"
-    postcss-selector-parser "^6.0.4"
+    "@csstools/cascade-layer-name-parser" "^1.0.3"
+    "@csstools/css-parser-algorithms" "^2.3.0"
+    "@csstools/css-tokenizer" "^2.1.1"
+    postcss-selector-parser "^6.0.13"
 
-postcss-dir-pseudo-class@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-7.0.2.tgz#71618b7eb4abe067845d11b3c8f322760c9b3e88"
-  integrity sha512-cMnslilYxBf9k3qejnovrUONZx1rXeUZJw06fgIUBzABJe3D2LiLL5WAER7Imt3nrkaIgG05XZBztueLEf5P8w==
+postcss-dir-pseudo-class@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-8.0.0.tgz#9e4e37d170f672520d3f38fd8376db0ca04d4e9c"
+  integrity sha512-Oy5BBi0dWPwij/IA+yDYj+/OBMQ9EPqAzTHeSNUYrUWdll/PRJmcbiUj0MNcsBi681I1gcSTLvMERPaXzdbvJg==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.13"
 
 postcss-discard-comments@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
   integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
 
+postcss-discard-comments@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz#9ca335e8b68919f301b24ba47dde226a42e535fe"
+  integrity sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==
+
 postcss-discard-duplicates@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
   integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
 
+postcss-discard-duplicates@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz#c26177a6c33070922e67e9a92c0fd23d443d1355"
+  integrity sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==
+
 postcss-discard-empty@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
   integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
 
+postcss-discard-empty@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz#06c1c4fce09e22d2a99e667c8550eb8a3a1b9aee"
+  integrity sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==
+
 postcss-discard-overridden@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
-postcss-double-position-gradients@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-4.0.2.tgz#855a23201f26be447210504e9b668429cbf4640c"
-  integrity sha512-GXL1RmFREDK4Q9aYvI2RhVrA6a6qqSMQQ5ke8gSH1xgV6exsqbcJpIumC7AOgooH6/WIG3/K/T8xxAiVHy/tJg==
+postcss-discard-overridden@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz#49c5262db14e975e349692d9024442de7cd8e234"
+  integrity sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==
+
+postcss-double-position-gradients@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.0.tgz#cdc11e1210c3fbd3f7bc242a5ee83e5b9d7db8fa"
+  integrity sha512-wR8npIkrIVUTicUpCWSSo1f/g7gAEIH70FMqCugY4m4j6TX4E0T2Q5rhfO0gqv00biBZdLyb+HkW8x6as+iJNQ==
   dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
     postcss-value-parser "^4.2.0"
 
 postcss-extend-rule@^4.0.0:
@@ -8769,34 +9089,34 @@ postcss-extend-rule@^4.0.0:
   dependencies:
     postcss-nesting "^10.1.2"
 
-postcss-focus-visible@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-8.0.2.tgz#a7ac26ffe3e9c2bd17d7200d75e2d79ee8110891"
-  integrity sha512-f/Vd+EC/GaKElknU59esVcRYr/Y3t1ZAQyL4u2xSOgkDy4bMCmG7VP5cGvj3+BTLNE9ETfEuz2nnt4qkZwTTeA==
+postcss-focus-visible@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-9.0.0.tgz#a81227428d6f1e524099c6581f7c7132f987e382"
+  integrity sha512-zA4TbVaIaT8npZBEROhZmlc+GBKE8AELPHXE7i4TmIUEQhw/P/mSJfY9t6tBzpQ1rABeGtEOHYrW4SboQeONMQ==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.13"
 
-postcss-focus-within@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-7.0.2.tgz#5d2c866030e66ed22b204c9506de640943310b1c"
-  integrity sha512-AHAJ89UQBcqBvFgQJE9XasGuwMNkKsGj4D/f9Uk60jFmEBHpAL14DrnSk3Rj+SwZTr/WUG+mh+Rvf8fid/346w==
+postcss-focus-within@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-8.0.0.tgz#8304380dd2dadc1c2dcfa52816ff86be7736fc16"
+  integrity sha512-E7+J9nuQzZaA37D/MUZMX1K817RZGDab8qw6pFwzAkDd/QtlWJ9/WTKmzewNiuxzeq6WWY7ATiRePVoDKp+DnA==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.13"
 
 postcss-font-variant@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
   integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
 
-postcss-gap-properties@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-4.0.1.tgz#0347d6a84a46bfbe88bedc542cc4b354e04a8338"
-  integrity sha512-V5OuQGw4lBumPlwHWk/PRfMKjaq/LTGR4WDTemIMCaMevArVfCCA9wBJiL1VjDAd+rzuCIlkRoRvDsSiAaZ4Fg==
+postcss-gap-properties@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-5.0.0.tgz#3bd77f3d51facb1da404b4edd72b8203929385a5"
+  integrity sha512-YjsEEL6890P7MCv6fch6Am1yq0EhQCJMXyT4LBohiu87+4/WqR7y5W3RIv53WdA901hhytgRvjlrAhibhW4qsA==
 
-postcss-image-set-function@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-5.0.2.tgz#088e0f535f43e74d6ea8033ff7b0482e2735ea6e"
-  integrity sha512-Sszjwo0ubETX0Fi5MvpYzsONwrsjeabjMoc5YqHvURFItXgIu3HdCjcVuVKGMPGzKRhgaknmdM5uVWInWPJmeg==
+postcss-image-set-function@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-6.0.0.tgz#a5aba4a805ae903ab8200b584242149c48c481fb"
+  integrity sha512-bg58QnJexFpPBU4IGPAugAPKV0FuFtX5rHYNSKVaV91TpHN7iwyEzz1bkIPCiSU5+BUN00e+3fV5KFrwIgRocw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -8816,15 +9136,6 @@ postcss-import@^13.0.0:
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
-postcss-import@^14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0"
-  integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
-  dependencies:
-    postcss-value-parser "^4.0.0"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
 postcss-import@^15.1.0:
   version "15.1.0"
   resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.1.0.tgz#41c64ed8cc0e23735a9698b3249ffdbf704adc70"
@@ -8839,30 +9150,30 @@ postcss-initial@^4.0.1:
   resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
   integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
 
-postcss-js@^4.0.0:
+postcss-js@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.1.tgz#61598186f3703bab052f1c4f7d805f3991bee9d2"
   integrity sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==
   dependencies:
     camelcase-css "^2.0.1"
 
-postcss-lab-function@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-5.2.0.tgz#7504de96d5bd21177af241fe7601b5151f2df1a4"
-  integrity sha512-ie/k0xFCib22LV56jZoygLuWfM4J4migb89QnEXOjORGh6UwsDVSPW/x+P2MYS+AKFfZ5Npcu5HYEzYcezAAag==
+postcss-lab-function@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-6.0.1.tgz#46dc530a242972d47018c6627128d8e9e96b82c8"
+  integrity sha512-/Xl6JitDh7jWkcOLxrHcAlEaqkxyaG3g4iDMy5RyhNaiQPJ9Egf2+Mxp1W2qnH5jB2bj59f3RbdKmC6qx1IcXA==
   dependencies:
-    "@csstools/css-color-parser" "^1.0.0"
-    "@csstools/css-parser-algorithms" "^2.0.1"
-    "@csstools/css-tokenizer" "^2.1.0"
-    "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+    "@csstools/css-color-parser" "^1.2.2"
+    "@csstools/css-parser-algorithms" "^2.3.1"
+    "@csstools/css-tokenizer" "^2.2.0"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
 
-postcss-load-config@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
-  integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
+postcss-load-config@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-4.0.1.tgz#152383f481c2758274404e4962743191d73875bd"
+  integrity sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==
   dependencies:
     lilconfig "^2.0.5"
-    yaml "^1.10.2"
+    yaml "^2.1.1"
 
 postcss-loader@^4.1.0, postcss-loader@^4.3.0:
   version "4.3.0"
@@ -8875,10 +9186,10 @@ postcss-loader@^4.1.0, postcss-loader@^4.3.0:
     schema-utils "^3.0.0"
     semver "^7.3.4"
 
-postcss-logical@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-6.1.0.tgz#c33ae75d3edaea7eb821e76dc4e6d0ecedc3200d"
-  integrity sha512-qb1+LpClhYjxac8SfOcWotnY3unKZesDqIOm+jnGt8rTl7xaIWpE2bPGZHxflOip1E/4ETo79qlJyRL3yrHn1g==
+postcss-logical@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-7.0.0.tgz#9a83426e716e3c8f957dda3fd874edbcf22c754e"
+  integrity sha512-zYf3vHkoW82f5UZTEXChTJvH49Yl9X37axTZsJGxrCG2kOUwtaAoz9E7tqYg0lsIoJLybaL8fk/2mOi81zVIUw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -8890,6 +9201,14 @@ postcss-merge-longhand@^5.1.7:
     postcss-value-parser "^4.2.0"
     stylehacks "^5.1.1"
 
+postcss-merge-longhand@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz#6f627b27db939bce316eaa97e22400267e798d69"
+  integrity sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+    stylehacks "^6.0.0"
+
 postcss-merge-rules@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c"
@@ -8900,6 +9219,16 @@ postcss-merge-rules@^5.1.4:
     cssnano-utils "^3.1.0"
     postcss-selector-parser "^6.0.5"
 
+postcss-merge-rules@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz#39f165746404e646c0f5c510222ccde4824a86aa"
+  integrity sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==
+  dependencies:
+    browserslist "^4.21.4"
+    caniuse-api "^3.0.0"
+    cssnano-utils "^4.0.0"
+    postcss-selector-parser "^6.0.5"
+
 postcss-minify-font-values@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
@@ -8907,6 +9236,13 @@ postcss-minify-font-values@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-minify-font-values@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz#68d4a028f9fa5f61701974724b2cc9445d8e6070"
+  integrity sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-minify-gradients@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
@@ -8916,6 +9252,15 @@ postcss-minify-gradients@^5.1.1:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
+postcss-minify-gradients@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz#22b5c88cc63091dadbad34e31ff958404d51d679"
+  integrity sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==
+  dependencies:
+    colord "^2.9.1"
+    cssnano-utils "^4.0.0"
+    postcss-value-parser "^4.2.0"
+
 postcss-minify-params@^5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352"
@@ -8925,6 +9270,15 @@ postcss-minify-params@^5.1.4:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
+postcss-minify-params@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz#2b3a85a9e3b990d7a16866f430f5fd1d5961b539"
+  integrity sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==
+  dependencies:
+    browserslist "^4.21.4"
+    cssnano-utils "^4.0.0"
+    postcss-value-parser "^4.2.0"
+
 postcss-minify-selectors@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
@@ -8932,15 +9286,22 @@ postcss-minify-selectors@^5.2.1:
   dependencies:
     postcss-selector-parser "^6.0.5"
 
+postcss-minify-selectors@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz#5046c5e8680a586e5a0cad52cc9aa36d6be5bda2"
+  integrity sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==
+  dependencies:
+    postcss-selector-parser "^6.0.5"
+
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+  integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
   dependencies:
     icss-utils "^5.0.0"
     postcss-selector-parser "^6.0.2"
@@ -8960,12 +9321,12 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nested@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735"
-  integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
+postcss-nested@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.1.tgz#f83dc9846ca16d2f4fa864f16e9d9f7d0961662c"
+  integrity sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.11"
 
 postcss-nesting@^10.1.10, postcss-nesting@^10.1.2:
   version "10.2.0"
@@ -8975,19 +9336,24 @@ postcss-nesting@^10.1.10, postcss-nesting@^10.1.2:
     "@csstools/selector-specificity" "^2.0.0"
     postcss-selector-parser "^6.0.10"
 
-postcss-nesting@^11.2.1:
-  version "11.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-11.2.2.tgz#ddedfea5a1fdcd8d753298d82297ad15d5640c0f"
-  integrity sha512-aOTiUniAB1bcPE6GGiynWRa6PZFPhOTAm5q3q5cem6QeSijIHHkWr6gs65ukCZMXeak8yXeZVbBJET3VM+HlhA==
+postcss-nesting@^12.0.0:
+  version "12.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-12.0.0.tgz#729932293b925ac5bffcb6df1e2620faa0447554"
+  integrity sha512-knqwW65kxssmyIFadRSimaiRyLVRd0MdwfabesKw6XvGLwSOCJ+4zfvNQQCOOYij5obwpZzDpODuGRv2PCyiUw==
   dependencies:
-    "@csstools/selector-specificity" "^2.0.0"
-    postcss-selector-parser "^6.0.10"
+    "@csstools/selector-specificity" "^3.0.0"
+    postcss-selector-parser "^6.0.13"
 
 postcss-normalize-charset@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
   integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
 
+postcss-normalize-charset@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz#36cc12457259064969fb96f84df491652a4b0975"
+  integrity sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==
+
 postcss-normalize-display-values@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
@@ -8995,6 +9361,13 @@ postcss-normalize-display-values@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-display-values@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz#8d2961415078644d8c6bbbdaf9a2fdd60f546cd4"
+  integrity sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-positions@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
@@ -9002,6 +9375,13 @@ postcss-normalize-positions@^5.1.1:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-positions@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz#25b96df99a69f8925f730eaee0be74416865e301"
+  integrity sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-repeat-style@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
@@ -9009,6 +9389,13 @@ postcss-normalize-repeat-style@^5.1.1:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-repeat-style@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz#ddf30ad8762feb5b1eb97f39f251acd7b8353299"
+  integrity sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-string@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
@@ -9016,6 +9403,13 @@ postcss-normalize-string@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-string@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz#948282647a51e409d69dde7910f0ac2ff97cb5d8"
+  integrity sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-timing-functions@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
@@ -9023,6 +9417,13 @@ postcss-normalize-timing-functions@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-timing-functions@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz#5f13e650b8c43351989fc5de694525cc2539841c"
+  integrity sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-unicode@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030"
@@ -9031,6 +9432,14 @@ postcss-normalize-unicode@^5.1.1:
     browserslist "^4.21.4"
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-unicode@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz#741b3310f874616bdcf07764f5503695d3604730"
+  integrity sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==
+  dependencies:
+    browserslist "^4.21.4"
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-url@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
@@ -9039,6 +9448,13 @@ postcss-normalize-url@^5.1.0:
     normalize-url "^6.0.1"
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-url@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz#d0a31e962a16401fb7deb7754b397a323fb650b4"
+  integrity sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-normalize-whitespace@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
@@ -9046,6 +9462,13 @@ postcss-normalize-whitespace@^5.1.1:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-normalize-whitespace@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz#accb961caa42e25ca4179b60855b79b1f7129d4d"
+  integrity sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-opacity-percentage@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-2.0.0.tgz#c0a56060cd4586e3f954dbde1efffc2deed53002"
@@ -9059,10 +9482,18 @@ postcss-ordered-values@^5.1.3:
     cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-overflow-shorthand@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-4.0.1.tgz#cb61ca24d8c4e1dbf14d85181b017cfa6953aa34"
-  integrity sha512-HQZ0qi/9iSYHW4w3ogNqVNr2J49DHJAl7r8O2p0Meip38jsdnRPgiDW7r/LlLrrMBMe3KHkvNtAV2UmRVxzLIg==
+postcss-ordered-values@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz#374704cdff25560d44061d17ba3c6308837a3218"
+  integrity sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==
+  dependencies:
+    cssnano-utils "^4.0.0"
+    postcss-value-parser "^4.2.0"
+
+postcss-overflow-shorthand@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-5.0.0.tgz#1ed6d6c532cdf52b5dabec06662dc63f9207855c"
+  integrity sha512-2rlxDyeSics/hC2FuMdPnWiP9WUPZ5x7FTuArXLFVpaSQ2woPSfZS4RD59HuEokbZhs/wPUQJ1E3MT6zVv94MQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -9071,80 +9502,82 @@ postcss-page-break@^3.0.4:
   resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
   integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
 
-postcss-place@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-8.0.1.tgz#408d7a27e99192df51c95fe62a3a34def62aa66a"
-  integrity sha512-Ow2LedN8sL4pq8ubukO77phSVt4QyCm35ZGCYXKvRFayAwcpgB0sjNJglDoTuRdUL32q/ZC1VkPBo0AOEr4Uiw==
+postcss-place@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-9.0.0.tgz#7e47851bf40d16ce06f6013453b706100ca6c102"
+  integrity sha512-qLEPD9VPH5opDVemwmRaujODF9nExn24VOC3ghgVLEvfYN7VZLwJHes0q/C9YR5hI2UC3VgBE8Wkdp1TxCXhtg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-preset-env@^8.0.1:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-8.3.0.tgz#a310f9029a62b5189cf1e6afd1970ccbf8c96fdc"
-  integrity sha512-VFc/bhwRo37RoTVzCTCKDJLw0lwsqLRCTc7dkJkfs9S7XXfTbk7QkhbMWHd2L+iZsAsE5yqdSRBZ41/Q828TbA==
-  dependencies:
-    "@csstools/postcss-cascade-layers" "^3.0.1"
-    "@csstools/postcss-color-function" "^2.1.0"
-    "@csstools/postcss-color-mix-function" "^1.0.0"
-    "@csstools/postcss-font-format-keywords" "^2.0.2"
-    "@csstools/postcss-gradients-interpolation-method" "^3.0.1"
-    "@csstools/postcss-hwb-function" "^2.2.0"
-    "@csstools/postcss-ic-unit" "^2.0.2"
-    "@csstools/postcss-is-pseudo-class" "^3.1.1"
-    "@csstools/postcss-logical-float-and-clear" "^1.0.1"
-    "@csstools/postcss-logical-resize" "^1.0.1"
-    "@csstools/postcss-logical-viewport-units" "^1.0.2"
-    "@csstools/postcss-media-minmax" "^1.0.0"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values" "^1.0.1"
-    "@csstools/postcss-nested-calc" "^2.0.2"
-    "@csstools/postcss-normalize-display-values" "^2.0.1"
-    "@csstools/postcss-oklab-function" "^2.2.0"
-    "@csstools/postcss-progressive-custom-properties" "^2.1.0"
-    "@csstools/postcss-scope-pseudo-class" "^2.0.2"
-    "@csstools/postcss-stepped-value-functions" "^2.1.0"
-    "@csstools/postcss-text-decoration-shorthand" "^2.2.1"
-    "@csstools/postcss-trigonometric-functions" "^2.1.0"
-    "@csstools/postcss-unset-value" "^2.0.1"
+postcss-preset-env@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-9.1.0.tgz#3e996fc261f69423a18830f7c301cb286c030d4a"
+  integrity sha512-G+x9BD7jb9uHBB7o720emXV00CP+VdWeirJsHC5ERSpbTd2e6Xg7vHzT+a6UkxFyddALuV+Q8wJMgeTKaau+Pg==
+  dependencies:
+    "@csstools/postcss-cascade-layers" "^4.0.0"
+    "@csstools/postcss-color-function" "^3.0.1"
+    "@csstools/postcss-color-mix-function" "^2.0.1"
+    "@csstools/postcss-exponential-functions" "^1.0.0"
+    "@csstools/postcss-font-format-keywords" "^3.0.0"
+    "@csstools/postcss-gradients-interpolation-method" "^4.0.1"
+    "@csstools/postcss-hwb-function" "^3.0.1"
+    "@csstools/postcss-ic-unit" "^3.0.0"
+    "@csstools/postcss-is-pseudo-class" "^4.0.0"
+    "@csstools/postcss-logical-float-and-clear" "^2.0.0"
+    "@csstools/postcss-logical-resize" "^2.0.0"
+    "@csstools/postcss-logical-viewport-units" "^2.0.1"
+    "@csstools/postcss-media-minmax" "^1.0.6"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values" "^2.0.1"
+    "@csstools/postcss-nested-calc" "^3.0.0"
+    "@csstools/postcss-normalize-display-values" "^3.0.0"
+    "@csstools/postcss-oklab-function" "^3.0.1"
+    "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+    "@csstools/postcss-relative-color-syntax" "^2.0.1"
+    "@csstools/postcss-scope-pseudo-class" "^3.0.0"
+    "@csstools/postcss-stepped-value-functions" "^3.0.1"
+    "@csstools/postcss-text-decoration-shorthand" "^3.0.0"
+    "@csstools/postcss-trigonometric-functions" "^3.0.1"
+    "@csstools/postcss-unset-value" "^3.0.0"
     autoprefixer "^10.4.14"
-    browserslist "^4.21.5"
-    css-blank-pseudo "^5.0.2"
-    css-has-pseudo "^5.0.2"
-    css-prefers-color-scheme "^8.0.2"
-    cssdb "^7.5.3"
+    browserslist "^4.21.9"
+    css-blank-pseudo "^6.0.0"
+    css-has-pseudo "^6.0.0"
+    css-prefers-color-scheme "^9.0.0"
+    cssdb "^7.7.0"
     postcss-attribute-case-insensitive "^6.0.2"
     postcss-clamp "^4.1.0"
-    postcss-color-functional-notation "^5.0.2"
+    postcss-color-functional-notation "^6.0.0"
     postcss-color-hex-alpha "^9.0.2"
-    postcss-color-rebeccapurple "^8.0.2"
-    postcss-custom-media "^9.1.2"
-    postcss-custom-properties "^13.1.4"
-    postcss-custom-selectors "^7.1.2"
-    postcss-dir-pseudo-class "^7.0.2"
-    postcss-double-position-gradients "^4.0.2"
-    postcss-focus-visible "^8.0.2"
-    postcss-focus-within "^7.0.2"
+    postcss-color-rebeccapurple "^9.0.0"
+    postcss-custom-media "^10.0.0"
+    postcss-custom-properties "^13.3.0"
+    postcss-custom-selectors "^7.1.4"
+    postcss-dir-pseudo-class "^8.0.0"
+    postcss-double-position-gradients "^5.0.0"
+    postcss-focus-visible "^9.0.0"
+    postcss-focus-within "^8.0.0"
     postcss-font-variant "^5.0.0"
-    postcss-gap-properties "^4.0.1"
-    postcss-image-set-function "^5.0.2"
+    postcss-gap-properties "^5.0.0"
+    postcss-image-set-function "^6.0.0"
     postcss-initial "^4.0.1"
-    postcss-lab-function "^5.2.0"
-    postcss-logical "^6.1.0"
-    postcss-nesting "^11.2.1"
+    postcss-lab-function "^6.0.1"
+    postcss-logical "^7.0.0"
+    postcss-nesting "^12.0.0"
     postcss-opacity-percentage "^2.0.0"
-    postcss-overflow-shorthand "^4.0.1"
+    postcss-overflow-shorthand "^5.0.0"
     postcss-page-break "^3.0.4"
-    postcss-place "^8.0.1"
-    postcss-pseudo-class-any-link "^8.0.2"
+    postcss-place "^9.0.0"
+    postcss-pseudo-class-any-link "^9.0.0"
     postcss-replace-overflow-wrap "^4.0.0"
     postcss-selector-not "^7.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-pseudo-class-any-link@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-8.0.2.tgz#f5738503f2045de0c4dc216eca99bd835f74e42e"
-  integrity sha512-FYTIuRE07jZ2CW8POvctRgArQJ43yxhr5vLmImdKUvjFCkR09kh8pIdlCwdx/jbFm7MiW4QP58L4oOUv3grQYA==
+postcss-pseudo-class-any-link@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-9.0.0.tgz#5fb5b700e0ecdc845a94eb433b8ccff756cbf660"
+  integrity sha512-QNCYIL98VKFKY6HGDEJpF6+K/sg9bxcUYnOmNHJxZS5wsFDFaVoPeG68WAuhsqwbIBSo/b9fjEnTwY2mTSD+uA==
   dependencies:
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.13"
 
 postcss-reduce-initial@^5.1.2:
   version "5.1.2"
@@ -9154,6 +9587,14 @@ postcss-reduce-initial@^5.1.2:
     browserslist "^4.21.4"
     caniuse-api "^3.0.0"
 
+postcss-reduce-initial@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz#7d16e83e60e27e2fa42f56ec0b426f1da332eca7"
+  integrity sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==
+  dependencies:
+    browserslist "^4.21.4"
+    caniuse-api "^3.0.0"
+
 postcss-reduce-transforms@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
@@ -9161,6 +9602,13 @@ postcss-reduce-transforms@^5.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
+postcss-reduce-transforms@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz#28ff2601a6d9b96a2f039b3501526e1f4d584a46"
+  integrity sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
 postcss-replace-overflow-wrap@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
@@ -9173,10 +9621,10 @@ postcss-selector-not@^7.0.1:
   dependencies:
     postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  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==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
+  version "6.0.13"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
+  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
@@ -9189,6 +9637,14 @@ postcss-svgo@^5.1.0:
     postcss-value-parser "^4.2.0"
     svgo "^2.7.0"
 
+postcss-svgo@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.0.tgz#7b18742d38d4505a0455bbe70d52b49f00eaf69d"
+  integrity sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+    svgo "^3.0.2"
+
 postcss-unique-selectors@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
@@ -9196,6 +9652,13 @@ postcss-unique-selectors@^5.1.1:
   dependencies:
     postcss-selector-parser "^6.0.5"
 
+postcss-unique-selectors@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz#c94e9b0f7bffb1203894e42294b5a1b3fb34fbe1"
+  integrity sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==
+  dependencies:
+    postcss-selector-parser "^6.0.5"
+
 postcss-url@^10.1.1, postcss-url@^10.1.3:
   version "10.1.3"
   resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
@@ -9219,12 +9682,12 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.0.9, postcss@^8.1.10, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.4.14, postcss@^8.4.16, postcss@^8.4.21:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
+postcss@^8.1.10, postcss@^8.2.1, postcss@^8.2.15, postcss@^8.4.14, postcss@^8.4.16, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.26:
+  version "8.4.27"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.27.tgz#234d7e4b72e34ba5a92c29636734349e0d9c3057"
+  integrity sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -9246,9 +9709,9 @@ prettier-linter-helpers@^1.0.0:
     fast-diff "^1.1.2"
 
 "prettier@^1.18.2 || ^2.0.0", prettier@^2.8.7:
-  version "2.8.7"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.7.tgz#bb79fc8729308549d28fe3a98fce73d2c0656450"
-  integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
+  integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
 
 pretty-bytes@^5.6.0:
   version "5.6.0"
@@ -9357,12 +9820,7 @@ pumpify@^1.3.3:
     inherits "^2.0.3"
     pump "^2.0.0"
 
-punycode@1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
-  integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
-
-punycode@^1.2.4:
+punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
   integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
@@ -9372,6 +9830,13 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f"
   integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==
 
+qs@^6.11.0:
+  version "6.11.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+  integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
+  dependencies:
+    side-channel "^1.0.4"
+
 qs@~6.5.2:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
@@ -9390,11 +9855,6 @@ querystring-es3@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
   integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
 
-querystring@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
-  integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -9410,11 +9870,6 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -9444,13 +9899,13 @@ rc9@^1.2.2:
     destr "^1.1.1"
     flat "^5.0.0"
 
-rc9@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/rc9/-/rc9-2.1.0.tgz#57d3a01e55907393ef9bd0cc29f2bd66a6cd0972"
-  integrity sha512-ROO9bv8PPqngWKoiUZU3JDQ4sugpdRs9DfwHnzDSxK25XtQn6BEHL6EOd/OtKuDT2qodrtNR+0WkPT6l0jxH5Q==
+rc9@^2.0.1, rc9@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rc9/-/rc9-2.1.1.tgz#6614c32db7731b44cd48641ce68f373c3ee212a9"
+  integrity sha512-lNeOl38Ws0eNxpO3+wD1I9rkHGQyj1NU1jlzv4go2CtEnEQEUfqnIvZG7W+bC/aXdJ27n5x/yUjb6RoT9tko+Q==
   dependencies:
     defu "^6.1.2"
-    destr "^1.2.2"
+    destr "^2.0.0"
     flat "^5.0.2"
 
 rc@^1.2.7:
@@ -9634,18 +10089,18 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexp-tree@^0.1.23, regexp-tree@~0.1.1:
-  version "0.1.24"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d"
-  integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw==
+  version "0.1.27"
+  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
+  integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
 
-regexp.prototype.flags@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
-  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+regexp.prototype.flags@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
+  integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    functions-have-names "^1.2.2"
+    define-properties "^1.2.0"
+    functions-have-names "^1.2.3"
 
 regexpp@^3.0.0:
   version "3.2.0"
@@ -9794,12 +10249,21 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1:
-  version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
-  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.14.2, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.22.2:
+  version "1.22.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
+  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+  dependencies:
+    is-core-module "^2.11.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.22.3:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
+  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
   dependencies:
-    is-core-module "^2.9.0"
+    is-core-module "^2.12.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -9880,12 +10344,22 @@ rxjs@^6.6.0:
     tslib "^1.9.0"
 
 rxjs@^7.8.0:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
+safe-array-concat@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060"
+  integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -9956,9 +10430,9 @@ sass-resources-loader@^2.2.4:
     loader-utils "^2.0.0"
 
 sass@^1.60.0:
-  version "1.60.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.60.0.tgz#657f0c23a302ac494b09a5ba8497b739fb5b5a81"
-  integrity sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==
+  version "1.64.2"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.64.2.tgz#0d9805ad6acf31c59c3acc725fcfb91b7fcc6909"
+  integrity sha512-TnDlfc+CRnUAgLO9D8cQLFu/GIjJIzJCGkE7o4ekIGQOH7T3GetiRR/PsTWJUHhkzcSPrARkPI+gNWn5alCzDg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -9999,23 +10473,23 @@ schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.0:
     ajv-keywords "^3.5.2"
 
 schema-utils@^3.0.0, schema-utils@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
-  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
   dependencies:
     "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
 schema-utils@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
-  integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    ajv "^8.8.0"
+    ajv "^8.9.0"
     ajv-formats "^2.1.1"
-    ajv-keywords "^5.0.0"
+    ajv-keywords "^5.1.0"
 
 scoped-regex@^1.0.0:
   version "1.0.0"
@@ -10046,19 +10520,19 @@ scule@^1.0.0:
   integrity sha512-4AsO/FrViE/iDNEPaAQlb77tf0csuq27EsVpy6ett584EcRTp6pTDLoGWVxCD77y5iU5FauOvhsI4o1APwPoSQ==
 
 "semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.0.0, semver@^6.1.0, semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -10175,9 +10649,9 @@ shebang-regex@^3.0.0:
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 shell-quote@^1.7.3:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba"
-  integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
 
 shelljs@^0.8.0:
   version "0.8.5"
@@ -10202,6 +10676,11 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+signal-exit@^4.0.2:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
 sirv@^1.0.7:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
@@ -10318,7 +10797,7 @@ source-list-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@@ -10467,10 +10946,10 @@ statuses@2.0.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-std-env@^3.0.1, std-env@^3.3.0, std-env@^3.3.1, std-env@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.2.tgz#af27343b001616015534292178327b202b9ee955"
-  integrity sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==
+std-env@^3.0.1, std-env@^3.3.0, std-env@^3.3.1, std-env@^3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.3.tgz#a54f06eb245fdcfef53d56f3c0251f1d5c3d01fe"
+  integrity sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==
 
 stdout-stream@^1.4.0:
   version "1.4.1"
@@ -10517,9 +10996,9 @@ strict-uri-encode@^1.0.0:
   integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==
 
 string-argv@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
-  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.2.tgz#2b6d0ef24b656274d957d54e0a4bbf6153dc02b6"
+  integrity sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==
 
 "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
@@ -10595,9 +11074,9 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
     ansi-regex "^5.0.1"
 
 strip-ansi@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
-  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
+  integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==
   dependencies:
     ansi-regex "^6.0.1"
 
@@ -10642,7 +11121,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -10677,11 +11156,20 @@ stylehacks@^5.1.1:
     browserslist "^4.21.4"
     postcss-selector-parser "^6.0.4"
 
-sucrase@^3.29.0:
-  version "3.31.0"
-  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.31.0.tgz#daae4fd458167c5d4ba1cce6aef57b988b417b33"
-  integrity sha512-6QsHnkqyVEzYcaiHsOKkzOtOgdJcb8i54x6AV2hDwyZcY9ZyykGZVw6L/YN98xC0evwTP6utsWWrKRaa8QlfEQ==
+stylehacks@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.0.tgz#9fdd7c217660dae0f62e14d51c89f6c01b3cb738"
+  integrity sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==
+  dependencies:
+    browserslist "^4.21.4"
+    postcss-selector-parser "^6.0.4"
+
+sucrase@^3.32.0:
+  version "3.34.0"
+  resolved "https://registry.yarnpkg.com/sucrase/-/sucrase-3.34.0.tgz#1e0e2d8fcf07f8b9c3569067d92fbd8690fb576f"
+  integrity sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==
   dependencies:
+    "@jridgewell/gen-mapping" "^0.3.2"
     commander "^4.0.0"
     glob "7.1.6"
     lines-and-columns "^1.1.6"
@@ -10733,6 +11221,18 @@ svgo@^2.7.0:
     picocolors "^1.0.0"
     stable "^0.1.8"
 
+svgo@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a"
+  integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==
+  dependencies:
+    "@trysound/sax" "0.2.0"
+    commander "^7.2.0"
+    css-select "^5.1.0"
+    css-tree "^2.2.1"
+    csso "^5.0.5"
+    picocolors "^1.0.0"
+
 tailwind-config-viewer@^1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/tailwind-config-viewer/-/tailwind-config-viewer-1.7.2.tgz#3d8242e6ef69d08f388c5dadb40eee62d4ae6386"
@@ -10748,34 +11248,32 @@ tailwind-config-viewer@^1.7.2:
     replace-in-file "^6.1.0"
 
 tailwindcss@^3.1.8:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.1.tgz#b6662fab6a9b704779e48d083a9fef5a81d2b81e"
-  integrity sha512-Vkiouc41d4CEq0ujXl6oiGFQ7bA3WEhUZdTgXAhtKxSy49OmKs8rEfQmupsfF0IGW8fv2iQkp1EVUuapCFrZ9g==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.3.3.tgz#90da807393a2859189e48e9e7000e6880a736daf"
+  integrity sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==
   dependencies:
+    "@alloc/quick-lru" "^5.2.0"
     arg "^5.0.2"
     chokidar "^3.5.3"
-    color-name "^1.1.4"
     didyoumean "^1.2.2"
     dlv "^1.1.3"
     fast-glob "^3.2.12"
     glob-parent "^6.0.2"
     is-glob "^4.0.3"
-    jiti "^1.17.2"
-    lilconfig "^2.0.6"
+    jiti "^1.18.2"
+    lilconfig "^2.1.0"
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
     object-hash "^3.0.0"
     picocolors "^1.0.0"
-    postcss "^8.0.9"
-    postcss-import "^14.1.0"
-    postcss-js "^4.0.0"
-    postcss-load-config "^3.1.4"
-    postcss-nested "6.0.0"
+    postcss "^8.4.23"
+    postcss-import "^15.1.0"
+    postcss-js "^4.0.1"
+    postcss-load-config "^4.0.1"
+    postcss-nested "^6.0.1"
     postcss-selector-parser "^6.0.11"
-    postcss-value-parser "^4.2.0"
-    quick-lru "^5.1.1"
-    resolve "^1.22.1"
-    sucrase "^3.29.0"
+    resolve "^1.22.2"
+    sucrase "^3.32.0"
 
 tapable@^1.0.0, tapable@^1.0.0-beta.5, tapable@^1.1.3:
   version "1.1.3"
@@ -10796,13 +11294,13 @@ tar@^4.4.1:
     yallist "^3.1.1"
 
 tar@^6.0.2, tar@^6.1.2:
-  version "6.1.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b"
-  integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==
+  version "6.1.15"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+  integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^4.0.0"
+    minipass "^5.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
@@ -10847,12 +11345,12 @@ terser@^4.1.2, terser@^4.6.13, terser@^4.6.3:
     source-map-support "~0.5.12"
 
 terser@^5.3.4:
-  version "5.16.8"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.8.tgz#ccde583dabe71df3f4ed02b65eb6532e0fae15d5"
-  integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==
+  version "5.19.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e"
+  integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==
   dependencies:
-    "@jridgewell/source-map" "^0.3.2"
-    acorn "^8.5.0"
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
@@ -11026,7 +11524,7 @@ ts-pnp@^1.1.6:
   resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92"
   integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==
 
-tsconfig-paths@^3.14.1:
+tsconfig-paths@^3.14.1, tsconfig-paths@^3.14.2:
   version "3.14.2"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
   integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
@@ -11042,9 +11540,9 @@ tslib@^1.8.1, tslib@^1.9.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
-  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.1.tgz#fd8c9a0ff42590b25703c0acb3de3d3f4ede0410"
+  integrity sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==
 
 tsscmp@1.0.6:
   version "1.0.6"
@@ -11115,6 +11613,36 @@ type-is@^1.6.16:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -11134,7 +11662,7 @@ typescript@~4.2:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
   integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
 
-ua-parser-js@^1.0.34:
+ua-parser-js@^1.0.35:
   version "1.0.35"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.35.tgz#c4ef44343bc3db0a3cbefdf21822f1b1fc1ab011"
   integrity sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==
@@ -11144,10 +11672,10 @@ ufo@^0.8.5, ufo@^0.8.6:
   resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.8.6.tgz#c0ec89bc0e0c9fa59a683680feb0f28b55ec323b"
   integrity sha512-fk6CmUgwKCfX79EzcDQQpSCMxrHstvbLswFChHS0Vump+kFkw7nJBfTZoC1j0bOGoY9I7R3n2DGek5ajbcYnOw==
 
-ufo@^1.0.0, ufo@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.1.tgz#e70265e7152f3aba425bd013d150b2cdf4056d7c"
-  integrity sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==
+ufo@^1.0.0, ufo@^1.1.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.2.0.tgz#28d127a087a46729133fdc89cb1358508b3f80ba"
+  integrity sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==
 
 uglify-js@^3.5.1:
   version "3.17.4"
@@ -11165,14 +11693,14 @@ unbox-primitive@^1.0.2:
     which-boxed-primitive "^1.0.2"
 
 unctx@^2.0.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/unctx/-/unctx-2.1.2.tgz#12d34c540ef4fbaffb2a3b38a0697e42b152d478"
-  integrity sha512-KK18aLRKe3OlbPyHbXAkIWSU3xK8GInomXfA7fzDMGFXQ1crX1UWrCzKesVXeUyHIayHUrnTvf87IPCKMyeKTg==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/unctx/-/unctx-2.3.1.tgz#5eb4aa9f96fb5fdac18b88fe5ba8e122fe671a62"
+  integrity sha512-PhKke8ZYauiqh3FEMVNm7ljvzQiph0Mt3GBRve03IJm7ukfaON2OBK795tLwhbyfzknuRRkW0+Ze+CQUmzOZ+A==
   dependencies:
     acorn "^8.8.2"
     estree-walker "^3.0.3"
-    magic-string "^0.27.0"
-    unplugin "^1.0.1"
+    magic-string "^0.30.0"
+    unplugin "^1.3.1"
 
 unfetch@^5.0.0:
   version "5.0.0"
@@ -11258,12 +11786,12 @@ unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-unplugin@^1.0.0, unplugin@^1.0.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.3.1.tgz#7af993ba8695d17d61b0845718380caf6af5109f"
-  integrity sha512-h4uUTIvFBQRxUKS2Wjys6ivoeofGhxzTe2sRWlooyjHXVttcVfV/JiavNd3d4+jty0SVV0dxGw9AkY9MwiaCEw==
+unplugin@^1.0.0, unplugin@^1.3.1:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/unplugin/-/unplugin-1.4.0.tgz#b771373aa1bc664f50a044ee8009bd3a7aa04d85"
+  integrity sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==
   dependencies:
-    acorn "^8.8.2"
+    acorn "^8.9.0"
     chokidar "^3.5.3"
     webpack-sources "^3.2.3"
     webpack-virtual-modules "^0.5.0"
@@ -11296,10 +11824,10 @@ upath@^2.0.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
   integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
 
-update-browserslist-db@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
-  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+update-browserslist-db@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
+  integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
@@ -11331,12 +11859,12 @@ url-loader@^4.1.1:
     schema-utils "^3.0.0"
 
 url@^0.11.0:
-  version "0.11.0"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
-  integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.1.tgz#26f90f615427eca1b9f4d6a28288c147e2302a32"
+  integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==
   dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
+    punycode "^1.4.1"
+    qs "^6.11.0"
 
 use@^3.1.0:
   version "3.1.1"
@@ -11424,12 +11952,10 @@ vue-analytics@^5.22.1:
   resolved "https://registry.yarnpkg.com/vue-analytics/-/vue-analytics-5.22.1.tgz#9d6b32da56daee1b9dfb23a267b50349a03f710f"
   integrity sha512-HPKQMN7gfcUqS5SxoO0VxqLRRSPkG1H1FqglsHccz6BatBatNtm/Vyy8brApktZxNCfnAkrSVDpxg3/FNDeOgQ==
 
-vue-chartjs@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-3.5.1.tgz#d25e845708f7744ae51bed9d23a975f5f8fc6529"
-  integrity sha512-foocQbJ7FtveICxb4EV5QuVpo6d8CmZFmAopBppDIGKY+esJV8IJgwmEW0RexQhxqXaL/E1xNURsgFFYyKzS/g==
-  dependencies:
-    "@types/chart.js" "^2.7.55"
+vue-chartjs@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/vue-chartjs/-/vue-chartjs-4.1.2.tgz#f899ba14f3b80660f8d2c610a015341806dfc437"
+  integrity sha512-QSggYjeFv/L4jFSBQpX8NzrAvX0B+Ha6nDgxkTG8tEXxYOOTwKI4phRLe+B4f+REnkmg7hgPY24R0cixZJyXBg==
 
 vue-class-component@^7.1.0:
   version "7.2.6"
@@ -11541,7 +12067,7 @@ vue2-leaflet@^2.7.1:
   resolved "https://registry.yarnpkg.com/vue2-leaflet/-/vue2-leaflet-2.7.1.tgz#2f95c287621bf778f10804c88223877f5c049257"
   integrity sha512-K7HOlzRhjt3Z7+IvTqEavIBRbmCwSZSCVUlz9u4Rc+3xGCLsHKz4TAL4diAmfHElCQdPPVdZdJk8wPUt2fu6WQ==
 
-vue@^2.7.10:
+vue@^2.0.1, vue@^2.7.10:
   version "2.7.14"
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.14.tgz#3743dcd248fd3a34d421ae456b864a0246bafb17"
   integrity sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==
@@ -11570,9 +12096,9 @@ vuetify-loader@^1.7.3:
     loader-utils "^2.0.0"
 
 vuetify@^2.6:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.14.tgz#a5bf662de938efe0450ac59776b04f760f5407d2"
-  integrity sha512-nr6wU3uTzhhEPssH23cW0Ee/hCrayp7cjl3nNjM2OmNwiJlV91tZiL1VO3597SqZyjh1xIa+m9J2rpKTSdIlrA==
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.7.0.tgz#a2c999da30072a62a2d577f0aafd996b276cc149"
+  integrity sha512-eDb+lbtB9e+FRbOPIIyXwgwgc2M6gvhHkhSgggzM0hmKh1XM34YStZbM865viH0AfpxGZIOsRcs0S+OtdyOB+Q==
 
 vuex@^3.6.2:
   version "3.6.2"
@@ -11610,10 +12136,10 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webpack-bundle-analyzer@^4.8.0:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
-  integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
+webpack-bundle-analyzer@^4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz#fc093c4ab174fd3dcbd1c30b763f56d10141209d"
+  integrity sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==
   dependencies:
     "@discoveryjs/json-ext" "0.5.7"
     acorn "^8.0.4"
@@ -11626,7 +12152,7 @@ webpack-bundle-analyzer@^4.8.0:
     sirv "^1.0.7"
     ws "^7.3.1"
 
-webpack-dev-middleware@^5.3.3:
+webpack-dev-middleware@^5.0.0:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
   integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
@@ -11637,10 +12163,10 @@ webpack-dev-middleware@^5.3.3:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-hot-middleware@^2.25.3:
-  version "2.25.3"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz#be343ce2848022cfd854dd82820cd730998c6794"
-  integrity sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA==
+webpack-hot-middleware@^2.25.4:
+  version "2.25.4"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.4.tgz#d8bc9e9cb664fc3105c8e83d2b9ed436bee4e193"
+  integrity sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w==
   dependencies:
     ansi-html-community "0.0.8"
     html-entities "^2.1.0"
@@ -11728,21 +12254,20 @@ which-boxed-primitive@^1.0.2:
     is-symbol "^1.0.3"
 
 which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
+  integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
 
-which-typed-array@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
-  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.10, which-typed-array@^1.1.11:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
+  integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
   dependencies:
     available-typed-arrays "^1.0.5"
     call-bind "^1.0.2"
     for-each "^0.3.3"
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
-    is-typed-array "^1.1.10"
 
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
@@ -11765,11 +12290,6 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
-word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
-
 worker-farm@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
@@ -11876,10 +12396,10 @@ yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.2.1.tgz#3014bf0482dcd15147aa8e56109ce8632cd60ce4"
-  integrity sha512-e0WHiYql7+9wr4cWMx3TVQrNwejKaEe7/rHNmQmqRjazfOP5W8PB6Jpebb5o6fIapbz9o9+2ipcaTM2ZwDI6lw==
+yaml@^2.1.1, yaml@^2.2.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.1.tgz#02fe0975d23cd441242aa7204e09fc28ac2ac33b"
+  integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
 yargs-parser@^18.1.2:
   version "18.1.3"
@@ -11917,9 +12437,9 @@ yargs@^15.3.1:
     yargs-parser "^18.1.2"
 
 yargs@^17.2.1:
-  version "17.7.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967"
-  integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
     cliui "^8.0.1"
     escalade "^3.1.1"

From bb37a0c3b8c7b492e678e8fbe58900143afd5d4a Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Wed, 2 Aug 2023 19:39:48 +0100
Subject: [PATCH 12/36] Created CommonChartOptions and adjusted victories and
 alert populations to fit. #319

---
 components/alert/AlertPopulations.vue         | 209 ++++++++----------
 .../victories/VictoriesTimeline.vue           |  60 +----
 constants/CommonChartOptions.ts               |  56 +++++
 nuxt.config.js                                |   1 +
 4 files changed, 156 insertions(+), 170 deletions(-)
 create mode 100644 constants/CommonChartOptions.ts

diff --git a/components/alert/AlertPopulations.vue b/components/alert/AlertPopulations.vue
index ec4a3191..626c3221 100644
--- a/components/alert/AlertPopulations.vue
+++ b/components/alert/AlertPopulations.vue
@@ -58,8 +58,8 @@
         <line-chart
           v-if="data.length"
           :chart-data="dataCollection"
-          :options="popNumberChartOptions"
-          style="height: 400px"
+          :chart-options="popNumberChartOptions"
+          :styles="{ height: '400px' }"
           class="w-full"
         ></line-chart>
         <div
@@ -78,13 +78,13 @@
         </div>
       </div>
       <div v-show="mode === 'average'" v-if="!isOutfitWar" class="text-center">
-        <line-chart
+        <LineChart
           v-if="avgData.length"
           :chart-data="dataAvgCollection"
-          :options="activityChartOptions"
-          style="height: 400px"
+          :chart-options="popActivityChartOptions"
+          :styles="{ height: '400px' }"
           class="w-full"
-        ></line-chart>
+        ></LineChart>
         <div
           v-else
           style="height: 400px"
@@ -106,7 +106,6 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import LineChart from '../LineChart.js'
 import { Ps2AlertsEventState } from '@/ps2alerts-constants/ps2AlertsEventState'
 import ApiRequest from '~/api-request'
 import { Endpoints } from '@/constants/Endpoints'
@@ -117,48 +116,29 @@ import { Ps2AlertsEventType } from '~/ps2alerts-constants/ps2AlertsEventType'
 import { TIME_FORMAT_SHORT } from '~/constants/Time'
 import { formatDateTime } from '~/utilities/TimeHelper'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
+import { commonChartOptions } from '~/constants/CommonChartOptions'
 
-const commonChartOptions = {
-  responsive: true,
-  maintainAspectRatio: false,
-  tooltips: {
-    mode: 'x',
-  },
+const popChartOptions = {
+  ...commonChartOptions.root,
   scales: {
-    xAxes: [
-      {
-        ticks: {
-          fontColor: '#fff',
-        },
-        gridLines: {
-          display: false,
-        },
-        scaleLabel: {
-          display: true,
-          labelString: 'Time',
-          fontColor: '#fff',
-        },
+    x: {
+      ...commonChartOptions.scales,
+      title: {
+        display: true,
+        text: 'Time (in your timezone)',
+        color: '#fff',
       },
-    ],
-    yAxes: [
-      {
-        ticks: {
-          fontColor: '#fff',
-        },
-        gridLines: {
-          color: '#718096',
-        },
-        scaleLabel: {
-          display: true,
-          labelString: 'Players',
-          fontColor: '#fff',
-        },
+    },
+    y: {
+      ...commonChartOptions.scales,
+      grid: {
+        color: '#7b8694',
+      },
+      title: {
+        display: true,
+        text: 'Players',
+        color: '#fff',
       },
-    ],
-  },
-  legend: {
-    labels: {
-      fontColor: '#fff',
     },
   },
 }
@@ -181,7 +161,6 @@ export default Vue.extend({
   name: 'AlertPopulations',
   components: {
     CountdownSpinner,
-    LineChart,
   },
   props: {
     alert: {
@@ -202,58 +181,61 @@ export default Vue.extend({
     return {
       dataCollection: {},
       dataAvgCollection: {},
-      popNumberChartOptions: commonChartOptions,
-      activityChartOptions: {
-        ...commonChartOptions,
-        annotation: {
-          annotations: [
-            {
-              ...annotationCommon,
-              id: 'activityDead',
-              value: 1,
-              label: {
-                ...labelCommon,
-                content: 'Dead (>48)',
-                yAdjust: -13,
+      popNumberChartOptions: popChartOptions,
+      popActivityChartOptions: {
+        ...popChartOptions,
+        plugins: {
+          ...popChartOptions.plugins,
+          annotation: {
+            annotations: [
+              {
+                ...annotationCommon,
+                id: 'activityDead',
+                value: 1,
+                label: {
+                  ...labelCommon,
+                  content: 'Dead (>48)',
+                  yAdjust: -13,
+                },
               },
-            },
-            {
-              ...annotationCommon,
-              id: 'activityLow',
-              value: 48,
-              label: {
-                ...labelCommon,
-                content: 'Low (48)',
+              {
+                ...annotationCommon,
+                id: 'activityLow',
+                value: 48,
+                label: {
+                  ...labelCommon,
+                  content: 'Low (48)',
+                },
               },
-            },
-            {
-              ...annotationCommon,
-              id: 'activityMed',
-              value: 96,
-              label: {
-                ...labelCommon,
-                content: 'Med (96)',
+              {
+                ...annotationCommon,
+                id: 'activityMed',
+                value: 96,
+                label: {
+                  ...labelCommon,
+                  content: 'Med (96)',
+                },
               },
-            },
-            {
-              ...annotationCommon,
-              id: 'activityHigh',
-              value: 144,
-              label: {
-                ...labelCommon,
-                content: 'High (144)',
+              {
+                ...annotationCommon,
+                id: 'activityHigh',
+                value: 144,
+                label: {
+                  ...labelCommon,
+                  content: 'High (144)',
+                },
               },
-            },
-            {
-              ...annotationCommon,
-              id: 'activityPrime',
-              value: 192,
-              label: {
-                ...labelCommon,
-                content: 'Prime (192)',
+              {
+                ...annotationCommon,
+                id: 'activityPrime',
+                value: 192,
+                label: {
+                  ...labelCommon,
+                  content: 'Prime (192)',
+                },
               },
-            },
-          ],
+            ],
+          },
         },
       },
       error: null,
@@ -388,53 +370,38 @@ export default Vue.extend({
       })
 
       const datasets = []
-      const pointBorderWidth = 2
-      const pointHoverBorderWidth = 4
 
       if (this.isOutfitWar) {
         datasets.push(
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             label: this.outfitwar.outfitwars?.teams?.red?.tag ?? 'Red Team',
-            borderColor: '#9b2c2c',
             data: trData,
-            pointStyle: 'rect',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             label: this.outfitwar.outfitwars?.teams?.blue?.tag ?? 'Blue Team',
-            borderColor: '#2b6cb0',
             data: ncData,
-            pointStyle: 'triangle',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           }
         )
       } else {
         datasets.push(
           {
-            label: 'VS',
-            borderColor: '#6B46C1',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.vs,
             data: vsData,
-            pointStyle: 'circle',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
-            label: 'TR',
-            borderColor: '#9b2c2c',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             data: trData,
-            pointStyle: 'rect',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
-            label: 'NC',
-            borderColor: '#2b6cb0',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             data: ncData,
-            pointStyle: 'triangle',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           }
         )
       }
@@ -446,12 +413,10 @@ export default Vue.extend({
 
       if (!avg && !this.isOutfitWar) {
         collection.datasets.push({
+          ...commonChartOptions.datasets,
+          ...commonChartOptions.datasets.nsoDraws,
           label: 'NSO',
-          borderColor: '#4a5568',
           data: nsoData,
-          pointStyle: 'circle',
-          pointBorderWidth,
-          pointHoverBorderWidth,
         })
       }
 
diff --git a/components/statistics/victories/VictoriesTimeline.vue b/components/statistics/victories/VictoriesTimeline.vue
index f72eb6df..e5c734fc 100644
--- a/components/statistics/victories/VictoriesTimeline.vue
+++ b/components/statistics/victories/VictoriesTimeline.vue
@@ -54,6 +54,7 @@ import {
   getStartOfYear,
   utcDate,
 } from '~/utilities/TimeHelper'
+import { commonChartOptions } from '~/constants/CommonChartOptions'
 
 export default Vue.extend({
   name: 'VictoriesTimeline',
@@ -94,24 +95,10 @@ export default Vue.extend({
       maxDate: new Date(),
       dataCollection: {},
       chartOptions: {
-        responsive: true,
-        maintainAspectRatio: false,
-        interaction: {
-          intersect: false,
-          mode: 'index',
-        },
-        plugins: {
-          legend: {
-            labels: {
-              color: '#fff',
-            },
-          },
-          datalabels: {
-            display: false,
-          },
-        },
+        ...commonChartOptions.root,
         scales: {
           x: {
+            ...commonChartOptions.scales,
             type: 'timeseries',
             distribution: 'linear',
             time: {
@@ -122,17 +109,9 @@ export default Vue.extend({
               DATE_FORMAT_ISO
             ),
             max: formatDateTime(utcDate(new Date()), DATE_FORMAT_ISO),
-            ticks: {
-              color: '#fff',
-            },
-            grid: {
-              color: '#50565d',
-            },
           },
           y: {
-            ticks: {
-              color: '#fff',
-            },
+            ...commonChartOptions.scales,
             grid: {
               color: '#7b8694',
             },
@@ -276,42 +255,27 @@ export default Vue.extend({
         drawData.push({ x: key, y: rowTyped.draws })
       }
 
-      const commonDatasetOptions = {
-        pointBorderWidth: 3,
-        pointHoverBorderWidth: 5,
-      }
-
       this.dataCollection = {
         datasets: [
           {
-            ...commonDatasetOptions,
-            label: 'VS',
-            backgroundColor: '#6B46C1',
-            borderColor: '#6B46C1',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.vs,
             data: vsData,
-            pointStyle: 'circle',
           },
           {
-            ...commonDatasetOptions,
-            label: 'TR',
-            backgroundColor: '#9b2c2c',
-            borderColor: '#9b2c2c',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             data: trData,
-            pointStyle: 'rect',
           },
           {
-            ...commonDatasetOptions,
-            label: 'NC',
-            backgroundColor: '#2b6cb0',
-            borderColor: '#2b6cb0',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             data: ncData,
-            pointStyle: 'rectRot',
           },
           {
-            ...commonDatasetOptions,
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nsoDraws,
             label: 'Draws',
-            backgroundColor: '#4a5568',
-            borderColor: '#4a5568',
             data: drawData,
           },
         ],
diff --git a/constants/CommonChartOptions.ts b/constants/CommonChartOptions.ts
new file mode 100644
index 00000000..043fb03a
--- /dev/null
+++ b/constants/CommonChartOptions.ts
@@ -0,0 +1,56 @@
+export const commonChartOptions = {
+  root: {
+    responsive: true,
+    maintainAspectRatio: false,
+    interaction: {
+      intersect: false,
+      mode: 'index',
+    },
+    plugins: {
+      legend: {
+        labels: {
+          color: '#fff',
+        },
+      },
+      datalabels: {
+        display: false,
+      },
+    },
+  },
+  scales: {
+    ticks: {
+      color: '#fff',
+    },
+    grid: {
+      color: '#50565d',
+    },
+  },
+  datasets: {
+    pointBorderWidth: 3,
+    pointHoverBorderWidth: 5,
+    vs: {
+      label: 'VS',
+      backgroundColor: '#6B46C1',
+      borderColor: '#6B46C1',
+      pointStyle: 'circle',
+    },
+    tr: {
+      label: 'TR',
+      backgroundColor: '#9b2c2c',
+      borderColor: '#9b2c2c',
+      pointStyle: 'rect',
+    },
+    nc: {
+      label: 'NC',
+      backgroundColor: '#2b6cb0',
+      borderColor: '#2b6cb0',
+      pointStyle: 'rectRot',
+    },
+    nsoDraws: {
+      label: 'NSO',
+      backgroundColor: '#4a5568',
+      borderColor: '#4a5568',
+      pointStyle: 'circle',
+    },
+  },
+}
diff --git a/nuxt.config.js b/nuxt.config.js
index 171e8101..4368e48e 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -164,6 +164,7 @@ export default {
         'faChartArea',
         'faCheck',
         'faCodeFork',
+        'faFaceFrown',
         'faEquals',
         'faExchangeAlt',
         'faExclamation',

From ea0015d0bd07b41118e71934e9520e6e267ffe54 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Wed, 2 Aug 2023 19:47:39 +0100
Subject: [PATCH 13/36] #319 Migrated AlertCombatHistory chart

---
 components/alert/AlertCombatHistory.vue | 65 ++++++++-----------------
 1 file changed, 21 insertions(+), 44 deletions(-)

diff --git a/components/alert/AlertCombatHistory.vue b/components/alert/AlertCombatHistory.vue
index 6b13b9a4..62486a5a 100644
--- a/components/alert/AlertCombatHistory.vue
+++ b/components/alert/AlertCombatHistory.vue
@@ -54,18 +54,17 @@
           Headshots
         </button>
       </div>
-      <line-chart
+      <LineChart
         :chart-data="dataCollection"
-        :options="chartOptions"
-        style="width: 100%; height: 400px"
-      ></line-chart>
+        :chart-options="chartOptions"
+        :styles="{ width: '100%', height: '400px' }"
+      ></LineChart>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
-import LineChart from '../LineChart.js'
 import { Ps2AlertsEventState } from '@/ps2alerts-constants/ps2AlertsEventState'
 import ApiRequest from '~/api-request'
 import { Endpoints } from '@/constants/Endpoints'
@@ -76,12 +75,13 @@ import { Ps2AlertsEventType } from '~/ps2alerts-constants/ps2AlertsEventType'
 import { formatDateTime, utcDate } from '~/utilities/TimeHelper'
 import { TIME_FORMAT_SHORT } from '~/constants/Time'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
+import { commonChartOptions } from '~/constants/CommonChartOptions'
+import ucFirst from '~/filters/UcFirst'
 
 export default Vue.extend({
   name: 'AlertPopulations',
   components: {
     CountdownSpinner,
-    LineChart,
   },
   props: {
     alert: {
@@ -102,46 +102,23 @@ export default Vue.extend({
     return {
       dataCollection: {},
       chartOptions: {
-        responsive: true,
-        maintainAspectRatio: false,
-        tooltips: {
-          mode: 'x',
-        },
+        ...commonChartOptions.root,
         scales: {
-          xAxes: [
-            {
-              ticks: {
-                fontColor: '#fff',
-              },
-              gridLines: {
-                display: false,
-              },
-              scaleLabel: {
-                display: true,
-                labelString: 'Time',
-                fontColor: '#fff',
-              },
+          x: {
+            ...commonChartOptions.scales,
+            title: {
+              display: true,
+              text: 'Time',
+              color: '#fff',
             },
-          ],
-          yAxes: [
-            {
-              ticks: {
-                fontColor: '#fff',
-              },
-              gridLines: {
-                color: '#718096',
-              },
-              scaleLabel: {
-                display: true,
-                labelString: 'Count',
-                fontColor: '#fff',
-              },
+          },
+          y: {
+            ...commonChartOptions.scales,
+            title: {
+              display: true,
+              text: 'Kills',
+              color: '#fff',
             },
-          ],
-        },
-        legend: {
-          labels: {
-            fontColor: '#fff',
           },
         },
       },
@@ -355,7 +332,7 @@ export default Vue.extend({
     updateMode(mode: string) {
       this.mode = mode
       const options = this.chartOptions
-      options.scales.yAxes[0].scaleLabel.labelString = mode.toUpperCase()
+      options.scales.y.title.text = ucFirst(mode)
       this.chartOptions = options
     },
   },

From 12b9b2d2e2d70b7cf5611eb7fcf5bf398cf52bab Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Thu, 10 Aug 2023 13:01:38 +0100
Subject: [PATCH 14/36] #319 Fixed various graphs and made them vastly more
 readable

---
 components/alert/AlertBattleranks.vue   | 166 +++++++++++-------------
 components/alert/AlertCombatHistory.vue |  43 +++---
 2 files changed, 90 insertions(+), 119 deletions(-)

diff --git a/components/alert/AlertBattleranks.vue b/components/alert/AlertBattleranks.vue
index ec20ad96..584a53be 100644
--- a/components/alert/AlertBattleranks.vue
+++ b/components/alert/AlertBattleranks.vue
@@ -10,18 +10,17 @@
       <h1 class="mb-4">Loading...</h1>
     </div>
     <div v-if="loaded" class="text-center">
-      <bar-chart
+      <BarChart
         :chart-data="dataCollection"
-        :options="chartOptions"
-        style="width: 100%; height: 300px"
-      ></bar-chart>
+        :chart-options="chartOptions"
+        :styles="{ width: '100%', height: '300px' }"
+      ></BarChart>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
-import BarChart from '../BarChart.js'
 import ApiRequest from '@/api-request'
 import { Ps2AlertsEventState } from '@/ps2alerts-constants/ps2AlertsEventState'
 import { Endpoints } from '@/constants/Endpoints'
@@ -31,6 +30,7 @@ import { Faction } from '@/ps2alerts-constants/faction'
 import { InstanceOutfitWarsResponseInterface } from '~/interfaces/InstanceOutfitWarsResponseInterface'
 import { Ps2AlertsEventType } from '~/ps2alerts-constants/ps2AlertsEventType'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
+import { commonChartOptions } from '~/constants/CommonChartOptions'
 
 interface BattlerankDistributionDataInterface {
   // Faction
@@ -44,7 +44,6 @@ export default Vue.extend({
   name: 'AlertBattleranks',
   components: {
     CountdownSpinner,
-    BarChart,
   },
   props: {
     alert: {
@@ -74,78 +73,59 @@ export default Vue.extend({
       dataCollection: {},
       dataCollectionFactions: {},
       chartOptions: {
-        responsive: true,
-        maintainAspectRatio: false,
-        tooltips: {
-          mode: 'x',
-        },
-        annotation: {
-          annotations: [
-            {
-              drawTime: 'afterDatasetsDraw',
-              type: 'line',
-              mode: 'vertical',
-              scaleID: 'x-axis-0',
-              borderColor: 'rgba(255, 0, 0, 0.25)',
-              borderWidth: 2,
-              value: 121,
-              label: {
-                content: 'ASP',
-                enabled: true,
-              },
+        ...commonChartOptions.root,
+        scales: {
+          x: {
+            ...commonChartOptions.scales,
+            stacked: true,
+            title: {
+              display: true,
+              text: 'BR',
+              color: '#fff',
             },
-            {
-              drawTime: 'afterDatasetsDraw',
-              type: 'line',
-              mode: 'vertical',
-              scaleID: 'x-axis-0',
-              borderColor: 'rgba(255, 0, 0, 0.25)',
-              borderWidth: 2,
-              value: 221,
-              label: {
-                content: 'ASP2',
-                enabled: true,
-              },
+          },
+          y: {
+            ...commonChartOptions.scales,
+            grid: {
+              color: '#7b8694',
             },
-          ],
-        },
-        scales: {
-          xAxes: [
-            {
-              stacked: true,
-              ticks: {
-                fontColor: '#fff',
-              },
-              gridLines: {
-                display: false,
-              },
-              scaleLabel: {
-                display: true,
-                labelString: 'BR',
-                fontColor: '#fff',
-              },
+            stacked: true,
+            title: {
+              display: true,
+              text: 'Players',
+              color: '#fff',
             },
-          ],
-          yAxes: [
-            {
-              stacked: true,
-              ticks: {
-                fontColor: '#fff',
-              },
-              gridLines: {
-                color: '#718096',
+          },
+        },
+        plugins: {
+          ...commonChartOptions.root.plugins,
+          annotation: {
+            annotations: [
+              {
+                drawTime: 'afterDatasetsDraw',
+                type: 'line',
+                mode: 'vertical',
+                borderColor: 'rgba(255, 0, 0, 0.25)',
+                borderWidth: 2,
+                value: 121,
+                label: {
+                  content: 'ASP',
+                  enabled: true,
+                },
               },
-              scaleLabel: {
-                display: true,
-                labelString: 'Players',
-                fontColor: '#fff',
+              {
+                drawTime: 'afterDatasetsDraw',
+                type: 'line',
+                mode: 'vertical',
+                borderColor: 'rgba(255, 0, 0, 0.25)',
+                borderWidth: 2,
+                value: 221,
+                label: {
+                  content: 'ASP2',
+                  enabled: true,
+                },
               },
-            },
-          ],
-        },
-        legend: {
-          labels: {
-            fontColor: '#fff',
+            ],
           },
         },
       },
@@ -287,49 +267,53 @@ export default Vue.extend({
       const battleranks: number[] = [...Array(limit).keys()]
 
       const datasets = []
-      let borderWidth = 4
+      const border = {
+        width: 8,
+      }
 
       if (this.isOutfitWar) {
-        borderWidth = 8
+        border.width = 8
         datasets.push(
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             label: this.outfitwar.outfitwars?.teams?.red?.tag ?? 'Red Team',
-            backgroundColor: '#9b2c2c',
             data: factionBattlerankData[3],
-            borderWidth,
+            border,
           },
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             label: this.outfitwar.outfitwars?.teams?.blue?.tag ?? 'Blue Team',
-            backgroundColor: '#2b6cb0',
             data: factionBattlerankData[2],
-            borderWidth,
+            border,
           }
         )
       } else {
         datasets.push(
           {
-            label: 'VS',
-            backgroundColor: '#6B46C1',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.vs,
             data: factionBattlerankData[1],
-            borderWidth,
+            border,
           },
           {
-            label: 'TR',
-            backgroundColor: '#9b2c2c',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             data: factionBattlerankData[3],
-            borderWidth,
+            border,
           },
           {
-            label: 'NC',
-            backgroundColor: '#2b6cb0',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             data: factionBattlerankData[2],
-            borderWidth,
+            border,
           },
           {
-            label: 'NSO',
-            backgroundColor: '#64748B',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nsoDraws,
             data: factionBattlerankData[4],
-            borderWidth,
+            border,
           }
         )
       }
diff --git a/components/alert/AlertCombatHistory.vue b/components/alert/AlertCombatHistory.vue
index 62486a5a..a4212ac2 100644
--- a/components/alert/AlertCombatHistory.vue
+++ b/components/alert/AlertCombatHistory.vue
@@ -114,6 +114,9 @@ export default Vue.extend({
           },
           y: {
             ...commonChartOptions.scales,
+            grid: {
+              color: '#7b8694',
+            },
             title: {
               display: true,
               text: 'Kills',
@@ -266,60 +269,44 @@ export default Vue.extend({
       }
 
       const datasets = []
-      const pointBorderWidth = 2
-      const pointHoverBorderWidth = 4
 
       if (this.isOutfitWar) {
         datasets.push(
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             label: this.outfitwar.outfitwars?.teams?.red?.tag ?? 'Red Team',
-            borderColor: '#9b2c2c',
             data: trData,
-            pointStyle: 'rect',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             label: this.outfitwar.outfitwars?.teams?.blue?.tag ?? 'Blue Team',
-            borderColor: '#2b6cb0',
             data: ncData,
-            pointStyle: 'triangle',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           }
         )
       } else {
         datasets.push(
           {
-            label: 'VS',
-            borderColor: '#6B46C1',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.vs,
             data: vsData,
-            pointStyle: 'circle',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
-            label: 'TR',
-            borderColor: '#9b2c2c',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.tr,
             data: trData,
-            pointStyle: 'rect',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
-            label: 'NC',
-            borderColor: '#2b6cb0',
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nc,
             data: ncData,
-            pointStyle: 'triangle',
-            pointBorderWidth,
-            pointHoverBorderWidth,
           },
           {
+            ...commonChartOptions.datasets,
+            ...commonChartOptions.datasets.nsoDraws,
             label: 'NSO',
-            borderColor: '#4a5568',
             data: nsoData,
-            pointBorderWidth: 2,
-            pointHoverBorderWidth: 4,
           }
         )
       }

From de15d404ff769e9eb49f628035dabf35a387c5ea Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Thu, 10 Aug 2023 15:13:46 +0100
Subject: [PATCH 15/36] #319 Totally gutted the Alert BRs and redesigned them
 to accept buckets with configurable sizes.

---
 components/alert/AlertBattleranks.vue | 161 ++++++++++++++++++--------
 1 file changed, 114 insertions(+), 47 deletions(-)

diff --git a/components/alert/AlertBattleranks.vue b/components/alert/AlertBattleranks.vue
index 584a53be..9f3251b7 100644
--- a/components/alert/AlertBattleranks.vue
+++ b/components/alert/AlertBattleranks.vue
@@ -10,6 +10,15 @@
       <h1 class="mb-4">Loading...</h1>
     </div>
     <div v-if="loaded" class="text-center">
+      <div class="flex m-auto w-60 justify-center">
+        <span>Range size: </span>
+        <input
+          v-model="bucketSize"
+          class="w-16 ml-2 appearance-none border border-solid border-transparent text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
+          type="number"
+          aria-label="Bucket size"
+        />
+      </div>
       <BarChart
         :chart-data="dataCollection"
         :chart-options="chartOptions"
@@ -32,14 +41,6 @@ import { Ps2AlertsEventType } from '~/ps2alerts-constants/ps2AlertsEventType'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
 import { commonChartOptions } from '~/constants/CommonChartOptions'
 
-interface BattlerankDistributionDataInterface {
-  // Faction
-  [k: number]: {
-    // Per BR ranking
-    [k: number]: number
-  }
-}
-
 export default Vue.extend({
   name: 'AlertBattleranks',
   components: {
@@ -72,6 +73,7 @@ export default Vue.extend({
       data: [] as InstanceCharacterAggregateResponseInterface[],
       dataCollection: {},
       dataCollectionFactions: {},
+      bucketSize: 5,
       chartOptions: {
         ...commonChartOptions.root,
         scales: {
@@ -146,6 +148,12 @@ export default Vue.extend({
         this.pull()
       }
     },
+    bucketSize(newVal, oldVal) {
+      if (newVal !== oldVal) {
+        localStorage.setItem('alertBRBucketSize', newVal.toString())
+        this.buildCollection()
+      }
+    },
   },
   beforeDestroy() {
     this.reset()
@@ -165,6 +173,7 @@ export default Vue.extend({
     },
     init(): void {
       this.pull()
+      this.bucketSize = this.getBucketSizePref()
 
       if (this.alert.state === Ps2AlertsEventState.STARTED) {
         this.updateCountdownInterval = window.setInterval(() => {
@@ -203,68 +212,113 @@ export default Vue.extend({
         })
     },
     buildCollection() {
-      const factionBattlerankData: BattlerankDistributionDataInterface = {}
-      let maxBR: number = 0
+      if (this.bucketSize < 1) {
+        return
+      }
 
-      // Ensure all factions have at least zero
-      ;[
+      const factionBattlerankData: Map<
+        Faction,
+        Map<number, { x: number; y: number }>
+      > = new Map()
+      const factionBattlerankDataChart: Map<
+        Faction,
+        { x: number; y: number }[]
+      > = new Map()
+      const battleRanksRaw: Set<number> = new Set()
+      const factions = [
         Faction.VANU_SOVEREIGNTY,
         Faction.NEW_CONGLOMERATE,
         Faction.TERRAN_REPUBLIC,
         Faction.NS_OPERATIVES,
-      ].forEach((faction) => {
-        factionBattlerankData[faction] = []
+      ]
+      const maxBR = 420
+
+      // Ensure all factions have a map set and all battle ranks are in the set
+      factions.forEach((faction) => {
+        factionBattlerankData.set(faction, new Map())
+        factionBattlerankDataChart.set(faction, [])
+        for (let i = 0; i <= maxBR; i++) {
+          const br = this.roundToNearestSize(i, this.bucketSize)
+          factionBattlerankData.get(faction)?.set(br, { x: br, y: 0 })
+          battleRanksRaw.add(br)
+        }
       })
 
+      // Here, we are going to create buckets of the data in the scale of 1-10, 11-20 etc. This is to reduce the number of bars the graph has to render from potentially 420 max to 42.
+      // This has huge benefits on mobile and it still makes quite a lot of sense statistically.
       this.data.forEach(
         (character: InstanceCharacterAggregateResponseInterface) => {
           const faction = character.character.faction
-          const battlerank = character.character.adjustedBattleRank
-
-          ;[
-            Faction.VANU_SOVEREIGNTY,
-            Faction.NEW_CONGLOMERATE,
-            Faction.TERRAN_REPUBLIC,
-            Faction.NS_OPERATIVES,
-          ].forEach((faction) => {
-            if (!factionBattlerankData[faction][battlerank]) {
-              factionBattlerankData[faction][battlerank] = 0
-            }
-          })
 
           // Excludes "World" players
           if (faction === 0) {
             return
           }
 
+          let team: Faction
+
           if (
             this.isOutfitWar &&
             this.outfitwar.outfitwars?.teams?.red &&
             this.outfitwar.outfitwars.teams.blue &&
             character.character.outfit
           ) {
-            factionBattlerankData[
-              character.character.outfit.id ===
-              this.outfitwar.outfitwars.teams.red.id
-                ? Faction.TERRAN_REPUBLIC
-                : Faction.NEW_CONGLOMERATE
-            ][battlerank]++
+            team = this.outfitwar.outfitwars.teams.red.id
+              ? Faction.TERRAN_REPUBLIC
+              : Faction.NEW_CONGLOMERATE
           } else {
-            factionBattlerankData[faction][battlerank]++
+            team = faction
           }
 
-          if (Number.isSafeInteger(battlerank)) {
-            maxBR = Math.max(maxBR, battlerank)
+          const battleRankBucket = this.roundToNearestSize(
+            character.character.adjustedBattleRank,
+            this.bucketSize
+          )
+
+          battleRanksRaw.add(battleRankBucket)
+
+          const factionDataMap = factionBattlerankData.get(team) ?? new Map()
+
+          if (!factionDataMap.get(battleRankBucket)) {
+            factionDataMap.set(battleRankBucket, {
+              x: battleRankBucket,
+              y: 0,
+            })
           }
+
+          const bucketValue = factionDataMap.get(battleRankBucket).y
+
+          factionDataMap.set(battleRankBucket, {
+            x: battleRankBucket,
+            y: bucketValue + 1,
+          })
         }
       )
 
-      let limit: number = 121
+      // Sort all of the factionBattlerankDatas by the battlerank labels
+      factions.forEach((faction) => {
+        const factionDataMap = factionBattlerankData.get(faction)
 
-      while (limit < maxBR) {
-        limit += 100
-      }
-      const battleranks: number[] = [...Array(limit).keys()]
+        if (!factionDataMap) {
+          return
+        }
+
+        const sorted = new Map(
+          [...factionDataMap.entries()].sort((a, b) => a[0] - b[0])
+        )
+
+        factionBattlerankData.set(faction, sorted)
+
+        // Convert the map to an array for the graph
+        factionBattlerankDataChart.set(faction, Array.from(sorted.values()))
+      })
+
+      console.log(factionBattlerankDataChart)
+
+      // Sort the battleRanksRaw into an ordered array
+      const battleRanks = Array.from(battleRanksRaw).sort((a, b) => a - b)
+
+      console.log(battleRanks)
 
       const datasets = []
       const border = {
@@ -278,14 +332,14 @@ export default Vue.extend({
             ...commonChartOptions.datasets,
             ...commonChartOptions.datasets.tr,
             label: this.outfitwar.outfitwars?.teams?.red?.tag ?? 'Red Team',
-            data: factionBattlerankData[3],
+            data: factionBattlerankDataChart.get(Faction.TERRAN_REPUBLIC),
             border,
           },
           {
             ...commonChartOptions.datasets,
             ...commonChartOptions.datasets.nc,
             label: this.outfitwar.outfitwars?.teams?.blue?.tag ?? 'Blue Team',
-            data: factionBattlerankData[2],
+            data: factionBattlerankDataChart.get(Faction.NEW_CONGLOMERATE),
             border,
           }
         )
@@ -294,38 +348,51 @@ export default Vue.extend({
           {
             ...commonChartOptions.datasets,
             ...commonChartOptions.datasets.vs,
-            data: factionBattlerankData[1],
+            data: factionBattlerankDataChart.get(Faction.VANU_SOVEREIGNTY),
             border,
           },
           {
             ...commonChartOptions.datasets,
             ...commonChartOptions.datasets.tr,
-            data: factionBattlerankData[3],
+            data: factionBattlerankDataChart.get(Faction.TERRAN_REPUBLIC),
             border,
           },
           {
             ...commonChartOptions.datasets,
             ...commonChartOptions.datasets.nc,
-            data: factionBattlerankData[2],
+            data: factionBattlerankDataChart.get(Faction.NEW_CONGLOMERATE),
             border,
           },
           {
             ...commonChartOptions.datasets,
             ...commonChartOptions.datasets.nsoDraws,
-            data: factionBattlerankData[4],
+            data: factionBattlerankDataChart.get(Faction.NS_OPERATIVES),
             border,
           }
         )
       }
 
       this.dataCollection = {
-        labels: battleranks,
+        labels: battleRanks,
         datasets,
       }
     },
     updateMode(mode: string): void {
       this.mode = mode
     },
+    getBucketSizePref(): number {
+      const bucketSize = localStorage.getItem('alertBRBucketSize')
+
+      if (!bucketSize) {
+        localStorage.setItem('alertBRBucketSize', '5')
+        return 5
+      }
+
+      return parseInt(bucketSize)
+    },
+    roundToNearestSize(num: number, size: number = 5): number {
+      return Math.floor(num / size) * size
+    },
   },
 })
 </script>

From 2f75b4886d8e516bba13605a6347e15d17c351d9 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Thu, 10 Aug 2023 19:07:17 +0100
Subject: [PATCH 16/36] #489: Added the ability to bookmark / pin search
 results

---
 components/search/SearchBar.vue    | 81 ++++++++++++++++++++++++++++++
 components/search/SearchResult.vue | 32 +++++++++++-
 nuxt.config.js                     |  2 +
 package.json                       |  1 +
 yarn.lock                          | 12 +++++
 5 files changed, 127 insertions(+), 1 deletion(-)

diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 2fa3ba8e..d1866747 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -43,6 +43,7 @@
             v-for="result in results"
             :key="result.name"
             :result="result"
+            @pinned="handlePinEvent"
           />
         </div>
         {{ error.message }}
@@ -75,8 +76,18 @@ export default defineComponent({
       searchTerm: '',
       apiRequest: new ApiRequest(),
       source: axios.CancelToken.source() as CancelTokenSource,
+      pinnedCharacters: new Map() as Map<
+        string,
+        SearchResultComponentInterface
+      >,
+      pinnedOutfits: new Map() as Map<string, SearchResultComponentInterface>,
     }
   },
+  created() {
+    this.loadPinned()
+    this.injectPinned()
+    console.log(this.results)
+  },
   methods: {
     parseResults(
       characterResults: SearchCharacterInterface[],
@@ -92,6 +103,7 @@ export default defineComponent({
           score = 100
         }
 
+        result.id = result.character.id
         result.matchScore = score
         result.type = 'player'
         result.faction = result.character.faction
@@ -119,6 +131,7 @@ export default defineComponent({
           score = score / 2
         }
 
+        result.id = result.outfit.id
         result.matchScore = score
         result.type = 'outfit'
         result.faction = result.outfit.faction
@@ -140,6 +153,7 @@ export default defineComponent({
     clear() {
       this.searchTerm = ''
       this.results = []
+      this.injectPinned()
       this.error = { message: '' }
       this.loading = false
       if (this.source) {
@@ -169,6 +183,7 @@ export default defineComponent({
           message: 'Please enter at least 3 characters',
         }
         this.results = []
+        this.injectPinned()
         return
       }
 
@@ -210,6 +225,7 @@ export default defineComponent({
 
         if (characterResults.length === 0 && outfitResults.length === 0) {
           this.results = []
+          this.injectPinned()
           this.error = { message: 'No results found!' }
           this.loading = false
           return
@@ -217,6 +233,7 @@ export default defineComponent({
 
         // Parse the results into a SearchResult component friendly format
         this.results = this.parseResults(characterResults, outfitResults)
+        this.injectPinned()
         this.loading = false
       } catch (error) {
         if (!axios.isCancel(error)) {
@@ -227,6 +244,70 @@ export default defineComponent({
         }
       }
     },
+    handlePinEvent(result: SearchResultComponentInterface): void {
+      result.isPinned = !result.isPinned
+
+      if (result.isPinned) {
+        // Detect the type
+        if (result.type === 'player') {
+          this.pinnedCharacters.set(result.id, result)
+        } else if (result.type === 'outfit') {
+          this.pinnedOutfits.set(result.id, result)
+        }
+      } else {
+        if (result.type === 'player') {
+          this.pinnedCharacters.delete(result.id)
+        } else if (result.type === 'outfit') {
+          this.pinnedOutfits.delete(result.id)
+        }
+
+        // Remove from current result set
+        this.results = this.results.filter((r) => r.id !== result.id)
+      }
+
+      // Update local storage
+      localStorage.setItem(
+        'pinnedCharacters',
+        JSON.stringify(Array.from(this.pinnedCharacters.values()))
+      )
+      localStorage.setItem(
+        'pinnedOutfits',
+        JSON.stringify(Array.from(this.pinnedOutfits.values()))
+      )
+
+      this.injectPinned()
+    },
+    loadPinned(): void {
+      // Load pinned characters and outfits from local storage
+      this.pinnedCharacters = new Map(
+        JSON.parse(localStorage.getItem('pinnedCharacters') || '[]').map(
+          (pinned: SearchResultComponentInterface) => [pinned.id, pinned]
+        )
+      )
+      this.pinnedOutfits = new Map(
+        JSON.parse(localStorage.getItem('pinnedOutfits') || '[]').map(
+          (pinned: SearchResultComponentInterface) => [pinned.id, pinned]
+        )
+      )
+    },
+    injectPinned(): void {
+      // Take the current result set and inject the pinned results right at the top, and remove them from the result set if present
+      const pinnedCharacters = Array.from(this.pinnedCharacters.values())
+      const pinnedOutfits = Array.from(this.pinnedOutfits.values())
+
+      // Remove pinned results from the result set
+      this.results = this.results.filter((result) => {
+        return !(
+          (result.type === 'player' &&
+            pinnedCharacters.find((pinned) => pinned.id === result.id)) ||
+          (result.type === 'outfit' &&
+            pinnedOutfits.find((pinned) => pinned.id === result.id))
+        )
+      })
+
+      // Inject the pinned results at the top
+      this.results = [...pinnedCharacters, ...pinnedOutfits, ...this.results]
+    },
   },
 })
 </script>
diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index c647f754..85799962 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,9 +1,28 @@
 <template>
   <div
-    class="my-2 py-2 text-center cursor-pointer hover border"
+    class="my-2 py-2 px-4 text-center cursor-pointer hover border relative"
     :class="classes"
     :score="result.matchScore"
   >
+    <font-awesome-icon
+      v-show="result.isPinned || isPinned"
+      :icon="['fas', 'bookmark']"
+      class="text-sm absolute top-1 right-1"
+      @click="pinResult(false)"
+    ></font-awesome-icon>
+    <v-tooltip right>
+      <template #activator="{ on, attrs }">
+        <font-awesome-icon
+          v-show="!result.isPinned && !isPinned"
+          :icon="['far', 'bookmark']"
+          class="text-sm absolute top-1 right-1"
+          v-bind="attrs"
+          @click="pinResult(true)"
+          v-on="on"
+        ></font-awesome-icon>
+      </template>
+      Pin this result so you can find your characters / outfits easily!
+    </v-tooltip>
     <NuxtLink :to="link">
       <p class="m-0">
         <span v-if="result.tag" class="font-mono">[{{ result.tag }}]</span>
@@ -37,6 +56,11 @@ export default defineComponent({
       },
     },
   },
+  data: () => {
+    return {
+      isPinned: false,
+    }
+  },
   computed: {
     characterResult(): SearchCharacterInterface | undefined {
       return this.result.type === 'player'
@@ -70,5 +94,11 @@ export default defineComponent({
       ]
     },
   },
+  methods: {
+    pinResult(value: boolean): void {
+      this.isPinned = value
+      this.$emit('pinned', this.result)
+    },
+  },
 })
 </script>
diff --git a/nuxt.config.js b/nuxt.config.js
index 4368e48e..2f1fbef0 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -159,6 +159,7 @@ export default {
         'faArrowUp',
         'faArrowsToDot',
         'faBarsProgress',
+        'faBookmark',
         'faBomb',
         'faBullhorn',
         'faChartArea',
@@ -198,6 +199,7 @@ export default {
         'faWrench',
         'faXmark',
       ],
+      regular: ['faBookmark'],
       brands: ['faDiscord', 'faGithub', 'faTwitter', 'faPatreon', 'faSith'],
     },
   },
diff --git a/package.json b/package.json
index 3ebe3b42..ebaf1dd8 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.0",
     "@fortawesome/free-brands-svg-icons": "^6.4.0",
     "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@fortawesome/free-regular-svg-icons": "^6.4.0",
     "@fortawesome/vue-fontawesome": "^2.0.10",
     "@nuxtjs/axios": "^5.13.1",
     "@nuxtjs/google-gtag": "^1.0.4",
diff --git a/yarn.lock b/yarn.lock
index e9ce08e2..16366476 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1333,6 +1333,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz#88da2b70d6ca18aaa6ed3687832e11f39e80624b"
   integrity sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==
 
+"@fortawesome/fontawesome-common-types@6.4.2":
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz#1766039cad33f8ad87f9467b98e0d18fbc8f01c5"
+  integrity sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==
+
 "@fortawesome/fontawesome-common-types@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz#949995a05c0d8801be7e0a594f775f1dbaa0d893"
@@ -1359,6 +1364,13 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.4.0"
 
+"@fortawesome/free-regular-svg-icons@^6.4.0":
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.2.tgz#aee79ed76ce5dd04931352f9d83700761b8b1b25"
+  integrity sha512-0+sIUWnkgTVVXVAPQmW4vxb9ZTHv0WstOa3rBx9iPxrrrDH6bNLsDYuwXF9b6fGm+iR7DKQvQshUH/FJm3ed9Q==
+  dependencies:
+    "@fortawesome/fontawesome-common-types" "6.4.2"
+
 "@fortawesome/free-solid-svg-icons@^6.4.0":
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz#48c0e790847fa56299e2f26b82b39663b8ad7119"

From 72b522b13f8f053753ecbb846dd961985a525724 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Thu, 10 Aug 2023 19:12:37 +0100
Subject: [PATCH 17/36] #489: Added iconography to search result subtext

---
 components/search/SearchResult.vue | 12 +++++++++++-
 nuxt.config.js                     |  1 +
 ps2alerts-constants                |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index 85799962..848ef31d 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -29,7 +29,17 @@
         {{ result.name }}
       </p>
       <p class="text-xs text-gray-400 font-semibold">
-        {{ result.type | ucFirst }} | {{ result.world | worldName }}
+        <font-awesome-icon
+          v-if="result.type === 'player'"
+          :icon="['fas', 'user']"
+        ></font-awesome-icon>
+        <font-awesome-icon
+          v-if="result.type === 'outfit'"
+          :icon="['fas', 'users']"
+        ></font-awesome-icon>
+        {{ result.type | ucFirst }} |
+        <font-awesome-icon :icon="['fas', 'globe']"></font-awesome-icon>
+        {{ result.world | worldName }}
       </p>
     </NuxtLink>
   </div>
diff --git a/nuxt.config.js b/nuxt.config.js
index 2f1fbef0..f9293197 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -173,6 +173,7 @@ export default {
         'faFighterJet',
         'faFileVideo',
         'faFlag',
+        'faGlobe',
         'faGun',
         'faHourglass',
         'faInfoCircle',
diff --git a/ps2alerts-constants b/ps2alerts-constants
index 9aad37ee..73114327 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit 9aad37ee2218396dbc272a8916a712518157ab81
+Subproject commit 7311432757fad15b164b96d84fe030a1e4af9dbb

From 711dcc24d5756bc5512d3130ccd59ebdf54033cf Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Thu, 10 Aug 2023 23:40:54 +0100
Subject: [PATCH 18/36] #489: Prevent password managers showing up on the
 searchbar

---
 components/search/SearchBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index d1866747..02db0637 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -14,7 +14,7 @@
           <input
             v-model="searchTerm"
             class="mr-2 appearance-none border border-solid border-transparent w-full text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
-            type="text"
+            type="search"
             placeholder="e.g. DIG, Maelstrome"
             aria-label="Full name"
             @keyup="search"

From a3ea1720333f899be6bd3796d7ead4e0228697e1 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Thu, 10 Aug 2023 23:41:18 +0100
Subject: [PATCH 19/36] #489: Improved formatting in players alerts involved
 list

---
 assets/css/tailwind.scss                      |   3 +
 components/profiles/ProfileAlertsInvolved.vue | 163 +++++++++++++-----
 constants/CommonChartOptions.ts               |   1 +
 filters/BracketName.ts                        |  41 +++--
 pages/player/_player.vue                      |   2 +-
 5 files changed, 148 insertions(+), 62 deletions(-)

diff --git a/assets/css/tailwind.scss b/assets/css/tailwind.scss
index 3c8475ac..01d1fd20 100644
--- a/assets/css/tailwind.scss
+++ b/assets/css/tailwind.scss
@@ -429,6 +429,9 @@ select {
     &:hover {
       @apply bg-gray-500;
     }
+    &.border {
+      @apply border-gray-400
+    }
   }
 
   &.TR {
diff --git a/components/profiles/ProfileAlertsInvolved.vue b/components/profiles/ProfileAlertsInvolved.vue
index 91e4493d..8dee5eb8 100644
--- a/components/profiles/ProfileAlertsInvolved.vue
+++ b/components/profiles/ProfileAlertsInvolved.vue
@@ -1,42 +1,62 @@
 <template>
-  <div class="col-span-12 lg:col-span-4 lg:col-start-5">
-    {{ statistics.alerts.length }} Alerts
-
-    <v-data-table
-      class="datatable"
-      item-key="instanceDetails.instanceId"
-      :headers="headers"
-      :items="parsedData"
-      v-bind="tableConfig"
-    >
-      <template #item.instance="{ item }">
-        <NuxtLink
-          :to="`/alert/${item.instanceDetails.instanceId}`"
-          class="text-red-500"
-        >
-          {{ item.instanceDetails.instanceId }}
-        </NuxtLink>
-      </template>
-      <template #item.victor="{ item }">
-        <span
-          v-if="item.victor === player.character.faction"
-          class="label green"
-          >Yes</span
-        >
-        <span v-else class="label">No</span>
-        <span class="label" :class="item.victor | factionShortName">{{
-          item.victor | factionShortName
-        }}</span>
-      </template>
-      <template #item.outfit="{ item }">
-        <NuxtLink :to="`/outfit/${item.outfit.id}`" class="text-red-500">
-          <span v-if="item.outfit.tag" class="font-mono"
-            >[{{ item.outfit.tag }}]</span
+  <div class="col-span-12 grid grid-cols-12">
+    <div class="col-span-12">{{ statistics.alerts.length }} Alerts</div>
+    <div class="col-span-12 md:col-span-4 lg:col-span-2">
+      <v-simple-table dark dense>
+        <thead>
+          <tr class="font-bold border-b border-white">
+            <td>Bracket</td>
+            <td>Count</td>
+          </tr>
+        </thead>
+        <tbody>
+          <tr v-for="(count, bracket) in alertsByBrackets" :key="bracket">
+            <td>
+              {{ bracket | bracketName }}
+            </td>
+            <td>{{ count }}</td>
+          </tr>
+        </tbody>
+      </v-simple-table>
+      <PieChart v-bind="charts.bracketDistributions" />
+    </div>
+    <div class="col-span-12">
+      <v-data-table
+        class="datatable"
+        item-key="instanceDetails.instanceId"
+        :headers="headers"
+        :items="parsedData"
+        v-bind="tableConfig"
+      >
+        <template #item.instance="{ item }">
+          <NuxtLink
+            :to="`/alert/${item.instanceDetails.instanceId}`"
+            class="label gray border"
+          >
+            {{ item.instanceDetails.instanceId }}
+          </NuxtLink>
+        </template>
+        <template #item.victor="{ item }">
+          <span
+            v-if="item.victor === player.character.faction"
+            class="label green"
+            >Yes</span
           >
-          {{ item.outfit.name }}
-        </NuxtLink>
-      </template>
-    </v-data-table>
+          <span v-else class="label">No</span>
+          <span class="label" :class="item.victor | factionShortName">{{
+            item.victor | factionShortName
+          }}</span>
+        </template>
+        <template #item.outfit="{ item }">
+          <NuxtLink :to="`/outfit/${item.outfit.id}`" class="label gray border">
+            <span v-if="item.outfit.tag" class="font-mono"
+              >[{{ item.outfit.tag }}]</span
+            >
+            {{ item.outfit.name }}
+          </NuxtLink>
+        </template>
+      </v-data-table>
+    </div>
   </div>
 </template>
 
@@ -47,11 +67,12 @@ import { ProfileAlertsConfig } from '~/constants/DataTableConfig'
 import { GlobalCharacterAggregateInterface } from '~/ps2alerts-constants/interfaces/api-responses/GlobalCharacterAggregateInterface'
 import { dateTimeFormat } from '~/filters/DateTimeFormat'
 import zoneNameFilter from '~/filters/ZoneName'
-import factionShortName from '~/filters/FactionShortName'
+import { Bracket } from '~/ps2alerts-constants/bracket'
+import bracketName from '~/filters/BracketName'
+import { commonChartOptions } from '~/constants/CommonChartOptions'
 
 export default Vue.extend({
   name: 'ProfileAlertsInvolved',
-  components: {},
   props: {
     statistics: {
       type: Object as () => ProfileMetricsInterface,
@@ -64,8 +85,50 @@ export default Vue.extend({
   },
   data() {
     return {
+      charts: {
+        bracketDistributions: {
+          chartData: {
+            labels: [
+              bracketName(Bracket.DEAD),
+              bracketName(Bracket.LOW),
+              bracketName(Bracket.MEDIUM),
+              bracketName(Bracket.HIGH),
+              bracketName(Bracket.PRIME),
+            ],
+            datasets: [
+              {
+                backgroundColor: [
+                  '#5d2e2e',
+                  '#7e2f2f',
+                  '#ab2a2a',
+                  '#c92020',
+                  '#ff0d00',
+                ],
+                data: [40, 20, 80, 10, 100],
+              },
+            ],
+          },
+          chartOptions: {
+            ...commonChartOptions.root,
+            plugins: {
+              ...commonChartOptions.root.plugins,
+              datalabels: {
+                ...commonChartOptions.root.plugins.datalabels,
+                display: true,
+              },
+            },
+          },
+        },
+      },
       parsedData: {} as any,
       tableConfig: ProfileAlertsConfig,
+      alertsByBrackets: {
+        1: 0,
+        2: 0,
+        3: 0,
+        4: 0,
+        5: 0,
+      } as Record<number, number>,
       headers: [
         {
           text: 'ID',
@@ -85,6 +148,12 @@ export default Vue.extend({
           sortable: true,
           value: 'cont',
         },
+        {
+          text: 'Bracket',
+          align: 'left',
+          sortable: true,
+          value: 'bracket',
+        },
         {
           text: 'Victor',
           align: 'left',
@@ -164,12 +233,21 @@ export default Vue.extend({
   },
   computed: {},
   created(): void {
-    this.parsedData = this.parseForTable(this.statistics)
+    this.parsedData = this.parseData(this.statistics)
+    this.charts.bracketDistributions.chartData.datasets[0].data = [
+      this.alertsByBrackets[1],
+      this.alertsByBrackets[2],
+      this.alertsByBrackets[3],
+      this.alertsByBrackets[4],
+      this.alertsByBrackets[5],
+    ]
   },
   methods: {
-    factionShortName,
-    parseForTable(stats: ProfileMetricsInterface): any {
+    parseData(stats: ProfileMetricsInterface): any {
       return stats.alerts.map((alert) => {
+        // Update other stats as part of this loop
+        this.alertsByBrackets[Number(alert.instanceDetails?.bracket) ?? 0] += 1
+
         return {
           ...alert,
           kills: alert.kills ?? 0,
@@ -188,6 +266,7 @@ export default Vue.extend({
             ? zoneNameFilter(alert.instanceDetails.zone)
             : 'Unknown',
           victor: alert.instanceDetails?.result?.victor ?? null,
+          bracket: bracketName(alert.instanceDetails?.bracket ?? '?'),
           outfit: alert.character.outfit,
           // All the brackets
           // 1 is used instead of 0 to prevent division by zero
diff --git a/constants/CommonChartOptions.ts b/constants/CommonChartOptions.ts
index 043fb03a..a8bd290f 100644
--- a/constants/CommonChartOptions.ts
+++ b/constants/CommonChartOptions.ts
@@ -14,6 +14,7 @@ export const commonChartOptions = {
       },
       datalabels: {
         display: false,
+        color: '#fff',
       },
     },
   },
diff --git a/filters/BracketName.ts b/filters/BracketName.ts
index 79eef5a3..32ddc674 100644
--- a/filters/BracketName.ts
+++ b/filters/BracketName.ts
@@ -1,25 +1,28 @@
 import Vue from 'vue'
 import { Bracket } from '@/ps2alerts-constants/bracket'
 
-const bracketName = Vue.filter('bracketName', (value: Bracket) => {
-  switch (value) {
-    case Bracket.UNKNOWN:
-      return 'N/A'
-    case Bracket.DEAD:
-      return 'Dead'
-    case Bracket.LOW:
-      return 'Low'
-    case Bracket.MEDIUM:
-      return 'Medium'
-    case Bracket.HIGH:
-      return 'High'
-    case Bracket.PRIME:
-      return 'Prime'
-    case Bracket.TOTAL:
-      return 'Totalled (UNUSED)'
-    default:
-      return 'UNKNOWN!'
+export const bracketName = Vue.filter(
+  'bracketName',
+  (value: Bracket | string) => {
+    switch (parseInt(<string>value, 10) as Bracket) {
+      case Bracket.UNKNOWN:
+        return 'N/A'
+      case Bracket.DEAD:
+        return 'Dead'
+      case Bracket.LOW:
+        return 'Low'
+      case Bracket.MEDIUM:
+        return 'Medium'
+      case Bracket.HIGH:
+        return 'High'
+      case Bracket.PRIME:
+        return 'Prime'
+      case Bracket.TOTAL:
+        return 'Totalled (UNUSED)'
+      default:
+        return 'UNKNOWN!'
+    }
   }
-})
+)
 
 export default bracketName
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index 1f6324cf..23121b68 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -28,7 +28,7 @@
         <ProfileCombatMetrics :statistics="statistics" />
       </div>
       <div class="col-span-12 card">
-        <div class="tag section">Alerts Involved</div>
+        <div class="tag section">Alerts Participated</div>
         <ProfileAlertsInvolved :statistics="statistics" :player="player" />
       </div>
     </div>

From 77ca4e0a2eb9bfaeb09763d67e15453729d365b1 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Fri, 11 Aug 2023 16:02:31 +0100
Subject: [PATCH 20/36] #617: Fixed widths for map toggle bar, for all
 resolutions

---
 pages/alert/_alert.vue | 53 ++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/pages/alert/_alert.vue b/pages/alert/_alert.vue
index 3fe7d986..9cb4e3d4 100644
--- a/pages/alert/_alert.vue
+++ b/pages/alert/_alert.vue
@@ -19,31 +19,38 @@
       />
       <AlertFactionVsFaction :alert="alert" />
 
-      <div
-        class="col-span-12 md:col-start-3 md:col-span-8 lg:col-span-6 lg:col-start-4"
-      >
-        <v-tabs v-model="mapsTab" dark fixed-tabs show-arrows class="mt-2">
-          <v-tabs-slider></v-tabs-slider>
+      <div class="col-span-12 mt-2">
+        <div class="flex justify-center">
+          <v-tabs
+            v-model="mapsTab"
+            dark
+            fixed-tabs
+            show-arrows
+            stacked
+            style="max-width: 640px"
+          >
+            <v-tabs-slider></v-tabs-slider>
 
-          <v-tab href="#map">
-            <font-awesome-icon
-              :icon="['fas', 'map']"
-              class="mr-2"
-            ></font-awesome-icon>
-            Map
-          </v-tab>
+            <v-tab href="#map">
+              <font-awesome-icon
+                :icon="['fas', 'map']"
+                class="mr-2"
+              ></font-awesome-icon>
+              Map
+            </v-tab>
 
-          <v-tab
-            v-if="alert.features && alert.features.captureHistory"
-            href="#captureHistory"
-          >
-            <font-awesome-icon
-              :icon="['fas', 'hourglass']"
-              class="mr-2"
-            ></font-awesome-icon>
-            Capture History
-          </v-tab>
-        </v-tabs>
+            <v-tab
+              v-if="alert.features && alert.features.captureHistory"
+              href="#captureHistory"
+            >
+              <font-awesome-icon
+                :icon="['fas', 'hourglass']"
+                class="mr-2"
+              ></font-awesome-icon>
+              Capture History
+            </v-tab>
+          </v-tabs>
+        </div>
       </div>
       <div class="col-span-12">
         <v-tabs-items v-model="mapsTab">

From c8f1e61bf6d4f1ae74f932388272866971e426ad Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Fri, 11 Aug 2023 16:07:14 +0100
Subject: [PATCH 21/36] Fixed minor regression with vuetify tabs not being
 uppercased

---
 assets/css/tailwind.scss | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/assets/css/tailwind.scss b/assets/css/tailwind.scss
index 01d1fd20..6761bc1f 100644
--- a/assets/css/tailwind.scss
+++ b/assets/css/tailwind.scss
@@ -423,6 +423,10 @@ select {
     }
   }
 
+  &.blue {
+    @apply bg-blue-500;
+  }
+
   &.gray {
     @apply bg-gray-600;
 
@@ -605,8 +609,9 @@ a.hyperlink {
 }
 
 .tag {
-  @apply py-1 px-2 rounded-tl-sm rounded-tr-sm text-xs text-center font-bold;
+  @apply rounded-tl-sm rounded-tr-sm text-sm text-center font-bold;
   margin: -1rem -1rem 1rem;
+  line-height: 2rem;
 
   &.section {
     background-color: rgba(48, 58, 64, 1);
@@ -712,6 +717,7 @@ td.text-middle {
 .theme--dark {
   &.v-tabs > .v-tabs-bar {
     background-color: #9b2c2c !important;
+    text-transform: uppercase !important;
 
     .v-tab--disabled {
       background-color: #000 !important;

From ff15ffb7c1673ea0978a1fdc5918d24da3e50357 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Fri, 11 Aug 2023 22:42:49 +0100
Subject: [PATCH 22/36] Added improvement tags in various places and fixed some
 tooltips. Removed console.logs

---
 components/alert/AlertBattleranks.vue         |  8 ++--
 components/alert/AlertPopulations.vue         | 37 ++++++++++++-------
 components/search/SearchBar.vue               |  1 -
 .../victories/VictoriesTimeline.vue           |  4 +-
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/components/alert/AlertBattleranks.vue b/components/alert/AlertBattleranks.vue
index 9f3251b7..55b0f6f7 100644
--- a/components/alert/AlertBattleranks.vue
+++ b/components/alert/AlertBattleranks.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="col-span-12 card relative text-center">
-    <div class="tag section">Battlerank Distribution</div>
+    <div class="tag section">
+      Battlerank Distribution <span class="label blue"> Improved in v4.5!</span>
+    </div>
     <CountdownSpinner
       v-if="alert.state === 1"
       :percent="updateCountdownPercent"
@@ -313,13 +315,9 @@ export default Vue.extend({
         factionBattlerankDataChart.set(faction, Array.from(sorted.values()))
       })
 
-      console.log(factionBattlerankDataChart)
-
       // Sort the battleRanksRaw into an ordered array
       const battleRanks = Array.from(battleRanksRaw).sort((a, b) => a - b)
 
-      console.log(battleRanks)
-
       const datasets = []
       const border = {
         width: 8,
diff --git a/components/alert/AlertPopulations.vue b/components/alert/AlertPopulations.vue
index 626c3221..30a70f47 100644
--- a/components/alert/AlertPopulations.vue
+++ b/components/alert/AlertPopulations.vue
@@ -2,18 +2,21 @@
   <div class="col-span-12 xl:col-span-6 card relative">
     <div class="tag section">
       Population History
-      <v-tooltip bottom>
-        <template #activator="{ on, attrs }">
-          <font-awesome-icon
-            :icon="['fas', 'info-circle']"
-            v-bind="attrs"
-            v-on="on"
-          ></font-awesome-icon>
-        </template>
-        The below chart is based on active players. If a player has died /
-        killed anyone or gained any XP in the last 3 minutes, they are classed
-        as active. This may mean the pops fluctuate between redeploys.
-      </v-tooltip>
+      <span class="label blue">
+        Improved in v4.5!
+        <v-tooltip bottom>
+          <template #activator="{ on, attrs }">
+            <font-awesome-icon
+              :icon="['fas', 'info-circle']"
+              v-bind="attrs"
+              v-on="on"
+            ></font-awesome-icon>
+          </template>
+          Graph was updated to be more readable. Activity levels are explained
+          (unfortunately not visualized yet) and broken down in the (i) tooltip
+          on the Activity Levels tab.
+        </v-tooltip>
+      </span>
     </div>
     <CountdownSpinner
       v-if="alert.state === 1"
@@ -50,7 +53,13 @@
               ></font-awesome-icon>
             </template>
             Shows the calculation for the Activity bracket. All factions must be
-            above the indicated level to achieve it (based on last entry).
+            above the threshold for the alert to achieve the bracket (based on
+            last entry).<br />
+            Prime = 4+ platoons (>192 players)<br />
+            High = 3+ platoons (>144 players)<br />
+            Medium = 2+ platoons (>96 players)<br />
+            Low = 1+ platoons (>48 players)<br />
+            Dead = <48 players
           </v-tooltip>
         </button>
       </div>
@@ -135,9 +144,9 @@ const popChartOptions = {
         color: '#7b8694',
       },
       title: {
+        ...commonChartOptions.scales.title,
         display: true,
         text: 'Players',
-        color: '#fff',
       },
     },
   },
diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 02db0637..7fb7a244 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -86,7 +86,6 @@ export default defineComponent({
   created() {
     this.loadPinned()
     this.injectPinned()
-    console.log(this.results)
   },
   methods: {
     parseResults(
diff --git a/components/statistics/victories/VictoriesTimeline.vue b/components/statistics/victories/VictoriesTimeline.vue
index e5c734fc..2cae8f62 100644
--- a/components/statistics/victories/VictoriesTimeline.vue
+++ b/components/statistics/victories/VictoriesTimeline.vue
@@ -1,7 +1,9 @@
 <template>
   <section class="mb-2">
     <div class="col-span-12 card relative">
-      <div class="tag section">Victory Timeline</div>
+      <div class="tag section">
+        Victory Timeline <span class="label blue"> Improved in v4.5!</span>
+      </div>
       <CountdownSpinner :percent="updateCountdownPercent" update-rate="60000" />
       <div v-if="loaded" class="text-center">
         <div class="grid grid-cols-12 gap-2">

From 14c43c4f7da3e4f0067ad1b47a46c34d5b5c6410 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Fri, 11 Aug 2023 22:43:24 +0100
Subject: [PATCH 23/36] #489: Added Alert combat performance summaries to
 player profile pages

---
 components/profiles/ProfileAlertsInvolved.vue |   8 +-
 components/profiles/ProfileCombatMetrics.vue  | 142 +++++++-
 constants/CommonChartOptions.ts               |   5 +
 constants/DataTableConfig.ts                  |   5 +
 filters/BracketName.ts                        |   2 +-
 .../profiles/ProfileMetricsInterface.ts       |  31 +-
 pages/player/_player.vue                      | 310 ++++++++++++++----
 7 files changed, 415 insertions(+), 88 deletions(-)

diff --git a/components/profiles/ProfileAlertsInvolved.vue b/components/profiles/ProfileAlertsInvolved.vue
index 8dee5eb8..a9f9c7fa 100644
--- a/components/profiles/ProfileAlertsInvolved.vue
+++ b/components/profiles/ProfileAlertsInvolved.vue
@@ -157,7 +157,7 @@ export default Vue.extend({
         {
           text: 'Victor',
           align: 'left',
-          sortable: true,
+          sortable: false,
           value: 'victor',
         },
         {
@@ -169,7 +169,7 @@ export default Vue.extend({
           text: 'BR',
           align: 'middle',
           filterable: false,
-          value: 'character.adjustedBattleRank',
+          value: 'br',
           cellClass: 'text-center',
         },
         {
@@ -272,6 +272,10 @@ export default Vue.extend({
           // 1 is used instead of 0 to prevent division by zero
           kd: ((alert.kills ?? 1) / (alert.deaths ?? 1)).toFixed(2),
           hsr: (((alert.headshots ?? 1) / (alert.kills ?? 1)) * 100).toFixed(2),
+          br:
+            alert.character.adjustedBattleRank ??
+            alert.character.battleRank ??
+            0,
         }
       })
     },
diff --git a/components/profiles/ProfileCombatMetrics.vue b/components/profiles/ProfileCombatMetrics.vue
index 9953c31c..5da432b5 100644
--- a/components/profiles/ProfileCombatMetrics.vue
+++ b/components/profiles/ProfileCombatMetrics.vue
@@ -1,12 +1,29 @@
 <template>
-  <div class="col-span-12 lg:col-span-4 lg:col-start-5">
-    Combat stats component
+  <div v-if="loaded" class="grid grid-cols-12">
+    <div class="col-span-12">
+      Kills Deaths etc
+
+      <v-data-table
+        class="datatable"
+        item-key="title"
+        :headers="headers"
+        :items="parsedData"
+        v-bind="tableConfig"
+      >
+      </v-data-table>
+    </div>
+    <div class="col-span-12 md:col-span-6 lg:col-span-8">Table of weapons</div>
+    <div class="col-span-12">Table of vehicles</div>
   </div>
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
-import { ProfileMetricsInterface } from '~/interfaces/profiles/ProfileMetricsInterface'
+import {
+  ProfileCommonMetricsInterface,
+  ProfileMetricsInterface,
+} from '~/interfaces/profiles/ProfileMetricsInterface'
+import { ProfileAlertsCombatMetricsTableConfig } from '~/constants/DataTableConfig'
 
 export default Vue.extend({
   name: 'ProfileCombatMetrics',
@@ -18,9 +35,124 @@ export default Vue.extend({
     },
   },
   data() {
-    return {}
+    return {
+      loaded: false,
+      tableConfig: ProfileAlertsCombatMetricsTableConfig,
+      parsedData: [] as (ProfileCommonMetricsInterface | null)[],
+      headers: [
+        {
+          text: 'Bracket',
+          align: 'left',
+          sortable: true,
+          value: 'bracket',
+        },
+        {
+          text: '# of alerts',
+          align: 'left',
+          sortable: true,
+          value: 'bracketCount',
+        },
+        {
+          text: 'Kills [avg]',
+          align: 'middle',
+          filterable: false,
+          value: 'kills',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Deaths [avg]',
+          align: 'middle',
+          filterable: false,
+          value: 'deaths',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'KD',
+          align: 'middle',
+          filterable: false,
+          value: 'kd',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Headshots [avg]',
+          align: 'middle',
+          filterable: false,
+          value: 'headshots',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'HSR%',
+          align: 'middle',
+          filterable: false,
+          value: 'hsr',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'TKs [avg]',
+          align: 'middle',
+          filterable: false,
+          value: 'teamKills',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'TK%',
+          align: 'middle',
+          filterable: false,
+          value: 'tkr',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'TKed [avg]',
+          align: 'middle',
+          filterable: false,
+          value: 'teamKilled',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'TKed%',
+          align: 'middle',
+          filterable: false,
+          value: 'tkedr',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Sui [avg]',
+          align: 'middle',
+          filterable: false,
+          value: 'suicides',
+          cellClass: 'text-center',
+        },
+        {
+          text: 'Sui%',
+          align: 'middle',
+          filterable: false,
+          value: 'suir',
+          cellClass: 'text-center',
+        },
+      ],
+    }
   },
   computed: {},
-  methods: {},
+  created() {
+    this.parsedData = this.parseData(this.statistics)
+    this.loaded = true
+  },
+  methods: {
+    parseData(
+      data: ProfileMetricsInterface
+    ): (ProfileCommonMetricsInterface | null)[] {
+      const returnArray: (ProfileCommonMetricsInterface | null)[] = []
+
+      returnArray.push(
+        data.brackets[0],
+        data.brackets[5],
+        data.brackets[4],
+        data.brackets[3],
+        data.brackets[2],
+        data.brackets[1]
+      )
+      return returnArray
+    },
+  },
 })
 </script>
diff --git a/constants/CommonChartOptions.ts b/constants/CommonChartOptions.ts
index a8bd290f..8e663620 100644
--- a/constants/CommonChartOptions.ts
+++ b/constants/CommonChartOptions.ts
@@ -19,6 +19,11 @@ export const commonChartOptions = {
     },
   },
   scales: {
+    title: {
+      display: false,
+      size: 16,
+      color: '#fff',
+    },
     ticks: {
       color: '#fff',
     },
diff --git a/constants/DataTableConfig.ts b/constants/DataTableConfig.ts
index 0bee06e4..2386438b 100644
--- a/constants/DataTableConfig.ts
+++ b/constants/DataTableConfig.ts
@@ -98,3 +98,8 @@ export const ProfileAlertsConfig = {
   'sort-by': ['instance'],
   'sort-desc': [true],
 }
+
+export const ProfileAlertsCombatMetricsTableConfig = {
+  ...DataTableConfig,
+  'sort-by': [null],
+}
diff --git a/filters/BracketName.ts b/filters/BracketName.ts
index 32ddc674..9175ac71 100644
--- a/filters/BracketName.ts
+++ b/filters/BracketName.ts
@@ -18,7 +18,7 @@ export const bracketName = Vue.filter(
       case Bracket.PRIME:
         return 'Prime'
       case Bracket.TOTAL:
-        return 'Totalled (UNUSED)'
+        return 'Total'
       default:
         return 'UNKNOWN!'
     }
diff --git a/interfaces/profiles/ProfileMetricsInterface.ts b/interfaces/profiles/ProfileMetricsInterface.ts
index 289c9866..9c280a26 100644
--- a/interfaces/profiles/ProfileMetricsInterface.ts
+++ b/interfaces/profiles/ProfileMetricsInterface.ts
@@ -1,16 +1,29 @@
-import { PS2AlertsFactionKillDataInterface } from '~/ps2alerts-constants/interfaces/PS2AlertsFactionKillDataInterface'
 import { InstanceCharacterInterface } from '~/ps2alerts-constants/interfaces/api-responses/InstanceCharacterInterface'
-import { CombatMetricsInterface } from '~/ps2alerts-constants/interfaces/CombatMetricsInterface'
 
-interface ProfileCommonMetricsInterface extends CombatMetricsInterface {
-  kd: number // Calculated
-  hsr: number // Calculated
-  factionKills: PS2AlertsFactionKillDataInterface
+export interface ProfileCommonMetricsInterface {
+  kills?: number | string
+  deaths?: number | string
+  teamKills?: number | string
+  teamKilled?: number | string
+  suicides?: number | string
+  headshots?: number | string
+  kd: string // Calculated
+  hsr: string // Calculated
+  tkr: string // Calculated
+  tkedr: string // Calculated
+  suir: string // Calculated
+  bracket: string
+  bracketCount: number
+  // factionKills: PS2AlertsFactionKillDataInterface
+}
+
+export interface BracketedProfileCommonMetricsInterface {
+  [bracket: number]: ProfileCommonMetricsInterface | null
 }
 
 export interface ProfileMetricsInterface {
-  totals: ProfileCommonMetricsInterface
-  averages: ProfileCommonMetricsInterface
-  lastXAlertsPerformance: ProfileCommonMetricsInterface
+  brackets: BracketedProfileCommonMetricsInterface
+  averages: BracketedProfileCommonMetricsInterface
+  // lastXAlertsPerformance: ProfileCommonMetricsInterface
   alerts: InstanceCharacterInterface[]
 }
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index 23121b68..ed0fc8b5 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -23,12 +23,12 @@
           />
         </div>
       </div>
-      <div class="col-span-12 2xl:col-span-4 md:col-span-6 card">
+      <div class="col-span-12 card">
         <div class="tag section">Combat Stats</div>
-        <ProfileCombatMetrics :statistics="statistics" />
+        <ProfileCombatMetrics :statistics="statistics" :player="player" />
       </div>
       <div class="col-span-12 card">
-        <div class="tag section">Alerts Participated</div>
+        <div class="tag section">Alert Statistics</div>
         <ProfileAlertsInvolved :statistics="statistics" :player="player" />
       </div>
     </div>
@@ -44,8 +44,13 @@ import factionTextClass from '~/filters/FactionTextClass'
 import ProfileAlertsInvolved from '~/components/profiles/ProfileAlertsInvolved.vue'
 import ProfileLogos from '~/components/profiles/ProfileLogos.vue'
 import ProfileCombatMetrics from '~/components/profiles/ProfileCombatMetrics.vue'
-import { ProfileMetricsInterface } from '~/interfaces/profiles/ProfileMetricsInterface'
+import {
+  ProfileCommonMetricsInterface,
+  ProfileMetricsInterface,
+} from '~/interfaces/profiles/ProfileMetricsInterface'
 import { InstanceCharacterInterface } from '~/ps2alerts-constants/interfaces/api-responses/InstanceCharacterInterface'
+import BracketName from '~/filters/BracketName'
+import { Bracket, ps2alertsBracketArray } from '~/ps2alerts-constants/bracket'
 
 export default Vue.extend({
   name: 'Player',
@@ -78,6 +83,89 @@ export default Vue.extend({
     async init(characterId: string): Promise<void> {
       await this.pull(characterId)
     },
+
+    parseAggregateAverages(
+      bracketData: GlobalCharacterAggregateInterface | null,
+      bracketCount: number
+    ): ProfileCommonMetricsInterface | null {
+      if (!bracketData) {
+        return null
+      }
+      return {
+        kills: ((bracketData.kills ?? 0) / bracketCount).toFixed(2),
+        deaths: ((bracketData.deaths ?? 0) / bracketCount).toFixed(2),
+        kd: ((bracketData.kills ?? 0) / (bracketData.deaths ?? 0)).toFixed(2),
+        headshots: ((bracketData.headshots ?? 0) / bracketCount).toFixed(2),
+        hsr: (
+          ((bracketData.headshots ?? 0) / (bracketData.kills ?? 0)) *
+          100
+        ).toFixed(2),
+        teamKills: ((bracketData.teamKills ?? 0) / bracketCount).toFixed(2),
+        tkr: (
+          ((bracketData.teamKills ?? 0) / (bracketData.kills ?? 0)) *
+          100
+        ).toFixed(2),
+        teamKilled: ((bracketData.teamKilled ?? 0) / bracketCount).toFixed(2),
+        tkedr: (
+          ((bracketData.teamKilled ?? 0) / (bracketData.deaths ?? 0)) *
+          100
+        ).toFixed(2),
+        suicides: ((bracketData.suicides ?? 0) / bracketCount).toFixed(2),
+        suir: (
+          ((bracketData.suicides ?? 0) / (bracketData.deaths ?? 0)) *
+          100
+        ).toFixed(2),
+        bracket: `Avg (${BracketName(bracketData.bracket)})`,
+        bracketCount,
+      }
+    },
+    parseAggregateBrackets(
+      bracketData: GlobalCharacterAggregateInterface | null,
+      bracketAverageData: ProfileCommonMetricsInterface | null,
+      bracketCount: number
+    ): ProfileCommonMetricsInterface | null {
+      if (!bracketData) {
+        return null
+      }
+
+      return {
+        kills: `${bracketData.kills ?? 0} [${bracketAverageData?.kills ?? 0}]`,
+        deaths: `${bracketData.deaths ?? 0} [${
+          bracketAverageData?.deaths ?? 0
+        }]`,
+        kd: ((bracketData.kills ?? 0) / (bracketData.deaths ?? 0)).toFixed(2),
+        headshots: `${bracketData.headshots ?? 0} [${
+          bracketAverageData?.headshots ?? 0
+        }]`,
+        hsr: (
+          ((bracketData.headshots ?? 0) / (bracketData.kills ?? 0)) *
+          100
+        ).toFixed(2),
+        teamKills: `${bracketData.teamKills ?? 0} [${
+          bracketAverageData?.teamKills ?? 0
+        }]`,
+        tkr: (
+          ((bracketData.teamKills ?? 0) / (bracketData.kills ?? 0)) *
+          100
+        ).toFixed(2),
+        teamKilled: `${bracketData.teamKilled ?? 0} [${
+          bracketAverageData?.teamKilled ?? 0
+        }]`,
+        tkedr: (
+          ((bracketData.teamKilled ?? 0) / (bracketData.deaths ?? 0)) *
+          100
+        ).toFixed(2),
+        suicides: `${bracketData.suicides ?? 0} [${
+          bracketAverageData?.suicides ?? 0
+        }]`,
+        suir: (
+          ((bracketData.suicides ?? 0) / (bracketData.deaths ?? 0)) *
+          100
+        ).toFixed(2),
+        bracket: BracketName(bracketData.bracket),
+        bracketCount,
+      }
+    },
     async pull(characterId: string): Promise<void> {
       await new ApiRequest()
         .get<GlobalCharacterAggregateInterface>(
@@ -90,77 +178,157 @@ export default Vue.extend({
           this.player = character
         })
 
-      await this.createMetrics(this.player)
+      console.log('player', this.player)
+
+      const aggregateRequests: Promise<GlobalCharacterAggregateInterface>[] = []
+
+      // For each bracket, create a promise and add it to the array to pull all data for the player in one go
+      const brackets = ps2alertsBracketArray.filter((bracket) => {
+        return bracket !== Bracket.UNKNOWN
+      })
+      brackets.forEach((bracket) => {
+        aggregateRequests.push(
+          new ApiRequest()
+            .get<GlobalCharacterAggregateInterface>(
+              `${Endpoints.AGGREGATES_GLOBAL_CHARACTER_SINGLE.replace(
+                '{character}',
+                characterId
+              )}?bracket=${bracket}`
+            )
+            .then((character) => {
+              return character
+            })
+        )
+      })
+
+      // We have to do this magic to handle when an aggregate may return a 404 if a player hasn't played in say a dead alert yet.
+      const safePromise = (
+        promise: Promise<GlobalCharacterAggregateInterface>
+      ) => {
+        return promise.catch((error) => {
+          console.log('error', error)
+          return null
+        })
+      }
+
+      const bracketResults = await Promise.all(
+        aggregateRequests.map((p) => safePromise(p))
+      ).then((results) => {
+        return results
+      })
+
+      console.log('bracketResults', bracketResults)
+
+      this.statistics = await this.createMetrics(this.player, bracketResults)
+
+      console.log('this.statistics', this.statistics)
       this.loaded = true
     },
     async createMetrics(
-      character: GlobalCharacterAggregateInterface
-    ): Promise<void> {
-      this.statistics = {
-        totals: {
-          kills: 0,
-          deaths: 0,
-          kd: 0,
-          headshots: 0,
-          hsr: 0,
-          teamKills: 0,
-          teamKilled: 0,
-          suicides: 0,
-          factionKills: {
-            vs: {
-              vs: 0,
-              nc: 0,
-              tr: 0,
-              nso: 0,
-            },
-          },
-        },
-        averages: {
-          kills: 0,
-          deaths: 0,
-          kd: 0,
-          headshots: 0,
-          hsr: 0,
-          teamKills: 0,
-          teamKilled: 0,
-          suicides: 0,
-          factionKills: {
-            vs: {
-              vs: 0,
-              nc: 0,
-              tr: 0,
-              nso: 0,
-            },
-          },
-        },
-        lastXAlertsPerformance: {
-          kills: 0,
-          deaths: 0,
-          kd: 0,
-          headshots: 0,
-          hsr: 0,
-          teamKills: 0,
-          teamKilled: 0,
-          suicides: 0,
-          factionKills: {
-            vs: {
-              vs: 0,
-              nc: 0,
-              tr: 0,
-              nso: 0,
-            },
-          },
+      character: GlobalCharacterAggregateInterface,
+      brackets: (GlobalCharacterAggregateInterface | null)[]
+    ): Promise<ProfileMetricsInterface> {
+      const alerts = await new ApiRequest()
+        .get<InstanceCharacterInterface[]>(
+          `${Endpoints.AGGREGATES_INSTANCE_CHARACTER_ALL.replace(
+            '{character}',
+            character.character.id
+          )}?getDetails=true`
+        )
+        .then((alerts) => {
+          return alerts
+        })
+
+      const alertCounts = {
+        total: 0,
+        dead: 0,
+        low: 0,
+        medium: 0,
+        high: 0,
+        prime: 0,
+      }
+
+      // Loop through all the alerts and get the counts out of them
+      alerts.forEach((alert) => {
+        alertCounts.total++
+        switch (alert.instanceDetails?.bracket) {
+          case Bracket.DEAD:
+            alertCounts.dead++
+            break
+          case Bracket.LOW:
+            alertCounts.low++
+            break
+          case Bracket.MEDIUM:
+            alertCounts.medium++
+            break
+          case Bracket.HIGH:
+            alertCounts.high++
+            break
+          case Bracket.PRIME:
+            alertCounts.prime++
+            break
+        }
+      })
+
+      const averages = {
+        0: this.parseAggregateAverages(
+          brackets[Bracket.TOTAL],
+          alertCounts.total
+        ),
+        1: this.parseAggregateAverages(
+          brackets[Bracket.DEAD],
+          alertCounts.dead
+        ),
+        2: this.parseAggregateAverages(brackets[Bracket.LOW], alertCounts.low),
+        3: this.parseAggregateAverages(
+          brackets[Bracket.MEDIUM],
+          alertCounts.medium
+        ),
+        4: this.parseAggregateAverages(
+          brackets[Bracket.HIGH],
+          alertCounts.high
+        ),
+        5: this.parseAggregateAverages(
+          brackets[Bracket.PRIME],
+          alertCounts.prime
+        ),
+      }
+
+      return {
+        brackets: {
+          0: this.parseAggregateBrackets(
+            brackets[Bracket.TOTAL],
+            averages[Bracket.TOTAL],
+            alertCounts.total
+          ),
+          1: this.parseAggregateBrackets(
+            brackets[Bracket.DEAD],
+            averages[Bracket.DEAD],
+            alertCounts.dead
+          ),
+          2: this.parseAggregateBrackets(
+            brackets[Bracket.LOW],
+            averages[Bracket.LOW],
+            alertCounts.low
+          ),
+          3: this.parseAggregateBrackets(
+            brackets[Bracket.MEDIUM],
+            averages[Bracket.MEDIUM],
+            alertCounts.medium
+          ),
+          4: this.parseAggregateBrackets(
+            brackets[Bracket.HIGH],
+            averages[Bracket.HIGH],
+            alertCounts.high
+          ),
+          5: this.parseAggregateBrackets(
+            brackets[Bracket.PRIME],
+            averages[Bracket.PRIME],
+            alertCounts.prime
+          ),
         },
-        alerts: await new ApiRequest()
-          .get<InstanceCharacterInterface[]>(
-            `${Endpoints.AGGREGATES_INSTANCE_CHARACTER_ALL.replace(
-              '{character}',
-              character.character.id
-            )}?getDetails=true`
-          )
-          .then((alerts) => {
-            return alerts
-          }),
+        averages,
+        alerts,
       }
     },
   },

From 7224d193f66f729cb260108cd103cfc817f321aa Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:00:02 +0100
Subject: [PATCH 24/36] #489: Fixed minor layout issue with search results

---
 components/search/SearchResult.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/search/SearchResult.vue b/components/search/SearchResult.vue
index 848ef31d..c86aebe3 100644
--- a/components/search/SearchResult.vue
+++ b/components/search/SearchResult.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="my-2 py-2 px-4 text-center cursor-pointer hover border relative"
+    class="my-2 py-2 px-4 last:mb-0 text-center cursor-pointer hover border relative"
     :class="classes"
     :score="result.matchScore"
   >

From 9d863547c7f5377b9524436a9a96886065ccfe79 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:01:31 +0100
Subject: [PATCH 25/36] #489: Updated ProfileAlertMetrics. Added info tooltips
 for more consistent way of showing keys.

---
 assets/css/tailwind.scss                      |  7 +++
 components/InfoTooltip.vue                    | 31 +++++++++++++
 components/alert/AlertCharacterMetrics.vue    | 44 ++++++++++++++-----
 ...tsInvolved.vue => ProfileAlertMetrics.vue} |  2 +-
 pages/player/_player.vue                      |  6 +--
 5 files changed, 75 insertions(+), 15 deletions(-)
 create mode 100644 components/InfoTooltip.vue
 rename components/profiles/{ProfileAlertsInvolved.vue => ProfileAlertMetrics.vue} (99%)

diff --git a/assets/css/tailwind.scss b/assets/css/tailwind.scss
index 6761bc1f..9a5f4427 100644
--- a/assets/css/tailwind.scss
+++ b/assets/css/tailwind.scss
@@ -425,6 +425,13 @@ select {
 
   &.blue {
     @apply bg-blue-500;
+
+    &:hover {
+      @apply bg-blue-400;
+    }
+    &.border {
+      @apply border-blue-400
+    }
   }
 
   &.gray {
diff --git a/components/InfoTooltip.vue b/components/InfoTooltip.vue
new file mode 100644
index 00000000..a8c0a8e7
--- /dev/null
+++ b/components/InfoTooltip.vue
@@ -0,0 +1,31 @@
+<template>
+  <v-tooltip bottom>
+    <template #activator="{ on, attrs }">
+      <font-awesome-icon
+        :icon="['fas', 'info-circle']"
+        v-bind="attrs"
+        v-on="on"
+      ></font-awesome-icon>
+    </template>
+    {{ message }}
+  </v-tooltip>
+</template>
+<script lang="ts">
+import Vue from 'vue'
+
+export default Vue.extend({
+  name: 'InfoTooltip',
+  components: {},
+  props: {
+    direction: {
+      type: String,
+      default: 'bottom',
+    },
+    message: {
+      type: String,
+      default: 'Foo',
+    },
+  },
+  data() {},
+})
+</script>
diff --git a/components/alert/AlertCharacterMetrics.vue b/components/alert/AlertCharacterMetrics.vue
index 3b100d65..df4604f4 100644
--- a/components/alert/AlertCharacterMetrics.vue
+++ b/components/alert/AlertCharacterMetrics.vue
@@ -29,23 +29,45 @@
             player. "Time Played" represents the time used for XPM calculations.
           </p>
         </div>
-        <p class="text-gray-400 text-sm mb-2 text-center">
+        <p class="text-gray-400 text-xs mb-2 text-center">
           BR, ASP and Outfit Membership info is updated once every 24 hours
           (upon your next play session). Any players above BR 120 have ASPed
-          (320 max).
+          (420 max).
         </p>
         <p class="my-2 text-sm text-center">
           Key:
-          <span class="label mb-1 gray"><b>BR</b> = Battle Rank</span>
-          <span class="label mb-1 gray"><b>KD</b> = Kill / Death Ratio</span>
-          <span class="label mb-1 gray"><b>HS</b> = Head Shots</span>
-          <span class="label mb-1 gray"><b>HSR%</b> = Head Shot Ratio</span>
-          <span class="label mb-1 gray"><b>TKs</b> = Team Kills</span>
           <span class="label mb-1 gray"
-            ><b>TKed</b> = Team killed by same faction</span
-          >
-          <span class="label mb-1 gray"><b>Sui</b> = Suicides</span>
-          <span class="label mb-1 gray"><b>KPM</b> = Kills Per Minute</span>
+            ><b>BR</b><InfoTooltip message="Battle Rank"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>KD</b
+            ><InfoTooltip message="Kills vs Deaths ratio %"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>HS</b><InfoTooltip message="Headshots"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>HSR%</b
+            ><InfoTooltip message="Headshots vs kills ratio %"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>TKs</b><InfoTooltip message="Teamkills"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><InfoTooltip message="TKed by same faction"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>Sui</b><InfoTooltip message="Suicides"></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>Time Played</b
+            ><InfoTooltip
+              message="Amount of time played from the start of the alert until it's end. Logoffs are not counted to prevent inflating the stats"
+            ></InfoTooltip
+          ></span>
+          <span class="label mb-1 gray"
+            ><b>KPM</b><InfoTooltip message="Kills per minute"></InfoTooltip
+          ></span>
           <span class="label mb-1 gray"><b>DPM</b> = Deaths Per Minute</span>
           <span class="label mb-1 gray"
             ><b>HSPM</b> = Head Shots Per Minute</span
diff --git a/components/profiles/ProfileAlertsInvolved.vue b/components/profiles/ProfileAlertMetrics.vue
similarity index 99%
rename from components/profiles/ProfileAlertsInvolved.vue
rename to components/profiles/ProfileAlertMetrics.vue
index a9f9c7fa..539b7b09 100644
--- a/components/profiles/ProfileAlertsInvolved.vue
+++ b/components/profiles/ProfileAlertMetrics.vue
@@ -72,7 +72,7 @@ import bracketName from '~/filters/BracketName'
 import { commonChartOptions } from '~/constants/CommonChartOptions'
 
 export default Vue.extend({
-  name: 'ProfileAlertsInvolved',
+  name: 'ProfileAlertMetrics',
   props: {
     statistics: {
       type: Object as () => ProfileMetricsInterface,
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index ed0fc8b5..3944a54f 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -29,7 +29,7 @@
       </div>
       <div class="col-span-12 card">
         <div class="tag section">Alert Statistics</div>
-        <ProfileAlertsInvolved :statistics="statistics" :player="player" />
+        <ProfileAlertMetrics :statistics="statistics" :player="player" />
       </div>
     </div>
   </section>
@@ -41,7 +41,7 @@ import ApiRequest from '~/api-request'
 import { Endpoints } from '~/constants/Endpoints'
 import { GlobalCharacterAggregateInterface } from '~/ps2alerts-constants/interfaces/api-responses/GlobalCharacterAggregateInterface'
 import factionTextClass from '~/filters/FactionTextClass'
-import ProfileAlertsInvolved from '~/components/profiles/ProfileAlertsInvolved.vue'
+import ProfileAlertMetrics from '~/components/profiles/ProfileAlertMetrics.vue'
 import ProfileLogos from '~/components/profiles/ProfileLogos.vue'
 import ProfileCombatMetrics from '~/components/profiles/ProfileCombatMetrics.vue'
 import {
@@ -55,7 +55,7 @@ import { Bracket, ps2alertsBracketArray } from '~/ps2alerts-constants/bracket'
 export default Vue.extend({
   name: 'Player',
   components: {
-    ProfileAlertsInvolved,
+    ProfileAlertMetrics,
     ProfileLogos,
     ProfileCombatMetrics,
   },

From 1d22a2192103345ebe302d2bd15d344447eaadbe Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:01:38 +0100
Subject: [PATCH 26/36] #489: Updated BR max info

---
 components/statistics/characters/CharactersLeaderboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/statistics/characters/CharactersLeaderboard.vue b/components/statistics/characters/CharactersLeaderboard.vue
index e772ec86..902e89ba 100644
--- a/components/statistics/characters/CharactersLeaderboard.vue
+++ b/components/statistics/characters/CharactersLeaderboard.vue
@@ -15,7 +15,7 @@
           <p class="text-gray-400 text-sm mb-4 text-center">
             BR, ASP and Outfit Membership info is updated once every 24 hours
             (upon your next play session). Any players above BR 120 have ASPed
-            (320 max).
+            (420 max).
           </p>
           <div class="mb-2">
             <input

From 2e937e75b8f7d1661408968e260cac030603d6dd Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:01:56 +0100
Subject: [PATCH 27/36] #489: Minor update to outfit stats page link

---
 components/profiles/ProfileLogos.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/profiles/ProfileLogos.vue b/components/profiles/ProfileLogos.vue
index 1b324ba8..135e3fa9 100644
--- a/components/profiles/ProfileLogos.vue
+++ b/components/profiles/ProfileLogos.vue
@@ -42,7 +42,7 @@
             >{{ outfit.name }}</span
           ><br />
           <span class="text-sm label gray mr-2">Outfit</span
-          ><span v-if="isInOutfit" class="label default"
+          ><span v-if="isInOutfit" class="label blue border"
             ><font-awesome-icon :icon="['fas', 'link']"></font-awesome-icon>
             Stats</span
           >

From 39b6d74d1688f57db990cc76f8191511c0e303e4 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:02:11 +0100
Subject: [PATCH 28/36] #489: Made a start on combat stats section

---
 components/profiles/ProfileCombatMetrics.vue | 71 +++++++++++++++++++-
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/components/profiles/ProfileCombatMetrics.vue b/components/profiles/ProfileCombatMetrics.vue
index 5da432b5..9b303d17 100644
--- a/components/profiles/ProfileCombatMetrics.vue
+++ b/components/profiles/ProfileCombatMetrics.vue
@@ -1,16 +1,83 @@
 <template>
   <div v-if="loaded" class="grid grid-cols-12">
     <div class="col-span-12">
-      Kills Deaths etc
-
       <v-data-table
         class="datatable"
         item-key="title"
         :headers="headers"
         :items="parsedData"
         v-bind="tableConfig"
+        disable-pagination
+        hide-default-footer
       >
       </v-data-table>
+      <div class="text-sm text-center mt-1">
+        Key:
+        <span class="label gray mb-1"
+          >Kills [avg]
+          <InfoTooltip
+            message="Total kills within the bracket with [average] across number of bracket alerts"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >Deaths [avg]
+          <InfoTooltip
+            message="Total deaths within the bracket with [average] across number of bracket alerts"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >KD
+          <InfoTooltip
+            message="Kills divided by deaths within the bracket"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >Headshots [avg]
+          <InfoTooltip
+            message="Total headshots within the bracket with [average] across number of bracket alerts"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >HSR%
+          <InfoTooltip
+            message="Headshots divided by kills within the bracket"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >TKs [avg]
+          <InfoTooltip
+            message="Total team kills within the bracket with [average] across number of bracket alerts"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >TK%
+          <InfoTooltip
+            message="Team kills divided by kills within the bracket"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >TKed [avg]
+          <InfoTooltip
+            message="Total times killed by teammates within the bracket with [average] across number of bracket alerts"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >TKed%
+          <InfoTooltip
+            message="Times killed by teammates divided by deaths within the bracket"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >Suicides [avg]
+          <InfoTooltip
+            message="Total suicides within the bracket with [average] across number of bracket alerts"
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1"
+          >Sui%
+          <InfoTooltip message="Suicides vs deaths"></InfoTooltip>
+        </span>
+      </div>
     </div>
     <div class="col-span-12 md:col-span-6 lg:col-span-8">Table of weapons</div>
     <div class="col-span-12">Table of vehicles</div>

From 7acc7a181bc5373dabbf23b31ad299b2a86666fe Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:43:41 +0100
Subject: [PATCH 29/36] Tidied up the tooltips and information on the Players
 and Outfits sections.

---
 components/InfoTooltip.vue                   |  23 +--
 components/alert/AlertCharacterMetrics.vue   | 103 ++++++++------
 components/alert/AlertOutfitMetrics.vue      | 142 +++++++++++++------
 components/profiles/ProfileCombatMetrics.vue |  75 +++++-----
 4 files changed, 220 insertions(+), 123 deletions(-)

diff --git a/components/InfoTooltip.vue b/components/InfoTooltip.vue
index a8c0a8e7..2b22e91f 100644
--- a/components/InfoTooltip.vue
+++ b/components/InfoTooltip.vue
@@ -1,13 +1,12 @@
 <template>
   <v-tooltip bottom>
     <template #activator="{ on, attrs }">
-      <font-awesome-icon
-        :icon="['fas', 'info-circle']"
-        v-bind="attrs"
-        v-on="on"
-      ></font-awesome-icon>
+      <span v-bind="attrs" v-on="on">
+        {{ text }}
+        <font-awesome-icon :icon="['fas', icon]"></font-awesome-icon>
+      </span>
     </template>
-    {{ message }}
+    {{ tooltip }}
   </v-tooltip>
 </template>
 <script lang="ts">
@@ -17,13 +16,17 @@ export default Vue.extend({
   name: 'InfoTooltip',
   components: {},
   props: {
-    direction: {
+    tooltip: {
       type: String,
-      default: 'bottom',
+      default: 'Foo',
     },
-    message: {
+    text: {
       type: String,
-      default: 'Foo',
+      default: '',
+    },
+    icon: {
+      type: String,
+      default: 'info-circle',
     },
   },
   data() {},
diff --git a/components/alert/AlertCharacterMetrics.vue b/components/alert/AlertCharacterMetrics.vue
index df4604f4..5bb6250e 100644
--- a/components/alert/AlertCharacterMetrics.vue
+++ b/components/alert/AlertCharacterMetrics.vue
@@ -36,48 +36,71 @@
         </p>
         <p class="my-2 text-sm text-center">
           Key:
+          <span class="label mb-1 gray">
+            <InfoTooltip text="BR" tooltip="Battle Rank"></InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip
+              text="Kills"
+              tooltip="Kills inflicted on other factions"
+            >
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip
+              text="Deaths"
+              tooltip="Deaths at the hands of other factions"
+            >
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="KD" tooltip="Kills vs Deaths ratio %">
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="HS" tooltip="Headshots"> </InfoTooltip>
+          </span>
           <span class="label mb-1 gray"
-            ><b>BR</b><InfoTooltip message="Battle Rank"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>KD</b
-            ><InfoTooltip message="Kills vs Deaths ratio %"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>HS</b><InfoTooltip message="Headshots"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>HSR%</b
-            ><InfoTooltip message="Headshots vs kills ratio %"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>TKs</b><InfoTooltip message="Teamkills"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><InfoTooltip message="TKed by same faction"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>Sui</b><InfoTooltip message="Suicides"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>Time Played</b
             ><InfoTooltip
-              message="Amount of time played from the start of the alert until it's end. Logoffs are not counted to prevent inflating the stats"
-            ></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"
-            ><b>KPM</b><InfoTooltip message="Kills per minute"></InfoTooltip
-          ></span>
-          <span class="label mb-1 gray"><b>DPM</b> = Deaths Per Minute</span>
-          <span class="label mb-1 gray"
-            ><b>HSPM</b> = Head Shots Per Minute</span
-          >
-          <span class="label mb-1 gray"
-            ><b>TKPM</b> = Team Kills Per Minute</span
-          >
-          <span class="label mb-1 gray"
-            ><b>SuiPM</b> = Suicides Per Minute</span
-          >
+              text="HSR%"
+              tooltip="Headshots vs kills ratio %"
+            ></InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="TKs" tooltip="Teamkills"></InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="TKed" tooltip="TKed by same faction">
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="Sui" tooltip="Suicides"> </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip
+              text="Time Played"
+              tooltip="Amount of time played from the start of the alert until it's end. Logoffs are not counted to prevent inflating the stats"
+            >
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="KPM" tooltip="Kills per minute"></InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="DPM" tooltip="Deaths per minute"></InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="HSPM" tooltip="Headshots per minute">
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="TKPM" tooltip="Team kills per minute">
+            </InfoTooltip>
+          </span>
+          <span class="label mb-1 gray">
+            <InfoTooltip text="SuiPM" tooltip="Suicides per minute">
+            </InfoTooltip>
+          </span>
         </p>
         <div class="mb-2">
           <input
diff --git a/components/alert/AlertOutfitMetrics.vue b/components/alert/AlertOutfitMetrics.vue
index f0a76e90..1b3a14f0 100644
--- a/components/alert/AlertOutfitMetrics.vue
+++ b/components/alert/AlertOutfitMetrics.vue
@@ -23,50 +23,112 @@
         </div>
       </div>
       <div class="col-span-12">
-        <div
-          v-if="alert.features && alert.features.xpm"
-          class="text-gray-400 text-sm mb-2 text-center"
-        >
-          <p class="text-xs">
-            Per Minute stats starts counting upon the first kill or death of a
-            player within the outfit. "Time Played" represents the time used for
-            XPM calculations.
-            <br />In contrast to Players, there is also a dropdown to show
-            per-participant (XPP &amp; XPM-PP) metrics as well.
-          </p>
-        </div>
         <div class="col-span-12 mb-2 text-sm text-center">
-          <p>
+          <p class="my-2 text-sm text-center">
             Key:
-            <span class="label mb-1 gray"><b>KD</b> = Kill / Death Ratio</span>
-            <span class="label mb-1 gray"><b>HS</b> = Head Shots</span>
-            <span class="label mb-1 gray"><b>HSR%</b> = Head Shot Ratio</span>
-            <span class="label mb-1 gray"><b>TKs</b> = Team Kills</span>
-            <span class="label mb-1 gray"
-              ><b>TKed</b> = Team killed by same faction</span
-            >
-            <span class="label mb-1 gray"><b>Sui</b> = Suicides</span>
-            <span class="label mb-1 gray"><b>KPM</b> = Kills Per Minute</span>
-            <span class="label mb-1 gray"><b>DPM</b> = Deaths Per Minute</span>
-            <span class="label mb-1 gray"
-              ><b>HSPM</b> = Head Shots Per Minute</span
-            >
+            <span class="label mb-1 gray">
+              <InfoTooltip
+                text="Players"
+                tooltip="Number of players within the outfit that participated in the alert"
+              >
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip
+                text="Captures"
+                tooltip="Bases captured where the outfit was the primary captor (and shows up on the map)"
+              >
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip
+                text="Kills"
+                tooltip="Kills inflicted on other factions"
+              >
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip
+                text="Deaths"
+                tooltip="Deaths at the hands of other factions"
+              >
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="KD" tooltip="Kills vs Deaths ratio %">
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="HS" tooltip="Headshots"> </InfoTooltip>
+            </span>
             <span class="label mb-1 gray"
-              ><b>TKPM</b> = Team Kills Per Minute</span
-            >
-            <span class="label mb-1 gray"
-              ><b>SuiPM</b> = Suicides Per Minute</span
-            >
-          </p>
-          <p>
-            Key within table dropdowns:
-            <span class="label mb-1 gray"
-              ><b>X-PP</b> = X metric per player</span
-            >
-            <span class="label mb-1 gray"
-              ><b>XPM-PP</b> = X metric per minute per player</span
-            >
+              ><InfoTooltip
+                text="HSR%"
+                tooltip="Headshots vs kills ratio %"
+              ></InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="TKs" tooltip="Teamkills"></InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="TKed" tooltip="TKed by same faction">
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="Sui" tooltip="Suicides"> </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip
+                text="Time Played"
+                tooltip="Amount of time played from the start of the alert until it's end. Logoffs are not counted to prevent inflating the stats"
+              >
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="KPM" tooltip="Kills per minute"></InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="DPM" tooltip="Deaths per minute"></InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="HSPM" tooltip="Headshots per minute">
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="TKPM" tooltip="Team kills per minute">
+              </InfoTooltip>
+            </span>
+            <span class="label mb-1 gray">
+              <InfoTooltip text="SuiPM" tooltip="Suicides per minute">
+              </InfoTooltip>
+            </span>
           </p>
+          <div
+            v-if="alert.features && alert.features.xpm"
+            class="text-gray-400 text-sm mb-2 text-center"
+          >
+            <p>
+              Key within table dropdowns:
+              <span class="label mb-1 gray">
+                <InfoTooltip text="X-PP" tooltip="X metric per minute">
+                </InfoTooltip>
+              </span>
+              <span class="label mb-1 gray">
+                <InfoTooltip
+                  text="XPM-PP"
+                  tooltip="X metric per minute, per player"
+                >
+                </InfoTooltip>
+              </span>
+            </p>
+            <p class="text-xs">
+              Per Minute stats starts counting upon the first kill or death of a
+              player within the outfit. "Time Played" represents the time used
+              for XPM calculations.
+              <br />To see these metrics, open the dropdown to show
+              per-participant (X-PP &amp; XPM-PP).
+            </p>
+          </div>
         </div>
         <div v-if="!isOutfitWar" class="mb-2">
           <input
diff --git a/components/profiles/ProfileCombatMetrics.vue b/components/profiles/ProfileCombatMetrics.vue
index 9b303d17..c1d8b7c3 100644
--- a/components/profiles/ProfileCombatMetrics.vue
+++ b/components/profiles/ProfileCombatMetrics.vue
@@ -12,70 +12,79 @@
       >
       </v-data-table>
       <div class="text-sm text-center mt-1">
+        [avg] = Average per alert across the
+        <InfoTooltip
+          :class="['text-red-500']"
+          text="bracket"
+          tooltip="Alerts are bracketed based on their population per faction. Prime = 5 platoons a side, High = 4, Medium = 3, Low = 2, Dead = <1"
+        ></InfoTooltip
+        ><br />
         Key:
-        <span class="label gray mb-1"
-          >Kills [avg]
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Total kills within the bracket with [average] across number of bracket alerts"
+            text="Kills [avg]"
+            tooltip="Total kills within the bracket with [average] across number of bracket alerts"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >Deaths [avg]
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Total deaths within the bracket with [average] across number of bracket alerts"
+            text="Deaths [avg]"
+            tooltip="Total deaths within the bracket with [average] across number of bracket alerts"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >KD
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Kills divided by deaths within the bracket"
+            text="KD"
+            tooltip="Kills divided by deaths within the bracket"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >Headshots [avg]
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Total headshots within the bracket with [average] across number of bracket alerts"
+            text="Headshots [avg]"
+            tooltip="Total headshots within the bracket with [average] across number of bracket alerts"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >HSR%
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Headshots divided by kills within the bracket"
+            text="HSR%"
+            tooltip="Headshots divided by kills within the bracket"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >TKs [avg]
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Total team kills within the bracket with [average] across number of bracket alerts"
+            text="TKs [avg]"
+            tooltip="Total team kills within the bracket with [average] across number of bracket alerts"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >TK%
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Team kills divided by kills within the bracket"
+            text="TK%"
+            tooltip="Team kills divided by kills within the bracket"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >TKed [avg]
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Total times killed by teammates within the bracket with [average] across number of bracket alerts"
+            text="TKed [avg]"
+            tooltip="Total times killed by teammates within the bracket with [average] across number of bracket alerts"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >TKed%
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Times killed by teammates divided by deaths within the bracket"
+            text="TKed%"
+            tooltip="Times killed by teammates divided by deaths within the bracket"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >Suicides [avg]
+        <span class="label gray mb-1">
           <InfoTooltip
-            message="Total suicides within the bracket with [average] across number of bracket alerts"
+            text="Sui [avg]"
+            tooltip="Total suicides within the bracket with [average] across number of bracket alerts"
           ></InfoTooltip>
         </span>
-        <span class="label gray mb-1"
-          >Sui%
-          <InfoTooltip message="Suicides vs deaths"></InfoTooltip>
+        <span class="label gray mb-1">
+          <InfoTooltip
+            text="Sui%"
+            tooltip="Suicides vs deaths within the bracket"
+          ></InfoTooltip>
         </span>
       </div>
     </div>

From 0115a342e1ef97b70c892aa25787947049acfa5b Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:43:53 +0100
Subject: [PATCH 30/36] Added tooltip to BR graph

---
 components/alert/AlertBattleranks.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/alert/AlertBattleranks.vue b/components/alert/AlertBattleranks.vue
index 55b0f6f7..7e25ddbb 100644
--- a/components/alert/AlertBattleranks.vue
+++ b/components/alert/AlertBattleranks.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="col-span-12 card relative text-center">
     <div class="tag section">
-      Battlerank Distribution <span class="label blue"> Improved in v4.5!</span>
+      Battle Rank Distribution
+      <span class="label blue"
+        ><InfoTooltip
+          text="Improved in v4.5!"
+          tooltip='Battle Ranks have been moved into "Ranges" (e.g. BR 100-105), which is vastly more legible to read than 420 bars! You can adjust the range size below, which will be remembered. Default is 5. The value shown is inclusive of the rank, e.g. BR 100 will land under the 100-105 range.'
+        ></InfoTooltip
+      ></span>
     </div>
     <CountdownSpinner
       v-if="alert.state === 1"

From dffdfb27431fff534052b53b0a736a17c35b521d Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:50:19 +0100
Subject: [PATCH 31/36] Forced tooltip to render as raw HTML to enable <brs>
 etc

---
 components/InfoTooltip.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/InfoTooltip.vue b/components/InfoTooltip.vue
index 2b22e91f..27a7d749 100644
--- a/components/InfoTooltip.vue
+++ b/components/InfoTooltip.vue
@@ -6,7 +6,7 @@
         <font-awesome-icon :icon="['fas', icon]"></font-awesome-icon>
       </span>
     </template>
-    {{ tooltip }}
+    <span v-html="tooltip"></span>
   </v-tooltip>
 </template>
 <script lang="ts">

From 7ab9f1618f57f6721dffd81acff8e9c2c00110cd Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 12:54:42 +0100
Subject: [PATCH 32/36] Improved / implemented tooltips in various places

---
 components/alert/AlertPopulations.vue        | 36 ++++++--------------
 components/profiles/ProfileCombatMetrics.vue |  7 +++-
 components/search/SearchBar.vue              |  8 ++++-
 3 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/components/alert/AlertPopulations.vue b/components/alert/AlertPopulations.vue
index 30a70f47..f631fa7b 100644
--- a/components/alert/AlertPopulations.vue
+++ b/components/alert/AlertPopulations.vue
@@ -3,19 +3,12 @@
     <div class="tag section">
       Population History
       <span class="label blue">
-        Improved in v4.5!
-        <v-tooltip bottom>
-          <template #activator="{ on, attrs }">
-            <font-awesome-icon
-              :icon="['fas', 'info-circle']"
-              v-bind="attrs"
-              v-on="on"
-            ></font-awesome-icon>
-          </template>
-          Graph was updated to be more readable. Activity levels are explained
-          (unfortunately not visualized yet) and broken down in the (i) tooltip
-          on the Activity Levels tab.
-        </v-tooltip>
+        <InfoTooltip
+          text="Improved in v4.5!"
+          tooltip="Graph was updated to be more readable. Activity levels are explained
+          (unfortunately thresholds not visualized yet) and broken down in the (i) tooltip
+          on the Activity Levels tab."
+        ></InfoTooltip>
       </span>
     </div>
     <CountdownSpinner
@@ -43,24 +36,17 @@
           @click="updateMode('average')"
         >
           <font-awesome-icon fixed-width :icon="['fas', 'exchange-alt']" />
-          Activity Level
-          <v-tooltip bottom>
-            <template #activator="{ on, attrs }">
-              <font-awesome-icon
-                :icon="['fas', 'info-circle']"
-                v-bind="attrs"
-                v-on="on"
-              ></font-awesome-icon>
-            </template>
-            Shows the calculation for the Activity bracket. All factions must be
+          <InfoTooltip
+            text="Activity Level"
+            tooltip="Shows the calculation for the Activity bracket. All factions must be
             above the threshold for the alert to achieve the bracket (based on
             last entry).<br />
             Prime = 4+ platoons (>192 players)<br />
             High = 3+ platoons (>144 players)<br />
             Medium = 2+ platoons (>96 players)<br />
             Low = 1+ platoons (>48 players)<br />
-            Dead = <48 players
-          </v-tooltip>
+            Dead = <48 players"
+          ></InfoTooltip>
         </button>
       </div>
       <div v-show="mode === 'number'">
diff --git a/components/profiles/ProfileCombatMetrics.vue b/components/profiles/ProfileCombatMetrics.vue
index c1d8b7c3..20ee671c 100644
--- a/components/profiles/ProfileCombatMetrics.vue
+++ b/components/profiles/ProfileCombatMetrics.vue
@@ -16,7 +16,12 @@
         <InfoTooltip
           :class="['text-red-500']"
           text="bracket"
-          tooltip="Alerts are bracketed based on their population per faction. Prime = 5 platoons a side, High = 4, Medium = 3, Low = 2, Dead = <1"
+          tooltip="Alerts are bracketed based on their population per faction.<br>
+            Prime = 4+ platoons (>192 players)<br />
+            High = 3+ platoons (>144 players)<br />
+            Medium = 2+ platoons (>96 players)<br />
+            Low = 1+ platoons (>48 players)<br />
+            Dead = <48 players"
         ></InfoTooltip
         ><br />
         Key:
diff --git a/components/search/SearchBar.vue b/components/search/SearchBar.vue
index 7fb7a244..e0450562 100644
--- a/components/search/SearchBar.vue
+++ b/components/search/SearchBar.vue
@@ -7,7 +7,13 @@
       class="bg-tint rounded lg:rounded-bl-none text-base text-center relative"
     >
       <div class="tag section">
-        Search <span class="label green">New in v4.5!</span>
+        Search
+        <span class="label green"
+          ><InfoTooltip
+            text="New in v4.5!"
+            tooltip='You are now able to search for your Character and Outfit! You can "Pin" (top right of the result) up to 5 results to easily search yourself again, which will be saved to your device.'
+          ></InfoTooltip>
+        </span>
       </div>
       <div class="p-2">
         <div class="flex items-center">

From 3ff4830a2aa7ff356a0271a4753204a44e717d3e Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 13:43:04 +0100
Subject: [PATCH 33/36] Corrected references within imports

---
 pages/alert/_alert.vue | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pages/alert/_alert.vue b/pages/alert/_alert.vue
index 9cb4e3d4..dba367fb 100644
--- a/pages/alert/_alert.vue
+++ b/pages/alert/_alert.vue
@@ -149,23 +149,23 @@
 
 <script lang="ts">
 import Vue from 'vue'
-import { InstanceTerritoryControlResponseInterface } from '@/interfaces/InstanceTerritoryControlResponseInterface'
-import ApiRequest from '@/api-request'
-import { Ps2AlertsEventState } from '@/ps2alerts-constants/ps2AlertsEventState'
-import { CensusEndpoints, Endpoints } from '@/constants/Endpoints'
-import AlertResult from '@/components/alert/AlertResult.vue'
-import AlertDetails from '@/components/alert/AlertDetails.vue'
-import AlertFactionCombatMetrics from '@/components/alert/AlertFactionCombatMetrics.vue'
-import AlertFactionVsFaction from '@/components/alert/AlertFactionVsFaction.vue'
-import AlertMap from '@/components/alert/AlertMap.vue'
-import AlertCharacterMetrics from '@/components/alert/AlertCharacterMetrics.vue'
-import AlertOutfitMetrics from '@/components/alert/AlertOutfitMetrics.vue'
-import AlertWeaponMetrics from '@/components/alert/AlertWeaponMetrics.vue'
-import AlertVehicleMetrics from '@/components/alert/AlertVehicleMetrics.vue'
-import AlertVehicleMatrix from '@/components/alert/AlertVehicleMatrix.vue'
-import AlertPopulations from '@/components/alert/AlertPopulations.vue'
-import AlertClassMetrics from '@/components/alert/AlertLoadoutMetrics.vue'
-import AlertCombatHistory from '@/components/alert/AlertCombatHistory.vue'
+import { InstanceTerritoryControlResponseInterface } from '~/interfaces/InstanceTerritoryControlResponseInterface'
+import ApiRequest from '~/api-request'
+import { Ps2AlertsEventState } from '~/ps2alerts-constants/ps2AlertsEventState'
+import { CensusEndpoints, Endpoints } from '~/constants/Endpoints'
+import AlertResult from '~/components/alert/AlertResult.vue'
+import AlertDetails from '~/components/alert/AlertDetails.vue'
+import AlertFactionCombatMetrics from '~/components/alert/AlertFactionCombatMetrics.vue'
+import AlertFactionVsFaction from '~/components/alert/AlertFactionVsFaction.vue'
+import AlertMap from '~/components/alert/AlertMap.vue'
+import AlertCharacterMetrics from '~/components/alert/AlertCharacterMetrics.vue'
+import AlertOutfitMetrics from '~/components/alert/AlertOutfitMetrics.vue'
+import AlertWeaponMetrics from '~/components/alert/AlertWeaponMetrics.vue'
+import AlertVehicleMetrics from '~/components/alert/AlertVehicleMetrics.vue'
+import AlertVehicleMatrix from '~/components/alert/AlertVehicleMatrix.vue'
+import AlertPopulations from '~/components/alert/AlertPopulations.vue'
+import AlertClassMetrics from '~/components/alert/AlertLoadoutMetrics.vue'
+import AlertCombatHistory from '~/components/alert/AlertCombatHistory.vue'
 import AlertBattleranks from '~/components/alert/AlertBattleranks.vue'
 import { InstanceFacilityControlAggregateResponseInterface } from '~/interfaces/aggregates/instance/InstanceFacilityControlAggregateResponseInterface'
 import facilityTypeName from '~/filters/FacilityTypeName'

From 25055507faeb5684184e5d25f57f29b50f49dbb8 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Mon, 28 Aug 2023 13:45:19 +0100
Subject: [PATCH 34/36] Enhanced tooltips and information presented in various
 areas

---
 components/InfoTooltip.vue              |  1 -
 components/alert/AlertBattleranks.vue   | 30 ++++++++++++++++++++-----
 components/alert/AlertCombatHistory.vue |  5 ++++-
 components/alert/AlertPopulations.vue   | 12 +++++++++-
 components/alert/AlertResult.vue        | 18 +++++----------
 filters/FactionTextClass.ts             |  2 +-
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/components/InfoTooltip.vue b/components/InfoTooltip.vue
index 27a7d749..03daa6ae 100644
--- a/components/InfoTooltip.vue
+++ b/components/InfoTooltip.vue
@@ -29,6 +29,5 @@ export default Vue.extend({
       default: 'info-circle',
     },
   },
-  data() {},
 })
 </script>
diff --git a/components/alert/AlertBattleranks.vue b/components/alert/AlertBattleranks.vue
index 7e25ddbb..03dcb410 100644
--- a/components/alert/AlertBattleranks.vue
+++ b/components/alert/AlertBattleranks.vue
@@ -5,7 +5,7 @@
       <span class="label blue"
         ><InfoTooltip
           text="Improved in v4.5!"
-          tooltip='Battle Ranks have been moved into "Ranges" (e.g. BR 100-105), which is vastly more legible to read than 420 bars! You can adjust the range size below, which will be remembered. Default is 5. The value shown is inclusive of the rank, e.g. BR 100 will land under the 100-105 range.'
+          tooltip='Battle Ranks have been moved into "Ranges" (e.g. BR 100-105), which is vastly more legible to read than 420 bars! You can adjust the range size below, which will be remembered.'
         ></InfoTooltip
       ></span>
     </div>
@@ -18,7 +18,7 @@
       <h1 class="mb-4">Loading...</h1>
     </div>
     <div v-if="loaded" class="text-center">
-      <div class="flex m-auto w-60 justify-center">
+      <div class="flex m-auto justify-center">
         <span>Range size: </span>
         <input
           v-model="bucketSize"
@@ -26,7 +26,18 @@
           type="number"
           aria-label="Bucket size"
         />
+        <button class="btn btn-sm mx-1" @click="updateSize(5)">5</button>
+        <button class="btn btn-sm mx-1" @click="updateSize(10)">10</button>
+        <button class="btn btn-sm mx-1" @click="updateSize(20)">20</button>
       </div>
+      <p class="text-xs text-gray-400 mt-2">
+        Shows the distribution of battle ranks per faction in groups of
+        {{ bucketSize }}. The value shown is inclusive of the rank, e.g. BR 100
+        will land under the 100-109 range. <br />Adjust the range above to your
+        desired size, it will be saved across visits on your device. It is
+        <b>not</b> recommended to use 1, the graph becomes pretty unreadable.
+        Default (and recommended) size is {{ bucketDefault }}.
+      </p>
       <BarChart
         :chart-data="dataCollection"
         :chart-options="chartOptions"
@@ -49,6 +60,8 @@ import { Ps2AlertsEventType } from '~/ps2alerts-constants/ps2AlertsEventType'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
 import { commonChartOptions } from '~/constants/CommonChartOptions'
 
+const bucketDefault = 10
+
 export default Vue.extend({
   name: 'AlertBattleranks',
   components: {
@@ -81,7 +94,8 @@ export default Vue.extend({
       data: [] as InstanceCharacterAggregateResponseInterface[],
       dataCollection: {},
       dataCollectionFactions: {},
-      bucketSize: 5,
+      bucketSize: bucketDefault,
+      bucketDefault,
       chartOptions: {
         ...commonChartOptions.root,
         scales: {
@@ -388,15 +402,19 @@ export default Vue.extend({
       const bucketSize = localStorage.getItem('alertBRBucketSize')
 
       if (!bucketSize) {
-        localStorage.setItem('alertBRBucketSize', '5')
-        return 5
+        localStorage.setItem('alertBRBucketSize', `${bucketDefault.toString()}`)
+        return bucketDefault
       }
 
       return parseInt(bucketSize)
     },
-    roundToNearestSize(num: number, size: number = 5): number {
+    roundToNearestSize(num: number, size: number = bucketDefault): number {
       return Math.floor(num / size) * size
     },
+    updateSize(bucketSize: number): void {
+      this.bucketSize = bucketSize
+      this.buildCollection()
+    },
   },
 })
 </script>
diff --git a/components/alert/AlertCombatHistory.vue b/components/alert/AlertCombatHistory.vue
index a4212ac2..9b2b7430 100644
--- a/components/alert/AlertCombatHistory.vue
+++ b/components/alert/AlertCombatHistory.vue
@@ -54,10 +54,13 @@
           Headshots
         </button>
       </div>
+      <p class="text-xs text-gray-400 mt-2">
+        Shows running totals of {{ mode.toLowerCase() }} per faction.
+      </p>
       <LineChart
         :chart-data="dataCollection"
         :chart-options="chartOptions"
-        :styles="{ width: '100%', height: '400px' }"
+        :styles="{ height: '400px' }"
       ></LineChart>
     </div>
   </div>
diff --git a/components/alert/AlertPopulations.vue b/components/alert/AlertPopulations.vue
index f631fa7b..d7212638 100644
--- a/components/alert/AlertPopulations.vue
+++ b/components/alert/AlertPopulations.vue
@@ -50,6 +50,11 @@
         </button>
       </div>
       <div v-show="mode === 'number'">
+        <p class="text-xs text-gray-400 mt-2">
+          The first 5 data points always have a "lag" while the population
+          calculations "warm up". They are not used to calculate the Activity
+          Level.
+        </p>
         <line-chart
           v-if="data.length"
           :chart-data="dataCollection"
@@ -73,11 +78,16 @@
         </div>
       </div>
       <div v-show="mode === 'average'" v-if="!isOutfitWar" class="text-center">
+        <p class="text-xs text-gray-400 mt-2">
+          Shows the calculation for the Activity bracket. All factions must be
+          above the threshold for the alert to achieve the bracket (based on
+          last entry).
+        </p>
         <LineChart
           v-if="avgData.length"
           :chart-data="dataAvgCollection"
           :chart-options="popActivityChartOptions"
-          :styles="{ height: '400px' }"
+          :styles="{ 'min-height': '400px' }"
           class="w-full"
         ></LineChart>
         <div
diff --git a/components/alert/AlertResult.vue b/components/alert/AlertResult.vue
index 1d204c0b..3ebea1ca 100644
--- a/components/alert/AlertResult.vue
+++ b/components/alert/AlertResult.vue
@@ -21,18 +21,13 @@
         <span :class="alert.result.victor | factionTextClass">{{
           victorText
         }}</span>
-        <v-tooltip v-if="alert.result && alert.result.draw" bottom>
-          <template #activator="{ on, attrs }">
-            <font-awesome-icon
-              :icon="['fas', 'info-circle']"
-              v-bind="attrs"
-              v-on="on"
-            ></font-awesome-icon>
-          </template>
-          When alert reaches a draw, the game does a coin flip between the
+        <InfoTooltip
+          v-if="alert.result && alert.result.draw"
+          text=""
+          tooltip="When alert reaches a draw, the game does a coin flip between the
           drawing factions to gain the continent lock bonus. In terms of the
-          metagame, this is a draw.
-        </v-tooltip>
+          metagame, this is a draw."
+        ></InfoTooltip>
       </h2>
     </div>
     <div v-if="alert.state === 1" class="mb-2 text-center text-2xl">
@@ -107,7 +102,6 @@ import factionOrTeamName from '~/filters/FactionOrTeamName'
 import { Team } from '~/ps2alerts-constants/outfitwars/team'
 import Countdown from '~/components/Countdown.vue'
 import CountdownSpinner from '~/components/common/CountdownSpinner.vue'
-import factionTextClass from '~/filters/FactionTextClass'
 
 export default Vue.extend({
   name: 'AlertResult',
diff --git a/filters/FactionTextClass.ts b/filters/FactionTextClass.ts
index 81cf7b34..c698e647 100644
--- a/filters/FactionTextClass.ts
+++ b/filters/FactionTextClass.ts
@@ -12,7 +12,7 @@ const factionTextClass = Vue.filter('factionTextClass', (value: Faction) => {
     case Faction.NS_OPERATIVES:
       return 'text-nso'
     default:
-      return 'text-gray-600'
+      return 'text-gray-400'
   }
 })
 

From 666e3a56bda2511ef14a246eaadbea46e6706cd3 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Sun, 3 Sep 2023 11:01:28 +0100
Subject: [PATCH 35/36] #489: Added Combat Metrics Graph, added XPM metrics to
 tables and graph

---
 components/profiles/ProfileCombatMetrics.vue  |  56 +++-
 .../profiles/ProfileCombatMetricsGraph.vue    | 298 ++++++++++++++++++
 constants/CommonChartOptions.ts               |   6 +
 .../profiles/ProfileMetricsInterface.ts       |   4 +
 pages/player/_player.vue                      | 193 ++++++++----
 ps2alerts-constants                           |   2 +-
 6 files changed, 492 insertions(+), 67 deletions(-)
 create mode 100644 components/profiles/ProfileCombatMetricsGraph.vue

diff --git a/components/profiles/ProfileCombatMetrics.vue b/components/profiles/ProfileCombatMetrics.vue
index 20ee671c..fb2611e2 100644
--- a/components/profiles/ProfileCombatMetrics.vue
+++ b/components/profiles/ProfileCombatMetrics.vue
@@ -24,6 +24,11 @@
             Dead = <48 players"
         ></InfoTooltip
         ><br />
+        <span class="text-sm text-gray-400"
+          >* Only counts alerts with XPM metrics available. Number of XPM alerts
+          in the bracket is in (#)</span
+        >
+        <br />
         Key:
         <span class="label gray mb-1">
           <InfoTooltip
@@ -91,10 +96,20 @@
             tooltip="Suicides vs deaths within the bracket"
           ></InfoTooltip>
         </span>
+        <span class="label gray mb-1">
+          <InfoTooltip
+            text="[KPM]"
+            tooltip="Average Kills Per Minute within the bracket. Only counts alerts with XPM metrics available."
+          ></InfoTooltip>
+        </span>
+        <span class="label gray mb-1">
+          <InfoTooltip
+            text="[DPM]"
+            tooltip="Average Deaths Per Minute within the bracket. Only counts alerts with XPM metrics available."
+          ></InfoTooltip>
+        </span>
       </div>
     </div>
-    <div class="col-span-12 md:col-span-6 lg:col-span-8">Table of weapons</div>
-    <div class="col-span-12">Table of vehicles</div>
   </div>
 </template>
 
@@ -210,6 +225,20 @@ export default Vue.extend({
           value: 'suir',
           cellClass: 'text-center',
         },
+        {
+          text: '[KPM] (#)*',
+          align: 'middle',
+          filterable: false,
+          value: 'kpm',
+          cellClass: 'text-center',
+        },
+        {
+          text: '[DPM] (#)*',
+          align: 'middle',
+          filterable: false,
+          value: 'dpm',
+          cellClass: 'text-center',
+        },
       ],
     }
   },
@@ -224,13 +253,24 @@ export default Vue.extend({
     ): (ProfileCommonMetricsInterface | null)[] {
       const returnArray: (ProfileCommonMetricsInterface | null)[] = []
 
+      const transformXPMs = (bracket: ProfileCommonMetricsInterface | null) => {
+        if (!bracket) {
+          return null
+        }
+        return {
+          ...bracket,
+          kpm: `${bracket?.kpm} (${bracket?.xpmBracketCount})`,
+          dpm: `${bracket?.dpm} (${bracket?.xpmBracketCount})`,
+        }
+      }
+
       returnArray.push(
-        data.brackets[0],
-        data.brackets[5],
-        data.brackets[4],
-        data.brackets[3],
-        data.brackets[2],
-        data.brackets[1]
+        transformXPMs(data.brackets[0]),
+        transformXPMs(data.brackets[5]),
+        transformXPMs(data.brackets[4]),
+        transformXPMs(data.brackets[3]),
+        transformXPMs(data.brackets[2]),
+        transformXPMs(data.brackets[1])
       )
       return returnArray
     },
diff --git a/components/profiles/ProfileCombatMetricsGraph.vue b/components/profiles/ProfileCombatMetricsGraph.vue
new file mode 100644
index 00000000..79a098d0
--- /dev/null
+++ b/components/profiles/ProfileCombatMetricsGraph.vue
@@ -0,0 +1,298 @@
+<template>
+  <div>
+    <div v-if="!loaded" class="flex justify-center place-items-center h-full">
+      <h1 class="mb-4">Loading...</h1>
+    </div>
+    <div v-if="loaded" class="text-center">
+      <div class="col-span-12">
+        <div class="md:btn-group justify-center grid grid-cols-3 md:flex">
+          <span class="mr-1">Stat:</span>
+          <button
+            v-for="mode in statModes"
+            :key="mode.stat"
+            class="btn btn-sm mx-1 my-1 md:mx-0 md:my-0 col-span-1"
+            :class="{ 'btn-active': statMode === mode.stat }"
+            @click="updateMode(mode.stat)"
+          >
+            {{ mode.text }}
+          </button>
+        </div>
+        <div class="col-span-12 mt-1">
+          <div class="md:btn-group justify-center grid grid-cols-3 md:flex">
+            <span class="mr-1">Bracket:</span>
+            <button
+              v-for="mode in bracketModes"
+              :key="mode.bracket"
+              class="btn btn-sm mx-1 my-1 md:mx-0 md:my-0 col-span-1"
+              :class="{ 'btn-active': bracketMode === mode.bracket }"
+              @click="updateBracket(mode.bracket)"
+            >
+              {{ mode.text }}
+            </button>
+          </div>
+          <div class="flex m-auto justify-center mt-1">
+            <span class="mr-1">Rolling average days:</span>
+            <input
+              v-model="averageSize"
+              class="w-16 appearance-none border border-solid border-transparent text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white"
+              type="number"
+              aria-label="Bucket size"
+            />
+            <button
+              v-for="size in averageSizeOptions"
+              :key="size"
+              class="btn btn-sm mx-1"
+              @click="updateAverage(size)"
+            >
+              {{ size }}
+            </button>
+          </div>
+        </div>
+      </div>
+      <p class="text-xs text-gray-400 mt-2">
+        Shows <b>{{ statMode.toLowerCase() }}</b> over time per day
+        <span v-if="bracketMode"
+          >within the <b>{{ bracketMode | bracketName }}</b> bracket.</span
+        >
+        <span v-if="!bracketMode">amongst <b>all</b> brackets</span>
+        <br />Last X "alert days" is an average based on full days where there
+        is data (which multiple alerts can be included in one day)
+      </p>
+      <LineChart
+        :chart-data="dataCollection"
+        :chart-options="chartOptions"
+        :styles="{ height: '400px' }"
+      ></LineChart>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import { commonChartOptions } from '~/constants/CommonChartOptions'
+import { ProfileMetricsInterface } from '~/interfaces/profiles/ProfileMetricsInterface'
+import { Bracket } from '~/ps2alerts-constants/bracket'
+import { formatDateTime, utcDate } from '~/utilities/TimeHelper'
+import { DATE_FORMAT } from '~/constants/Time'
+import { Ps2AlertsEventState } from '~/ps2alerts-constants/ps2AlertsEventState'
+
+export default Vue.extend({
+  name: 'ProfileCombatMetricsGraph',
+  props: {
+    statistics: {
+      type: Object as () => ProfileMetricsInterface,
+      default: {},
+      required: true,
+    },
+  },
+  data() {
+    return {
+      dataCollection: {},
+      chartOptions: {
+        ...commonChartOptions.root,
+        scales: {
+          x: {
+            ...commonChartOptions.scales,
+            title: {
+              display: true,
+              text: 'Date',
+              color: '#fff',
+            },
+          },
+          y: {
+            ...commonChartOptions.scales,
+            grid: {
+              color: '#7b8694',
+            },
+            title: {
+              display: true,
+              text: 'Kills',
+              color: '#fff',
+            },
+          },
+        },
+      },
+      loaded: false,
+      data: [] as ProfileMetricsInterface[],
+      statMode: 'kills',
+      statModes: [
+        { stat: 'kills', text: 'Kills' },
+        { stat: 'deaths', text: 'Deaths' },
+        { stat: 'kd', text: 'KD' },
+        { stat: 'teamKills', text: 'Teamkills' },
+        { stat: 'suicides', text: 'Suicides' },
+        { stat: 'headshots', text: 'Headshots' },
+        { stat: 'kpm', text: 'KPM' },
+        { stat: 'dpm', text: 'DPM' },
+      ],
+      bracketMode: null as Bracket | null,
+      bracketModes: [
+        { bracket: null, text: 'All Alerts' },
+        { bracket: 5, text: 'Prime' },
+        { bracket: 4, text: 'High' },
+        { bracket: 3, text: 'Medium' },
+        { bracket: 2, text: 'Low' },
+        { bracket: 1, text: 'Dead' },
+      ],
+      averageSize: 7,
+      averageSizeOptions: [7, 14, 28, 30],
+    }
+  },
+  watch: {
+    statMode() {
+      this.buildCollection()
+    },
+    bracketMode() {
+      this.buildCollection()
+    },
+    averageSize() {
+      this.buildCollection()
+    },
+  },
+  beforeDestroy() {
+    this.reset()
+  },
+  created() {
+    this.reset()
+    this.buildCollection()
+  },
+  methods: {
+    reset() {
+      this.loaded = false
+    },
+    buildCollection() {
+      const times: string[] = []
+      const playerData: number[] = []
+      const averageData: number[] = []
+      const runningAverageData: number[] = []
+      const datasets = []
+      const dateMap = new Map<string, number>()
+      let firstDate = ''
+
+      if (!this.statistics.alerts) {
+        return
+      }
+
+      this.statistics.alerts.forEach((statistic) => {
+        // If the statistic is not for the target bracket, skip it
+        if (
+          this.bracketMode &&
+          statistic.instanceDetails?.bracket !== this.bracketMode
+        ) {
+          return
+        }
+
+        // If alert isn't finished yet don't bother counting it
+        if (statistic.instanceDetails?.state !== Ps2AlertsEventState.ENDED) {
+          return
+        }
+
+        // Convert alert time into a readable format using our defined formats for alert history etc
+        const time = formatDateTime(
+          utcDate(new Date(statistic.instanceDetails?.timeStarted || '')),
+          DATE_FORMAT
+        )
+
+        const dateData = dateMap.get(time)
+        let stat = statistic[this.statMode] || 0
+
+        if (this.statMode === 'kd') {
+          stat = (statistic.kills || 1) / (statistic.deaths || 1)
+        }
+        if (this.statMode === 'kpm') {
+          stat = statistic.xPerMinutes?.killsPerMinute || 0
+        }
+        if (this.statMode === 'dpm') {
+          stat = statistic.xPerMinutes?.deathsPerMinute || 0
+        }
+
+        if (!firstDate) {
+          firstDate = time
+        }
+
+        if (!dateData) {
+          dateMap.set(time, stat)
+        } else {
+          dateMap.set(time, dateData + stat)
+        }
+      })
+
+      // Loop through all the date data and generate the final dataset
+      dateMap.forEach((value, key) => {
+        times.push(key)
+        playerData.push(value)
+
+        const bracket = this.bracketMode ?? 0
+
+        averageData.push(
+          this.statistics?.averages?.[bracket]?.[this.statMode] ?? 0
+        )
+
+        const lastTen = playerData.slice(-this.averageSize)
+
+        // If it's the first entry, just use that
+        if (lastTen.length === 0) {
+          runningAverageData.push(value)
+        }
+
+        // Calculate the sum of the last 10 elements
+        const sum = lastTen.reduce((acc, val) => acc + val, 0)
+
+        // Calculate the average of the last 10 elements and push
+        runningAverageData.push(sum / lastTen.length)
+      })
+
+      const datasetOptions = {
+        ...commonChartOptions.datasets,
+        ...commonChartOptions.datasets.neutral,
+        // Find the stat out of the statModes and pull it's text
+        label:
+          this.statModes.find((mode) => mode.stat === this.statMode)?.text ||
+          'ERROR',
+      }
+      const averageDatasetOptions = {
+        ...commonChartOptions.datasets,
+        ...commonChartOptions.datasets.tr,
+        label: 'Avg for bracket',
+        pointStyle: 'line',
+      }
+      const runningAverageDatasetOptions = {
+        ...commonChartOptions.datasets,
+        ...commonChartOptions.datasets.nc,
+        label: `Last X alert days rolling avg`,
+      }
+
+      datasets.push({
+        ...datasetOptions,
+        data: playerData,
+      })
+
+      datasets.push({
+        ...averageDatasetOptions,
+        data: averageData,
+      })
+
+      datasets.push({
+        ...runningAverageDatasetOptions,
+        data: runningAverageData,
+      })
+
+      this.dataCollection = {
+        labels: times,
+        datasets,
+      }
+
+      this.loaded = true
+    },
+    updateMode(mode: string) {
+      this.statMode = mode
+    },
+    updateBracket(bracket: Bracket | null) {
+      this.bracketMode = bracket
+    },
+    updateAverage(averageSize: number) {
+      this.averageSize = averageSize
+    },
+  },
+})
+</script>
diff --git a/constants/CommonChartOptions.ts b/constants/CommonChartOptions.ts
index 8e663620..cb9882f1 100644
--- a/constants/CommonChartOptions.ts
+++ b/constants/CommonChartOptions.ts
@@ -58,5 +58,11 @@ export const commonChartOptions = {
       borderColor: '#4a5568',
       pointStyle: 'circle',
     },
+    neutral: {
+      label: 'STAT',
+      backgroundColor: '#12d383',
+      borderColor: '#12d383',
+      pointStyle: 'circle',
+    },
   },
 }
diff --git a/interfaces/profiles/ProfileMetricsInterface.ts b/interfaces/profiles/ProfileMetricsInterface.ts
index 9c280a26..96f84feb 100644
--- a/interfaces/profiles/ProfileMetricsInterface.ts
+++ b/interfaces/profiles/ProfileMetricsInterface.ts
@@ -12,9 +12,13 @@ export interface ProfileCommonMetricsInterface {
   tkr: string // Calculated
   tkedr: string // Calculated
   suir: string // Calculated
+  kpm: string // Calculated
+  dpm: string // Calculated
+  xpmBracketCount?: number
   bracket: string
   bracketCount: number
   // factionKills: PS2AlertsFactionKillDataInterface
+  [key: string]: any
 }
 
 export interface BracketedProfileCommonMetricsInterface {
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index 3944a54f..2b982dbc 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -27,6 +27,12 @@
         <div class="tag section">Combat Stats</div>
         <ProfileCombatMetrics :statistics="statistics" :player="player" />
       </div>
+      <div class="col-span-12 card relative">
+        <div class="tag section">Bracketed Combat stat history</div>
+        <ProfileCombatMetricsGraph
+          :statistics="statistics"
+        ></ProfileCombatMetricsGraph>
+      </div>
       <div class="col-span-12 card">
         <div class="tag section">Alert Statistics</div>
         <ProfileAlertMetrics :statistics="statistics" :player="player" />
@@ -65,6 +71,9 @@ export default Vue.extend({
       player: {} as GlobalCharacterAggregateInterface,
       statistics: {} as ProfileMetricsInterface,
       outfitLogoMissing: false,
+      bracketXpmCountMap: new Map<Bracket, number>(),
+      kpmBracketMap: new Map<Bracket, number>(),
+      dpmBracketMap: new Map<Bracket, number>(),
     }
   },
   computed: {
@@ -84,6 +93,63 @@ export default Vue.extend({
       await this.pull(characterId)
     },
 
+    async pull(characterId: string): Promise<void> {
+      await new ApiRequest()
+        .get<GlobalCharacterAggregateInterface>(
+          Endpoints.AGGREGATES_GLOBAL_CHARACTER_SINGLE.replace(
+            '{character}',
+            characterId
+          )
+        )
+        .then((character) => {
+          this.player = character
+        })
+
+      const aggregateRequests: Promise<GlobalCharacterAggregateInterface>[] = []
+
+      // For each bracket, create a promise and add it to the array to pull all data for the player in one go
+      const brackets = ps2alertsBracketArray.filter((bracket) => {
+        return bracket !== Bracket.UNKNOWN
+      })
+
+      brackets.forEach((bracket) => {
+        aggregateRequests.push(
+          new ApiRequest()
+            .get<GlobalCharacterAggregateInterface>(
+              `${Endpoints.AGGREGATES_GLOBAL_CHARACTER_SINGLE.replace(
+                '{character}',
+                characterId
+              )}?bracket=${bracket}`
+            )
+            .then((character) => {
+              return character
+            })
+        )
+      })
+
+      // We have to do this magic to handle when an aggregate may return a 404 if a player hasn't played in say a dead alert yet.
+      const safePromise = (
+        promise: Promise<GlobalCharacterAggregateInterface>
+      ) => {
+        return promise.catch((error) => {
+          console.log('error', error)
+          return null
+        })
+      }
+
+      const bracketResults = await Promise.all(
+        aggregateRequests.map((p) => safePromise(p))
+      ).then((results) => {
+        return results
+      })
+
+      this.statistics = await this.createMetrics(this.player, bracketResults)
+
+      console.log('statistics', this.statistics)
+
+      this.loaded = true
+    },
+
     parseAggregateAverages(
       bracketData: GlobalCharacterAggregateInterface | null,
       bracketCount: number
@@ -91,6 +157,15 @@ export default Vue.extend({
       if (!bracketData) {
         return null
       }
+
+      // We have already hydrated the totals for KPM/DPM, now here we calculate the averages for the bracket
+      const kpmRaw = this.kpmBracketMap.get(bracketData.bracket) || 0
+      const dpmRaw = this.dpmBracketMap.get(bracketData.bracket) || 0
+      const xpmBracketCount =
+        this.bracketXpmCountMap.get(bracketData.bracket) || 0
+      const kpm = (kpmRaw / xpmBracketCount).toFixed(2)
+      const dpm = (dpmRaw / xpmBracketCount).toFixed(2)
+
       return {
         kills: ((bracketData.kills ?? 0) / bracketCount).toFixed(2),
         deaths: ((bracketData.deaths ?? 0) / bracketCount).toFixed(2),
@@ -115,6 +190,8 @@ export default Vue.extend({
           ((bracketData.suicides ?? 0) / (bracketData.deaths ?? 0)) *
           100
         ).toFixed(2),
+        kpm,
+        dpm,
         bracket: `Avg (${BracketName(bracketData.bracket)})`,
         bracketCount,
       }
@@ -128,6 +205,22 @@ export default Vue.extend({
         return null
       }
 
+      // We have already hydrated the totals for KPM/DPM, now here we calculate the averages for the bracket
+      const kpmRaw = this.kpmBracketMap.get(bracketData.bracket) || 0
+      const dpmRaw = this.dpmBracketMap.get(bracketData.bracket) || 0
+      const xpmBracketCount =
+        this.bracketXpmCountMap.get(bracketData.bracket) || 0
+      const kpm = (kpmRaw / xpmBracketCount).toFixed(2)
+      const dpm = (dpmRaw / xpmBracketCount).toFixed(2)
+
+      if (bracketData.bracket === Bracket.TOTAL) {
+        console.log(
+          'XPM Maps',
+          this.kpmBracketMap,
+          this.dpmBracketMap,
+          this.bracketXpmCountMap
+        )
+      }
       return {
         kills: `${bracketData.kills ?? 0} [${bracketAverageData?.kills ?? 0}]`,
         deaths: `${bracketData.deaths ?? 0} [${
@@ -162,68 +255,13 @@ export default Vue.extend({
           ((bracketData.suicides ?? 0) / (bracketData.deaths ?? 0)) *
           100
         ).toFixed(2),
+        kpm,
+        dpm,
+        xpmBracketCount,
         bracket: BracketName(bracketData.bracket),
         bracketCount,
       }
     },
-    async pull(characterId: string): Promise<void> {
-      await new ApiRequest()
-        .get<GlobalCharacterAggregateInterface>(
-          Endpoints.AGGREGATES_GLOBAL_CHARACTER_SINGLE.replace(
-            '{character}',
-            characterId
-          )
-        )
-        .then((character) => {
-          this.player = character
-        })
-
-      console.log('player', this.player)
-
-      const aggregateRequests: Promise<GlobalCharacterAggregateInterface>[] = []
-
-      // For each bracket, create a promise and add it to the array to pull all data for the player in one go
-      const brackets = ps2alertsBracketArray.filter((bracket) => {
-        return bracket !== Bracket.UNKNOWN
-      })
-      brackets.forEach((bracket) => {
-        aggregateRequests.push(
-          new ApiRequest()
-            .get<GlobalCharacterAggregateInterface>(
-              `${Endpoints.AGGREGATES_GLOBAL_CHARACTER_SINGLE.replace(
-                '{character}',
-                characterId
-              )}?bracket=${bracket}`
-            )
-            .then((character) => {
-              return character
-            })
-        )
-      })
-
-      // We have to do this magic to handle when an aggregate may return a 404 if a player hasn't played in say a dead alert yet.
-      const safePromise = (
-        promise: Promise<GlobalCharacterAggregateInterface>
-      ) => {
-        return promise.catch((error) => {
-          console.log('error', error)
-          return null
-        })
-      }
-
-      const bracketResults = await Promise.all(
-        aggregateRequests.map((p) => safePromise(p))
-      ).then((results) => {
-        return results
-      })
-
-      console.log('bracketResults', bracketResults)
-
-      this.statistics = await this.createMetrics(this.player, bracketResults)
-
-      console.log('this.statistics', this.statistics)
-      this.loaded = true
-    },
     async createMetrics(
       character: GlobalCharacterAggregateInterface,
       brackets: (GlobalCharacterAggregateInterface | null)[]
@@ -248,24 +286,63 @@ export default Vue.extend({
         prime: 0,
       }
 
+      const totalXpms = (
+        alert: InstanceCharacterInterface,
+        isTotal = false
+      ) => {
+        // XPMs are partially available
+        if (!alert.xPerMinutes) {
+          return
+        }
+
+        let bracket = alert.instanceDetails?.bracket || Bracket.UNKNOWN
+        if (isTotal) {
+          bracket = Bracket.TOTAL
+        }
+
+        // We're using a special map here to hold the count of alerts with XPM metrics, cos it would be very low otherwise if divided by total number of alerts with no XPMs.
+        const bracketXpmCount = (this.bracketXpmCountMap.get(bracket) || 0) + 1
+        this.bracketXpmCountMap.set(bracket, bracketXpmCount)
+
+        // First get the total of the metrics per alert
+        const kpm = this.kpmBracketMap.get(bracket) || 0
+        const newKpm = kpm + alert.xPerMinutes?.killsPerMinute ?? 0
+        this.kpmBracketMap.set(bracket, newKpm)
+
+        const dpm = this.dpmBracketMap.get(bracket) || 0
+        const newDpm = dpm + alert.xPerMinutes?.deathsPerMinute ?? 0
+        this.dpmBracketMap.set(bracket, newDpm)
+
+        // We do the division later once all the alerts have been totalled up
+      }
+
       // Loop through all the alerts and get the counts out of them
+      // At the same time, calculate the KPM and DPM metrics and store it as a map to inject into the bracket data
+      // Saves us having to loop through all the alerts twice which is quite expensive
       alerts.forEach((alert) => {
         alertCounts.total++
+        totalXpms(alert, true)
+
         switch (alert.instanceDetails?.bracket) {
           case Bracket.DEAD:
             alertCounts.dead++
+            totalXpms(alert)
             break
           case Bracket.LOW:
             alertCounts.low++
+            totalXpms(alert)
             break
           case Bracket.MEDIUM:
             alertCounts.medium++
+            totalXpms(alert)
             break
           case Bracket.HIGH:
             alertCounts.high++
+            totalXpms(alert)
             break
           case Bracket.PRIME:
             alertCounts.prime++
+            totalXpms(alert)
             break
         }
       })
diff --git a/ps2alerts-constants b/ps2alerts-constants
index 73114327..9c335814 160000
--- a/ps2alerts-constants
+++ b/ps2alerts-constants
@@ -1 +1 @@
-Subproject commit 7311432757fad15b164b96d84fe030a1e4af9dbb
+Subproject commit 9c335814624621b263e0e851f0268f8aac5161ca

From b6167db4fc48e3d4992e97df95c7b871e6f54721 Mon Sep 17 00:00:00 2001
From: Matt Cavanagh <maelstrome26@gmail.com>
Date: Sun, 29 Oct 2023 11:47:33 +0100
Subject: [PATCH 36/36] #489: Added ProfileDays

---
 assets/css/tailwind.scss                      |  3 +
 components/profiles/ProfileDaysFilter.vue     | 60 +++++++++++++++++++
 .../statistics/characters/Characters.vue      |  3 +-
 components/statistics/outfits/Outfits.vue     |  3 +-
 pages/player/_player.vue                      |  9 +++
 5 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 components/profiles/ProfileDaysFilter.vue

diff --git a/assets/css/tailwind.scss b/assets/css/tailwind.scss
index 9a5f4427..ae0d432b 100644
--- a/assets/css/tailwind.scss
+++ b/assets/css/tailwind.scss
@@ -157,6 +157,9 @@ body {
     background-color: rgba(100, 130, 140, 1);
   }
 }
+.bg-tint-solid {
+  background-color: #303a40;
+}
 .bg-vs {
   background-color: rgba(85, 60, 154, 0.5);
   transition: background-color 0.25s ease-out;
diff --git a/components/profiles/ProfileDaysFilter.vue b/components/profiles/ProfileDaysFilter.vue
new file mode 100644
index 00000000..2a458055
--- /dev/null
+++ b/components/profiles/ProfileDaysFilter.vue
@@ -0,0 +1,60 @@
+<template>
+  <div class="">
+    <div
+      class="md:btn-group justify-center grid grid-cols-3 md:flex bg-tint-solid p-2 rounded-md border-other"
+    >
+      <span class="mr-1" style="line-height: 30px"
+        >Last # days
+        <InfoTooltip
+          tooltip="Filter all of the below data by the last X number of days. This is useful for seeing how a player/outfit has been performing recently."
+        ></InfoTooltip
+      ></span>
+      <input
+        v-model="days"
+        class="w-16 appearance-none border border-solid border-transparent text-white py-1 px-2 leading-tight bg-tint-light rounded-sm focus:bg-gray-500 focus:outline-none focus:border-white mr-1"
+        type="number"
+        aria-label="Days"
+        placeholder="All"
+      />
+      <button
+        v-for="mode in dateModes"
+        :key="mode.days"
+        class="btn btn-sm mx-1 my-1 md:mx-0 md:my-0 col-span-1 rounded-none"
+        :class="{ 'btn-active': days === mode.days }"
+        @click="updateDays(mode.days)"
+      >
+        {{ mode.text }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+
+export default Vue.extend({
+  name: 'ProfileDaysFilter',
+  props: {},
+  data() {
+    return {
+      dateModes: [
+        { days: 7, text: '7' },
+        { days: 14, text: '14' },
+        { days: 30, text: '30' },
+        { days: 60, text: '60' },
+        { days: 90, text: '90' },
+        { days: 180, text: '180' },
+        { days: 365, text: '365' },
+        { days: null, text: 'All Time' },
+      ],
+      days: null as number | null,
+    }
+  },
+  methods: {
+    updateDays(days: number | null) {
+      this.days = days
+      this.$emit('updatedDaysFilter', days)
+    },
+  },
+})
+</script>
diff --git a/components/statistics/characters/Characters.vue b/components/statistics/characters/Characters.vue
index 4a50aac7..64b841b5 100644
--- a/components/statistics/characters/Characters.vue
+++ b/components/statistics/characters/Characters.vue
@@ -2,8 +2,7 @@
   <section class="mb-4">
     <h1 class="text-3xl text-center mb-2">Player Statistics</h1>
     <p class="text-center mb-4">
-      Shows the top 1000 Players for the selected criteria. You'll be able to
-      search for yourself in a future update.
+      Shows the top 1000 Players for the selected criteria.
     </p>
     <div v-if="loaded">
       <p v-if="filter.bracket !== 0" class="text-center mb-4">
diff --git a/components/statistics/outfits/Outfits.vue b/components/statistics/outfits/Outfits.vue
index 7cf147ff..a10102dc 100644
--- a/components/statistics/outfits/Outfits.vue
+++ b/components/statistics/outfits/Outfits.vue
@@ -2,8 +2,7 @@
   <section class="mb-4">
     <h1 class="text-3xl text-center mb-2">Outfit Statistics</h1>
     <p class="text-center mb-4">
-      Shows the top 1000 Outfits for the selected criteria. You'll be able to
-      search for your outfit in a future update.
+      Shows the top 1000 Outfits for the selected criteria.
     </p>
     <div v-if="loaded">
       <p v-if="filter.bracket !== 0" class="text-center mb-4">
diff --git a/pages/player/_player.vue b/pages/player/_player.vue
index 2b982dbc..b047e46c 100644
--- a/pages/player/_player.vue
+++ b/pages/player/_player.vue
@@ -23,6 +23,12 @@
           />
         </div>
       </div>
+      <div
+        class="col-span-12 flex justify-center sticky z-50"
+        style="top: 0.5rem"
+      >
+        <ProfileDaysFilter></ProfileDaysFilter>
+      </div>
       <div class="col-span-12 card">
         <div class="tag section">Combat Stats</div>
         <ProfileCombatMetrics :statistics="statistics" :player="player" />
@@ -50,6 +56,7 @@ import factionTextClass from '~/filters/FactionTextClass'
 import ProfileAlertMetrics from '~/components/profiles/ProfileAlertMetrics.vue'
 import ProfileLogos from '~/components/profiles/ProfileLogos.vue'
 import ProfileCombatMetrics from '~/components/profiles/ProfileCombatMetrics.vue'
+import ProfileDaysFilter from '~/components/profiles/ProfileDaysFilter.vue'
 import {
   ProfileCommonMetricsInterface,
   ProfileMetricsInterface,
@@ -64,6 +71,7 @@ export default Vue.extend({
     ProfileAlertMetrics,
     ProfileLogos,
     ProfileCombatMetrics,
+    ProfileDaysFilter,
   },
   data() {
     return {
@@ -297,6 +305,7 @@ export default Vue.extend({
 
         let bracket = alert.instanceDetails?.bracket || Bracket.UNKNOWN
         if (isTotal) {
+          // @ts-ignore It's trying to assign a value of 0 which TS doesn't like, but it is a valid bracket, so bugger off TS no-one likes you.
           bracket = Bracket.TOTAL
         }