From 96a98403213dafe9f8ac0e5d5bd40c43024313df Mon Sep 17 00:00:00 2001
From: Michael Rittmeister <michael@rittmeister.in>
Date: Sat, 7 Dec 2024 22:13:13 +0100
Subject: [PATCH] Update dependencies - Use WASM for web instead of JS

---
 .idea/caches/deviceStreaming.xml              |   2 +-
 .idea/gradle.xml                              |   1 +
 .idea/kotlinc.xml                             |   2 +-
 app/desktop/build.gradle.kts                  |   9 +-
 .../kotlin/AuthorizationServer.kt             |   4 +-
 .../src/nonWindowsMain/kotlin/ConfigFile.kt   |   2 +-
 app/desktop/uwp_helper/build.gradle.kts       |   4 +-
 app/shared/build.gradle.kts                   |   8 +-
 .../commonMain/kotlin/components/SearchBar.kt |   4 +-
 .../dev/schlaubi/tonbrett/app/ImageLoader.kt  |   0
 .../tonbrett/app/api/Authentication.kt        |   0
 .../tonbrett/app/components/SoundContainer.kt |   0
 .../schlaubi/tonbrett/app/util/isMobile.kt    |   0
 app/web/build.gradle.kts                      |  17 ++-
 .../tonbrett/app/web/DiscordActivitiesSDK.kt  |  32 ------
 .../templates/discord-activity.template.html  |  14 ++-
 app/web/src/templates/index.template.html     |   2 +-
 .../tonbrett/app/web/AuthorizationScreen.kt   |  24 ++--
 .../tonbrett/app/web/DiscordActivitiesSDK.kt  |  35 ++++++
 .../tonbrett/app/web/DiscordActivity.kt       |  31 ++----
 .../dev/schlaubi/tonbrett/app/web/GlueCode.kt |   8 ++
 .../dev/schlaubi/tonbrett/app/web/Main.kt     |   1 -
 .../tonbrett/app/web/resource/RouteHandler.kt |   7 +-
 app/web/webpack.config.d/tonbrett.config.js   |   1 +
 bot/build.gradle.kts                          |   3 +-
 .../dev/schlaubi/tonbrett/bot/server/Ui.kt    |   5 +
 build.gradle.kts                              |   6 +-
 .../kotlin/multiplatform-module.gradle.kts    |   2 +-
 .../main/kotlin/published-module.gradle.kts   |   1 -
 client/build.gradle.kts                       |   2 +-
 gradle.properties                             |   3 +-
 gradle/libs.versions.toml                     |  21 ++--
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 kotlin-js-store/yarn.lock                     | 104 +++++-------------
 34 files changed, 162 insertions(+), 195 deletions(-)
 rename app/shared/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/ImageLoader.kt (100%)
 rename app/shared/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt (100%)
 rename app/shared/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/components/SoundContainer.kt (100%)
 rename app/shared/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/util/isMobile.kt (100%)
 delete mode 100644 app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt
 rename app/web/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt (91%)
 create mode 100644 app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt
 rename app/web/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt (74%)
 create mode 100644 app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/GlueCode.kt
 rename app/web/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt (96%)
 rename app/web/src/{jsMain => wasmJsMain}/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt (93%)

diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml
index 5a2f8669..b81700b5 100644
--- a/.idea/caches/deviceStreaming.xml
+++ b/.idea/caches/deviceStreaming.xml
@@ -262,7 +262,7 @@
           <option name="codename" value="q6q" />
           <option name="id" value="q6q" />
           <option name="manufacturer" value="Samsung" />
-          <option name="name" value="SM-F956B" />
+          <option name="name" value="Galaxy Z Fold6" />
           <option name="screenDensity" value="420" />
           <option name="screenX" value="1856" />
           <option name="screenY" value="2160" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 424ed855..996d8388 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -17,6 +17,7 @@
         </compositeConfiguration>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="temurin-22" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index c224ad56..bb449370 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.21" />
