From 63ff918b9122a3aaa43df02fd98772ba1335ab33 Mon Sep 17 00:00:00 2001
From: GamingLiamStudios <58615717+GamingLiamStudios@users.noreply.github.com>
Date: Wed, 2 Mar 2022 09:18:26 +1100
Subject: [PATCH 01/13] Update en_OWO.json

---
 src/i18n/en_OWO.json | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en_OWO.json b/src/i18n/en_OWO.json
index dbbf5726..1f30734f 100644
--- a/src/i18n/en_OWO.json
+++ b/src/i18n/en_OWO.json
@@ -89,6 +89,8 @@
   "term.time.added": "Added",
   "term.time.released": "Weweased",
   "term.time.updated": "Updated",
+  "term.time.days": "days",
+  "term.time.day": "day",
   "term.time.hours": "houws",
   "term.time.hour": "houw",
   "term.time.minutes": "minyutes",
@@ -115,6 +117,10 @@
   "term.equalizer": "Equawizew",
   "term.reset": "Weset",
   "term.tracks": "twacks",
+  "term.track": {
+    "one": "track",
+    "other": "tracks"
+  },
   "term.videos": "Videos",
   "term.menu": "Menyu",
   "term.check": "Check",
@@ -157,7 +163,7 @@
   "home.recentlyPlayed": "Wecentwy Pwayed",
   "home.recentlyAdded": "Wecentwy Added",
   "home.artistsFeed": "Youw Awtists Feed",
-  "home.artistsFeed.noArtist": "Fowwow some awtists fiwst and theiw watest weweases wiww be hewe",
+  "home.artistsFeed.noArtist": "Fowwow some awtists to see theiw watest weweases",
   "home.madeForYou": "Made Fow You",
   "home.friendsListeningTo": "Fwiends Wistenying To",
   "home.followedArtists": "Fowwowed Awtists",
@@ -239,6 +245,10 @@
   "settings.option.general.updateCider.branch.description": "Sewect the bwanch to update Cidew to",
   "settings.option.general.updateCider.branch.main": "Stabwe",
   "settings.option.general.updateCider.branch.develop": "Devewopment",
+  "settings.notyf.updateCider.update-not-available": "Nyo update avaiwabwe",
+  "settings.notyf.updateCider.update-downloaded": "Update has been downwoaded, westawt to appwy",
+  "settings.notyf.updateCider.update-error": "Ewwow updating Cidew",
+  "settings.notyf.updateCider.update-timeout": "Update timed out",
   "settings.header.audio": "Audio",
   "settings.header.audio.description": "Adjust the audio settings fow Cidew.",
   "settings.option.audio.volumeStep": "Vowume Step",
@@ -254,7 +264,7 @@
   "settings.header.audio.quality.standard.description": "64 kbps",
   "settings.option.audio.seamlessTransition": "Seamwess Audio Twansition",
   "settings.option.audio.enableAdvancedFunctionality": "Enyabwe Advanced Functionyawity",
-  "settings.option.audio.enableAdvancedFunctionality.description": "Enyabwing AudioContext functionyawity wiww awwow fow extended audio featuwes wike Audio Nyowmawization , Equawizews and Visuawizews, howevew on some systems this may cause stuttewing in audio twacks.",
+  "settings.option.audio.enableAdvancedFunctionality.description": "Enyabwing AudioContext functionyawity wiww awwow fow extended audio featuwes wike Audio Nyowmawization, Equawizews and Visuawizews - howevew on some systems this may cause stuttewing in audio twacks.",
   "settings.option.audio.audioLab": "Cidew Audio Wab",
   "settings.option.audio.audioLab.description": "An assowtment of in-house devewoped audio effects fow Cidew.",
   "settings.warn.audioLab.withoutAF": "AudioContext (Advanced Functionyawity) is wequiwed to enyabwe Cidew Audio Wabowatowy.",

From 197a14c236b887fd2ba281137e4a2caca723557d Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Tue, 1 Mar 2022 20:31:10 -0800
Subject: [PATCH 02/13] condense vars

---
 src/renderer/index.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index e8e8d57d..ef8becc1 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -785,11 +785,20 @@ const app = new Vue({
             })
 
             ipcRenderer.on('SoundCheckTag', (event, tag) => {
-                let replaygain = self.parseSCTagToRG(tag)
-                console.debug(`[Cider][MaikiwiSoundCheck] Replay Gain: ${JSON.stringify(replaygain)} | Attenuating '${Math.log10(replaygain.gain) * 20}' dB`)
+                // let replaygain = self.parseSCTagToRG(tag)
+                let soundcheck = tag.split(" ")
+                let numbers = []
+                for (item of soundcheck) {
+                    numbers.push(parseInt(item, 16))
+    
+                }
+                numbers.shift()
+                let peak = Math.max(numbers[6], numbers[7]) / 32768.0
+                let gain = Math.pow(10, ((-7.63 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant
+                console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: ${Math.log10(peak) * 20} | Adjusting '${Math.log10(gain) * 20}' dB`)
                 try {
                     //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak)))
-                    CiderAudio.audioNodes.gainNode.gain.value = replaygain.gain
+                    CiderAudio.audioNodes.gainNode.gain.value = gain
                 } catch (e) {
                 }
             })
@@ -3835,6 +3844,7 @@ const app = new Vue({
                 element.onclick = app.LastFMDeauthorize;
             });
         },
+        /**  
         parseSCTagToRG: function (tag) {
             let soundcheck = tag.split(" ")
             let numbers = []
@@ -3850,7 +3860,7 @@ const app = new Vue({
                 gain: gain,
                 peak: peak
             }
-        },
+        },*/
         fullscreen(flag) {
             if (flag) {
                 ipcRenderer.send('setFullScreen', true);

From e308160beca018dd44beaed5f1539cd69bedd3f5 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Tue, 1 Mar 2022 22:04:27 -0800
Subject: [PATCH 03/13] controller test

---
 src/renderer/index.js                         |  64 ++++++++++++++++++
 src/renderer/sounds/btn1.ogg                  | Bin 0 -> 9364 bytes
 src/renderer/sounds/confirm.ogg               | Bin 0 -> 9775 bytes
 src/renderer/sounds/hover.ogg                 | Bin 0 -> 24019 bytes
 .../views/components/mediaitem-list-item.ejs  |   3 +
 .../views/components/mediaitem-square.ejs     |   6 +-
 6 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 src/renderer/sounds/btn1.ogg
 create mode 100644 src/renderer/sounds/confirm.ogg
 create mode 100644 src/renderer/sounds/hover.ogg

diff --git a/src/renderer/index.js b/src/renderer/index.js
index ef8becc1..eb557878 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -302,6 +302,70 @@ const app = new Vue({
         }
     },
     methods: {
+        simulateController() {
+            let intTabIndex = 0
+
+            var sounds = {
+                Confirm: new Audio("./sounds/confirm.ogg"),
+                Menu: new Audio("./sounds/btn1.ogg"),
+                Hover: new Audio("./sounds/hover.ogg")
+            }
+
+            document.addEventListener("keydown", (e) => {
+                sounds.Confirm.currentTime = 0
+                sounds.Menu.currentTime = 0
+                sounds.Hover.currentTime = 0
+                let tabbable = $("[tabindex]")
+                console.log(e.key)
+                switch (e.key) {
+                    default:
+                    break;
+                    case "ArrowLeft":
+
+                        e.preventDefault()
+                        break;
+                    case "ArrowRight":
+                        e.preventDefault()
+                        break;
+                    case "ArrowUp":
+                        sounds.Hover.play()
+                        if(intTabIndex <= 0) {
+                            intTabIndex = 0
+                        }else{
+                            intTabIndex--
+                        }
+                        $(tabbable[intTabIndex]).focus()
+                        // $("#app-content").scrollTop($(document.activeElement).offset().top)
+                        e.preventDefault()
+                        break;
+                    case "ArrowDown":
+                        sounds.Hover.play()
+                        if(intTabIndex < tabbable.length) {
+                            intTabIndex++
+                        }else{
+                            intTabIndex = tabbable.length
+                        }
+                        $(tabbable[intTabIndex]).focus()
+                        // $("#app-content").scrollTop($(document.activeElement).offset().top)
+                        e.preventDefault()
+                        break;
+                    case "c":
+                        app.resetState()
+                    break;
+                    case "x": 
+                        sounds.Menu.play()
+                        document.activeElement.dispatchEvent(new Event("contextmenu"))
+                        e.preventDefault()
+                    break;
+                    case "z":
+                        sounds.Confirm.play()
+                        document.activeElement.dispatchEvent(new Event("click"))
+                        document.activeElement.dispatchEvent(new Event("controller-click"))
+                        e.preventDefault()
+                        break;
+                }
+            });
+        },
         songLinkShare(amUrl) {
             notyf.open({ type: "info", className: "notyf-info", message: app.getLz('term.song.link.generate') })
             let self = this
diff --git a/src/renderer/sounds/btn1.ogg b/src/renderer/sounds/btn1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..f6f75efa116b5be7c86654e702d0644a88b05ecd
GIT binary patch
literal 9364
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
KSXhLa0R9W|ib{U~

literal 0
HcmV?d00001

diff --git a/src/renderer/sounds/confirm.ogg b/src/renderer/sounds/confirm.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..c4e3857b29b7bc2c03c5791fd0835ffe9f48437a
GIT binary patch
literal 9775
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

literal 0
HcmV?d00001

diff --git a/src/renderer/sounds/hover.ogg b/src/renderer/sounds/hover.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..9da1b148ca9c85a31563d4f5d28f42d9cef20ca1
GIT binary patch
literal 24019
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
YKz=QNvJ_e}gRCVVwcex)$v6Ob0D@w2EdT%j

literal 0
HcmV?d00001

diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index 7eff29fa..d9d5551e 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -12,6 +12,9 @@
          @mouseenter="checkLibrary"
          @mouseover="showInLibrary = true"
          @mouseleave="showInLibrary = false"
+         @dblclick="route()"
+         @controller-click.self="route()"
+         tabindex="0"
          :class="[{'mediaitem-selected': app.select_hasMediaItem(guid)}, addClasses]">
         <template v-if="isVisible">
             <div class="isLibrary" v-if="showLibraryStatus == true">
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index d525c4c5..30e19ca4 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -1,5 +1,9 @@
 <script type="text/x-template" id="mediaitem-square">
-    <div tabindex="0"
+    <div
+        tabindex="0"
+        @click.self="app.routeView(item)"
+        @controller-click.self="app.routeView(item)"
+        @contextmenu.self="contextMenu"
          class="cd-mediaitem-square" :class="getClasses()" @contextmenu="contextMenu"
          v-observe-visibility="{callback: visibilityChanged}"
          :style="{'--spcolor': getBgColor()}">

From 0f8b739705135dfeb2ca23ae611709b963b28521 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 00:33:27 -0800
Subject: [PATCH 04/13] virtual cursor

---
 src/renderer/index.js                         | 278 ++++++++++++++++--
 src/renderer/style.less                       |  13 +
 src/renderer/views/components/artist-chip.ejs |   2 +-
 .../views/components/mediaitem-list-item.ejs  |   2 +-
 .../views/components/mediaitem-square.ejs     |   2 +-
 src/renderer/views/main.ejs                   |   1 +
 6 files changed, 263 insertions(+), 35 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index eb557878..effa9058 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -233,7 +233,8 @@ const app = new Vue({
             topChromeVisible: true,
             progresshover: false,
             windowControlPosition: "right",
-            contentAreaScrolling: true
+            contentAreaScrolling: true,
+            showCursor: false
         },
         collectionList: {
             response: {},
@@ -303,7 +304,19 @@ const app = new Vue({
     },
     methods: {
         simulateController() {
+            this.chrome.showCursor = true
+            let cursorPos = [0, 0];
             let intTabIndex = 0
+            let self = this
+            let cursorSpeed = 4
+            let scrollSpeed = 8
+            let buttonPressDelay = 500
+            let stickDeadZone = 0.2
+            let scrollGroup = null
+
+            let lastButtonPress = {
+
+            }
 
             var sounds = {
                 Confirm: new Audio("./sounds/confirm.ogg"),
@@ -311,6 +324,166 @@ const app = new Vue({
                 Hover: new Audio("./sounds/hover.ogg")
             }
 
+            let element = document.elementFromPoint(0, 0)
+            let elementType = 0
+
+            function appLoop() {
+                var gamepads = navigator.getGamepads ? navigator.getGamepads() : (navigator.webkitGetGamepads ? navigator.webkitGetGamepads() : []);
+                if (!gamepads) {
+                    return;
+                }
+
+                var gp = gamepads[0];
+
+                //  LEFT STICK
+                if (gp.axes[0] > stickDeadZone) {
+                    cursorPos[0] += (gp.axes[0] * cursorSpeed)
+                } else if (gp.axes[0] < -stickDeadZone) {
+                    cursorPos[0] += (gp.axes[0] * cursorSpeed)
+                }
+
+                if (gp.axes[1] > stickDeadZone) {
+                    cursorPos[1] += (gp.axes[1] * cursorSpeed)
+                } else if (gp.axes[1] < -stickDeadZone) {
+                    cursorPos[1] += (gp.axes[1] * cursorSpeed)
+                }
+
+                // RIGHT STICK.
+                if (gp.axes[3] > stickDeadZone) {
+                    $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
+                } else if (gp.axes[3] < -stickDeadZone) {
+                    $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
+                }
+                
+
+                if(scrollGroup) {
+                    if (gp.axes[2] > stickDeadZone) {
+                        console.log('axis 2 up')
+                        $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
+                    } else if (gp.axes[2] < -stickDeadZone) {
+                        console.log('axis 2 dn')
+                        $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
+                    }
+                }
+
+
+                $(".cursor").css({
+                    top: cursorPos[1] + "px",
+                    left: cursorPos[0] + "px"
+                })
+
+                // A BUTTON
+                if (gp.buttons[0].pressed) {
+                    if (!lastButtonPress["A"]) {
+                        lastButtonPress["A"] = 0
+                    }
+                    if (Date.now() - lastButtonPress["A"] > buttonPressDelay) {
+                        lastButtonPress["A"] = Date.now()
+                        sounds.Confirm.play()
+                        if (elementType == 0) {
+                            document.activeElement.dispatchEvent(new Event("click"))
+                            document.activeElement.dispatchEvent(new Event("controller-click"))
+                        } else {
+                            element.dispatchEvent(new Event("click"))
+                            element.dispatchEvent(new Event("controller-click"))
+                        }
+                    }
+                }
+
+                // B BUTTON
+                if (gp.buttons[1].pressed) {
+
+                    if (!lastButtonPress["B"]) {
+                        lastButtonPress["B"] = 0
+                    }
+                    if (Date.now() - lastButtonPress["B"] > buttonPressDelay) {
+                        lastButtonPress["B"] = Date.now()
+                        if (elementType == 0) {
+                            document.activeElement.dispatchEvent(new Event("contextmenu"))
+                            setTimeout(()=>{
+                                if($(".menu-option").length > 0) {
+                                    let bounds = $(".menu-option")[0].getBoundingClientRect()
+                                    cursorPos[0] = bounds.left + (bounds.width / 2)
+                                    cursorPos[1] = bounds.top + (bounds.height / 2)
+                                }
+                            }, 100)
+                        } else {
+                            element.dispatchEvent(new Event("contextmenu"))
+                        }
+                    }
+                    
+                }
+
+                // right bumper
+                if (gp.buttons[5].pressed) {
+                    if (!lastButtonPress["RB"]) {
+                        lastButtonPress["RB"] = 0
+                    }
+                    if (Date.now() - lastButtonPress["RB"] > buttonPressDelay) {
+                        lastButtonPress["RB"] = Date.now()
+                        app.navigateForward()
+
+                    }
+                }
+
+                // left bumper
+                if (gp.buttons[4].pressed) {
+                    if (!lastButtonPress["LB"]) {
+                        lastButtonPress["LB"] = 0
+                    }
+                    if (Date.now() - lastButtonPress["LB"] > buttonPressDelay) {
+                        lastButtonPress["LB"] = Date.now()
+                        app.navigateBack()
+
+                    }
+                }
+
+
+
+                // cursor hover
+
+                element = document.elementFromPoint(cursorPos[0], cursorPos[1])
+
+                if (element) {
+                    let closest = element.closest("[tabindex], input, button, a")
+                    let scrollGroupClo = element.closest(".v-hl-container")
+                    
+                    if(scrollGroupClo) {
+                        if(scrollGroupClo.classList.contains("v-hl-container")) {
+                            scrollGroup = scrollGroupClo
+                            scrollGroup.style["scroll-snap-type"] = "unset"
+                        } else {
+                            scrollGroup.style["scroll-snap-type"] = ""
+                            scrollGroup = null
+                        }
+                    }
+
+                    if (closest) {
+                        
+                        elementType = 0
+                        closest.focus()
+                    } else {
+                        if(closest) {
+                            closest.blur()
+                        }
+                        elementType = 1
+                        element.focus()
+                    }
+                }
+                // console.log(gp.axes[0], gp.axes[1])
+                start = requestAnimationFrame(appLoop);
+            }
+
+            // controller pairing
+            notyf.error("Press the button on your controller to pair it to Cider.")
+            window.addEventListener("gamepadconnected", function (e) {
+                console.log("Gamepad connected at index %d: %s. %d buttons, %d axes.",
+                    e.gamepad.index, e.gamepad.id,
+                    e.gamepad.buttons.length, e.gamepad.axes.length);
+                notyf.success("Pairing successful!")
+                appLoop()
+            }, { once: true });
+
             document.addEventListener("keydown", (e) => {
                 sounds.Confirm.currentTime = 0
                 sounds.Menu.currentTime = 0
@@ -319,51 +492,92 @@ const app = new Vue({
                 console.log(e.key)
                 switch (e.key) {
                     default:
-                    break;
+                        break;
                     case "ArrowLeft":
-
                         e.preventDefault()
+
+                        cursorPos[0] -= cursorSpeed
                         break;
                     case "ArrowRight":
                         e.preventDefault()
+
+                        cursorPos[0] += cursorSpeed
                         break;
                     case "ArrowUp":
-                        sounds.Hover.play()
-                        if(intTabIndex <= 0) {
-                            intTabIndex = 0
-                        }else{
-                            intTabIndex--
-                        }
-                        $(tabbable[intTabIndex]).focus()
-                        // $("#app-content").scrollTop($(document.activeElement).offset().top)
                         e.preventDefault()
+
+                        cursorPos[1] -= cursorSpeed
+                        // sounds.Hover.play()
+                        // if(intTabIndex <= 0) {
+                        //     intTabIndex = 0
+                        // }else{
+                        //     intTabIndex--
+                        // }
+                        // $(tabbable[intTabIndex]).focus()
+                        // $("#app-content").scrollTop($(document.activeElement).offset().top)
                         break;
                     case "ArrowDown":
-                        sounds.Hover.play()
-                        if(intTabIndex < tabbable.length) {
-                            intTabIndex++
-                        }else{
-                            intTabIndex = tabbable.length
-                        }
-                        $(tabbable[intTabIndex]).focus()
-                        // $("#app-content").scrollTop($(document.activeElement).offset().top)
                         e.preventDefault()
+
+                        cursorPos[1] += cursorSpeed
+                        // if(intTabIndex < tabbable.length) {
+                        //     intTabIndex++
+                        // }else{
+                        //     intTabIndex = tabbable.length
+                        // }
+                        // $(tabbable[intTabIndex]).focus()
+                        // $("#app-content").scrollTop($(document.activeElement).offset().top)
                         break;
                     case "c":
                         app.resetState()
-                    break;
-                    case "x": 
-                        sounds.Menu.play()
-                        document.activeElement.dispatchEvent(new Event("contextmenu"))
+                        break;
+                    case "x":
+                        // set cursorPos to the top right of the screen
+                        // sounds.Menu.play()
+                        if (elementType == 0) {
+                            document.activeElement.dispatchEvent(new Event("contextmenu"))
+                        } else {
+                            element.dispatchEvent(new Event("contextmenu"))
+                        }
+
                         e.preventDefault()
-                    break;
+                        break;
                     case "z":
                         sounds.Confirm.play()
-                        document.activeElement.dispatchEvent(new Event("click"))
-                        document.activeElement.dispatchEvent(new Event("controller-click"))
+                        if (elementType == 0) {
+                            document.activeElement.dispatchEvent(new Event("click"))
+                            document.activeElement.dispatchEvent(new Event("controller-click"))
+                        } else {
+                            element.dispatchEvent(new Event("click"))
+                            element.dispatchEvent(new Event("controller-click"))
+                        }
+
                         e.preventDefault()
                         break;
                 }
+
+                $(".cursor").css({
+                    top: cursorPos[1] + "px",
+                    left: cursorPos[0] + "px"
+                })
+                function lerp(a, b, n) {
+                    return (1 - n) * a + n * b
+                }
+
+
+                element = document.elementFromPoint(cursorPos[0], cursorPos[1])
+
+                if (element) {
+                    let closest = element.closest("[tabindex], input, button, a")
+                    if (closest) {
+                        elementType = 0
+                        closest.focus()
+                    } else {
+                        elementType = 1
+                        element.focus()
+                    }
+                }
+                console.log(element)
             });
         },
         songLinkShare(amUrl) {
@@ -854,7 +1068,7 @@ const app = new Vue({
                 let numbers = []
                 for (item of soundcheck) {
                     numbers.push(parseInt(item, 16))
-    
+
                 }
                 numbers.shift()
                 let peak = Math.max(numbers[6], numbers[7]) / 32768.0
@@ -978,7 +1192,7 @@ const app = new Vue({
             }, 500)
             ipcRenderer.invoke("renderer-ready", true)
             document.querySelector("#LOADER").remove()
-            if(this.cfg.general.themeUpdateNotification) {
+            if (this.cfg.general.themeUpdateNotification) {
                 this.checkForThemeUpdates()
             }
         },
@@ -992,7 +1206,7 @@ const app = new Vue({
                         .then(res => {
                             if (res[0].sha != theme.commit) {
                                 const notify = notyf.open({ className: "notyf-info", type: "info", message: `[Themes] ${theme.name} has an update available.` })
-                                notify.on("click", ()=>{
+                                notify.on("click", () => {
                                     app.appRoute("themes-github")
                                     notyf.dismiss(notify)
                                 })
@@ -1038,9 +1252,9 @@ const app = new Vue({
             }
             if (directives[directive]) {
                 return this.chrome.appliedTheme.info.directives[directive].value
-            } else if(this.cfg.visual.directives[directive]) {
+            } else if (this.cfg.visual.directives[directive]) {
                 return this.cfg.visual.directives.windowLayout
-            }else{
+            } else {
                 return ""
             }
         },
@@ -3470,7 +3684,7 @@ const app = new Vue({
                 let artworkSize = 50
                 if (app.getThemeDirective("lcdArtworkSize") != "") {
                     artworkSize = app.getThemeDirective("lcdArtworkSize")
-                }else if(this.cfg.visual.directives.windowLayout == "twopanel") {
+                } else if (this.cfg.visual.directives.windowLayout == "twopanel") {
                     artworkSize = 70
                 }
                 this.currentArtUrl = '';
diff --git a/src/renderer/style.less b/src/renderer/style.less
index ead9279b..495c0585 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -3152,6 +3152,19 @@ body[platform='darwin'] {
   flex-direction: column;
 } 
 
+.cursor {
+  background: rgb(255 255 255 / 50%);
+  width: 16px;
+  height: 16px;
+  position: fixed;
+  z-index: 9999999999;
+  pointer-events: none;
+  border-radius: 100%;
+  box-shadow: 0px 0px 0px 2px rgb(200 200 200 / 100%);
+  top: 0;
+  left: 0;
+}
+
 @import url("less/macos.less");
 @import url("less/linux.less");
 @import url("less/compact.less");
diff --git a/src/renderer/views/components/artist-chip.ejs b/src/renderer/views/components/artist-chip.ejs
index 6d2734e4..d0be7f95 100644
--- a/src/renderer/views/components/artist-chip.ejs
+++ b/src/renderer/views/components/artist-chip.ejs
@@ -1,5 +1,5 @@
 <script type="text/x-template" id="artist-chip">
-    <div class="artist-chip" @click.self="route">
+    <div class="artist-chip" @click.self="route" tabindex="0">
         <div class="artist-chip__image">
             <mediaitem-artwork v-if="artist.id != null" :url="artist.attributes.artwork.url" :size="32"></mediaitem-artwork>
         </div>
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index d9d5551e..0297dcf3 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -13,7 +13,7 @@
          @mouseover="showInLibrary = true"
          @mouseleave="showInLibrary = false"
          @dblclick="route()"
-         @controller-click.self="route()"
+         @controller-click="route()"
          tabindex="0"
          :class="[{'mediaitem-selected': app.select_hasMediaItem(guid)}, addClasses]">
         <template v-if="isVisible">
diff --git a/src/renderer/views/components/mediaitem-square.ejs b/src/renderer/views/components/mediaitem-square.ejs
index 30e19ca4..3d8724cb 100644
--- a/src/renderer/views/components/mediaitem-square.ejs
+++ b/src/renderer/views/components/mediaitem-square.ejs
@@ -2,7 +2,7 @@
     <div
         tabindex="0"
         @click.self="app.routeView(item)"
-        @controller-click.self="app.routeView(item)"
+        @controller-click="app.routeView(item)"
         @contextmenu.self="contextMenu"
          class="cd-mediaitem-square" :class="getClasses()" @contextmenu="contextMenu"
          v-observe-visibility="{callback: visibilityChanged}"
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 45d67546..5d18d61a 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -80,6 +80,7 @@
         </div>
     </transition>
     <%- include('app/panels'); %>
+    <div class="cursor" v-if="chrome.showCursor"></div>
 </div>
 
 <% for(var i=0; i < Object.keys(env.components).length ; i++) {%>

From 34dbfc1f86042f20e29af41a0f835440bdf1fbf3 Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:23:02 +0000
Subject: [PATCH 05/13] Update

---
 .circleci/config.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 52126941..72f778fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,13 +14,13 @@ jobs:
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
-            - yarn-packages-{{ checksum "yarn.lock" }}
+            - yarn-packages-{{ checksum "cider-yarn.lock" }}
       - run:
           name: Install Dependencies
           command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
       - save_cache:
           name: Save Yarn Package Cache
-          key: yarn-packages-{{ checksum "yarn.lock" }}
+          key: yarn-packages-{{ checksum "cider-yarn.lock" }}
           paths:
             - ~/.cache/yarn
       - run:
@@ -38,9 +38,6 @@ jobs:
           name: Start X VNC Server
           command: x11vnc -forever -nopw -create
           background: true
-            #- run:
-            #name: Base Functionality Testing
-            #command: yarn test
       - store_test_results:
           path: test-results
       - run:

From d647be3271b7be6f115c67dffb281bd8c397ed5b Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:26:07 +0000
Subject: [PATCH 06/13] lockfile update

---
 cider-yarn.lock | 1736 +++++++++++++++++++++++------------------------
 1 file changed, 865 insertions(+), 871 deletions(-)

diff --git a/cider-yarn.lock b/cider-yarn.lock
index 07525a10..2dcab8bd 100644
--- a/cider-yarn.lock
+++ b/cider-yarn.lock
@@ -12,40 +12,60 @@
   resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
   integrity sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=
 
-"@ampproject/remapping@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.2.tgz#f3d9760bf30588c51408dbe7c05ff2bb13069307"
-  integrity sha512-sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA==
+"@ampproject/remapping@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
+  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.2.2"
-    sourcemap-codec "1.4.8"
+    "@jridgewell/trace-mapping" "^0.3.0"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.7":
+"@babel/code-frame@7.16.7", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
   integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
   dependencies:
     "@babel/highlight" "^7.16.7"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8":
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0":
   version "7.17.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
   integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
 
-"@babel/core@^7.14.8", "@babel/core@^7.9.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz#16b8772b0a567f215839f689c5ded6bb20e864d5"
-  integrity sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA==
+"@babel/core@7.16.12":
+  version "7.16.12"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784"
+  integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==
   dependencies:
-    "@ampproject/remapping" "^2.0.0"
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
+    "@babel/generator" "^7.16.8"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.0"
-    "@babel/parser" "^7.17.0"
+    "@babel/helpers" "^7.16.7"
+    "@babel/parser" "^7.16.12"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
+    "@babel/traverse" "^7.16.10"
+    "@babel/types" "^7.16.8"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/core@^7.9.0":
+  version "7.17.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
+  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
+  dependencies:
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.17.3"
+    "@babel/helper-compilation-targets" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.16.7"
+    "@babel/helpers" "^7.17.2"
+    "@babel/parser" "^7.17.3"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
     "@babel/types" "^7.17.0"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
@@ -53,10 +73,10 @@
     json5 "^2.1.2"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.0.tgz#7bd890ba706cd86d3e2f727322346ffdbf98f65e"
-  integrity sha512-I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw==
+"@babel/generator@^7.16.8", "@babel/generator@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
+  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
   dependencies:
     "@babel/types" "^7.17.0"
     jsesc "^2.5.1"
@@ -87,10 +107,10 @@
     browserslist "^4.17.5"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7":
-  version "7.17.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21"
-  integrity sha512-JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ==
+"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
+  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.16.7"
     "@babel/helper-environment-visitor" "^7.16.7"
@@ -182,9 +202,9 @@
     "@babel/types" "^7.16.7"
 
 "@babel/helper-module-transforms@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz#7665faeb721a01ca5327ddc6bba15a5cb34b6a41"
-  integrity sha512-gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng==
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0"
+  integrity sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==
   dependencies:
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-module-imports" "^7.16.7"
@@ -192,8 +212,8 @@
     "@babel/helper-split-export-declaration" "^7.16.7"
     "@babel/helper-validator-identifier" "^7.16.7"
     "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/traverse" "^7.17.3"
+    "@babel/types" "^7.17.0"
 
 "@babel/helper-optimise-call-expression@^7.16.7":
   version "7.16.7"
@@ -268,10 +288,10 @@
     "@babel/traverse" "^7.16.8"
     "@babel/types" "^7.16.8"
 
-"@babel/helpers@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz#79cdf6c66a579f3a7b5e739371bc63ca0306886b"
-  integrity sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ==
+"@babel/helpers@^7.16.7", "@babel/helpers@^7.17.2":
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
+  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
   dependencies:
     "@babel/template" "^7.16.7"
     "@babel/traverse" "^7.17.0"
@@ -286,10 +306,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c"
-  integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw==
+"@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
+  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
   version "7.16.7"
@@ -316,7 +336,7 @@
     "@babel/helper-remap-async-to-generator" "^7.16.8"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.16.7":
+"@babel/plugin-proposal-class-properties@7.16.7", "@babel/plugin-proposal-class-properties@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
   integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
@@ -325,15 +345,15 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a"
-  integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw==
+  version "7.17.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
+  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.17.6"
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.14.5", "@babel/plugin-proposal-dynamic-import@^7.16.7":
+"@babel/plugin-proposal-dynamic-import@7.16.7", "@babel/plugin-proposal-dynamic-import@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
   integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
@@ -341,7 +361,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.14.5", "@babel/plugin-proposal-export-namespace-from@^7.16.7":
+"@babel/plugin-proposal-export-namespace-from@7.16.7", "@babel/plugin-proposal-export-namespace-from@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
   integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
@@ -357,7 +377,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.14.5", "@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
+"@babel/plugin-proposal-logical-assignment-operators@7.16.7", "@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
   integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
@@ -365,7 +385,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
+"@babel/plugin-proposal-nullish-coalescing-operator@7.16.7", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
   integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
@@ -373,7 +393,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.14.5", "@babel/plugin-proposal-numeric-separator@^7.16.7":
+"@babel/plugin-proposal-numeric-separator@7.16.7", "@babel/plugin-proposal-numeric-separator@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
   integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
@@ -382,11 +402,11 @@
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8"
-  integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA==
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
+  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
   dependencies:
-    "@babel/compat-data" "^7.16.4"
+    "@babel/compat-data" "^7.17.0"
     "@babel/helper-compilation-targets" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
@@ -400,7 +420,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.14.5", "@babel/plugin-proposal-optional-chaining@^7.16.7":
+"@babel/plugin-proposal-optional-chaining@7.16.7", "@babel/plugin-proposal-optional-chaining@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
   integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
@@ -409,7 +429,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.14.5", "@babel/plugin-proposal-private-methods@^7.16.11":
+"@babel/plugin-proposal-private-methods@7.16.11", "@babel/plugin-proposal-private-methods@^7.16.11":
   version "7.16.11"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
   integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
@@ -417,7 +437,7 @@
     "@babel/helper-create-class-features-plugin" "^7.16.10"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-proposal-private-property-in-object@^7.14.5", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
+"@babel/plugin-proposal-private-property-in-object@7.16.7", "@babel/plugin-proposal-private-property-in-object@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
   integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
@@ -435,7 +455,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.16.7"
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@7.8.4", "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -470,7 +490,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@7.8.3", "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
@@ -505,14 +525,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.8.3":
+"@babel/plugin-syntax-object-rest-spread@7.8.3", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@7.8.3", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
@@ -599,9 +619,9 @@
     "@babel/helper-plugin-utils" "^7.16.7"
 
 "@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23"
-  integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A==
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc"
+  integrity sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
@@ -667,7 +687,7 @@
     "@babel/helper-plugin-utils" "^7.16.7"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.14.5", "@babel/plugin-transform-modules-commonjs@^7.16.8":
+"@babel/plugin-transform-modules-commonjs@7.16.8", "@babel/plugin-transform-modules-commonjs@^7.16.8":
   version "7.16.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
   integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
@@ -732,7 +752,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.16.7"
 
-"@babel/plugin-transform-react-jsx@^7.14.5":
+"@babel/plugin-transform-react-jsx@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.16.7.tgz#86a6a220552afd0e4e1f0388a68a372be7add0d4"
   integrity sha512-8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag==
@@ -908,7 +928,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-typescript@^7.14.5":
+"@babel/preset-typescript@7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz#ab114d68bb2020afc069cd51b37ff98a046a70b9"
   integrity sha512-WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ==
@@ -918,9 +938,9 @@
     "@babel/plugin-transform-typescript" "^7.16.7"
 
 "@babel/runtime@^7.8.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.0.tgz#b8d142fc0f7664fb3d9b5833fd40dcbab89276c0"
-  integrity sha512-etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ==
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
+  integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -933,18 +953,18 @@
     "@babel/parser" "^7.16.7"
     "@babel/types" "^7.16.7"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30"
-  integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg==
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
+  version "7.17.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
+  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
   dependencies:
     "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
+    "@babel/generator" "^7.17.3"
     "@babel/helper-environment-visitor" "^7.16.7"
     "@babel/helper-function-name" "^7.16.7"
     "@babel/helper-hoist-variables" "^7.16.7"
     "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.0"
+    "@babel/parser" "^7.17.3"
     "@babel/types" "^7.17.0"
     debug "^4.1.0"
     globals "^11.1.0"
@@ -974,7 +994,7 @@
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-"@electron/get@^1.13.0", "@electron/get@^1.6.0":
+"@electron/get@^1.13.0":
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368"
   integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==
@@ -1002,14 +1022,14 @@
     fs-extra "^9.0.1"
 
 "@gar/promisify@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210"
-  integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@jest/types@^27.2.5", "@jest/types@^27.4.2":
-  version "27.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.4.2.tgz#96536ebd34da6392c2b7c7737d693885b5dd44a5"
-  integrity sha512-j35yw0PMTPpZsUoOBiuHzr1zTYoad1cVIE0ajEjcrJONxxrko/IRGKkXx3os0Nsi4Hu3+5VmDbVfq5WhG/pWAg==
+"@jest/types@^27.2.5", "@jest/types@^27.5.1":
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
+  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1018,17 +1038,22 @@
     chalk "^4.0.0"
 
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72"
-  integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg==
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
+  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
 
-"@jridgewell/trace-mapping@^0.2.2":
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.2.5.tgz#d5061cc513fd3a0a949feb56b8073989865b1abe"
-  integrity sha512-K+Eths78fXDFOvQ2hgJhCiI5s+g81r2yXmACBpbn+f2+Qt94PNoTgUcAXPT8DZkhXCsZRsHVWVtY5KIBMcpDqQ==
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
+  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+
+"@jridgewell/trace-mapping@^0.3.0":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
+  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
-    sourcemap-codec "1.4.8"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@malept/cross-spawn-promise@^1.1.0":
   version "1.1.1"
@@ -1053,9 +1078,9 @@
   integrity sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow==
 
 "@npmcli/fs@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.0.tgz#bec1d1b89c170d40e1b73ad6c943b0b75e7d2951"
-  integrity sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
+  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
   dependencies:
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
@@ -1068,162 +1093,215 @@
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@playwright/test@^1.18.1":
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.18.1.tgz#efaa3aa9c7f8aebeb75cd45fd9737529e9b30fbd"
-  integrity sha512-v6jAM2GpRvf4MUvSLkrAXg101XT9mLu2X2NbCnEoj7GHBXwavDlAJDMwh4Hn8oipDxB6MS6FTcr7opXsIMNwrA==
+"@playwright/test@^1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.19.2.tgz#429d1aa70f5e4cd521cdc8a5d9861ae4fcda3f7c"
+  integrity sha512-5oCmlYHjtOL662OxSkZBYGnoHWIQui7b4YHWNeSCYwhQjmjVcV5njRc8oBZlU8IwJgG7ZH2yhDk1haU96ygbWw==
   dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/core" "^7.14.8"
-    "@babel/plugin-proposal-class-properties" "^7.14.5"
-    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
-    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
-    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
-    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-    "@babel/plugin-proposal-private-methods" "^7.14.5"
-    "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
-    "@babel/plugin-syntax-async-generators" "^7.8.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.3"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-    "@babel/plugin-transform-modules-commonjs" "^7.14.5"
-    "@babel/plugin-transform-react-jsx" "^7.14.5"
-    "@babel/preset-typescript" "^7.14.5"
-    babel-plugin-module-resolver "^4.1.0"
+    "@babel/code-frame" "7.16.7"
+    "@babel/core" "7.16.12"
+    "@babel/plugin-proposal-class-properties" "7.16.7"
+    "@babel/plugin-proposal-dynamic-import" "7.16.7"
+    "@babel/plugin-proposal-export-namespace-from" "7.16.7"
+    "@babel/plugin-proposal-logical-assignment-operators" "7.16.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "7.16.7"
+    "@babel/plugin-proposal-numeric-separator" "7.16.7"
+    "@babel/plugin-proposal-optional-chaining" "7.16.7"
+    "@babel/plugin-proposal-private-methods" "7.16.11"
+    "@babel/plugin-proposal-private-property-in-object" "7.16.7"
+    "@babel/plugin-syntax-async-generators" "7.8.4"
+    "@babel/plugin-syntax-json-strings" "7.8.3"
+    "@babel/plugin-syntax-object-rest-spread" "7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "7.8.3"
+    "@babel/plugin-transform-modules-commonjs" "7.16.8"
+    "@babel/plugin-transform-react-jsx" "7.16.7"
+    "@babel/preset-typescript" "7.16.7"
+    babel-plugin-module-resolver "4.1.0"
     colors "1.4.0"
-    commander "^8.2.0"
-    debug "^4.1.1"
-    expect "=27.2.5"
-    jest-matcher-utils "=27.2.5"
-    jpeg-js "^0.4.2"
-    json5 "^2.2.0"
-    mime "^2.4.6"
-    minimatch "^3.0.3"
-    ms "^2.1.2"
-    open "^8.3.0"
-    pirates "^4.0.1"
-    pixelmatch "^5.2.1"
-    playwright-core "=1.18.1"
-    pngjs "^5.0.0"
-    rimraf "^3.0.2"
-    source-map-support "^0.4.18"
-    stack-utils "^2.0.3"
-    yazl "^2.5.1"
+    commander "8.3.0"
+    debug "4.3.3"
+    expect "27.2.5"
+    jest-matcher-utils "27.2.5"
+    jpeg-js "0.4.3"
+    json5 "2.2.0"
+    mime "3.0.0"
+    minimatch "3.0.4"
+    ms "2.1.3"
+    open "8.4.0"
+    pirates "4.0.4"
+    pixelmatch "5.2.1"
+    playwright-core "1.19.2"
+    pngjs "6.0.0"
+    rimraf "3.0.2"
+    source-map-support "0.4.18"
+    stack-utils "2.0.5"
+    yazl "2.5.1"
 
-"@sentry/browser@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.7.1.tgz#e01144a08984a486ecc91d7922cc457e9c9bd6b7"
-  integrity sha512-R5PYx4TTvifcU790XkK6JVGwavKaXwycDU0MaAwfc4Vf7BLm5KCNJCsDySu1RPAap/017MVYf54p6dWvKiRviA==
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78=
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A=
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=
   dependencies:
-    "@sentry/core" "6.7.1"
-    "@sentry/types" "6.7.1"
-    "@sentry/utils" "6.7.1"
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
+
+"@sentry/browser@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.17.2.tgz#8e794b846f43a341068c83420918d896683d903e"
+  integrity sha512-4Ow5z9GxK5dG9+stBNKb7s6NoxE4wgEcHRmO66QTK4gH2NNmzV4R/aaZ7iDoS/lD86sH0M86jm76dpg9uiJPmw==
+  dependencies:
+    "@sentry/core" "6.17.2"
+    "@sentry/types" "6.17.2"
+    "@sentry/utils" "6.17.2"
     tslib "^1.9.3"
 
-"@sentry/core@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.7.1.tgz#c3aaa6415d06bec65ac446b13b84f073805633e3"
-  integrity sha512-VAv8OR/7INn2JfiLcuop4hfDcyC7mfL9fdPndQEhlacjmw8gRrgXjR7qyhnCTgzFLkHI7V5bcdIzA83TRPYQpA==
+"@sentry/core@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.17.2.tgz#f218920f269ccdbaee20a092bbc90a71a007cc88"
+  integrity sha512-Uew0CNMr+QvowrF4EJYjOUgHep/sZJ3l5zevPEELugIgqWBodd+ZDCV3fQFR7cr6KOqx1rMgVrgcKIkLl0l+RA==
   dependencies:
-    "@sentry/hub" "6.7.1"
-    "@sentry/minimal" "6.7.1"
-    "@sentry/types" "6.7.1"
-    "@sentry/utils" "6.7.1"
+    "@sentry/hub" "6.17.2"
+    "@sentry/minimal" "6.17.2"
+    "@sentry/types" "6.17.2"
+    "@sentry/utils" "6.17.2"
     tslib "^1.9.3"
 
-"@sentry/electron@^2.5.4":
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-2.5.4.tgz#337b2f7e228e805a3e4eb3611c7b12c6cf87c618"
-  integrity sha512-tCCK+P581TmdjsDpHBQz7qYcldzGdUk1Fd6FPxPy1JKGzeY4uf/uSLKzR80Lzs5kTpEZFOwiMHSA8yjwFp5qoA==
+"@sentry/electron@^3.0.2":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@sentry/electron/-/electron-3.0.3.tgz#cfb8ba582753a9b34beb4f775cc48fd0a82096df"
+  integrity sha512-uDSFfl3eL29Dq8jYIJmWFWRHMQCSNk6pjL6gUmJiPhEhpu72hokZyezUJsJrSyipraqLgmSimY71u0ayARYqwg==
   dependencies:
-    "@sentry/browser" "6.7.1"
-    "@sentry/core" "6.7.1"
-    "@sentry/minimal" "6.7.1"
-    "@sentry/node" "6.7.1"
-    "@sentry/types" "6.7.1"
-    "@sentry/utils" "6.7.1"
-    tslib "^2.2.0"
+    "@sentry/browser" "6.17.2"
+    "@sentry/core" "6.17.2"
+    "@sentry/node" "6.17.2"
+    "@sentry/types" "6.17.2"
+    "@sentry/utils" "6.17.2"
+    deepmerge "^4.2.2"
+    tslib "^2.3.1"
 
-"@sentry/hub@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.7.1.tgz#d46d24deec67f0731a808ca16796e6765b371bc1"
-  integrity sha512-eVCTWvvcp6xa0A5GGNHMQEWslmKPlisE5rGmsV/kjvSUv3zSrI0eIDfb51ikdnCiBjHpK2NBWP8Vy8cZOEJegg==
+"@sentry/hub@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.17.2.tgz#d92accada845fa21fff1b2b491d3c6964851693b"
+  integrity sha512-CMi6jU920bTwRTmGHjP4u8toOx4gm1dsx+rsxvp+FKzqRwpwoyi9mOw8oEYERVzaqaYceGdFylyRUrjdf0f77g==
   dependencies:
-    "@sentry/types" "6.7.1"
-    "@sentry/utils" "6.7.1"
+    "@sentry/types" "6.17.2"
+    "@sentry/utils" "6.17.2"
     tslib "^1.9.3"
 
-"@sentry/integrations@^6.17.4":
-  version "6.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.17.4.tgz#a894526ce25020aea1dc9b2f2a4aa584c7de9b3a"
-  integrity sha512-NmFbv9w4AK1d4NYi0beTuJgn6t81bdiGZmkNZ9VKVI0mBfoZfwxIo7fGNrla3HMkeTwLHntXuzUu4v+w1EARqA==
+"@sentry/integrations@^6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.18.1.tgz#c815eb9d104739805401b69d5559adec14876e33"
+  integrity sha512-Xzg9C0qPpauZGab2OLKnJjCwn/Lx7WsZK87Q53KaYcscdvXNV0LriNzNKcBIRH+Q+GEsaF3mjyGDLmuDABB59A==
   dependencies:
-    "@sentry/types" "6.17.4"
-    "@sentry/utils" "6.17.4"
+    "@sentry/types" "6.18.1"
+    "@sentry/utils" "6.18.1"
     localforage "^1.8.1"
     tslib "^1.9.3"
 
-"@sentry/minimal@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.7.1.tgz#babf85ee2f167e9dcf150d750d7a0b250c98449c"
-  integrity sha512-HDDPEnQRD6hC0qaHdqqKDStcdE1KhkFh0RCtJNMCDn0zpav8Dj9AteF70x6kLSlliAJ/JFwi6AmQrLz+FxPexw==
+"@sentry/minimal@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.17.2.tgz#3b482a0d76aa33b6c9441dd21acbcc3a113e5120"
+  integrity sha512-Cdh+iM6QhLKfxwUWWP4mk2K7+EsQj4tuF2dGQke4Zcbp7zQ7wbcMruUcZHiZfvg5kiSYxwNVkH7cXMzcO7AJsg==
   dependencies:
-    "@sentry/hub" "6.7.1"
-    "@sentry/types" "6.7.1"
+    "@sentry/hub" "6.17.2"
+    "@sentry/types" "6.17.2"
     tslib "^1.9.3"
 
-"@sentry/node@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.7.1.tgz#b09e2eca8e187168feba7bd865a23935bf0f5cc0"
-  integrity sha512-rtZo1O8ROv4lZwuljQz3iFZW89oXSlgXCG2VqkxQyRspPWu89abROpxLjYzsWwQ8djnur1XjFv51kOLDUTS6Qw==
+"@sentry/node@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.17.2.tgz#32a5fa00b64a331073daf1e44f500c8c57184eb1"
+  integrity sha512-358z45WaejnsE8RZVpuLJJiFVCSEi0TRY7P60CljZuz8rnvniD3G0tuXChvu4djVty8NScWZHT/QoxvuJdTHgQ==
   dependencies:
-    "@sentry/core" "6.7.1"
-    "@sentry/hub" "6.7.1"
-    "@sentry/tracing" "6.7.1"
-    "@sentry/types" "6.7.1"
-    "@sentry/utils" "6.7.1"
+    "@sentry/core" "6.17.2"
+    "@sentry/hub" "6.17.2"
+    "@sentry/tracing" "6.17.2"
+    "@sentry/types" "6.17.2"
+    "@sentry/utils" "6.17.2"
     cookie "^0.4.1"
     https-proxy-agent "^5.0.0"
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/tracing@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.7.1.tgz#b11f0c17a6c5dc14ef44733e5436afb686683268"
-  integrity sha512-wyS3nWNl5mzaC1qZ2AIp1hjXnfO9EERjMIJjCihs2LWBz1r3efxrHxJHs8wXlNWvrT3KLhq/7vvF5CdU82uPeQ==
+"@sentry/tracing@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.17.2.tgz#437337071fdeffa319746905b3706518b099ec6b"
+  integrity sha512-oWY2Ga+5D5f90utvfF2Y0eQvme+eS768ZWjR+klRYgZWoY8r1v8uWwWsvroYU1g+h6X0G/xh3giFjsdOWtRENw==
   dependencies:
-    "@sentry/hub" "6.7.1"
-    "@sentry/minimal" "6.7.1"
-    "@sentry/types" "6.7.1"
-    "@sentry/utils" "6.7.1"
+    "@sentry/hub" "6.17.2"
+    "@sentry/minimal" "6.17.2"
+    "@sentry/types" "6.17.2"
+    "@sentry/utils" "6.17.2"
     tslib "^1.9.3"
 
-"@sentry/types@6.17.4":
-  version "6.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.17.4.tgz#36b78d7c4a6de19b2bbc631bb34893bcad30c0ba"
-  integrity sha512-RUyiXCKf61k2GIMP7FQX0naoSew4zLxe+UrtbjwVcWU4AFPZfH7tLNtTpVE85zAKbxsaiq3OD2FPtTZarHcwxQ==
+"@sentry/types@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.17.2.tgz#4dde3423db5953e798b19ed29618c28fc7bf2e30"
+  integrity sha512-UrFLRDz5mn253O8k/XftLxoldF+NyZdkqKLGIQmST5HEVr7ub9nQJ4Y5ZFA3zJYWpraaW8faIbuw+pgetC8hmQ==
 
-"@sentry/types@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.7.1.tgz#c8263e1886df5e815570c4668eb40a1cfaa1c88b"
-  integrity sha512-9AO7HKoip2MBMNQJEd6+AKtjj2+q9Ze4ooWUdEvdOVSt5drg7BGpK221/p9JEOyJAZwEPEXdcMd3VAIMiOb4MA==
+"@sentry/types@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.18.1.tgz#e2de38dd0da8096a5d22f8effc6756c919266ede"
+  integrity sha512-wp741NoBKnXE/4T9L723sWJ8EcNMxeTIT1smgNJOfbPwrsDICoYmGEt6JFa05XHpWBGI66WuNvnDjoHVeh6zhA==
 
-"@sentry/utils@6.17.4":
-  version "6.17.4"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.17.4.tgz#4f109629d2e7f16c5595b4367445ef47bfe96b61"
-  integrity sha512-+ENzZbrlVL1JJ+FoK2EOS27nbA/yToeaJPFlyVOnbthUxVyN3TTi9Uzn9F05fIE/2BTkOEk89wPtgcHafgrD6A==
+"@sentry/utils@6.17.2":
+  version "6.17.2"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.17.2.tgz#e8044e753b47f86068053c8d79e4ae61a39b6732"
+  integrity sha512-ePWtO44KJQwUULOiU86fa1WU3Ird2TH0i39gqB2d3zNS3QyVp9qPlzSdPKSPJ9LdgadzBHw7ikEuE+GY8JTrhA==
   dependencies:
-    "@sentry/types" "6.17.4"
+    "@sentry/types" "6.17.2"
     tslib "^1.9.3"
 
-"@sentry/utils@6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.7.1.tgz#909184ad580f0f6375e1e4d4a6ffd33dfe64a4d1"
-  integrity sha512-Tq2otdbWlHAkctD+EWTYKkEx6BL1Qn3Z/imkO06/PvzpWvVhJWQ5qHAzz5XnwwqNHyV03KVzYB6znq1Bea9HuA==
+"@sentry/utils@6.18.1":
+  version "6.18.1"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.18.1.tgz#1aa819502b042540612f4db7bcb86c7b176f5a6b"
+  integrity sha512-IFZmuvA+c5lDGlZEri13JSyUP0BHelzY0S4dcKxAzskPW+BtBdQDgYGV90iED1y+IRMLawWb34GF7HyJSouN1Q==
   dependencies:
-    "@sentry/types" "6.7.1"
+    "@sentry/types" "6.18.1"
     tslib "^1.9.3"
 
 "@sindresorhus/is@^0.14.0":
@@ -1232,9 +1310,9 @@
   integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
 
 "@sindresorhus/is@^4.0.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.4.0.tgz#e277e5bdbdf7cb1e20d320f02f5e2ed113cd3185"
-  integrity sha512-QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ==
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
+  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
 
 "@szmarczak/http-timer@^1.1.2":
   version "1.1.2"
@@ -1260,6 +1338,11 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
+
 "@types/body-parser@*":
   version "1.19.2"
   resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
@@ -1297,7 +1380,7 @@
   resolved "https://registry.yarnpkg.com/@types/discord-rpc/-/discord-rpc-4.0.0.tgz#29080812b9092996046af1a21138fb488d180f87"
   integrity sha512-a5HiKOcBkB43g/lN6fBYw8FyGc6Ue9CYucxxHxXlELXpb1CxCa2NA2pGK2Ub88pi4uY5+HQeSFbYtH6DJtV3Qw==
 
-"@types/eslint-scope@^3.7.0":
+"@types/eslint-scope@^3.7.3":
   version "3.7.3"
   resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
   integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
@@ -1313,10 +1396,10 @@
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.50":
-  version "0.0.50"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+"@types/estree@*", "@types/estree@^0.0.51":
+  version "0.0.51"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
 "@types/express-serve-static-core@^4.17.18":
   version "4.17.28"
@@ -1393,6 +1476,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/long@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
+  integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
+
 "@types/mime@^1":
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
@@ -1408,15 +1496,15 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/node@*":
-  version "17.0.14"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.14.tgz#33b9b94f789a8fedd30a68efdbca4dbb06b61f20"
-  integrity sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "17.0.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
+  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
 
 "@types/node@^14.6.2":
-  version "14.18.10"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.10.tgz#774f43868964f3cfe4ced1f5417fe15818a4eaea"
-  integrity sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ==
+  version "14.18.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24"
+  integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==
 
 "@types/plist@^3.0.1":
   version "3.0.2"
@@ -1514,10 +1602,10 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
-"@types/ws@^8.2.2":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.2.2.tgz#7c5be4decb19500ae6b3d563043cd407bf366c21"
-  integrity sha512-NOn5eIcgWLOo6qW8AcuLZ7G8PycXu0xTxxkS6Q18VWFxgPUSOwV0pBj2a/4viNZVu25i7RIB7GttdkAIUUXOOg==
+"@types/ws@^8.5.1":
+  version "8.5.2"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.2.tgz#77e0c2e360e9579da930ffcfa53c5975ea3bdd26"
+  integrity sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==
   dependencies:
     "@types/node" "*"
 
@@ -1691,7 +1779,7 @@ abstract-socket@^2.0.0:
     bindings "^1.2.1"
     nan "^2.12.1"
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -1704,11 +1792,16 @@ acorn-import-assertions@^1.7.6:
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn@^8.4.1:
+acorn@^8.4.1, acorn@^8.5.0:
   version "8.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
   integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
+adm-zip@0.4.10:
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.10.tgz#6efb1090e78a12db377f3ba5f27b363f21988ac1"
+  integrity sha512-075E4f1zFxHbsnn6C4OI4jVzUT1zV+M68QdBxcVxmO/Yqk35CFnFFYLaepvth68gzlIlyQ/hkaI2JY99Nh3C5Q==
+
 agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
@@ -1717,9 +1810,9 @@ agent-base@6, agent-base@^6.0.2:
     debug "4"
 
 agentkeepalive@^4.1.3:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.0.tgz#616ce94ccb41d1a39a45d203d8076fe98713062d"
-  integrity sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
+  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
   dependencies:
     debug "^4.1.0"
     depd "^1.1.2"
@@ -1761,9 +1854,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.1, ajv@^6.12.0, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.0, ajv@^8.6.3:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
+  version "8.10.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
+  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -1829,7 +1922,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.0:
+anymatch@^3.0.0, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -1842,10 +1935,10 @@ app-builder-bin@3.7.1:
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.7.1.tgz#cb0825c5e12efc85b196ac3ed9c89f076c61040e"
   integrity sha512-ql93vEUq6WsstGXD+SBLSIQw6SNnhbDEM0swzgugytMxLp3rT24Ag/jcC80ZHxiPRTdew1niuR7P3/FCrDqIjw==
 
-app-builder-lib@22.14.5:
-  version "22.14.5"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.5.tgz#a61a50b132b858e98fdc70b6b88994ae99b4f96d"
-  integrity sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==
+app-builder-lib@22.14.13:
+  version "22.14.13"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.14.13.tgz#c1f5b6afc86596357598bb90b69eef06c7c2eeb3"
+  integrity sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@develar/schema-utils" "~2.6.5"
@@ -1853,13 +1946,13 @@ app-builder-lib@22.14.5:
     "@malept/flatpak-bundler" "^0.4.0"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "22.14.5"
-    builder-util-runtime "8.9.1"
+    builder-util "22.14.13"
+    builder-util-runtime "8.9.2"
     chromium-pickle-js "^0.2.0"
     debug "^4.3.2"
     ejs "^3.1.6"
     electron-osx-sign "^0.5.0"
-    electron-publish "22.14.5"
+    electron-publish "22.14.13"
     form-data "^4.0.0"
     fs-extra "^10.0.0"
     hosted-git-info "^4.0.2"
@@ -1883,10 +1976,10 @@ aproba@^1.1.1:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
-  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
+are-we-there-yet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
+  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
@@ -1945,7 +2038,7 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-asar@^3.0.3, asar@^3.1.0:
+asar@^3.0.3:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
   integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
@@ -1992,7 +2085,7 @@ async@0.9.x:
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
   integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
 
-async@^2.6.2:
+async@^2.6.0, async@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -2019,11 +2112,6 @@ atomically@^1.7.0:
   resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe"
   integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==
 
-author-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450"
-  integrity sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=
-
 babel-loader@^8.1.0:
   version "8.2.3"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
@@ -2048,7 +2136,7 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-module-resolver@^4.1.0:
+babel-plugin-module-resolver@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz#22a4f32f7441727ec1fbf4967b863e1e3e9f33e2"
   integrity sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==
@@ -2121,6 +2209,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
 bindings@^1.2.1, bindings@^1.3.0, bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -2135,25 +2228,25 @@ bluebird-lst@^1.0.9:
   dependencies:
     bluebird "^3.5.5"
 
-bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@^3.5.0, bluebird@^3.5.1, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.1.tgz#1499abbaa9274af3ecc9f6f10396c995943e31d4"
-  integrity sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==
+body-parser@1.19.2:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
+  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
   dependencies:
-    bytes "3.1.1"
+    bytes "3.1.2"
     content-type "~1.0.4"
     debug "2.6.9"
     depd "~1.1.2"
     http-errors "1.8.1"
     iconv-lite "0.4.24"
     on-finished "~2.3.0"
-    qs "6.9.6"
-    raw-body "2.4.2"
+    qs "6.9.7"
+    raw-body "2.4.3"
     type-is "~1.6.18"
 
 bonjour@^3.5.0:
@@ -2174,9 +2267,9 @@ boolbase@^1.0.0:
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
 boolean@^3.0.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435"
-  integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
+  integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
 
 boxen@^5.0.0:
   version "5.1.2"
@@ -2216,7 +2309,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1:
+braces@^3.0.1, braces@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2224,14 +2317,14 @@ braces@^3.0.1:
     fill-range "^7.0.1"
 
 browserslist@^4.14.5, browserslist@^4.17.5, browserslist@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.1.tgz#4ac0435b35ab655896c31d53018b6dd5e9e4c9a3"
-  integrity sha512-u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A==
+  version "4.19.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383"
+  integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==
   dependencies:
-    caniuse-lite "^1.0.30001286"
-    electron-to-chromium "^1.4.17"
+    caniuse-lite "^1.0.30001312"
+    electron-to-chromium "^1.4.71"
     escalade "^3.1.1"
-    node-releases "^2.0.1"
+    node-releases "^2.0.2"
     picocolors "^1.0.0"
 
 buffer-alloc-unsafe@^1.1.0:
@@ -2280,29 +2373,31 @@ buffer@^5.1.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builder-util-runtime@8.9.1:
-  version "8.9.1"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz#25f066b3fbc20b3e6236a9b956b1ebb0e33ff66a"
-  integrity sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==
+builder-util-runtime@8.9.2:
+  version "8.9.2"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz#a9669ae5b5dcabfe411ded26678e7ae997246c28"
+  integrity sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==
   dependencies:
     debug "^4.3.2"
     sax "^1.2.4"
 
-builder-util@22.14.5:
-  version "22.14.5"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.5.tgz#42a18608d2a566c0846e91266464776c8bfb0cc9"
-  integrity sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==
+builder-util@22.14.13:
+  version "22.14.13"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.14.13.tgz#41b5b7b4ee53aff4e09cc007fb144522598f3ce6"
+  integrity sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==
   dependencies:
     "7zip-bin" "~5.1.1"
     "@types/debug" "^4.1.6"
     "@types/fs-extra" "^9.0.11"
     app-builder-bin "3.7.1"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "8.9.1"
+    builder-util-runtime "8.9.2"
     chalk "^4.1.1"
     cross-spawn "^7.0.3"
     debug "^4.3.2"
     fs-extra "^10.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.0"
     is-ci "^3.0.0"
     js-yaml "^4.1.0"
     source-map-support "^0.5.19"
@@ -2314,10 +2409,10 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-bytes@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.1.tgz#3f018291cb4cbad9accb6e6970bca9c8889e879a"
-  integrity sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
 cacache@^13.0.1:
   version "13.0.1"
@@ -2439,10 +2534,26 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001286:
-  version "1.0.30001306"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001306.tgz#582592afe243bad2223081b8abab07bf289cc699"
-  integrity sha512-Wd1OuggRzg1rbnM5hv1wXs2VkxJH/AA+LuudlIqvZiCvivF+wJJe2mgBZC8gPMgI7D76PP5CTx8Luvaqc1V6OQ==
+caniuse-lite@^1.0.30001312:
+  version "1.0.30001312"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f"
+  integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==
+
+castv2-client@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/castv2-client/-/castv2-client-1.2.0.tgz#a9193b1a5448b8cb9a0415bd021c8811ed7b0544"
+  integrity sha1-qRk7GlRIuMuaBBW9AhyIEe17BUQ=
+  dependencies:
+    castv2 "~0.1.4"
+    debug "^2.2.0"
+
+castv2@~0.1.4:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/castv2/-/castv2-0.1.10.tgz#d3df00124f1ba8a97691c69dd44221d3b5f93c56"
+  integrity sha512-3QWevHrjT22KdF08Y2a217IYCDQDP7vEJaY4n0lPBeC5UBYbMFMadDfVTsaQwq7wqsEgYUHElPGm3EO1ey+TNw==
+  dependencies:
+    debug "^4.1.1"
+    protobufjs "^6.8.8"
 
 chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
@@ -2480,6 +2591,21 @@ chokidar@^2.1.8:
   optionalDependencies:
     fsevents "^1.2.7"
 
+chokidar@^3.5.3:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
 chownr@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -2611,7 +2737,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.2:
+color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
@@ -2640,6 +2766,11 @@ commander@2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
+commander@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
+  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
+
 commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -2655,11 +2786,6 @@ commander@^5.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^8.2.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -2751,7 +2877,7 @@ connect-history-api-fallback@^1.6.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
-console-control-strings@^1.0.0, console-control-strings@^1.1.0:
+console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -2780,12 +2906,7 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1"
-  integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==
-
-cookie@^0.4.1:
+cookie@0.4.2, cookie@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
@@ -2808,9 +2929,9 @@ copy-descriptor@^0.1.0:
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js-compat@^3.20.2, core-js-compat@^3.21.0:
-  version "3.21.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885"
-  integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A==
+  version "3.21.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
+  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
   dependencies:
     browserslist "^4.19.1"
     semver "7.0.0"
@@ -2839,15 +2960,6 @@ crocket@^0.9.11:
   dependencies:
     xpipe "*"
 
-cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz#46253b0f497676e766faf4a7061004618b5ac5ec"
-  integrity sha512-mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw==
-  dependencies:
-    "@malept/cross-spawn-promise" "^1.1.0"
-    is-wsl "^2.2.0"
-    which "^2.0.2"
-
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2859,7 +2971,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.1, cross-spawn@^7.0.3:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -2956,14 +3068,14 @@ debug@2.6.9, debug@^2.1.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
+debug@4, debug@4.3.3, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
   integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -3011,6 +3123,11 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+deepmerge@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+
 default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -3076,6 +3193,11 @@ del@^4.1.1:
     pify "^4.0.1"
     rimraf "^2.6.3"
 
+delay@^4.3.0:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/delay/-/delay-4.4.1.tgz#6e02d02946a1b6ab98b39262ced965acba2ac4d1"
+  integrity sha512-aL3AhqtfhOlT/3ai6sWXeqwnw63ATNpnUiN4HL7x9q+My5QtHlO3OIkasmug9LKzpheLdmUKGRKnYXYAS7FQkQ==
+
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -3106,10 +3228,10 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-diff-sequences@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.4.0.tgz#d783920ad8d06ec718a060d00196dfef25b132a5"
-  integrity sha512-YqiQzkrsmHMH5uuh8OdQFU9/ZpADnwzml8z0O5HvRNda+5UZsaX/xN+AAxfR2hWq1Y7HZnAzO9J5lJXOuDz2Ww==
+diff-sequences@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
+  integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
 
 dijkstrajs@^1.0.1:
   version "1.0.2"
@@ -3136,14 +3258,14 @@ discord-rpc@^4.0.1:
   optionalDependencies:
     register-scheme "github:devsnek/node-register-scheme"
 
-dmg-builder@22.14.5:
-  version "22.14.5"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.5.tgz#137c0b55e639badcc0b119eb060e6fa4ed61d948"
-  integrity sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w==
+dmg-builder@22.14.13:
+  version "22.14.13"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.14.13.tgz#cc613f3c18e889b8777d525991fd52f50a564f8c"
+  integrity sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==
   dependencies:
-    app-builder-lib "22.14.5"
-    builder-util "22.14.5"
-    builder-util-runtime "8.9.1"
+    app-builder-lib "22.14.13"
+    builder-util "22.14.13"
+    builder-util-runtime "8.9.2"
     fs-extra "^10.0.0"
     iconv-lite "^0.6.2"
     js-yaml "^4.1.0"
@@ -3151,9 +3273,9 @@ dmg-builder@22.14.5:
     dmg-license "^1.0.9"
 
 dmg-license@^1.0.9:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc"
-  integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A==
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a"
+  integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==
   dependencies:
     "@types/plist" "^3.0.1"
     "@types/verror" "^1.10.3"
@@ -3294,17 +3416,25 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.6.1"
 
-electron-builder@^22.14.5:
-  version "22.14.5"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.5.tgz#3a25547bd4fe3728d4704da80956a794c5c31496"
-  integrity sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==
+electron-builder-notarize-pkg@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/electron-builder-notarize-pkg/-/electron-builder-notarize-pkg-1.2.0.tgz#c6f4b0027418be465b2ab41effc6eecc68110bcb"
+  integrity sha512-ibnOeZwXxEPIzPujHfsLoCG+x4BcRQndBQoRyvTEZEeCeO/D4uu3TSAPeNXZuKfoL3h2auaIBIhh4He5HgY1rw==
+  dependencies:
+    delay "^4.3.0"
+    execa "^4.0.0"
+
+electron-builder@^22.14.13:
+  version "22.14.13"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.14.13.tgz#fd40564685cf5422a8f8d667940af3d3776f4fb8"
+  integrity sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==
   dependencies:
     "@types/yargs" "^17.0.1"
-    app-builder-lib "22.14.5"
-    builder-util "22.14.5"
-    builder-util-runtime "8.9.1"
+    app-builder-lib "22.14.13"
+    builder-util "22.14.13"
+    builder-util-runtime "8.9.2"
     chalk "^4.1.1"
-    dmg-builder "22.14.5"
+    dmg-builder "22.14.13"
     fs-extra "^10.0.0"
     is-ci "^3.0.0"
     lazy-val "^1.0.5"
@@ -3329,10 +3459,10 @@ electron-fetch@^1.7.4:
   dependencies:
     encoding "^0.1.13"
 
-electron-log@^4.4.5:
-  version "4.4.5"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.5.tgz#5fcfd0c2dc5fbda915ee0a9d802705dc57930786"
-  integrity sha512-Cfa2CKnwBhlUfIl/qr2GF5SCqfoA9yPBqTJ6/wPs+PEn36M2+EZ3RpGSaOhYQ1BZpolL1CWyeu3gMG8epLl3Ng==
+electron-log@^4.4.6:
+  version "4.4.6"
+  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.6.tgz#e7824fc725370384f6edaaac0480c423e570dc69"
+  integrity sha512-nirYgRdY+F+vclr8ijdwy2vW03IzFpDHTaKNWu76dEN21Y76+smcES5knS7cgHUUB0qNLOi8vZO36taakjbSXA==
 
 electron-notarize@^1.1.1:
   version "1.1.1"
@@ -3354,38 +3484,14 @@ electron-osx-sign@^0.5.0:
     minimist "^1.2.0"
     plist "^3.0.1"
 
-electron-packager@^15.4.0:
-  version "15.4.0"
-  resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-15.4.0.tgz#07ea036b70cde2062d4c8dce4d907d793b303998"
-  integrity sha512-JrrLcBP15KGrPj0cZ/ALKGmaQ4gJkn3mocf0E3bRKdR3kxKWYcDRpCvdhksYDXw/r3I6tMEcZ7XzyApWFXdVpw==
-  dependencies:
-    "@electron/get" "^1.6.0"
-    asar "^3.1.0"
-    cross-spawn-windows-exe "^1.2.0"
-    debug "^4.0.1"
-    electron-notarize "^1.1.1"
-    electron-osx-sign "^0.5.0"
-    extract-zip "^2.0.0"
-    filenamify "^4.1.0"
-    fs-extra "^9.0.0"
-    galactus "^0.2.1"
-    get-package-info "^1.0.0"
-    junk "^3.1.0"
-    parse-author "^2.0.0"
-    plist "^3.0.0"
-    rcedit "^3.0.1"
-    resolve "^1.1.6"
-    semver "^7.1.3"
-    yargs-parser "^20.0.0"
-
-electron-publish@22.14.5:
-  version "22.14.5"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.5.tgz#34bcdce671f0e651330db20040d6919c77c94bd6"
-  integrity sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg==
+electron-publish@22.14.13:
+  version "22.14.13"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.14.13.tgz#8b71e6975af8cc6ac5b21f293ade23f8704047c7"
+  integrity sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==
   dependencies:
     "@types/fs-extra" "^9.0.11"
-    builder-util "22.14.5"
-    builder-util-runtime "8.9.1"
+    builder-util "22.14.13"
+    builder-util-runtime "8.9.2"
     chalk "^4.1.1"
     fs-extra "^10.0.0"
     lazy-val "^1.0.5"
@@ -3399,18 +3505,18 @@ electron-store@^8.0.1:
     conf "^10.0.3"
     type-fest "^1.0.2"
 
-electron-to-chromium@^1.4.17:
-  version "1.4.64"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.64.tgz#8b1b5372f77ca208f2c498c6490da0e51176bd81"
-  integrity sha512-8mec/99xgLUZCIZZq3wt61Tpxg55jnOSpxGYapE/1Ma9MpFEYYaz4QNYm0CM1rrnCo7i3FRHhbaWjeCLsveGjQ==
+electron-to-chromium@^1.4.71:
+  version "1.4.75"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz#d1ad9bb46f2f1bf432118c2be21d27ffeae82fdd"
+  integrity sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==
 
-electron-updater@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.1.tgz#80ca805c4f51b2e682aac29d18fed75d6a533d32"
-  integrity sha512-YsU1mHqXLrXXmBMsxhxy24PrbaB8rnpZDPmFa2gOkTYk/Ch13+R0fjsRSpPYvqtskVVY0ux8fu+HnUkVkqc7og==
+electron-updater@^4.6.5:
+  version "4.6.5"
+  resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-4.6.5.tgz#e9a75458bbfd6bb41a58a829839e150ad2eb2d3d"
+  integrity sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==
   dependencies:
     "@types/semver" "^7.3.6"
-    builder-util-runtime "8.9.1"
+    builder-util-runtime "8.9.2"
     fs-extra "^10.0.0"
     js-yaml "^4.1.0"
     lazy-val "^1.0.5"
@@ -3473,8 +3579,8 @@ electron-window-state@^5.0.3:
     mkdirp "^0.5.1"
 
 "electron@git+https://github.com/castlabs/electron-releases.git":
-  version "18.0.0-alpha.1"
-  resolved "git+https://github.com/castlabs/electron-releases.git#513890a7edda1f9723fbf410a4806b4cabd88827"
+  version "18.0.0-alpha.5"
+  resolved "git+https://github.com/castlabs/electron-releases.git#4f424eddd6ec2569c5f293778ba8056205805247"
   dependencies:
     "@electron/get" "^1.13.0"
     "@types/node" "^14.6.2"
@@ -3529,9 +3635,9 @@ enhanced-resolve@^4.1.1:
     tapable "^1.0.0"
 
 enhanced-resolve@^5.8.3:
-  version "5.8.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
-  integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
+  version "5.9.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.1.tgz#e898cea44d9199fd92137496cff5691b910fb43e"
+  integrity sha512-jdyZMwCQ5Oj4c5+BTnkxPgDZO/BJzh/ADDmKebayyzNwjVX1AFCeGkOfxNx0mHi2+8BKC5VxUYiw3TIvoT7vhw==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
@@ -3558,7 +3664,7 @@ errno@^0.1.3:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -3625,7 +3731,7 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
@@ -3703,7 +3809,7 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-eventsource@^1.0.7:
+eventsource@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
   integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
@@ -3723,6 +3829,21 @@ execa@^1.0.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execa@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
+  dependencies:
+    cross-spawn "^7.0.0"
+    get-stream "^5.0.0"
+    human-signals "^1.1.1"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.0"
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+    strip-final-newline "^2.0.0"
+
 expand-brackets@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@@ -3743,7 +3864,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@=27.2.5:
+expect@27.2.5:
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/expect/-/expect-27.2.5.tgz#16154aaa60b4d9a5b0adacfea3e4d6178f4b93fd"
   integrity sha512-ZrO0w7bo8BgGoP/bLz+HDCI+0Hfei9jUSZs5yI/Wyn9VkG9w8oJ7rHRgYj+MA7yqqFa0IwHA3flJzZtYugShJA==
@@ -3755,17 +3876,17 @@ expect@=27.2.5:
     jest-message-util "^27.2.5"
     jest-regex-util "^27.0.6"
 
-express@^4.17.1, express@^4.17.2:
-  version "4.17.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.2.tgz#c18369f265297319beed4e5558753cc8c1364cb3"
-  integrity sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==
+express@^4.17.1, express@^4.17.3:
+  version "4.17.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
+  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
   dependencies:
-    accepts "~1.3.7"
+    accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.1"
+    body-parser "1.19.2"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.1"
+    cookie "0.4.2"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~1.1.2"
@@ -3780,7 +3901,7 @@ express@^4.17.1, express@^4.17.2:
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.9.6"
+    qs "6.9.7"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
     send "0.17.2"
@@ -3806,6 +3927,11 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
+extend@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
 extglob@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@@ -3820,17 +3946,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@^1.0.3:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
-  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
-  dependencies:
-    concat-stream "^1.6.2"
-    debug "^2.6.9"
-    mkdirp "^0.5.4"
-    yauzl "^2.10.0"
-
-extract-zip@^2.0.0, extract-zip@^2.0.1:
+extract-zip@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
@@ -3841,6 +3957,16 @@ extract-zip@^2.0.0, extract-zip@^2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+extract-zip@^1.0.3:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
+  integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
+  dependencies:
+    concat-stream "^1.6.2"
+    debug "^2.6.9"
+    mkdirp "^0.5.4"
+    yauzl "^2.10.0"
+
 extsprintf@^1.2.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
@@ -3861,7 +3987,7 @@ fast-safe-stringify@^2.0.6:
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
 
-faye-websocket@^0.11.3:
+faye-websocket@^0.11.3, faye-websocket@^0.11.4:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
   integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
@@ -3909,20 +4035,6 @@ filelist@^1.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-filename-reserved-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
-  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
-
-filenamify@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.3.0.tgz#62391cb58f02b09971c9d4f9d63b3cf9aba03106"
-  integrity sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==
-  dependencies:
-    filename-reserved-regex "^2.0.0"
-    strip-outer "^1.0.1"
-    trim-repeated "^1.0.0"
-
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -3970,13 +4082,6 @@ find-cache-dir@^3.3.1:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -4002,18 +4107,10 @@ findup-sync@^3.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flora-colossus@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flora-colossus/-/flora-colossus-1.0.1.tgz#aba198425a8185341e64f9d2a6a96fd9a3cbdb93"
-  integrity sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==
-  dependencies:
-    debug "^4.1.1"
-    fs-extra "^7.0.0"
-
 follow-redirects@^1.0.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
+  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
 
 for-in@^1.0.2:
   version "1.0.2"
@@ -4052,32 +4149,14 @@ from@~0:
   integrity sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=
 
 fs-extra@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.0.tgz#9ff61b655dde53fb34a82df84bb214ce802e17c1"
-  integrity sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
+  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
   dependencies:
     graceful-fs "^4.2.0"
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
-  integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
-fs-extra@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-extra@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
@@ -4127,34 +4206,30 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fsevents@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-galactus@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/galactus/-/galactus-0.2.1.tgz#cbed2d20a40c1f5679a35908e2b9415733e78db9"
-  integrity sha1-y+0tIKQMH1Z5o1kI4rlBVzPnjbk=
-  dependencies:
-    debug "^3.1.0"
-    flora-colossus "^1.0.0"
-    fs-extra "^4.0.0"
-
 gauge@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8"
-  integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.2.tgz#c3777652f542b6ef62797246e8c7caddecb32cc7"
+  integrity sha512-aSPRm2CvA9R8QyU5eXMFPd+cYkyxLsXHd2l5/FOH2V/eml//M04G6KZOmTap07O1PvEwNcl2NndyLfK8g3QrKA==
   dependencies:
     ansi-regex "^5.0.1"
     aproba "^1.0.3 || ^2.0.0"
-    color-support "^1.1.2"
-    console-control-strings "^1.0.0"
+    color-support "^1.1.3"
+    console-control-strings "^1.1.0"
     has-unicode "^2.0.1"
-    signal-exit "^3.0.0"
+    signal-exit "^3.0.7"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
-    wide-align "^1.1.2"
+    wide-align "^1.1.5"
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -4175,16 +4250,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
-get-package-info@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-package-info/-/get-package-info-1.0.0.tgz#6432796563e28113cd9474dbbd00052985a4999c"
-  integrity sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=
-  dependencies:
-    bluebird "^3.1.1"
-    debug "^2.2.0"
-    lodash.get "^4.0.0"
-    read-pkg-up "^2.0.0"
-
 get-port@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-5.1.1.tgz#0469ed07563479de6efb986baf053dcd7d4e3193"
@@ -4197,7 +4262,7 @@ get-stream@^4.0.0, get-stream@^4.1.0:
   dependencies:
     pump "^3.0.0"
 
-get-stream@^5.1.0:
+get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
@@ -4225,6 +4290,13 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
@@ -4364,7 +4436,7 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.9"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
   integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
@@ -4395,9 +4467,9 @@ has-flag@^4.0.0:
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-symbols@^1.0.1, has-symbols@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
@@ -4471,11 +4543,6 @@ homedir-polyfill@^1.0.1:
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
 hosted-git-info@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
@@ -4601,6 +4668,15 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
+  dependencies:
+    "@tootallnate/once" "2"
+    agent-base "6"
+    debug "4"
+
 http-proxy-middleware@0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -4628,7 +4704,7 @@ http2-wrapper@^1.0.0-beta.5.2:
     quick-lru "^5.1.1"
     resolve-alpn "^1.0.0"
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
   integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
@@ -4636,6 +4712,11 @@ https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+human-signals@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
+
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -4826,6 +4907,13 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-boolean-object@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
@@ -4943,7 +5031,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
@@ -5051,6 +5139,11 @@ is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
+
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -5143,22 +5236,22 @@ jake@^10.6.1:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
-jest-diff@^27.2.5, jest-diff@^27.4.6:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.4.6.tgz#93815774d2012a2cbb6cf23f84d48c7a2618f98d"
-  integrity sha512-zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w==
+jest-diff@^27.2.5, jest-diff@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
+  integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^27.4.0"
-    jest-get-type "^27.4.0"
-    pretty-format "^27.4.6"
+    diff-sequences "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
 
-jest-get-type@^27.0.6, jest-get-type@^27.4.0:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.4.0.tgz#7503d2663fffa431638337b3998d39c5e928e9b5"
-  integrity sha512-tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ==
+jest-get-type@^27.0.6, jest-get-type@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+  integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
 
-jest-matcher-utils@=27.2.5:
+jest-matcher-utils@27.2.5:
   version "27.2.5"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.2.5.tgz#4684faaa8eb32bf15e6edaead6834031897e2980"
   integrity sha512-qNR/kh6bz0Dyv3m68Ck2g1fLW5KlSOUNcFQh87VXHZwWc/gY6XwnKofx76Qytz3x5LDWT09/2+yXndTkaG4aWg==
@@ -5169,34 +5262,34 @@ jest-matcher-utils@=27.2.5:
     pretty-format "^27.2.5"
 
 jest-matcher-utils@^27.2.5:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz#53ca7f7b58170638590e946f5363b988775509b8"
-  integrity sha512-XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA==
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
+  integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^27.4.6"
-    jest-get-type "^27.4.0"
-    pretty-format "^27.4.6"
+    jest-diff "^27.5.1"
+    jest-get-type "^27.5.1"
+    pretty-format "^27.5.1"
 
 jest-message-util@^27.2.5:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.4.6.tgz#9fdde41a33820ded3127465e1a5896061524da31"
-  integrity sha512-0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA==
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
+  integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^27.4.2"
+    "@jest/types" "^27.5.1"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^27.4.6"
+    pretty-format "^27.5.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
 jest-regex-util@^27.0.6:
-  version "27.4.0"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.4.0.tgz#e4c45b52653128843d07ad94aec34393ea14fbca"
-  integrity sha512-WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg==
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
+  integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
 
 jest-worker@^25.4.0:
   version "25.5.0"
@@ -5207,15 +5300,15 @@ jest-worker@^25.4.0:
     supports-color "^7.0.0"
 
 jest-worker@^27.4.5:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.4.6.tgz#5d2d93db419566cb680752ca0792780e71b3273e"
-  integrity sha512-gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw==
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jpeg-js@^0.4.2:
+jpeg-js@0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.3.tgz#6158e09f1983ad773813704be80680550eff977b"
   integrity sha512-ru1HWKek8octvUHFHvE5ZzQ1yAsJmIvRdGWvSoKV52XKyuyYA437QWDttXT8eZXDSbuMpHlLzPDZUPd6idIz+Q==
@@ -5290,10 +5383,12 @@ json-stringify-safe@^5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json3@^3.3.3:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
-  integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
+json5@2.2.0, json5@^2.1.0, json5@^2.1.2, json5@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
 
 json5@^0.5.1:
   version "0.5.1"
@@ -5307,13 +5402,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0, json5@^2.1.2, json5@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonc@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/jsonc/-/jsonc-2.0.0.tgz#9e2a25100d164a9bb864c57517563717fa882551"
@@ -5342,11 +5430,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-junk@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
-  integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
-
 keyv@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -5355,9 +5438,9 @@ keyv@^3.0.0:
     json-buffer "3.0.0"
 
 keyv@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.1.0.tgz#8ab5ca4ae6a34e05c629531d9a7f871575af0d5b"
-  integrity sha512-YsY3wr6HabE11/sscee+3nZ03XjvkrPWGouAmJFBdZoK92wiOlJCzI5/sDEIKdJhdhHO144ei45U9gXfbu14Uw==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.1.1.tgz#02c538bfdbd2a9308cc932d4096f05ae42bfa06a"
+  integrity sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==
   dependencies:
     json-buffer "3.0.1"
 
@@ -5423,16 +5506,6 @@ lie@3.1.1:
   dependencies:
     immediate "~3.0.5"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 loader-runner@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
@@ -5463,14 +5536,6 @@ localforage@^1.8.1:
   dependencies:
     lie "3.1.1"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -5496,11 +5561,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
-lodash.get@^4.0.0:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.isequal@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
@@ -5617,9 +5677,9 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-"mdns-js@git+https://github.com/bitfocus/node-mdns-js.git":
+"mdns-js@git+https://github.com/ciderapp/node-mdns-js.git":
   version "1.0.7"
-  resolved "git+https://github.com/bitfocus/node-mdns-js.git#1af6b83ce91e5538012f977e1dcadbda5dc0d3b5"
+  resolved "git+https://github.com/ciderapp/node-mdns-js.git#1af6b83ce91e5538012f977e1dcadbda5dc0d3b5"
   dependencies:
     debug "^4.1.1"
     dns-js "github:bitfocus/node-dns-js#v0.2.2"
@@ -5693,11 +5753,16 @@ micromatch@^4.0.4:
     braces "^3.0.1"
     picomatch "^2.2.3"
 
-mime-db@1.51.0, "mime-db@>= 1.43.0 < 2":
+mime-db@1.51.0:
   version "1.51.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
   integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
 
+"mime-db@>= 1.43.0 < 2":
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
 mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.34"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
@@ -5710,7 +5775,12 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^2.4.4, mime@^2.4.6, mime@^2.5.2:
+mime@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
+mime@^2.4.4, mime@^2.5.2:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
@@ -5750,13 +5820,20 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.0.4, minimatch@^3.0.3, minimatch@^3.0.4:
+minimatch@3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^3.0.4:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
@@ -5867,7 +5944,7 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1, ms@^2.1.2:
+ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5885,10 +5962,10 @@ multicast-dns@^6.0.1:
     dns-packet "^1.3.1"
     thunky "^1.0.2"
 
-music-metadata@^7.11.4:
-  version "7.11.8"
-  resolved "https://registry.yarnpkg.com/music-metadata/-/music-metadata-7.11.8.tgz#be67ff6d5e5499d2a31a7044079cb83c03544cc2"
-  integrity sha512-KaJzxDlYId05zN029WaKhJYcT5FB0QmTRSGDq5bRfPTBUw4Hl0VvJvaO5C5mm0ATWMREecMANV9YUatLMg+0Mg==
+music-metadata@^7.12.1:
+  version "7.12.2"
+  resolved "https://registry.yarnpkg.com/music-metadata/-/music-metadata-7.12.2.tgz#13771b5d88285afd93659ed2496912c92e0558b6"
+  integrity sha512-KO1L6q30b6HfGlDQk1VAdrZqCKi4Gy7pN7eZOZ0YZQkhF/KCLHxKCjKKli9ao9kIBC/9s+uXHvjW3bDIBWuGew==
   dependencies:
     "@tokenizer/token" "^0.3.0"
     content-type "^1.0.4"
@@ -5896,7 +5973,7 @@ music-metadata@^7.11.4:
     file-type "16.5.3"
     media-typer "^1.1.0"
     strtok3 "^6.2.4"
-    token-types "^4.1.1"
+    token-types "^4.2.0"
 
 musickit-typescript@^1.2.4:
   version "1.2.4"
@@ -5986,10 +6063,21 @@ node-loader@^0.6.0:
   resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-0.6.0.tgz#c797ef51095ed5859902b157f6384f6361e05ae8"
   integrity sha1-x5fvUQle1YWZArFX9jhPY2HgWug=
 
-node-releases@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
-  integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
+node-releases@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
+  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+
+node-ssdp@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/node-ssdp/-/node-ssdp-4.0.1.tgz#ea5b2e9a287823b58b3ede348b22a08159cf718f"
+  integrity sha512-uJXkLZVuyaMg1qNbMbGQ6YzNzyOD+NLxYyxIJocPTKTVECPDokOiCZA686jTLXHMUnV34uY/lcUSJ+/5fhY43A==
+  dependencies:
+    async "^2.6.0"
+    bluebird "^3.5.1"
+    debug "^3.1.0"
+    extend "^3.0.1"
+    ip "^1.1.5"
 
 nopt@^5.0.0:
   version "5.0.0"
@@ -5998,16 +6086,6 @@ nopt@^5.0.0:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
 normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
@@ -6015,7 +6093,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -6055,12 +6133,19 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c"
-  integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==
+npm-run-path@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
-    are-we-there-yet "^2.0.0"
+    path-key "^3.0.0"
+
+npmlog@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
+  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
+  dependencies:
+    are-we-there-yet "^3.0.0"
     console-control-strings "^1.1.0"
     gauge "^4.0.0"
     set-blocking "^2.0.0"
@@ -6161,14 +6246,14 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^5.1.2:
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^8.3.0:
+open@8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
   integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
@@ -6206,13 +6291,6 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
-p-limit@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
 p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -6220,13 +6298,6 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.3.0:
   dependencies:
     p-try "^2.0.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
@@ -6267,11 +6338,6 @@ p-retry@^3.0.1:
   dependencies:
     retry "^0.12.0"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
-
 p-try@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
@@ -6295,20 +6361,6 @@ param-case@^3.0.3:
     dot-case "^3.0.4"
     tslib "^2.0.3"
 
-parse-author@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/parse-author/-/parse-author-2.0.0.tgz#d3460bf1ddd0dfaeed42da754242e65fb684a81f"
-  integrity sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=
-  dependencies:
-    author-regex "^1.0.0"
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -6370,7 +6422,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -6385,13 +6437,6 @@ path-to-regexp@0.1.7:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
-
 pause-stream@0.0.11:
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/pause-stream/-/pause-stream-0.0.11.tgz#fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"
@@ -6399,10 +6444,10 @@ pause-stream@0.0.11:
   dependencies:
     through "~2.3"
 
-peek-readable@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.0.2.tgz#a5cb847e347d3eccdc37642c82d2b4155c1ab8af"
-  integrity sha512-9fMaz6zoxw9ypO1KZy5RDJgSupEtu0Q+g/OqqsVHX3rKGR8qehRLYzsFARZ4bVvdvfknKiXvuDbkMnO1g6cRpQ==
+peek-readable@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72"
+  integrity sha512-ZI3LnwUv5nOGbQzD9c2iDG6toheuXSZP5esSHBjopsXH4dg19soufvpUGA3uohi5anFtGb2lhAVdHzH6R/Evvg==
 
 pend@~1.2.0:
   version "1.2.0"
@@ -6419,7 +6464,7 @@ picocolors@^1.0.0:
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-picomatch@^2.0.4, picomatch@^2.2.3:
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -6451,12 +6496,12 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.1:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+pirates@4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6"
+  integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==
 
-pixelmatch@^5.2.1:
+pixelmatch@5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.2.1.tgz#9e4e4f4aa59648208a31310306a5bed5522b0d65"
   integrity sha512-WjcAdYSnKrrdDdqTcVEY7aB7UhhwjYQKYhHiBXdJef0MOaQeYpUdQ+iVyBLa5YBKS8MPVPPMX7rpOByISLpeEQ==
@@ -6484,36 +6529,36 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
-playwright-core@=1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.18.1.tgz#a5cf3f212d10692382e2acd1f7bc8c9ff9bbb849"
-  integrity sha512-NALGl8R1GHzGLlhUApmpmfh6M1rrrPcDTygWvhTbprxwGB9qd/j9DRwyn4HTQcUB6o0/VOpo46fH9ez3+D/Rog==
+playwright-core@1.19.2:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.19.2.tgz#90b9209554f174c649abf495952fcb4335437218"
+  integrity sha512-OsL3sJZIo1UxKNWSP7zW7sk3FyUGG06YRHxHeBw51eIOxTCQRx5t+hXd0cvXashN2CHnd3hIZTs2aKa/im4hZQ==
   dependencies:
-    commander "^8.2.0"
-    debug "^4.1.1"
-    extract-zip "^2.0.1"
-    https-proxy-agent "^5.0.0"
-    jpeg-js "^0.4.2"
-    mime "^2.4.6"
-    pngjs "^5.0.0"
-    progress "^2.0.3"
-    proper-lockfile "^4.1.1"
-    proxy-from-env "^1.1.0"
-    rimraf "^3.0.2"
-    socks-proxy-agent "^6.1.0"
-    stack-utils "^2.0.3"
-    ws "^7.4.6"
-    yauzl "^2.10.0"
-    yazl "^2.5.1"
+    commander "8.3.0"
+    debug "4.3.3"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    jpeg-js "0.4.3"
+    mime "3.0.0"
+    pngjs "6.0.0"
+    progress "2.0.3"
+    proper-lockfile "4.1.2"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    socks-proxy-agent "6.1.1"
+    stack-utils "2.0.5"
+    ws "8.4.2"
+    yauzl "2.10.0"
+    yazl "2.5.1"
 
-playwright@^1.18.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.18.1.tgz#45c2ca6ee25c44e336985de9b51955727b5f17cf"
-  integrity sha512-8EaX9EtbtAoMq5tnzIsoA3b/V86V/6Mq2skuOU4qEw+5OVxs1lwesDwmjy/RVU1Qfx5UuwSQzhp45wyH22oa+A==
+playwright@^1.19.2:
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.19.2.tgz#d9927ae8512482642356e50a286c5767dfb7a621"
+  integrity sha512-2JmGWr/Iw/Uu27bZULeHgjn8doNrRVxIYdhspMuMlfKNpzwAe/sfm7wH8uey6jiZxnPL4bC5V4ACQcF4dAGWnw==
   dependencies:
-    playwright-core "=1.18.1"
+    playwright-core "1.19.2"
 
-plist@^3.0.0, plist@^3.0.1, plist@^3.0.4:
+plist@^3.0.1, plist@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.4.tgz#a62df837e3aed2bb3b735899d510c4f186019cbe"
   integrity sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==
@@ -6521,6 +6566,11 @@ plist@^3.0.0, plist@^3.0.1, plist@^3.0.4:
     base64-js "^1.5.1"
     xmlbuilder "^9.0.7"
 
+pngjs@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
+  integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
+
 pngjs@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-4.0.1.tgz#f803869bb2fc1bfe1bf99aa4ec21c108117cfdbe"
@@ -6617,10 +6667,10 @@ pretty-error@^2.1.1:
     lodash "^4.17.20"
     renderkid "^2.0.4"
 
-pretty-format@^27.2.5, pretty-format@^27.4.6:
-  version "27.4.6"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.4.6.tgz#1b784d2f53c68db31797b2348fa39b49e31846b7"
-  integrity sha512-NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g==
+pretty-format@^27.2.5, pretty-format@^27.5.1:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
   dependencies:
     ansi-regex "^5.0.1"
     ansi-styles "^5.0.0"
@@ -6631,7 +6681,7 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-progress@^2.0.3:
+progress@2.0.3, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -6649,7 +6699,7 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-proper-lockfile@^4.1.1:
+proper-lockfile@4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f"
   integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA==
@@ -6663,6 +6713,25 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
+protobufjs@^6.8.8:
+  version "6.11.2"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"
+  integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" ">=13.7.0"
+    long "^4.0.0"
+
 proxy-addr@~2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
@@ -6671,7 +6740,7 @@ proxy-addr@~2.0.7:
     forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-from-env@^1.1.0:
+proxy-from-env@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -6711,11 +6780,6 @@ qap@^3.1.2:
   resolved "https://registry.yarnpkg.com/qap/-/qap-3.3.1.tgz#11f9e8fa8890fe7cb99210c0f44d0613b7372cac"
   integrity sha1-Efno+oiQ/ny5khDA9E0GE7c3LKw=
 
-qrcode-terminal@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819"
-  integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==
-
 qrcode@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.0.tgz#95abb8a91fdafd86f8190f2836abbfc500c72d1b"
@@ -6726,10 +6790,10 @@ qrcode@^1.5.0:
     pngjs "^5.0.0"
     yargs "^15.3.1"
 
-qs@6.9.6:
-  version "6.9.6"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee"
-  integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==
+qs@6.9.7:
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
+  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
 
 query-string@^4.1.0:
   version "4.3.4"
@@ -6766,12 +6830,12 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.2.tgz#baf3e9c21eebced59dd6533ac872b71f7b61cb32"
-  integrity sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==
+raw-body@2.4.3:
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
+  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
   dependencies:
-    bytes "3.1.1"
+    bytes "3.1.2"
     http-errors "1.8.1"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
@@ -6786,13 +6850,6 @@ rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-rcedit@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-3.0.1.tgz#ae21b43e49c075f4d84df1929832a12c302f3c90"
-  integrity sha512-XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw==
-  dependencies:
-    cross-spawn-windows-exe "^1.1.0"
-
 react-dom@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
@@ -6840,23 +6897,6 @@ read-config-file@~4.0.1:
     json5 "^2.1.0"
     lazy-val "^1.0.4"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 "readable-stream@1 || 2", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
@@ -6895,6 +6935,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
 regenerate-unicode-properties@^10.0.1:
   version "10.0.1"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
@@ -7066,7 +7113,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.14.2:
+resolve@^1.13.1, resolve@^1.14.2:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -7099,6 +7146,13 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
+rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -7106,13 +7160,6 @@ rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 roarr@^2.15.3:
   version "2.15.4"
   resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
@@ -7230,16 +7277,16 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@^5.3.0, semver@^5.5.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -7373,7 +7420,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -7392,7 +7439,7 @@ slice-ansi@^3.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-smart-buffer@^4.0.2, smart-buffer@^4.1.0:
+smart-buffer@^4.0.2, smart-buffer@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
@@ -7428,16 +7475,15 @@ snapdragon@^0.8.1:
     use "^3.1.0"
 
 sockjs-client@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.2.tgz#4bc48c2da9ce4769f19dc723396b50f5c12330a3"
-  integrity sha512-ZzRxPBISQE7RpzlH4tKJMQbHM9pabHluk0WBaxAQ+wm/UieeBVBou0p4wVnSQGN9QmpAZygQ0cDIypWuqOFmFQ==
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.6.0.tgz#e0277b8974558edcb557eafc7d3027ef6128d865"
+  integrity sha512-qVHJlyfdHFht3eBFZdKEXKTlb7I4IV41xnVNo8yUKA1UHcPJwgW2SvTq9LhnjjCywSkSK7c/e4nghU0GOoMCRQ==
   dependencies:
-    debug "^3.2.6"
-    eventsource "^1.0.7"
-    faye-websocket "^0.11.3"
+    debug "^3.2.7"
+    eventsource "^1.1.0"
+    faye-websocket "^0.11.4"
     inherits "^2.0.4"
-    json3 "^3.3.3"
-    url-parse "^1.5.3"
+    url-parse "^1.5.10"
 
 sockjs@^0.3.21:
   version "0.3.24"
@@ -7448,7 +7494,7 @@ sockjs@^0.3.21:
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@^6.0.0, socks-proxy-agent@^6.1.0:
+socks-proxy-agent@6.1.1, socks-proxy-agent@^6.0.0:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
   integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
@@ -7458,12 +7504,12 @@ socks-proxy-agent@^6.0.0, socks-proxy-agent@^6.1.0:
     socks "^2.6.1"
 
 socks@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
-  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
+  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
   dependencies:
     ip "^1.1.5"
-    smart-buffer "^4.1.0"
+    smart-buffer "^4.2.0"
 
 sort-keys@^1.0.0:
   version "1.1.2"
@@ -7488,7 +7534,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.4.18:
+source-map-support@0.4.18:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
@@ -7523,37 +7569,6 @@ source-map@^0.7.3, source-map@~0.7.2:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-sourcemap-codec@1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
-  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-
 spdy-transport@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
@@ -7616,7 +7631,7 @@ ssri@^8.0.0, ssri@^8.0.1:
   dependencies:
     minipass "^3.1.1"
 
-stack-utils@^2.0.3:
+stack-utils@2.0.5, stack-utils@^2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
   integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
@@ -7722,11 +7737,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-bom@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
-
 strip-bom@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
@@ -7737,6 +7747,11 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
 strip-json-comments@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -7747,20 +7762,13 @@ strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-strip-outer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
-  integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 strtok3@^6.2.4:
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.2.4.tgz#302aea64c0fa25d12a0385069ba66253fdc38a81"
-  integrity sha512-GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw==
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.3.0.tgz#358b80ffe6d5d5620e19a073aa78ce947a90f9a0"
+  integrity sha512-fZtbhtvI9I48xDSywd/somNqgUHl2L2cstmXCCif0itOf96jeW18MBSyrLuNicYQVkvpOxkZtkzujiTJ9LW5Jw==
   dependencies:
     "@tokenizer/token" "^0.3.0"
-    peek-readable "^4.0.1"
+    peek-readable "^4.1.0"
 
 style-loader@^1.1.3:
   version "1.3.0"
@@ -7876,10 +7884,11 @@ terser@^4.6.12, terser@^4.6.3:
     source-map-support "~0.5.12"
 
 terser@^5.7.2:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.10.0.tgz#b86390809c0389105eb0a0b62397563096ddafcc"
-  integrity sha512-AMmF99DMfEDiRJfxfY5jj5wNH/bYO09cniSqhfoyxc8sFoYIgkJy86G04UoZU5VjlpnplVu0K6Tx6E9b5+DlHA==
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.0.tgz#728c6bff05f7d1dcb687d8eace0644802a9dae8a"
+  integrity sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==
   dependencies:
+    acorn "^8.5.0"
     commander "^2.20.0"
     source-map "~0.7.2"
     source-map-support "~0.5.20"
@@ -7955,10 +7964,10 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-token-types@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.1.1.tgz#ef9e8c8e2e0ded9f1b3f8dbaa46a3228b113ba1a"
-  integrity sha512-hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w==
+token-types@^4.1.1, token-types@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.2.0.tgz#b66bc3d67420c6873222a424eee64a744f4c2f13"
+  integrity sha512-P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w==
   dependencies:
     "@tokenizer/token" "^0.3.0"
     ieee754 "^1.2.1"
@@ -7968,13 +7977,6 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
-trim-repeated@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21"
-  integrity sha1-42RqLqTokTEr9+rObPsFOAvAHCE=
-  dependencies:
-    escape-string-regexp "^1.0.2"
-
 truncate-utf8-bytes@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b"
@@ -7987,7 +7989,7 @@ tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.2.0:
+tslib@^2.0.3, tslib@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
   integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
@@ -8033,9 +8035,9 @@ typedarray@^0.0.6:
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
 typescript@^4.5.5:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
-  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4"
+  integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -8182,10 +8184,10 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3, url-parse@^1.5.3:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.4.tgz#e4f645a7e2a0852cc8a66b14b292a3e9a11a97fd"
-  integrity sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==
+url-parse@^1.4.3, url-parse@^1.5.10:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
@@ -8246,14 +8248,6 @@ v8-compile-cache@^2.1.1, v8-compile-cache@^2.3.0:
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
-  dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
@@ -8383,18 +8377,18 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.3:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack-sources@^3.2.2:
+webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@~5.65.0:
-  version "5.65.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.65.0.tgz#ed2891d9145ba1f0d318e4ea4f89c3fa18e6f9be"
-  integrity sha512-Q5or2o6EKs7+oKmJo7LaqZaMOlDWQse9Tm5l1WAfU/ujLGN5Pb0SqGeVkN/4bpPmEqEP5RnVhiqsOtWtUVwGRw==
+webpack@~5.69.1:
+  version "5.69.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.69.1.tgz#8cfd92c192c6a52c99ab00529b5a0d33aa848dc5"
+  integrity sha512-+VyvOSJXZMT2V5vLzOnDuMz5GxEqLk7hKWQ56YxPW/PQRUuKimPqmEIJOx8jHYeyo65pKbapbW464mvsKbaj4A==
   dependencies:
-    "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.50"
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^0.0.51"
     "@webassemblyjs/ast" "1.11.1"
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
@@ -8407,7 +8401,7 @@ webpack@~5.65.0:
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.4"
+    graceful-fs "^4.2.9"
     json-parse-better-errors "^1.0.2"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
@@ -8416,7 +8410,7 @@ webpack@~5.65.0:
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
     watchpack "^2.3.1"
-    webpack-sources "^3.2.2"
+    webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -8470,7 +8464,7 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.2:
+wide-align@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
@@ -8526,6 +8520,11 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
+ws@8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
+  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
+
 ws@^6.2.1:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
@@ -8533,15 +8532,15 @@ ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.3.1, ws@^7.4.6:
-  version "7.5.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b"
-  integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==
+ws@^7.3.1:
+  version "7.5.7"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
+  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
 
-ws@^8.4.2:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.4.2.tgz#18e749868d8439f2268368829042894b6907aa0b"
-  integrity sha512-Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA==
+ws@^8.5.0:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
+  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -8612,15 +8611,10 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^20.0.0:
-  version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
-  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
-
 yargs-parser@^21.0.0:
-  version "21.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55"
-  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
+  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
 
 yargs@^13.3.2:
   version "13.3.2"
@@ -8668,7 +8662,7 @@ yargs@^17.0.1:
     y18n "^5.0.5"
     yargs-parser "^21.0.0"
 
-yauzl@^2.10.0:
+yauzl@2.10.0, yauzl@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
@@ -8676,7 +8670,7 @@ yauzl@^2.10.0:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yazl@^2.5.1:
+yazl@2.5.1:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/yazl/-/yazl-2.5.1.tgz#a3d65d3dd659a5b0937850e8609f22fffa2b5c35"
   integrity sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==

From 0a4151d5a4e318a2d26db0d15ad8d74f89ae2b6f Mon Sep 17 00:00:00 2001
From: Core <64542347+coredev-uk@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:26:57 +0000
Subject: [PATCH 07/13] circle config update

---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72f778fc..28c3749e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,12 +34,6 @@ jobs:
             sudo dpkg --add-architecture i386
             sudo apt-get update -y
             sudo apt-get install -y wine32
-      - run:
-          name: Start X VNC Server
-          command: x11vnc -forever -nopw -create
-          background: true
-      - store_test_results:
-          path: test-results
       - run:
           name: Append Commit BuildID to Version
           command: yarn circle:append-bid

From a8375c5c5935ff62061a11d0637370802b7979ec Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 06:03:19 -0800
Subject: [PATCH 08/13] adds playlist caching

---
 src/main/base/browserwindow.ts |  81 +++-----------------
 src/renderer/index.js          | 134 +++++++++++++++++++++++++++------
 src/renderer/style.less        |   1 +
 3 files changed, 125 insertions(+), 91 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index bbd4a035..739c2623 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -726,79 +726,22 @@ export class BrowserWindow {
             event.returnValue = this.devMode;
         });
 
-        ipcMain.on("put-library-songs", (_event, arg) => {
+        ipcMain.handle("put-cache", (_event, arg) => {
             writeFileSync(
-                join(utils.getPath('ciderCache'), "library-songs.json"),
-                JSON.stringify(arg)
+                join(utils.getPath('ciderCache'), `${arg.file}.json`),
+                arg.data
             );
         });
 
-        ipcMain.on("put-library-artists", (_event, arg) => {
-            writeFileSync(
-                join(utils.getPath('ciderCache'), "library-artists.json"),
-                JSON.stringify(arg)
-            );
-        });
-
-        ipcMain.on("put-library-albums", (_event, arg) => {
-            writeFileSync(
-                join(utils.getPath('ciderCache'), "library-albums.json"),
-                JSON.stringify(arg)
-            );
-        });
-
-        ipcMain.on("put-library-playlists", (_event, arg) => {
-            writeFileSync(
-                join(utils.getPath('ciderCache'), "library-playlists.json"),
-                JSON.stringify(arg)
-            );
-        });
-
-        ipcMain.on("put-library-recentlyAdded", (_event, arg) => {
-            writeFileSync(
-                join(utils.getPath('ciderCache'), "library-recentlyAdded.json"),
-                JSON.stringify(arg)
-            );
-        });
-
-        ipcMain.on("get-library-songs", (event) => {
-            let librarySongs = readFileSync(
-                join(utils.getPath('ciderCache'), "library-songs.json"),
-                "utf8"
-            );
-            event.returnValue = JSON.parse(librarySongs);
-        });
-
-        ipcMain.on("get-library-artists", (event) => {
-            let libraryArtists = readFileSync(
-                join(utils.getPath('ciderCache'), "library-artists.json"),
-                "utf8"
-            );
-            event.returnValue = JSON.parse(libraryArtists);
-        });
-
-        ipcMain.on("get-library-albums", (event) => {
-            let libraryAlbums = readFileSync(
-                join(utils.getPath('ciderCache'), "library-albums.json"),
-                "utf8"
-            );
-            event.returnValue = JSON.parse(libraryAlbums);
-        });
-
-        ipcMain.on("get-library-playlists", (event) => {
-            let libraryPlaylists = readFileSync(
-                join(utils.getPath('ciderCache'), "library-playlists.json"),
-                "utf8"
-            );
-            event.returnValue = JSON.parse(libraryPlaylists);
-        });
-
-        ipcMain.on("get-library-recentlyAdded", (event) => {
-            let libraryRecentlyAdded = readFileSync(
-                join(utils.getPath('ciderCache'), "library-recentlyAdded.json"),
-                "utf8"
-            );
-            event.returnValue = JSON.parse(libraryRecentlyAdded);
+        ipcMain.on("get-cache", (event, arg) => {
+            let read = ""
+            if (existsSync(join(utils.getPath('ciderCache'), `${arg}.json`))) {
+                read = readFileSync(
+                    join(utils.getPath('ciderCache'), `${arg}.json`),
+                    "utf8"
+                );
+            }
+            event.returnValue = read;
         });
 
         ipcMain.handle("getYTLyrics", async (_event, track, artist) => {
diff --git a/src/renderer/index.js b/src/renderer/index.js
index effa9058..f53e8707 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -1,5 +1,25 @@
 Vue.use(VueHorizontal);
 Vue.use(VueObserveVisibility);
+
+const CiderCache = {
+    async getCache(file) {
+        let cache = await ipcRenderer.sendSync("get-cache", file)
+        if (isJson(cache)) {
+            cache = JSON.parse(cache)
+        }else{
+            cache = false
+        }
+        return cache
+    },
+    async putCache(file, data) {
+        ipcRenderer.invoke("put-cache", {
+            file: file,
+            data: JSON.stringify(data)
+        })
+        return true
+    }
+}
+
 var notyf = new Notyf();
 
 const MusicKitObjects = {
@@ -49,10 +69,10 @@ Array.prototype.limit = function (n) {
 const store = new Vuex.Store({
     state: {
         library: {
-            songs: ipcRenderer.sendSync("get-library-songs"),
-            albums: ipcRenderer.sendSync("get-library-albums"),
-            recentlyAdded: ipcRenderer.sendSync("get-library-recentlyAdded"),
-            playlists: ipcRenderer.sendSync("get-library-playlists")
+            // songs: ipcRenderer.sendSync("get-library-songs"),
+            // albums: ipcRenderer.sendSync("get-library-albums"),
+            // recentlyAdded: ipcRenderer.sendSync("get-library-recentlyAdded"),
+            // playlists: ipcRenderer.sendSync("get-library-playlists")
         },
         artwork: {
             playerLCD: ""
@@ -308,12 +328,14 @@ const app = new Vue({
             let cursorPos = [0, 0];
             let intTabIndex = 0
             let self = this
-            let cursorSpeed = 4
+            const cursorSpeedPvt = 4
             let scrollSpeed = 8
             let buttonPressDelay = 500
             let stickDeadZone = 0.2
             let scrollGroup = null
 
+            let cursorSpeed = cursorSpeedPvt
+
             let lastButtonPress = {
 
             }
@@ -354,9 +376,9 @@ const app = new Vue({
                 } else if (gp.axes[3] < -stickDeadZone) {
                     $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
                 }
-                
 
-                if(scrollGroup) {
+
+                if (scrollGroup) {
                     if (gp.axes[2] > stickDeadZone) {
                         console.log('axis 2 up')
                         $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
@@ -369,7 +391,8 @@ const app = new Vue({
 
                 $(".cursor").css({
                     top: cursorPos[1] + "px",
-                    left: cursorPos[0] + "px"
+                    left: cursorPos[0] + "px",
+                    display: "block"
                 })
 
                 // A BUTTON
@@ -400,8 +423,8 @@ const app = new Vue({
                         lastButtonPress["B"] = Date.now()
                         if (elementType == 0) {
                             document.activeElement.dispatchEvent(new Event("contextmenu"))
-                            setTimeout(()=>{
-                                if($(".menu-option").length > 0) {
+                            setTimeout(() => {
+                                if ($(".menu-option").length > 0) {
                                     let bounds = $(".menu-option")[0].getBoundingClientRect()
                                     cursorPos[0] = bounds.left + (bounds.width / 2)
                                     cursorPos[1] = bounds.top + (bounds.height / 2)
@@ -411,7 +434,7 @@ const app = new Vue({
                             element.dispatchEvent(new Event("contextmenu"))
                         }
                     }
-                    
+
                 }
 
                 // right bumper
@@ -447,9 +470,9 @@ const app = new Vue({
                 if (element) {
                     let closest = element.closest("[tabindex], input, button, a")
                     let scrollGroupClo = element.closest(".v-hl-container")
-                    
-                    if(scrollGroupClo) {
-                        if(scrollGroupClo.classList.contains("v-hl-container")) {
+
+                    if (scrollGroupClo) {
+                        if (scrollGroupClo.classList.contains("v-hl-container")) {
                             scrollGroup = scrollGroupClo
                             scrollGroup.style["scroll-snap-type"] = "unset"
                         } else {
@@ -459,16 +482,23 @@ const app = new Vue({
                     }
 
                     if (closest) {
-                        
                         elementType = 0
                         closest.focus()
                     } else {
-                        if(closest) {
+                        if (closest) {
                             closest.blur()
                         }
                         elementType = 1
                         element.focus()
                     }
+                    cursorSpeed = cursorSpeedPvt
+                    if (!element.classList.contains("app-chrome")
+                        && !element.classList.contains("app-content")) {
+                        cursorSpeed = cursorSpeedPvt
+                    }
+                    // console.log($._data($(element), "events"))
+                } else {
+                    cursorSpeed = 12
                 }
                 // console.log(gp.axes[0], gp.axes[1])
                 start = requestAnimationFrame(appLoop);
@@ -1330,13 +1360,55 @@ const app = new Vue({
         },
         async refreshPlaylists() {
             let self = this
-            this.apiCall('https://api.music.apple.com/v1/me/library/playlist-folders/p.playlistsroot/children/', res => {
-                self.playlists.listing = res.data
-                self.playlists.listing.forEach(playlist => {
-                    playlist.parent = "p.playlistsroot"
-                })
+            let newListing = []
+            const cachedPlaylist = await CiderCache.getCache("library-playlists")
+
+            if(cachedPlaylist) {
+                console.log("using cached playlists")
+                this.playlists.listing = cachedPlaylist
                 self.sortPlaylists()
-            })
+            }else{
+                console.log("playlist has no cache")
+            }
+
+            const playlistroot = await app.mk.api.v3.music("/v1/me/library/playlist-folders/p.playlistsroot/children/")
+
+            newListing = []
+
+            this.library.backgroundNotification.message = "Building playlist cache..."
+            this.library.backgroundNotification.show = true
+
+            async function deepScan(parent = "p.playlistsroot") {
+                console.log(`scanning ${parent}`)
+                const playlistData = await app.mk.api.v3.music(`/v1/me/library/playlist-folders/${parent}/children/`)
+                await asyncForEach(playlistData.data.data, async (playlist) => {
+                    playlist.parent = parent
+                    playlist.children = []
+                    playlist.tracks = []
+                    try {
+                        let tracks = await app.mk.api.v3.music(playlist.href + "/tracks").catch(e => {
+                            // no tracks
+                        })
+                        playlist.tracks = tracks.data
+                    } catch (e) { }
+    
+                    if (playlist.type == "library-playlist-folders") {
+                        try {
+                            await deepScan(playlist.id).catch(e => {})
+                        } catch (e) {
+    
+                        }
+                    }
+                    newListing.push(playlist)
+                })
+            }          
+
+            await deepScan()
+            
+            this.library.backgroundNotification.show = false
+            this.playlists.listing = newListing
+            self.sortPlaylists()
+            CiderCache.putCache("library-playlists", newListing)
         },
         sortPlaylists() {
             this.playlists.listing.sort((a, b) => {
@@ -4594,6 +4666,24 @@ async function webGPU() {
     }
 }
 
+function isJson(item) {
+    item = typeof item !== "string"
+        ? JSON.stringify(item)
+        : item;
+
+    try {
+        item = JSON.parse(item);
+    } catch (e) {
+        return false;
+    }
+
+    if (typeof item === "object" && item !== null) {
+        return true;
+    }
+
+    return false;
+}
+
 webGPU().then()
 
 let screenWidth = screen.width;
diff --git a/src/renderer/style.less b/src/renderer/style.less
index 495c0585..89633b1f 100644
--- a/src/renderer/style.less
+++ b/src/renderer/style.less
@@ -3163,6 +3163,7 @@ body[platform='darwin'] {
   box-shadow: 0px 0px 0px 2px rgb(200 200 200 / 100%);
   top: 0;
   left: 0;
+  display: none;
 }
 
 @import url("less/macos.less");

From 760fce64c96fc2b5e535fe101e89eda49c14a3ff Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 06:03:48 -0800
Subject: [PATCH 09/13] Update index.js

---
 src/renderer/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index f53e8707..988d3601 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -1371,10 +1371,6 @@ const app = new Vue({
                 console.log("playlist has no cache")
             }
 
-            const playlistroot = await app.mk.api.v3.music("/v1/me/library/playlist-folders/p.playlistsroot/children/")
-
-            newListing = []
-
             this.library.backgroundNotification.message = "Building playlist cache..."
             this.library.backgroundNotification.show = true
 

From 66a659ad77b190be0ac9773a5bb0cab95efa455e Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 06:32:13 -0800
Subject: [PATCH 10/13] library now uses CiderCache

---
 src/renderer/index.js | 43 +++++++++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index 988d3601..6c180499 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -6,6 +6,9 @@ const CiderCache = {
         let cache = await ipcRenderer.sendSync("get-cache", file)
         if (isJson(cache)) {
             cache = JSON.parse(cache)
+            if(Object.keys(cache).length === 0) {
+                cache = false
+            }
         }else{
             cache = false
         }
@@ -983,12 +986,14 @@ const app = new Vue({
             // })
 
             // load cached library
-            if (localStorage.getItem("librarySongs") != null) {
-                this.library.songs.listing = JSON.parse(localStorage.getItem("librarySongs"))
+            let librarySongs = await CiderCache.getCache("library-songs")
+            let libraryAlbums = await CiderCache.getCache("library-albums")
+            if (librarySongs) {
+                this.library.songs.listing = librarySongs
                 this.library.songs.displayListing = this.library.songs.listing
             }
-            if (localStorage.getItem("libraryAlbums") != null) {
-                this.library.albums.listing = JSON.parse(localStorage.getItem("libraryAlbums"))
+            if (libraryAlbums) {
+                this.library.albums.listing = libraryAlbums
                 this.library.albums.displayListing = this.library.albums.listing
             }
 
@@ -2418,6 +2423,7 @@ const app = new Vue({
         async getLibrarySongsFull(force = false) {
             let self = this
             let library = []
+            let cacheId = "library-songs"
             let downloaded = null;
             if ((this.library.songs.downloadState == 2) && !force) {
                 return
@@ -2425,8 +2431,9 @@ const app = new Vue({
             if (this.library.songs.downloadState == 1) {
                 return
             }
-            if (localStorage.getItem("librarySongs") != null) {
-                this.library.songs.listing = JSON.parse(localStorage.getItem("librarySongs"))
+            let librarySongs = await CiderCache.getCache(cacheId)
+            if (librarySongs) {
+                this.library.songs.listing = librarySongs
                 this.searchLibrarySongs()
             }
             if (this.songstest) {
@@ -2503,7 +2510,7 @@ const app = new Vue({
                     self.library.songs.downloadState = 2
                     self.library.backgroundNotification.show = false
                     self.searchLibrarySongs()
-                    localStorage.setItem("librarySongs", JSON.stringify(library))
+                    CiderCache.putCache(cacheId, library)
                 }
                 if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
                     console.log(`downloading next chunk - ${library.length} songs so far`)
@@ -2513,7 +2520,7 @@ const app = new Vue({
                     self.library.songs.downloadState = 2
                     self.library.backgroundNotification.show = false
                     self.searchLibrarySongs()
-                    localStorage.setItem("librarySongs", JSON.stringify(library))
+                    CiderCache.putCache(cacheId, library)
                     // console.log(library)
                 }
             }
@@ -2524,12 +2531,14 @@ const app = new Vue({
         async getLibraryAlbumsFull(force = false, index) {
             let self = this
             let library = []
+            let cacheId = "library-albums"
             let downloaded = null;
             if ((this.library.albums.downloadState == 2 || this.library.albums.downloadState == 1) && !force) {
                 return
             }
-            if (localStorage.getItem("libraryAlbums") != null) {
-                this.library.albums.listing = JSON.parse(localStorage.getItem("libraryAlbums"))
+            let libraryAlbums = await CiderCache.getCache(cacheId)
+            if (libraryAlbums) {
+                this.library.albums.listing = libraryAlbums
                 this.searchLibraryAlbums(index)
             }
             if (this.songstest) {
@@ -2610,7 +2619,7 @@ const app = new Vue({
                     self.library.albums.listing = library
                     self.library.albums.downloadState = 2
                     self.library.backgroundNotification.show = false
-                    localStorage.setItem("libraryAlbums", JSON.stringify(library))
+                    CiderCache.putCache(cacheId, library)
                     self.searchLibraryAlbums(index)
                 }
                 if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
@@ -2621,7 +2630,7 @@ const app = new Vue({
                     self.library.albums.listing = library
                     self.library.albums.downloadState = 2
                     self.library.backgroundNotification.show = false
-                    localStorage.setItem("libraryAlbums", JSON.stringify(library))
+                    CiderCache.putCache(cacheId, library)
                     self.searchLibraryAlbums(index)
                     // console.log(library)
                 }
@@ -2633,12 +2642,14 @@ const app = new Vue({
         async getLibraryArtistsFull(force = false, index) {
             let self = this
             let library = []
+            let cacheId = "library-artists"
             let downloaded = null;
             if ((this.library.artists.downloadState == 2 || this.library.artists.downloadState == 1) && !force) {
                 return
             }
-            if (localStorage.getItem("libraryArtists") != null) {
-                this.library.artists.listing = JSON.parse(localStorage.getItem("libraryArtists"))
+            let libraryArtists = await CiderCache.getCache(cacheId)
+            if (libraryArtists) {
+                this.library.artists.listing = libraryArtists
                 this.searchLibraryArtists(index)
             }
             if (this.songstest) {
@@ -2717,7 +2728,7 @@ const app = new Vue({
                     self.library.artists.listing = library
                     self.library.artists.downloadState = 2
                     self.library.artists.show = false
-                    localStorage.setItem("libraryArtists", JSON.stringify(library))
+                    CiderCache.putCache(cacheId, library)
                     self.searchLibraryArtists(index)
                 }
                 if (downloaded.meta.total > library.length || typeof downloaded.meta.next != "undefined") {
@@ -2728,7 +2739,7 @@ const app = new Vue({
                     self.library.artists.listing = library
                     self.library.artists.downloadState = 2
                     self.library.backgroundNotification.show = false
-                    localStorage.setItem("libraryArtists", JSON.stringify(library))
+                    CiderCache.putCache(cacheId, library)
                     self.searchLibraryArtists(index)
                     // console.log(library)
                 }

From b446b82c7ba019c1194a6c802adbf93abf7ed48f Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 06:59:27 -0800
Subject: [PATCH 11/13] improvements to controller scroll groups

---
 src/main/base/browserwindow.ts         |  4 ----
 src/renderer/index.js                  | 21 +++++++++++++++++----
 src/renderer/views/app/app-content.ejs |  2 +-
 src/renderer/views/app/sidebar.ejs     |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 739c2623..a1cb7e23 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -184,10 +184,6 @@ export class BrowserWindow {
                     page: "plugins-github",
                     component: `<plugins-github></plugins-github>`,
                     condition: `page == 'plugins-github'`
-                }, {
-                    page: "podcasts",
-                    component: `<apple-podcasts></apple-podcasts>`,
-                    condition: `page == 'podcasts'`
                 }, {
                     page: "remote-pair",
                     component: `<remote-pair></remote-pair>`,
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 6c180499..bba6b0e0 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -336,6 +336,7 @@ const app = new Vue({
             let buttonPressDelay = 500
             let stickDeadZone = 0.2
             let scrollGroup = null
+            let scrollGroupY = null
 
             let cursorSpeed = cursorSpeedPvt
 
@@ -374,11 +375,14 @@ const app = new Vue({
                 }
 
                 // RIGHT STICK.
-                if (gp.axes[3] > stickDeadZone) {
-                    $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
-                } else if (gp.axes[3] < -stickDeadZone) {
-                    $("#app-content").scrollTop($("#app-content").scrollTop() + (gp.axes[3] * scrollSpeed))
+                if(scrollGroupY) {
+                    if (gp.axes[3] > stickDeadZone) {
+                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                    } else if (gp.axes[3] < -stickDeadZone) {
+                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                    }
                 }
+                
 
 
                 if (scrollGroup) {
@@ -472,6 +476,15 @@ const app = new Vue({
 
                 if (element) {
                     let closest = element.closest("[tabindex], input, button, a")
+
+                    // VERT SCROLL
+                    let scrollGroupCloY = element.closest(`[scrollaxis="y"]`)
+                    if (scrollGroupCloY) {
+                        scrollGroupY = scrollGroupCloY
+                    }
+                    
+
+                    //  HOZ SCROLL
                     let scrollGroupClo = element.closest(".v-hl-container")
 
                     if (scrollGroupClo) {
diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs
index c5fa06bc..38549d75 100644
--- a/src/renderer/views/app/app-content.ejs
+++ b/src/renderer/views/app/app-content.ejs
@@ -1,4 +1,4 @@
-<div id="app-content" :style="{'overflow': (chrome.contentAreaScrolling ? '' : 'hidden')}">
+<div id="app-content" scrollaxis="y" :style="{'overflow': (chrome.contentAreaScrolling ? '' : 'hidden')}">
     <div id="navigation-bar">
         <button class="nav-item" @click="navigateBack()">
             <%- include('../svg/chevron-left.svg') %>
diff --git a/src/renderer/views/app/sidebar.ejs b/src/renderer/views/app/sidebar.ejs
index deaf7bba..65aa3688 100644
--- a/src/renderer/views/app/sidebar.ejs
+++ b/src/renderer/views/app/sidebar.ejs
@@ -19,7 +19,7 @@
             </button>
         </div>
     </div>
-    <div class="app-sidebar-content">
+    <div class="app-sidebar-content" scrollaxis="y">
         <div class="app-sidebar-header-text">
             {{$root.getLz('app.name')}}
         </div>

From 9f81aa9ad23c234eef214a0d260cb481aa26e813 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 07:22:29 -0800
Subject: [PATCH 12/13] playlists will not rebuild if in dev

---
 src/renderer/index.js | 75 +++++++++++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index bba6b0e0..75ce8e21 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -6,10 +6,10 @@ const CiderCache = {
         let cache = await ipcRenderer.sendSync("get-cache", file)
         if (isJson(cache)) {
             cache = JSON.parse(cache)
-            if(Object.keys(cache).length === 0) {
+            if (Object.keys(cache).length === 0) {
                 cache = false
             }
-        }else{
+        } else {
             cache = false
         }
         return cache
@@ -331,12 +331,14 @@ const app = new Vue({
             let cursorPos = [0, 0];
             let intTabIndex = 0
             let self = this
-            const cursorSpeedPvt = 4
+            const cursorSpeedPvt = 8
+            const cursorSize = 16
             let scrollSpeed = 8
             let buttonPressDelay = 500
             let stickDeadZone = 0.2
             let scrollGroup = null
             let scrollGroupY = null
+            let elementFocusEnabled = true
 
             let cursorSpeed = cursorSpeedPvt
 
@@ -374,24 +376,44 @@ const app = new Vue({
                     cursorPos[1] += (gp.axes[1] * cursorSpeed)
                 }
 
-                // RIGHT STICK.
-                if(scrollGroupY) {
-                    if (gp.axes[3] > stickDeadZone) {
-                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
-                    } else if (gp.axes[3] < -stickDeadZone) {
-                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
-                    }
+                if (cursorPos[0] < cursorSize) {
+                    cursorPos[0] = cursorSize
+                }
+                if (cursorPos[1] < cursorSize) {
+                    cursorPos[1] = cursorSize
+                }
+                if (cursorPos[0] > window.innerWidth - cursorSize) {
+                    cursorPos[0] = window.innerWidth - cursorSize
+                }
+                if (cursorPos[1] > window.innerHeight - cursorSize) {
+                    cursorPos[1] = window.innerHeight - cursorSize
                 }
                 
 
+                // RIGHT STICK.
+                if (scrollGroupY) {
+                    if (gp.axes[3] > stickDeadZone) {
+                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                        elementFocusEnabled = false
+                    } else if (gp.axes[3] < -stickDeadZone) {
+                        $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
+                        elementFocusEnabled = false
+                    }else {
+                        elementFocusEnabled = true
+                    }
+                } 
+
+
 
                 if (scrollGroup) {
                     if (gp.axes[2] > stickDeadZone) {
-                        console.log('axis 2 up')
                         $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
+                        elementFocusEnabled = false
                     } else if (gp.axes[2] < -stickDeadZone) {
-                        console.log('axis 2 dn')
                         $(scrollGroup).scrollLeft($(scrollGroup).scrollLeft() + (gp.axes[2] * scrollSpeed))
+                        elementFocusEnabled = false
+                    } else {
+                        elementFocusEnabled = true
                     }
                 }
 
@@ -471,10 +493,12 @@ const app = new Vue({
 
 
                 // cursor hover
-
-                element = document.elementFromPoint(cursorPos[0], cursorPos[1])
+                if (elementFocusEnabled) {
+                    element = document.elementFromPoint(cursorPos[0], cursorPos[1])
+                }
 
                 if (element) {
+
                     let closest = element.closest("[tabindex], input, button, a")
 
                     // VERT SCROLL
@@ -482,7 +506,7 @@ const app = new Vue({
                     if (scrollGroupCloY) {
                         scrollGroupY = scrollGroupCloY
                     }
-                    
+
 
                     //  HOZ SCROLL
                     let scrollGroupClo = element.closest(".v-hl-container")
@@ -1223,7 +1247,7 @@ const app = new Vue({
                 this.cfg.audio.volume = this.mk.volume
             })
 
-            this.refreshPlaylists()
+            this.refreshPlaylists(this.isDev)
             document.body.removeAttribute("loading")
             if (window.location.hash != "") {
                 this.appRoute(window.location.hash)
@@ -1376,18 +1400,21 @@ const app = new Vue({
                 }
             })
         },
-        async refreshPlaylists() {
+        async refreshPlaylists(localOnly = false) {
             let self = this
             let newListing = []
             const cachedPlaylist = await CiderCache.getCache("library-playlists")
 
-            if(cachedPlaylist) {
+            if (cachedPlaylist) {
                 console.log("using cached playlists")
                 this.playlists.listing = cachedPlaylist
                 self.sortPlaylists()
-            }else{
+            } else {
                 console.log("playlist has no cache")
             }
+            if(localOnly) {
+                return
+            }
 
             this.library.backgroundNotification.message = "Building playlist cache..."
             this.library.backgroundNotification.show = true
@@ -1405,20 +1432,20 @@ const app = new Vue({
                         })
                         playlist.tracks = tracks.data
                     } catch (e) { }
-    
+
                     if (playlist.type == "library-playlist-folders") {
                         try {
-                            await deepScan(playlist.id).catch(e => {})
+                            await deepScan(playlist.id).catch(e => { })
                         } catch (e) {
-    
+
                         }
                     }
                     newListing.push(playlist)
                 })
-            }          
+            }
 
             await deepScan()
-            
+
             this.library.backgroundNotification.show = false
             this.playlists.listing = newListing
             self.sortPlaylists()

From 6924c76f4ce658ed3fabbd527045ffd271f2d635 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Wed, 2 Mar 2022 15:05:41 -0800
Subject: [PATCH 13/13] adds playlist track mapping

---
 src/i18n/en_US.json                   |  2 ++
 src/i18n/source/en_US.json            |  2 ++
 src/main/base/store.ts                |  3 +-
 src/renderer/index.js                 | 49 +++++++++++++++++++++------
 src/renderer/views/pages/settings.ejs | 11 ++++++
 5 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json
index 88683bf5..9acdad54 100644
--- a/src/i18n/en_US.json
+++ b/src/i18n/en_US.json
@@ -352,6 +352,8 @@
   "settings.option.experimental.compactUI": "Compact UI",
   "settings.option.experimental.close_button_hide": "Close Button Should Hide the Application",
   "settings.option.experimental.inline_playlists": "Inline Playlists and Albums",
+  "settings.option.advanced.playlistTrackMapping": "Playlist Track Mapping",
+  "settings.option.advanced.playlistTrackMapping.description": "Enables deep scanning of playlists to determine which tracks are in which playlists.",
   "spatial.notTurnedOn": "Audio Spatialization is disabled. To use, please enable it first.",
   "spatial.spatialProperties": "Spatial Properties",
   "spatial.width": "Width",
diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json
index 88683bf5..9acdad54 100644
--- a/src/i18n/source/en_US.json
+++ b/src/i18n/source/en_US.json
@@ -352,6 +352,8 @@
   "settings.option.experimental.compactUI": "Compact UI",
   "settings.option.experimental.close_button_hide": "Close Button Should Hide the Application",
   "settings.option.experimental.inline_playlists": "Inline Playlists and Albums",
+  "settings.option.advanced.playlistTrackMapping": "Playlist Track Mapping",
+  "settings.option.advanced.playlistTrackMapping.description": "Enables deep scanning of playlists to determine which tracks are in which playlists.",
   "spatial.notTurnedOn": "Audio Spatialization is disabled. To use, please enable it first.",
   "spatial.spatialProperties": "Spatial Properties",
   "spatial.width": "Width",
diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index 17c1c4c2..f7bb8e36 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -118,7 +118,8 @@ export class Store {
         },
         "advanced": {
             "AudioContext": false,
-            "experiments": []
+            "experiments": [],
+            "playlistTrackMapping": true
         }
     }
     private migrations: any = {}
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 75ce8e21..538a4c6b 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -15,6 +15,7 @@ const CiderCache = {
         return cache
     },
     async putCache(file, data) {
+        console.log(`Caching ${file}`)
         ipcRenderer.invoke("put-cache", {
             file: file,
             data: JSON.stringify(data)
@@ -201,7 +202,8 @@ const app = new Vue({
             listing: [],
             details: {},
             loadingState: 0, // 0 loading, 1 loaded, 2 error
-            id: ""
+            id: "",
+            trackMapping: {}
         },
         webremoteurl: "",
         webremoteqr: "",
@@ -388,7 +390,7 @@ const app = new Vue({
                 if (cursorPos[1] > window.innerHeight - cursorSize) {
                     cursorPos[1] = window.innerHeight - cursorSize
                 }
-                
+
 
                 // RIGHT STICK.
                 if (scrollGroupY) {
@@ -398,10 +400,10 @@ const app = new Vue({
                     } else if (gp.axes[3] < -stickDeadZone) {
                         $(scrollGroupY).scrollTop($(scrollGroupY).scrollTop() + (gp.axes[3] * scrollSpeed))
                         elementFocusEnabled = false
-                    }else {
+                    } else {
                         elementFocusEnabled = true
                     }
-                } 
+                }
 
 
 
@@ -1400,10 +1402,12 @@ const app = new Vue({
                 }
             })
         },
-        async refreshPlaylists(localOnly = false) {
+        async refreshPlaylists(localOnly = false, trackMap = true) {
             let self = this
             let newListing = []
+            let trackMapping = {}
             const cachedPlaylist = await CiderCache.getCache("library-playlists")
+            const cachedTrackMapping = await CiderCache.getCache("library-playlists-tracks")
 
             if (cachedPlaylist) {
                 console.log("using cached playlists")
@@ -1412,7 +1416,12 @@ const app = new Vue({
             } else {
                 console.log("playlist has no cache")
             }
-            if(localOnly) {
+
+            if(cachedTrackMapping) {
+                console.log("using cached track mapping")
+                this.playlists.trackMapping = cachedTrackMapping
+            }
+            if (localOnly) {
                 return
             }
 
@@ -1427,12 +1436,26 @@ const app = new Vue({
                     playlist.children = []
                     playlist.tracks = []
                     try {
-                        let tracks = await app.mk.api.v3.music(playlist.href + "/tracks").catch(e => {
-                            // no tracks
-                        })
-                        playlist.tracks = tracks.data
-                    } catch (e) { }
+                        if (trackMap) {
+                            let tracks = await app.mk.api.v3.music(playlist.href + "/tracks").catch(e => {
+                                // no tracks
+                                e = null
+                            })
+                            tracks.data.data.forEach(track => {
+                                if (!trackMapping[track.id]) {
+                                    trackMapping[track.id] = []
+                                }
+                                trackMapping[track.id].push(playlist.id)
 
+                                if (typeof track.attributes.playParams.catalogId == "string") {
+                                    if (!trackMapping[track.attributes.playParams.catalogId]) {
+                                        trackMapping[track.attributes.playParams.catalogId] = []
+                                    }
+                                    trackMapping[track.attributes.playParams.catalogId].push(playlist.id)
+                                }
+                            })
+                        }
+                    } catch (e) { }
                     if (playlist.type == "library-playlist-folders") {
                         try {
                             await deepScan(playlist.id).catch(e => { })
@@ -1449,6 +1472,10 @@ const app = new Vue({
             this.library.backgroundNotification.show = false
             this.playlists.listing = newListing
             self.sortPlaylists()
+            if (trackMap) {
+                CiderCache.putCache("library-playlists-tracks", trackMapping)
+                this.playlists.trackMapping = trackMapping
+            }
             CiderCache.putCache("library-playlists", newListing)
         },
         sortPlaylists() {
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 1333a090..01d8b52b 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -673,6 +673,17 @@
                     </div>
                 </div>
 
+                <div class="md-option-line">
+                    <div class="md-option-segment">
+                        {{$root.getLz('settings.option.advanced.playlistTrackMapping')}}
+                        <br>
+                        <small>{{$root.getLz('settings.option.advanced.playlistTrackMapping.description')}}</small>
+                    </div>
+                    <div class="md-option-segment md-option-segment_auto">
+                        <input type="checkbox" v-model="app.cfg.advanced.playlistTrackMapping" switch/>
+                    </div>
+                </div>
+
 
                 <div class="md-option-line">
                     <div class="md-option-segment">