+    <option name="version" value="2.1.0" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/desktop/build.gradle.kts b/app/desktop/build.gradle.kts
index 6e8315f8..0b36349b 100644
--- a/app/desktop/build.gradle.kts
+++ b/app/desktop/build.gradle.kts
@@ -1,6 +1,5 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.konan.target.HostManager
-import org.jetbrains.kotlin.org.jline.utils.OSUtils
 
 plugins {
     alias(libs.plugins.kotlin.compose)
@@ -49,8 +48,8 @@ compose.desktop {
                 "java.naming" // required by logback
             )
             when {
-                OSUtils.IS_WINDOWS -> targetFormats(TargetFormat.AppImage)
-                OSUtils.IS_OSX -> targetFormats(TargetFormat.Pkg)
+                HostManager.hostIsMingw -> targetFormats(TargetFormat.AppImage)
+                HostManager.hostIsMac -> targetFormats(TargetFormat.Pkg)
                 else -> targetFormats(TargetFormat.Deb)
             }
 
@@ -113,7 +112,7 @@ tasks {
         archiveExtension = "tar.gz"
     }
 
-    if (OSUtils.IS_WINDOWS) {
+    if (true) {
         registerMsixTasks()
         registerMsixTasks("MSStore", msStore = true)
     }
@@ -169,7 +168,7 @@ fun TaskContainerScope.registerMsixTasks(prefix: String = "", msStore: Boolean =
 
     afterEvaluate {
         "packageReleaseDistributionForCurrentOS" {
-            if (OSUtils.IS_WINDOWS) {
+            if (HostManager.hostIsMingw) {
                 dependsOn(finalizeMsixWorkspace)
             }
         }
diff --git a/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt b/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
index 45805bed..0cf1fbc7 100644
--- a/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
+++ b/app/desktop/src/nonWindowsMain/kotlin/AuthorizationServer.kt
@@ -26,10 +26,10 @@ fun Application.authModule(onAuth: () -> Unit, scope: CoroutineScope) {
     install(CORS) {
         allowMethod(HttpMethod.Post)
         val baseUrl = getUrl()
-        allowHost(baseUrl.host, listOf(baseUrl.protocol.name))
+        allowHost(baseUrl.hostWithPortIfSpecified, listOf(baseUrl.protocol.name))
     }
     routing {
-        post("login") {
+        get("login") {
             val token = call.parameters["token"] ?: throw BadRequestException("Missing token")
 
             saveConfig(Config(token))
diff --git a/app/desktop/src/nonWindowsMain/kotlin/ConfigFile.kt b/app/desktop/src/nonWindowsMain/kotlin/ConfigFile.kt
index 4740e410..af923b19 100644
--- a/app/desktop/src/nonWindowsMain/kotlin/ConfigFile.kt
+++ b/app/desktop/src/nonWindowsMain/kotlin/ConfigFile.kt
@@ -1,4 +1,4 @@
-@file:OptIn(ExperimentalSerializationApi::class)
+@file:OptIn(ExperimentalSerializationApi::class, ExperimentalSerializationApi::class)
 
 package dev.schlaubi.tonbrett.app.desktop
 
diff --git a/app/desktop/uwp_helper/build.gradle.kts b/app/desktop/uwp_helper/build.gradle.kts
index 2e6f68b5..c383855b 100644
--- a/app/desktop/uwp_helper/build.gradle.kts
+++ b/app/desktop/uwp_helper/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.org.jline.utils.OSUtils
+import org.jetbrains.kotlin.konan.target.HostManager
 
 plugins {
     java
@@ -27,7 +27,7 @@ tasks {
         outputs.dir(jextractOutput)
 
         // I cannot figure out how to change the path on GitHub Actions
-        val command = if (OSUtils.IS_WINDOWS) {
+        val command = if (HostManager.hostIsMingw) {
             "jextract.bat"
         } else {
             "jextract"
diff --git a/app/shared/build.gradle.kts b/app/shared/build.gradle.kts
index 5bee4635..7dcbc186 100644
--- a/app/shared/build.gradle.kts
+++ b/app/shared/build.gradle.kts
@@ -24,6 +24,7 @@ kotlin {
                 withApple()
                 withJvm()
                 withJs()
+                withWasmJs()
             }
 
             group("mobile") {
@@ -37,6 +38,7 @@ kotlin {
                 withJs()
                 withApple()
                 withAndroidTarget()
+                withWasmJs()
             }
         }
     }
@@ -66,12 +68,6 @@ kotlin {
             }
         }
 
-        jsMain {
-            dependencies {
-                api("org.jetbrains.kotlin:kotlinx-atomicfu-runtime:2.0.20")
-            }
-        }
-
         named("desktopMain") {
             dependencies {
                 implementation(libs.kmongo.id.serialization)
diff --git a/app/shared/src/commonMain/kotlin/components/SearchBar.kt b/app/shared/src/commonMain/kotlin/components/SearchBar.kt
index 86432d7d..f76e279d 100644
--- a/app/shared/src/commonMain/kotlin/components/SearchBar.kt
+++ b/app/shared/src/commonMain/kotlin/components/SearchBar.kt
@@ -121,7 +121,9 @@ fun SearchBar(updateSounds: SoundUpdater) {
                     },
                     colors = TextFieldDefaults.colors(
                         unfocusedTextColor = ColorScheme.current.textColor,
-                        focusedTextColor = ColorScheme.current.textColor
+                        focusedTextColor = ColorScheme.current.textColor,
+                        focusedContainerColor = ColorScheme.current.searchBarColor,
+                        unfocusedContainerColor = ColorScheme.current.searchBarColor,
                     )
                 )
             },
diff --git a/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/ImageLoader.kt b/app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/ImageLoader.kt
similarity index 100%
rename from app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/ImageLoader.kt
rename to app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/ImageLoader.kt
diff --git a/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt b/app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
similarity index 100%
rename from app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
rename to app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/api/Authentication.kt
diff --git a/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/components/SoundContainer.kt b/app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/components/SoundContainer.kt
similarity index 100%
rename from app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/components/SoundContainer.kt
rename to app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/components/SoundContainer.kt
diff --git a/app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/util/isMobile.kt b/app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/util/isMobile.kt
similarity index 100%
rename from app/shared/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/util/isMobile.kt
rename to app/shared/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/util/isMobile.kt
diff --git a/app/web/build.gradle.kts b/app/web/build.gradle.kts
index 2d36d04e..92e37b63 100644
--- a/app/web/build.gradle.kts
+++ b/app/web/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+
 plugins {
     alias(libs.plugins.kotlin.compose)
     kotlin("multiplatform")
@@ -9,8 +11,13 @@ repositories {
 }
 
 kotlin {
-    js(IR) {
-        browser()
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser {
+            webpackTask {
+                mainOutputFileName = ".proxy/web.js"
+            }
+        }
         binaries.executable()
         compilations.all {
             packageJson {
@@ -41,7 +48,7 @@ kotlin {
                 implementation(compose.material)
                 implementation(compose.components.resources)
                 implementation(compose.materialIconsExtended)
-                implementation(npm("@discord/embedded-app-sdk", "1.4.2"))
+                implementation(npm("@discord/embedded-app-sdk", "1.7.1"))
             }
         }
     }
@@ -50,11 +57,11 @@ kotlin {
 tasks {
     val copyIcon by creating(Copy::class) {
         from(rootProject.file("icons/logo.ico"))
-        into(layout.buildDirectory.dir("distributions"))
+        into(layout.buildDirectory.dir("dist/wasmJs/productionExecutable"))
         rename { "favicon.ico" }
     }
 
-    named("jsMainClasses") {
+    named("wasmJsMainClasses") {
         dependsOn(copyIcon)
     }
 }
diff --git a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt b/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt
deleted file mode 100644
index e7fd27d7..00000000
--- a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-@file:JsModule("@discord/embedded-app-sdk")
-@file:JsNonModule
-package dev.schlaubi.tonbrett.app.web
-
-import kotlin.js.Promise
-
-external interface AuthorizeInput {
-    @JsName("client_id")
-    val clientId: String
-    val scope: Array<String>
-    @JsName("response_type")
-    val responseType: String
-    @JsName("code_challenge")
-    val codeChallenge: String?
-    val state: String?
-    val prompt: String?
-    @JsName("code_challenge_method")
-    val codeChallengeMethod: String?
-}
-
-external class AuthorizeResponse {
-    val code: String
-}
-
-external class DiscordSDK constructor(oauthClientId: String) {
-    val commands: Commands
-    fun ready(): Promise<Unit>
-
-    class Commands {
-        fun authorize(input: AuthorizeInput): Promise<AuthorizeResponse>
-    }
-}
diff --git a/app/web/src/templates/discord-activity.template.html b/app/web/src/templates/discord-activity.template.html
index 8fcf2968..18c426cb 100644
--- a/app/web/src/templates/discord-activity.template.html
+++ b/app/web/src/templates/discord-activity.template.html
@@ -3,9 +3,21 @@
 <head>
   <meta charset="UTF-8">
   <title>Tonbrett</title>
-  <script src="/.proxy/api/soundboard/ui/skiko.js"> </script>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
+<script>
+  // glue code for Kotlin/WASM
+  // noinspection JSUnusedGlobalSymbols
+  function authorize(discordSdk, appId, state) {
+    return discordSdk.commands.authorize({
+      client_id: appId,
+      scope: ["identify"],
+      response_type: "code",
+      state: state
+    });
+  }
+</script>
 <style>
   body {
     background-color: rgb(17, 18, 20);
diff --git a/app/web/src/templates/index.template.html b/app/web/src/templates/index.template.html
index ea5b538f..4cb9e06b 100644
--- a/app/web/src/templates/index.template.html
+++ b/app/web/src/templates/index.template.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" type="image/png" href="/soundboard/ui/favicon.ico"/>
     <title>Tonbrett</title>
-    <script src="/soundboard/ui/skiko.js"> </script>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
 <style>
diff --git a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt
similarity index 91%
rename from app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt
rename to app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt
index 410bc73b..96d4e503 100644
--- a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt
+++ b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/AuthorizationScreen.kt
@@ -7,12 +7,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.Divider
-import androidx.compose.material.Icon
-import androidx.compose.material.IconButton
-import androidx.compose.material.ProvideTextStyle
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
+import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.CheckCircle
@@ -26,35 +21,34 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
-import dev.schlaubi.tonbrett.app.LocalStrings
 import dev.schlaubi.tonbrett.app.ColorScheme
+import dev.schlaubi.tonbrett.app.LocalStrings
 import dev.schlaubi.tonbrett.common.authServerPort
-import io.ktor.client.fetch.*
+import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.browser.window
 import kotlinx.coroutines.await
 import kotlinx.coroutines.delay
-import io.github.oshai.kotlinlogging.KotlinLogging
 import org.w3c.dom.url.URLSearchParams
+import org.w3c.fetch.RequestInit
+import org.w3c.xhr.XMLHttpRequest
 import kotlin.time.Duration.Companion.seconds
 
 private val LOG = KotlinLogging.logger { }
 
+private fun post(): RequestInit = js("{method: 'POST'}")
+
 @Composable
 fun AuthorizationScreen(cli: Boolean, protocol: Boolean) {
     val strings = LocalStrings.current
     val token =
-        remember { URLSearchParams(window.location.search).get("token") ?: error("Missing token") }
+        remember { URLSearchParams(window.location.search.toJsString()).get("token") ?: error("Missing token") }
     if (!cli) {
         LaunchedEffect(Unit) {
             try {
                 if (protocol) {
                     window.location.href = "tonbrett://login?token=$token"
                 } else {
-                    fetch(
-                        "http://localhost:$authServerPort/login?token=$token",
-                        object : RequestInit {
-                            override var method: String? = "POST"
-                        }).await()
+                    window.fetch("http://localhost:$authServerPort/login?token=$token").await()
                 }
             } catch (e: Throwable) {
                 LOG.error(e) { "Could not propagate token" }
diff --git a/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt
new file mode 100644
index 00000000..79c16833
--- /dev/null
+++ b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivitiesSDK.kt
@@ -0,0 +1,35 @@
+@file:JsModule("@discord/embedded-app-sdk")
+
+package dev.schlaubi.tonbrett.app.web
+
+import kotlin.js.Promise
+
+external interface AuthorizeInput : JsAny {
+    @JsName("client_id")
+    val clientId: JsString
+    val scope: JsArray<JsString>
+
+    @JsName("response_type")
+    val responseType: JsString
+
+    @JsName("code_challenge")
+    val codeChallenge: JsString?
+    val state: JsString?
+    val prompt: JsString?
+
+    @JsName("code_challenge_method")
+    val codeChallengeMethod: JsString?
+}
+
+external class AuthorizeResponse : JsAny {
+    val code: JsString
+}
+
+external class DiscordSDK constructor(oauthClientId: String) : JsAny {
+    val commands: Commands
+    fun ready(): Promise<JsAny?>
+
+    class Commands {
+        fun authorize(input: AuthorizeInput): Promise<AuthorizeResponse>
+    }
+}
diff --git a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt
similarity index 74%
rename from app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt
rename to app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt
index 9f9c2574..0d7308ce 100644
--- a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt
+++ b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/DiscordActivity.kt
@@ -14,17 +14,15 @@ import dev.schlaubi.tonbrett.app.api.getUrl
 import dev.schlaubi.tonbrett.app.title
 import dev.schlaubi.tonbrett.common.AuthRefreshResponse
 import dev.schlaubi.tonbrett.common.Route
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.client.plugins.defaultRequest
-import io.ktor.client.plugins.resources.Resources
-import io.ktor.client.plugins.resources.post
-import io.ktor.http.takeFrom
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.util.generateNonce
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.client.plugins.resources.*
+import io.ktor.http.*
+import io.ktor.serialization.kotlinx.json.*
+import io.ktor.util.*
 import kotlinx.coroutines.await
-import org.jetbrains.skiko.wasm.onWasmReady
 
 private val apiClient by lazy {
     HttpClient {
@@ -49,13 +47,13 @@ private enum class State {
 
 private val context = AppContext()
 
-fun discordActivity() = onWasmReady {
+fun discordActivity() {
     try {
         CanvasBasedWindow(title) {
             var state by remember { mutableStateOf(State.INITIALIZING) }
 
             LaunchedEffect(Unit) {
-                discordSdk.ready().await()
+                discordSdk.ready().await<JsAny?>()
 
                 state = if (context.isSignedIn) State.RUNNING else State.AUTHORIZING
                 println("Switching state to $state")
@@ -84,14 +82,9 @@ fun discordActivity() = onWasmReady {
 
 private suspend fun requestToken(): AuthRefreshResponse {
     val state = generateNonce()
-    val input = Any().asDynamic()
-    input.client_id = appId
-    input.scope = arrayOf("identify")
-    input.response_type = "code"
-    input.state = state
 
-    val response = discordSdk.commands.authorize(input).await()
-    return apiClient.exchangeToken(response.code, state)
+    val response = discordSdk.authorize(appId, state).await<AuthorizeResponse>()
+    return apiClient.exchangeToken(response.code.toString(), state)
 }
 
 /**
diff --git a/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/GlueCode.kt b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/GlueCode.kt
new file mode 100644
index 00000000..d14d7b27
--- /dev/null
+++ b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/GlueCode.kt
@@ -0,0 +1,8 @@
+package dev.schlaubi.tonbrett.app.web
+
+import kotlin.js.Promise
+
+external fun authorize(discordSdk: JsAny, appId: JsString, state: JsString): Promise<AuthorizeResponse>
+
+fun DiscordSDK.authorize(appId: String, state: String) =
+    authorize(this, appId.toJsString(), state.toJsString())
diff --git a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
similarity index 96%
rename from app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
rename to app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
index f2376bc8..a0936faa 100644
--- a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
+++ b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/Main.kt
@@ -11,7 +11,6 @@ import dev.schlaubi.tonbrett.common.Route
 import kotlinx.browser.document
 import kotlinx.browser.sessionStorage
 import kotlinx.browser.window
-import org.jetbrains.skiko.wasm.onWasmReady
 import org.w3c.dom.get
 
 private val context = AppContext()
diff --git a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt
similarity index 93%
rename from app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt
rename to app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt
index 93c686b6..3a0ad6b0 100644
--- a/app/web/src/jsMain/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt
+++ b/app/web/src/wasmJsMain/kotlin/dev/schlaubi/tonbrett/app/web/resource/RouteHandler.kt
@@ -10,7 +10,6 @@ import io.ktor.resources.serialization.*
 import kotlinx.browser.window
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.serializer
-import org.jetbrains.skiko.wasm.onWasmReady
 
 @PublishedApi
 internal val format = ResourcesFormat(TonbrettSerializersModule)
@@ -41,16 +40,16 @@ inline fun <reified R : Any> routeHandler(body: (R) -> Unit) {
  * @see routeHandler
  */
 @Suppress("FunctionName")
-inline fun <reified R : Any> ComposeRouteHandler(crossinline content: @Composable (R) -> Unit) = routeHandler<R> { resource ->
-    onWasmReady {
+inline fun <reified R : Any> ComposeRouteHandler(crossinline content: @Composable (R) -> Unit) =
+    routeHandler<R> { resource ->
         CanvasBasedWindow(title) {
             content(resource)
         }
     }
-}
 
 @PublishedApi
 internal fun String.dropLeadingSlash() = dropLeading('/')
+
 @PublishedApi
 internal fun String.dropLeadingQuery() = dropLeading('?')
 
diff --git a/app/web/webpack.config.d/tonbrett.config.js b/app/web/webpack.config.d/tonbrett.config.js
index f327a47b..b7fec8c2 100644
--- a/app/web/webpack.config.d/tonbrett.config.js
+++ b/app/web/webpack.config.d/tonbrett.config.js
@@ -9,6 +9,7 @@ config.plugins.push(new HtmlWebpackPlugin({
 }));
 config.plugins.push(new HtmlWebpackPlugin({
     filename: 'discord-activity.html',
+    publicPath: "/.proxy/static/",
     template: '../../../../app/web/src/templates/discord-activity.template.html'
 }));
 config.resolve.fallback = { "os": require.resolve("os-browserify/browser"), "path": require.resolve("path-browserify") }
diff --git a/bot/build.gradle.kts b/bot/build.gradle.kts
index 02f04819..5847cdf4 100644
--- a/bot/build.gradle.kts
+++ b/bot/build.gradle.kts
@@ -17,6 +17,7 @@ dependencies {
     ktorDependency(libs.ktor.server.auth)
     ktorDependency(libs.ktor.server.cors)
     ktorDependency(libs.ktor.server.auth.jwt)
+    ktorDependency(libs.ktor.server.compression)
     implementation(libs.kmongo.id.serialization)
     plugin(mikbot(libs.mikbot.ktor))
     plugin(libs.mikbot.music)
@@ -50,7 +51,7 @@ mikbotPlugin {
 tasks {
     val buildWebApp = register<Copy>("buildWebApp") {
         val webApp = project(":app:web")
-        from(webApp.tasks.named("jsBrowserDistribution"))
+        from(webApp.tasks.named("wasmJsBrowserDistribution"))
         into(layout.buildDirectory.dir("resources/main/web"))
     }
 
diff --git a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
index d082b8af..7036dc6e 100644
--- a/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
+++ b/bot/src/main/kotlin/dev/schlaubi/tonbrett/bot/server/Ui.kt
@@ -6,6 +6,7 @@ import io.ktor.events.*
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.http.content.*
+import io.ktor.server.plugins.compression.*
 import io.ktor.server.resources.*
 import io.ktor.server.routing.*
 import kotlin.reflect.jvm.javaField
@@ -16,6 +17,10 @@ private val ClassLoaderFixer = createRouteScopedPlugin("ClassLoaderFixer") {
 
 private inline fun <reified T : Any> Route.staticUi(index: String? = "index.html") = resource<T> {
     install(ClassLoaderFixer)
+    install(Compression) {
+        gzip()
+        deflate()
+    }
     staticResources("", "web", index = index)
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 53fa967f..46e6379c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinBaseExtension
 
 plugins {
     alias(libs.plugins.kotlin.serialization) apply false
@@ -7,7 +7,7 @@ plugins {
 
 allprojects {
     group = "dev.schlaubi.tonbrett"
-    version = "2.1.5"
+    version = "2.2.0"
 
     repositories {
         mavenCentral()
@@ -18,7 +18,7 @@ allprojects {
 
 subprojects {
     afterEvaluate {
-        extensions.findByType<KotlinTopLevelExtension>()?.apply {
+        extensions.findByType<KotlinBaseExtension>()?.apply {
             jvmToolchain(22)
         }
     }
diff --git a/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts b/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
index 62da0097..0f8ae33b 100644
--- a/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
+++ b/buildSrc/src/main/kotlin/multiplatform-module.gradle.kts
@@ -34,7 +34,7 @@ kotlin {
         }
     }
     jvm("desktop")
-    js(IR) {
+    wasmJs {
         browser()
     }
     iosSimulatorArm64()
diff --git a/buildSrc/src/main/kotlin/published-module.gradle.kts b/buildSrc/src/main/kotlin/published-module.gradle.kts
index 7780f5a1..df47a5e9 100644
--- a/buildSrc/src/main/kotlin/published-module.gradle.kts
+++ b/buildSrc/src/main/kotlin/published-module.gradle.kts
@@ -1,7 +1,6 @@
 import org.gradle.kotlin.dsl.`maven-publish`
 import org.gradle.kotlin.dsl.signing
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 import java.util.Base64
 
 plugins {
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
index 4069dad9..6436d46b 100644
--- a/client/build.gradle.kts
+++ b/client/build.gradle.kts
@@ -38,7 +38,7 @@ kotlin {
             }
         }
 
-        jsMain {
+        wasmJsMain {
             dependencies {
                 implementation(libs.ktor.client.js)
             }
diff --git a/gradle.properties b/gradle.properties
index 7dd0312a..414951b2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,6 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true
 org.gradle.jvmargs=-Xmx4G
 kotlin.js.ir.output.granularity=whole-program
 kotlin.mpp.androidSourceSetLayoutVersion=2
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 android.useAndroidX=true
 org.jetbrains.compose.experimental.uikit.enabled=true
 kotlin.native.ignoreDisabledTargets=true
@@ -14,5 +13,5 @@ systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal
 systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
 systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
 
-dev.schlaubi.tonbrett.no_windows=false
+dev.schlaubi.tonbrett.no_windows=true
 ksp.useKSP2=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b492c29d..ee04ebb2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
-kotlin = "2.0.21"
-ktor = "3.0.1"
+kotlin = "2.1.0"
+ktor = "3.0.2"
 kmongo = "5.1.0"
 kord = "0.15.0"
-mikbot = "4.1.3"
-ksp = "2.0.21-1.0.26"
-kordex = "2.3.1-MIKBOT.2"
-android = "8.7.2"
-compose = "1.7.0"
+mikbot = "4.2.0"
+ksp = "2.1.0-1.0.29"
+kordex = "2.3.1-MIKBOT.4"
+android = "8.8.0-rc01"
+compose = "1.8.0-alpha01"
 compose-wear = "1.4.0"
 lyricist = "1.7.0"
 google-play = "2.1.0"
 coroutines = "1.9.0"
-play-services-wearable = "18.2.0"
+play-services-wearable = "19.0.0"
 horologist = "0.7.3-alpha"
 protobuf = "4.28.3"
-coil = "3.0.0-rc01"
+coil = "3.0.4"
 lavalink-api = "4.0.8"
 
 [libraries]
@@ -39,6 +39,7 @@ ktor-server-netty = { group = "io.ktor", name = "ktor-server-netty", version.ref
 ktor-server-cors = { group = "io.ktor", name = "ktor-server-cors", version.ref = "ktor" }
 ktor-server-status-pages = { group = "io.ktor", name = "ktor-server-status-pages", version.ref = "ktor" }
 ktor-server-auth-jwt = { group = "io.ktor", name = "ktor-server-auth-jwt", version.ref = "ktor" }
+ktor-server-compression = { group = "io.ktor", name = "ktor-server-compression", version.ref = "ktor" }
 ktor-client-core = { group = "io.ktor", name = "ktor-client-core", version.ref = "ktor" }
 ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
 ktor-client-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.ref = "ktor" }
@@ -50,7 +51,7 @@ ktor-sse = { group = "io.ktor", name = "ktor-sse", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 
 mikbot-ktor = { group = "dev.schlaubi", name = "mikbot-ktor", version.ref = "mikbot" }
-mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "4.1.0-SNAPSHOT" }
+mikbot-music = { group = "dev.schlaubi", name = "mikbot-music-player", version = "4.2.0-SNAPSHOT" }
 
 kotlin-logging = { group = "io.github.oshai", name = "kotlin-logging", version = "7.0.0" }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df97d72b..e2847c82 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
index 14f1e49b..e45754a0 100644
--- a/kotlin-js-store/yarn.lock
+++ b/kotlin-js-store/yarn.lock
@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@discord/embedded-app-sdk@1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@discord/embedded-app-sdk/-/embedded-app-sdk-1.4.2.tgz#aed330ff6953f49aece2145ff66cd06cdda3c302"
-  integrity sha512-nNeXQ61gT4OGv8fPLG/WEDuzynVLueb9El8yYGNiaTAOWnuuVjrVv0DpU16ixn+d1sgmNnfhW2mG6SBZGrK+Pw==
+"@discord/embedded-app-sdk@1.7.1":
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/@discord/embedded-app-sdk/-/embedded-app-sdk-1.7.1.tgz#cc3f90a98e8922b2a0cf2afd01ced3edaaa8e73c"
+  integrity sha512-9IYpXt7kEogmMIAzsu8ImN7puhidPr+py5rgVZVaoaRDh4w4I7alvmQjF/r0MxdpXiEgQxQek1KMl2HsNq/mFA==
   dependencies:
     "@types/lodash.transform" "^4.6.6"
     "@types/uuid" "^10.0.0"
@@ -123,27 +123,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/eslint-scope@^3.7.3":
-  version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
-  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
-  dependencies:
-    "@types/eslint" "*"
-    "@types/estree" "*"
-
-"@types/eslint@*":
-  version "8.37.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.37.0.tgz#29cebc6c2a3ac7fea7113207bf5a828fdf4d7ef1"
-  integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/estree@*":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194"
-  integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==
-
 "@types/estree@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
@@ -196,7 +175,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
@@ -455,13 +434,6 @@ JSONStream@^1.0.3:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abort-controller@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
-  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
-  dependencies:
-    event-target-shim "^5.0.0"
-
 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"
@@ -1519,7 +1491,7 @@ engine.io@~6.5.2:
     engine.io-parser "~5.2.1"
     ws "~8.11.0"
 
-enhanced-resolve@^5.17.0:
+enhanced-resolve@^5.17.1:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -1604,11 +1576,6 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-event-target-shim@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
-  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
-
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
@@ -2409,10 +2376,10 @@ karma-webpack@5.0.1:
     minimatch "^9.0.3"
     webpack-merge "^4.1.5"
 
-karma@6.4.3:
-  version "6.4.3"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
-  integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
+karma@6.4.4:
+  version "6.4.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
+  integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -2444,6 +2411,13 @@ kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+kotlin-web-helpers@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
+  integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
+  dependencies:
+    format-util "^1.0.5"
+
 labeled-stream-splicer@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21"
@@ -2647,10 +2621,10 @@ mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.6"
 
-mocha@10.7.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
-  integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
+mocha@10.7.3:
+  version "10.7.3"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
+  integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
   dependencies:
     ansi-colors "^4.1.3"
     browser-stdout "^1.3.1"
@@ -2735,13 +2709,6 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-fetch@2.6.7:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-forge@^1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -3747,11 +3714,6 @@ toidentifier@1.0.1:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-tr46@~0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
-
 tslib@^2.0.3:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
@@ -3907,11 +3869,6 @@ wbuf@^1.1.0, wbuf@^1.7.3:
   dependencies:
     minimalistic-assert "^1.0.0"
 
-webidl-conversions@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
-
 webpack-cli@5.1.4:
   version "5.1.4"
   resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.1.4.tgz#c8e046ba7eaae4911d7e71e2b25b776fcc35759b"
@@ -3998,12 +3955,11 @@ webpack-sources@^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.93.0:
-  version "5.93.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
-  integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
+webpack@5.94.0:
+  version "5.94.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
+  integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
   dependencies:
-    "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^1.0.5"
     "@webassemblyjs/ast" "^1.12.1"
     "@webassemblyjs/wasm-edit" "^1.12.1"
@@ -4012,7 +3968,7 @@ webpack@5.93.0:
     acorn-import-attributes "^1.9.5"
     browserslist "^4.21.10"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.17.0"
+    enhanced-resolve "^5.17.1"
     es-module-lexer "^1.2.1"
     eslint-scope "5.1.1"
     events "^3.2.0"
@@ -4042,14 +3998,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-url@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
-  dependencies:
-    tr46 "~0.0.3"
-    webidl-conversions "^3.0.0"
-
 which-typed-array@^1.1.14, which-typed-array@^1.1.2:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"