diff --git a/Auth/README.md b/Auth/README.md index b6dcd8120..085d2eedd 100644 --- a/Auth/README.md +++ b/Auth/README.md @@ -44,7 +44,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:auth-kt:VERSION") + implementation("io.supabase:auth-kt:VERSION") } ``` diff --git a/Auth/src/androidMain/AndroidManifest.xml b/Auth/src/androidMain/AndroidManifest.xml index 088c82e26..1146471bc 100644 --- a/Auth/src/androidMain/AndroidManifest.xml +++ b/Auth/src/androidMain/AndroidManifest.xml @@ -9,7 +9,7 @@ android:exported="false" tools:node="merge"> diff --git a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.android.kt b/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.android.kt deleted file mode 100644 index 2c8887fef..000000000 --- a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.android.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -internal actual fun Auth.defaultPlatformRedirectUrl(): String? = config.deepLinkOrNull \ No newline at end of file diff --git a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Android.kt b/Auth/src/androidMain/kotlin/io/supabase/auth/Android.kt similarity index 90% rename from Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Android.kt rename to Auth/src/androidMain/kotlin/io/supabase/auth/Android.kt index c1378f8ab..d48069fb4 100644 --- a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Android.kt +++ b/Auth/src/androidMain/kotlin/io/supabase/auth/Android.kt @@ -1,11 +1,11 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import android.content.Intent import android.net.Uri import androidx.browser.customtabs.CustomTabsIntent -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.user.UserSession import kotlinx.coroutines.launch internal fun openUrl(uri: Uri, action: ExternalAuthAction) { diff --git a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/androidMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 88% rename from Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/androidMain/kotlin/io/supabase/auth/AuthConfig.kt index e20e9fec3..89e9cb957 100644 --- a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/androidMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import androidx.browser.customtabs.CustomTabsIntent -import io.github.jan.supabase.auth.providers.ExternalAuthConfig -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.auth.providers.ExternalAuthConfig +import io.supabase.plugins.CustomSerializationConfig /** * The configuration for [Auth] diff --git a/Auth/src/androidMain/kotlin/io/supabase/auth/RedirectUrl.android.kt b/Auth/src/androidMain/kotlin/io/supabase/auth/RedirectUrl.android.kt new file mode 100644 index 000000000..9fe213ba8 --- /dev/null +++ b/Auth/src/androidMain/kotlin/io/supabase/auth/RedirectUrl.android.kt @@ -0,0 +1,8 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.auth.deepLinkOrNull + +@SupabaseInternal +internal actual fun Auth.defaultPlatformRedirectUrl(): String? = config.deepLinkOrNull \ No newline at end of file diff --git a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Utils.android.kt b/Auth/src/androidMain/kotlin/io/supabase/auth/Utils.android.kt similarity index 77% rename from Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Utils.android.kt rename to Auth/src/androidMain/kotlin/io/supabase/auth/Utils.android.kt index fa42ca949..0d9bd8ef2 100644 --- a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/Utils.android.kt +++ b/Auth/src/androidMain/kotlin/io/supabase/auth/Utils.android.kt @@ -1,9 +1,10 @@ @file:Suppress("RedundantSuspendModifier") -package io.github.jan.supabase.auth + +package io.supabase.auth import android.net.Uri -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.SupabaseClient +import io.supabase.auth.user.UserSession internal actual suspend fun SupabaseClient.openExternalUrl(url: String) { openUrl(Uri.parse(url), auth.config.defaultExternalAuthAction) diff --git a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/androidMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt similarity index 61% rename from Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt rename to Auth/src/androidMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt index 267e6bf68..a9061d8b3 100644 --- a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ b/Auth/src/androidMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults /** * Configuration for external authentication providers like Google, Twitter, etc. diff --git a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/androidMain/kotlin/io/supabase/auth/setupPlatform.kt similarity index 94% rename from Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt rename to Auth/src/androidMain/kotlin/io/supabase/auth/setupPlatform.kt index 458a00b36..2f38be8c7 100644 --- a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ b/Auth/src/androidMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -1,12 +1,12 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import android.content.Context import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner import androidx.startup.Initializer -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.logging.d +import io.supabase.annotations.SupabaseInternal +import io.supabase.logging.d import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/Auth/src/androidUnitTest/kotlin/platformSettings.kt b/Auth/src/androidUnitTest/kotlin/platformSettings.kt index 687460611..bf862c7ad 100644 --- a/Auth/src/androidUnitTest/kotlin/platformSettings.kt +++ b/Auth/src/androidUnitTest/kotlin/platformSettings.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() { enableLifecycleCallbacks = false diff --git a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.apple.kt b/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.apple.kt deleted file mode 100644 index 2c8887fef..000000000 --- a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.apple.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -internal actual fun Auth.defaultPlatformRedirectUrl(): String? = config.deepLinkOrNull \ No newline at end of file diff --git a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt deleted file mode 100644 index a1b155557..000000000 --- a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -actual fun Auth.setupPlatform() = Unit \ No newline at end of file diff --git a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/Apple.kt b/Auth/src/appleMain/kotlin/io/supabase/auth/Apple.kt similarity index 89% rename from Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/Apple.kt rename to Auth/src/appleMain/kotlin/io/supabase/auth/Apple.kt index c83e19a43..c5b0d8fd3 100644 --- a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/Apple.kt +++ b/Auth/src/appleMain/kotlin/io/supabase/auth/Apple.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.logging.d +import io.supabase.SupabaseClient +import io.supabase.auth.user.UserSession +import io.supabase.logging.d import kotlinx.coroutines.launch import platform.Foundation.NSURL import platform.Foundation.NSURLComponents diff --git a/Auth/src/appleMain/kotlin/io/supabase/auth/RedirectUrl.apple.kt b/Auth/src/appleMain/kotlin/io/supabase/auth/RedirectUrl.apple.kt new file mode 100644 index 000000000..9fe213ba8 --- /dev/null +++ b/Auth/src/appleMain/kotlin/io/supabase/auth/RedirectUrl.apple.kt @@ -0,0 +1,8 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.auth.deepLinkOrNull + +@SupabaseInternal +internal actual fun Auth.defaultPlatformRedirectUrl(): String? = config.deepLinkOrNull \ No newline at end of file diff --git a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/Utils.apple.kt b/Auth/src/appleMain/kotlin/io/supabase/auth/Utils.apple.kt similarity index 51% rename from Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/Utils.apple.kt rename to Auth/src/appleMain/kotlin/io/supabase/auth/Utils.apple.kt index 38015ada0..21804c998 100644 --- a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/Utils.apple.kt +++ b/Auth/src/appleMain/kotlin/io/supabase/auth/Utils.apple.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.providers.openUrl +import io.supabase.SupabaseClient +import io.supabase.auth.providers.openUrl import platform.Foundation.NSURL internal actual suspend fun SupabaseClient.openExternalUrl(url: String) { diff --git a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/appleMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt similarity index 61% rename from Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt rename to Auth/src/appleMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt index 267e6bf68..a9061d8b3 100644 --- a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ b/Auth/src/appleMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults /** * Configuration for external authentication providers like Google, Twitter, etc. diff --git a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/providers/OAuthProvider.kt b/Auth/src/appleMain/kotlin/io/supabase/auth/providers/OAuthProvider.kt similarity index 61% rename from Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/providers/OAuthProvider.kt rename to Auth/src/appleMain/kotlin/io/supabase/auth/providers/OAuthProvider.kt index a6f9c1424..d001c26e5 100644 --- a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/providers/OAuthProvider.kt +++ b/Auth/src/appleMain/kotlin/io/supabase/auth/providers/OAuthProvider.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers import platform.Foundation.NSURL diff --git a/Auth/src/appleMain/kotlin/io/supabase/auth/setupPlatform.kt b/Auth/src/appleMain/kotlin/io/supabase/auth/setupPlatform.kt new file mode 100644 index 000000000..868af526c --- /dev/null +++ b/Auth/src/appleMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -0,0 +1,7 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth + +@SupabaseInternal +actual fun Auth.setupPlatform() = Unit \ No newline at end of file diff --git a/Auth/src/appleTest/kotlin/platformSettings.kt b/Auth/src/appleTest/kotlin/platformSettings.kt index f6fa8ceb8..e8d05c1bf 100644 --- a/Auth/src/appleTest/kotlin/platformSettings.kt +++ b/Auth/src/appleTest/kotlin/platformSettings.kt @@ -1,3 +1,3 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() = Unit \ No newline at end of file diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AccessToken.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/AccessToken.kt similarity index 83% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AccessToken.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/AccessToken.kt index ed2a5e6ce..d8b3627b8 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AccessToken.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/AccessToken.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.plugins.MainConfig -import io.github.jan.supabase.plugins.MainPlugin +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.plugins.MainConfig +import io.supabase.plugins.MainPlugin /** * Returns the access token used for requests. The token is resolved in the following order: diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/Auth.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/Auth.kt similarity index 92% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/Auth.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/Auth.kt index eda215120..fa6274f68 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/Auth.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/Auth.kt @@ -1,30 +1,30 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.admin.AdminApi -import io.github.jan.supabase.auth.exception.AuthRestException -import io.github.jan.supabase.auth.exception.AuthWeakPasswordException -import io.github.jan.supabase.auth.mfa.MfaApi -import io.github.jan.supabase.auth.providers.AuthProvider -import io.github.jan.supabase.auth.providers.ExternalAuthConfigDefaults -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.OAuthProvider -import io.github.jan.supabase.auth.providers.builtin.Email -import io.github.jan.supabase.auth.providers.builtin.Phone -import io.github.jan.supabase.auth.providers.builtin.SSO -import io.github.jan.supabase.auth.status.SessionSource -import io.github.jan.supabase.auth.status.SessionStatus -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.auth.user.UserUpdateBuilder -import io.github.jan.supabase.exceptions.HttpRequestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.plugins.CustomSerializationPlugin -import io.github.jan.supabase.plugins.MainPlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider +package io.supabase.auth + import io.ktor.client.plugins.HttpRequestTimeoutException +import io.supabase.SupabaseClient +import io.supabase.auth.admin.AdminApi +import io.supabase.auth.exception.AuthRestException +import io.supabase.auth.exception.AuthWeakPasswordException +import io.supabase.auth.mfa.MfaApi +import io.supabase.auth.providers.AuthProvider +import io.supabase.auth.providers.ExternalAuthConfigDefaults +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.OAuthProvider +import io.supabase.auth.providers.builtin.Email +import io.supabase.auth.providers.builtin.Phone +import io.supabase.auth.providers.builtin.SSO +import io.supabase.auth.status.SessionSource +import io.supabase.auth.status.SessionStatus +import io.supabase.auth.user.UserInfo +import io.supabase.auth.user.UserSession +import io.supabase.auth.user.UserUpdateBuilder +import io.supabase.exceptions.HttpRequestException +import io.supabase.exceptions.RestException +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.e +import io.supabase.plugins.CustomSerializationPlugin +import io.supabase.plugins.MainPlugin +import io.supabase.plugins.SupabasePluginProvider import kotlinx.coroutines.flow.StateFlow import kotlinx.serialization.json.JsonObject @@ -314,7 +314,8 @@ sealed interface Auth : MainPlugin, CustomSerializationPlugin { * @param accessToken The jwt token to import * @param retrieveUser Whether to retrieve the user profile or not */ - suspend fun importAuthToken(accessToken: String, refreshToken: String = "", retrieveUser: Boolean = false, autoRefresh: Boolean = if(refreshToken.isNotBlank()) config.alwaysAutoRefresh else false) = importSession(UserSession(accessToken, refreshToken, "", "", 0L, "", if(retrieveUser) tryToGetUser(accessToken) else null), autoRefresh) + suspend fun importAuthToken(accessToken: String, refreshToken: String = "", retrieveUser: Boolean = false, autoRefresh: Boolean = if(refreshToken.isNotBlank()) config.alwaysAutoRefresh else false) = importSession( + UserSession(accessToken, refreshToken, "", "", 0L, "", if (retrieveUser) tryToGetUser(accessToken) else null), autoRefresh) /** * Retrieves the latest session from storage and starts auto-refreshing if [autoRefresh] is true or [AuthConfig.alwaysAutoRefresh] as the default parameter diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 96% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/AuthConfig.kt index 9e7a90f68..37ae69700 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.plugins.CustomSerializationConfig -import io.github.jan.supabase.plugins.MainConfig +import io.supabase.SupabaseClientBuilder +import io.supabase.SupabaseSerializer +import io.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.MainConfig import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers import kotlin.time.Duration diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthExtensions.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthExtensions.kt similarity index 93% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthExtensions.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/AuthExtensions.kt index f1fadbb91..0167a10dd 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthExtensions.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthExtensions.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.encodeToJsonElement -import io.github.jan.supabase.logging.d +import io.supabase.auth.user.UserSession +import io.supabase.encodeToJsonElement +import io.supabase.logging.d import kotlinx.serialization.json.jsonObject internal fun noDeeplinkError(arg: String): Nothing = error(""" diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthImpl.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthImpl.kt similarity index 91% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthImpl.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/AuthImpl.kt index 083103374..8915f7951 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthImpl.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthImpl.kt @@ -1,37 +1,5 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.admin.AdminApi -import io.github.jan.supabase.auth.admin.AdminApiImpl -import io.github.jan.supabase.auth.exception.AuthRestException -import io.github.jan.supabase.auth.exception.AuthSessionMissingException -import io.github.jan.supabase.auth.exception.AuthWeakPasswordException -import io.github.jan.supabase.auth.mfa.MfaApi -import io.github.jan.supabase.auth.mfa.MfaApiImpl -import io.github.jan.supabase.auth.providers.AuthProvider -import io.github.jan.supabase.auth.providers.ExternalAuthConfigDefaults -import io.github.jan.supabase.auth.providers.OAuthProvider -import io.github.jan.supabase.auth.providers.builtin.OTP -import io.github.jan.supabase.auth.providers.builtin.SSO -import io.github.jan.supabase.auth.status.RefreshFailureCause -import io.github.jan.supabase.auth.status.SessionSource -import io.github.jan.supabase.auth.status.SessionStatus -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.auth.user.UserUpdateBuilder -import io.github.jan.supabase.bodyOrNull -import io.github.jan.supabase.exceptions.BadRequestRestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.exceptions.UnauthorizedRestException -import io.github.jan.supabase.exceptions.UnknownRestException -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.logging.i -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.safeBody -import io.github.jan.supabase.supabaseJson +package io.supabase.auth + import io.ktor.client.call.body import io.ktor.client.request.parameter import io.ktor.client.statement.HttpResponse @@ -39,6 +7,38 @@ import io.ktor.client.statement.bodyAsText import io.ktor.client.statement.request import io.ktor.http.HttpMethod import io.ktor.http.HttpStatusCode +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.admin.AdminApi +import io.supabase.auth.admin.AdminApiImpl +import io.supabase.auth.exception.AuthRestException +import io.supabase.auth.exception.AuthSessionMissingException +import io.supabase.auth.exception.AuthWeakPasswordException +import io.supabase.auth.mfa.MfaApi +import io.supabase.auth.mfa.MfaApiImpl +import io.supabase.auth.providers.AuthProvider +import io.supabase.auth.providers.ExternalAuthConfigDefaults +import io.supabase.auth.providers.OAuthProvider +import io.supabase.auth.providers.builtin.OTP +import io.supabase.auth.providers.builtin.SSO +import io.supabase.auth.status.RefreshFailureCause +import io.supabase.auth.status.SessionSource +import io.supabase.auth.status.SessionStatus +import io.supabase.auth.user.UserInfo +import io.supabase.auth.user.UserSession +import io.supabase.auth.user.UserUpdateBuilder +import io.supabase.bodyOrNull +import io.supabase.exceptions.BadRequestRestException +import io.supabase.exceptions.RestException +import io.supabase.exceptions.UnauthorizedRestException +import io.supabase.exceptions.UnknownRestException +import io.supabase.logging.d +import io.supabase.logging.e +import io.supabase.logging.i +import io.supabase.putJsonObject +import io.supabase.safeBody +import io.supabase.supabaseJson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job import kotlinx.coroutines.cancel @@ -522,8 +522,12 @@ internal class AuthImpl( private fun checkErrorCodes(error: GoTrueErrorResponse, response: HttpResponse): RestException? { return when (error.error) { - AuthWeakPasswordException.CODE -> AuthWeakPasswordException(error.description, response.status.value, error.weakPassword?.reasons ?: emptyList()) - AuthSessionMissingException.CODE -> { + AuthWeakPasswordException.Companion.CODE -> AuthWeakPasswordException( + error.description, + response.status.value, + error.weakPassword?.reasons ?: emptyList() + ) + AuthSessionMissingException.Companion.CODE -> { authScope.launch { Auth.logger.e { "Received session not found api error. Clearing session..." } clearSession() diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthenticatedSupabaseApi.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthenticatedSupabaseApi.kt similarity index 91% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthenticatedSupabaseApi.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/AuthenticatedSupabaseApi.kt index aca2fd113..0381a361f 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/AuthenticatedSupabaseApi.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/AuthenticatedSupabaseApi.kt @@ -1,15 +1,16 @@ @file:Suppress("UndocumentedPublicClass", "UndocumentedPublicFunction") -package io.github.jan.supabase.auth -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.network.SupabaseApi -import io.github.jan.supabase.plugins.MainPlugin +package io.supabase.auth + import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.bearerAuth import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.HttpStatement +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.exceptions.RestException +import io.supabase.network.SupabaseApi +import io.supabase.plugins.MainPlugin @OptIn(SupabaseInternal::class) class AuthenticatedSupabaseApi @SupabaseInternal constructor( diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/CodeVerifierCache.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/CodeVerifierCache.kt similarity index 96% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/CodeVerifierCache.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/CodeVerifierCache.kt index 8a1cbff6e..28fa314b0 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/CodeVerifierCache.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/CodeVerifierCache.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import kotlinx.atomicfu.AtomicRef import kotlinx.atomicfu.atomic diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/GoTrueErrorResponse.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/GoTrueErrorResponse.kt similarity index 98% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/GoTrueErrorResponse.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/GoTrueErrorResponse.kt index 83d8381da..3ac9797b8 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/GoTrueErrorResponse.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/GoTrueErrorResponse.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/JsonUtils.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/JsonUtils.kt similarity index 92% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/JsonUtils.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/JsonUtils.kt index 82a4b12d3..f2bcfa026 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/JsonUtils.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/JsonUtils.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import kotlinx.serialization.json.JsonObjectBuilder import kotlinx.serialization.json.put diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/OtpType.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/OtpType.kt similarity index 97% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/OtpType.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/OtpType.kt index dbda5b060..f03c3a5b1 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/OtpType.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/OtpType.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth /** * OTPs (One Time Passwords) are used to authenticate users via email or phone. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/PKCE.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/PKCE.kt similarity index 95% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/PKCE.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/PKCE.kt index 76b138fbf..455bfecc2 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/PKCE.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/PKCE.kt @@ -1,5 +1,6 @@ @file:Suppress("MatchingDeclarationName") -package io.github.jan.supabase.auth + +package io.supabase.auth import korlibs.crypto.SHA256 import korlibs.crypto.SecureRandom diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/PostgrestFilterDSL.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/PostgrestFilterDSL.kt similarity index 83% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/PostgrestFilterDSL.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/PostgrestFilterDSL.kt index 981352837..f616294fa 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/PostgrestFilterDSL.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/PostgrestFilterDSL.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth /** * Used to mark Postgrest filter DSL functions diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/RedirectUrl.kt similarity index 68% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/RedirectUrl.kt index 80ac1c1d7..7d05d3e9d 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/RedirectUrl.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal @SupabaseInternal internal expect fun Auth.defaultPlatformRedirectUrl(): String? diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/SessionManager.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/SessionManager.kt similarity index 91% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/SessionManager.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/SessionManager.kt index 14703dccc..6d029eac3 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/SessionManager.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/SessionManager.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.auth.user.UserSession import kotlinx.atomicfu.AtomicRef import kotlinx.atomicfu.atomic diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/SignOutScope.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/SignOutScope.kt similarity index 92% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/SignOutScope.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/SignOutScope.kt index 5992199e2..ae33c438a 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/SignOutScope.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/SignOutScope.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth /** * Represents the scope of a sign-out action. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/Utils.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/Utils.kt similarity index 78% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/Utils.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/Utils.kt index a3d7c1779..066a12711 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/Utils.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/Utils.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.status.SessionSource -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.logging.d +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.status.SessionSource +import io.supabase.auth.user.UserSession +import io.supabase.logging.d import io.ktor.client.request.HttpRequestBuilder import kotlinx.coroutines.launch diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminApi.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminApi.kt similarity index 93% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminApi.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminApi.kt index 0eb69881b..22095635c 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminApi.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminApi.kt @@ -1,17 +1,17 @@ -package io.github.jan.supabase.auth.admin - -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.AuthImpl -import io.github.jan.supabase.auth.SignOutScope -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.auth.user.UserMfaFactor -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.safeBody -import io.github.jan.supabase.supabaseJson +package io.supabase.auth.admin + import io.ktor.client.call.body import io.ktor.client.request.parameter import io.ktor.http.HttpHeaders +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.auth.AuthImpl +import io.supabase.auth.SignOutScope +import io.supabase.auth.user.UserInfo +import io.supabase.auth.user.UserMfaFactor +import io.supabase.putJsonObject +import io.supabase.safeBody +import io.supabase.supabaseJson import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.buildJsonObject diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminUserBuilder.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminUserBuilder.kt similarity index 98% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminUserBuilder.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminUserBuilder.kt index d7e1b9812..b94e609f1 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminUserBuilder.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminUserBuilder.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.admin +package io.supabase.auth.admin import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminUserUpdateBuilder.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminUserUpdateBuilder.kt similarity index 97% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminUserUpdateBuilder.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminUserUpdateBuilder.kt index e15152ef5..7cebfc171 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/AdminUserUpdateBuilder.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/AdminUserUpdateBuilder.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.admin +package io.supabase.auth.admin import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/LinkType.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/LinkType.kt similarity index 96% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/LinkType.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/admin/LinkType.kt index 843c67e54..ba937e7d7 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/admin/LinkType.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/admin/LinkType.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth.admin +package io.supabase.auth.admin -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthErrorCode.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthErrorCode.kt similarity index 98% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthErrorCode.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthErrorCode.kt index d3c72f332..09b3ca0a4 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthErrorCode.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthErrorCode.kt @@ -1,5 +1,9 @@ @file:Suppress("UndocumentedPublicProperty") -package io.github.jan.supabase.auth.exception + +package io.supabase.auth.exception + +import io.supabase.auth.exception.AuthErrorCode.entries + /** * Enum class for error codes returned by the Auth API. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthRestException.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthRestException.kt similarity index 88% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthRestException.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthRestException.kt index f5c123a10..17c011c8c 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthRestException.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthRestException.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth.exception +package io.supabase.auth.exception -import io.github.jan.supabase.exceptions.RestException +import io.supabase.exceptions.RestException /** * Base class for rest exceptions thrown by the Auth API. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthSessionMissingException.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthSessionMissingException.kt similarity index 88% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthSessionMissingException.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthSessionMissingException.kt index f5a180f10..785d14312 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthSessionMissingException.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthSessionMissingException.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.exception +package io.supabase.auth.exception /** * Exception thrown when a session is not found. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthWeakPasswordException.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthWeakPasswordException.kt similarity index 90% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthWeakPasswordException.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthWeakPasswordException.kt index d9d1a6dc3..8039b803c 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/exception/AuthWeakPasswordException.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/exception/AuthWeakPasswordException.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.exception +package io.supabase.auth.exception /** * Exception thrown on sign-up if the password is too weak diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/AuthenticatorAssuranceLevel.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/AuthenticatorAssuranceLevel.kt similarity index 96% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/AuthenticatorAssuranceLevel.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/mfa/AuthenticatorAssuranceLevel.kt index 2dff23a4c..eea67fd04 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/AuthenticatorAssuranceLevel.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/AuthenticatorAssuranceLevel.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.mfa +package io.supabase.auth.mfa /** * The assurance level of a session diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/FactorType.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/FactorType.kt similarity index 95% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/FactorType.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/mfa/FactorType.kt index c5b7072b6..691143270 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/FactorType.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/FactorType.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth.mfa +package io.supabase.auth.mfa -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.supabaseJson +import io.supabase.annotations.SupabaseInternal +import io.supabase.supabaseJson import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaApi.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaApi.kt similarity index 94% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaApi.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaApi.kt index 33dfe7868..fd341bb09 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaApi.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaApi.kt @@ -1,13 +1,13 @@ -package io.github.jan.supabase.auth.mfa - -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.AuthImpl -import io.github.jan.supabase.auth.providers.builtin.Phone -import io.github.jan.supabase.auth.status.SessionStatus -import io.github.jan.supabase.auth.user.UserMfaFactor -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.safeBody +package io.supabase.auth.mfa + +import io.supabase.auth.Auth +import io.supabase.auth.AuthImpl +import io.supabase.auth.providers.builtin.Phone +import io.supabase.auth.status.SessionStatus +import io.supabase.auth.user.UserMfaFactor +import io.supabase.auth.user.UserSession +import io.supabase.putJsonObject +import io.supabase.safeBody import io.ktor.client.call.body import io.ktor.util.decodeBase64String import kotlinx.coroutines.flow.Flow diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaChallenge.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaChallenge.kt similarity index 94% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaChallenge.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaChallenge.kt index 15128f8f1..f98b5ccc1 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaChallenge.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaChallenge.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.mfa +package io.supabase.auth.mfa import kotlinx.datetime.Instant import kotlinx.serialization.SerialName diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaFactor.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaFactor.kt similarity index 87% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaFactor.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaFactor.kt index d1d66998e..14dbf4ced 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaFactor.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaFactor.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.mfa +package io.supabase.auth.mfa /** * Represents an enrolled MFA Factor diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaStatus.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaStatus.kt similarity index 89% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaStatus.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaStatus.kt index f92bfcdd2..d5cb73500 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/mfa/MfaStatus.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/mfa/MfaStatus.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.mfa +package io.supabase.auth.mfa /** * Represents the MFA status of a user. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/AuthProvider.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/AuthProvider.kt similarity index 87% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/AuthProvider.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/AuthProvider.kt index f53468584..cfe36ed11 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/AuthProvider.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/AuthProvider.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.SupabaseClient +import io.supabase.auth.user.UserSession /** * An authentication provider diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt similarity index 88% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt index d25fb73e6..3763e18f6 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers -import io.github.jan.supabase.auth.Auth +import io.supabase.auth.Auth /** * Configuration for external authentication providers like Google, Twitter, etc. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/IDTokenProvider.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/IDTokenProvider.kt similarity index 95% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/IDTokenProvider.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/IDTokenProvider.kt index 6dd56a252..11007d7f0 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/IDTokenProvider.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/IDTokenProvider.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/OAuthProvider.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/OAuthProvider.kt similarity index 83% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/OAuthProvider.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/OAuthProvider.kt index f50d0f7fe..69b205531 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/OAuthProvider.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/OAuthProvider.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.startExternalAuth -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.SupabaseClient +import io.supabase.auth.auth +import io.supabase.auth.startExternalAuth +import io.supabase.auth.user.UserSession /** * Represents an OAuth provider. diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/Providers.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/Providers.kt similarity index 97% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/Providers.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/Providers.kt index 2c2dd04e0..f7c43eae3 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/Providers.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/Providers.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicClass") -package io.github.jan.supabase.auth.providers + +package io.supabase.auth.providers data object Google : IDTokenProvider() { diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/CaptchaTokenSerializer.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/CaptchaTokenSerializer.kt similarity index 90% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/CaptchaTokenSerializer.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/CaptchaTokenSerializer.kt index d5e6014dd..b4b97ab58 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/CaptchaTokenSerializer.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/CaptchaTokenSerializer.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.KSerializer import kotlinx.serialization.descriptors.SerialDescriptor import kotlinx.serialization.descriptors.buildClassSerialDescriptor diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/DefaultAuthProvider.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/DefaultAuthProvider.kt similarity index 80% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/DefaultAuthProvider.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/DefaultAuthProvider.kt index b328cb296..50dd87937 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/DefaultAuthProvider.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/DefaultAuthProvider.kt @@ -1,19 +1,19 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.AuthImpl -import io.github.jan.supabase.auth.FlowType -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.generateCodeChallenge -import io.github.jan.supabase.auth.generateCodeVerifier -import io.github.jan.supabase.auth.providers.AuthProvider -import io.github.jan.supabase.auth.putCodeChallenge -import io.github.jan.supabase.auth.redirectTo -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.supabaseJson +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.AuthImpl +import io.supabase.auth.FlowType +import io.supabase.auth.auth +import io.supabase.auth.generateCodeChallenge +import io.supabase.auth.generateCodeVerifier +import io.supabase.auth.providers.AuthProvider +import io.supabase.auth.putCodeChallenge +import io.supabase.auth.redirectTo +import io.supabase.auth.user.UserSession +import io.supabase.putJsonObject +import io.supabase.supabaseJson import io.ktor.client.call.body import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/Email.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/Email.kt similarity index 85% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/Email.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/Email.kt index 5fb777aab..6038b67fa 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/Email.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/Email.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.exceptions.SupabaseEncodingException -import io.github.jan.supabase.supabaseJson +import io.supabase.auth.user.UserInfo +import io.supabase.exceptions.SupabaseEncodingException +import io.supabase.supabaseJson import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.MissingFieldException import kotlinx.serialization.Serializable diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/IDToken.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/IDToken.kt similarity index 82% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/IDToken.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/IDToken.kt index 877fd5a4d..e4df7922e 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/IDToken.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/IDToken.kt @@ -1,13 +1,13 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.auth.providers.Apple -import io.github.jan.supabase.auth.providers.Azure -import io.github.jan.supabase.auth.providers.Facebook -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.IDTokenProvider -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.exceptions.SupabaseEncodingException -import io.github.jan.supabase.supabaseJson +import io.supabase.auth.providers.Apple +import io.supabase.auth.providers.Azure +import io.supabase.auth.providers.Facebook +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.IDTokenProvider +import io.supabase.auth.user.UserInfo +import io.supabase.exceptions.SupabaseEncodingException +import io.supabase.supabaseJson import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.MissingFieldException import kotlinx.serialization.SerialName diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/OTP.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/OTP.kt similarity index 83% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/OTP.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/OTP.kt index 3875f0d62..8dace06ff 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/OTP.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/OTP.kt @@ -1,17 +1,17 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.auth.AuthImpl -import io.github.jan.supabase.auth.FlowType -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.generateCodeChallenge -import io.github.jan.supabase.auth.generateCodeVerifier -import io.github.jan.supabase.auth.providers.AuthProvider -import io.github.jan.supabase.auth.putCaptchaToken -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.encodeToJsonElement -import io.github.jan.supabase.putJsonObject +import io.supabase.SupabaseClient +import io.supabase.SupabaseSerializer +import io.supabase.auth.AuthImpl +import io.supabase.auth.FlowType +import io.supabase.auth.auth +import io.supabase.auth.generateCodeChallenge +import io.supabase.auth.generateCodeVerifier +import io.supabase.auth.providers.AuthProvider +import io.supabase.auth.putCaptchaToken +import io.supabase.auth.user.UserSession +import io.supabase.encodeToJsonElement +import io.supabase.putJsonObject import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/Phone.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/Phone.kt similarity index 92% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/Phone.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/Phone.kt index 0718dacbe..6c8b688b4 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/Phone.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/Phone.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.exceptions.SupabaseEncodingException -import io.github.jan.supabase.supabaseJson +import io.supabase.auth.user.UserInfo +import io.supabase.exceptions.SupabaseEncodingException +import io.supabase.supabaseJson import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.KSerializer import kotlinx.serialization.MissingFieldException diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/SSO.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/SSO.kt similarity index 85% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/SSO.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/SSO.kt index 783e75ce1..2c009e64c 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/providers/builtin/SSO.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/providers/builtin/SSO.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.auth.providers.builtin +package io.supabase.auth.providers.builtin -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.providers.AuthProvider -import io.github.jan.supabase.auth.startExternalAuth -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.SupabaseClient +import io.supabase.auth.auth +import io.supabase.auth.providers.AuthProvider +import io.supabase.auth.startExternalAuth +import io.supabase.auth.user.UserSession import kotlinx.serialization.Serializable /** diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/RefreshFailureCause.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/status/RefreshFailureCause.kt similarity index 84% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/RefreshFailureCause.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/status/RefreshFailureCause.kt index 63aa3cca8..df10d5db9 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/RefreshFailureCause.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/status/RefreshFailureCause.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth.status +package io.supabase.auth.status -import io.github.jan.supabase.exceptions.RestException +import io.supabase.exceptions.RestException /** * Represents the cause of a refresh error diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/SessionSource.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/status/SessionSource.kt similarity index 89% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/SessionSource.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/status/SessionSource.kt index 766ecab91..90a05618b 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/SessionSource.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/status/SessionSource.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth.status +package io.supabase.auth.status -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.providers.AuthProvider -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.auth.Auth +import io.supabase.auth.providers.AuthProvider +import io.supabase.auth.user.UserSession /** * Represents the source of a session diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/SessionStatus.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/status/SessionStatus.kt similarity index 91% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/SessionStatus.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/status/SessionStatus.kt index 76ac7fb5d..8f0713ac0 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/status/SessionStatus.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/status/SessionStatus.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth.status +package io.supabase.auth.status -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.auth.Auth +import io.supabase.auth.user.UserSession /** * Represents the status of the current session in [Auth] diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/Identity.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/user/Identity.kt similarity index 94% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/Identity.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/user/Identity.kt index 46219e370..ce3b3dbe5 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/Identity.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/user/Identity.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicClass", "UndocumentedPublicFunction", "UndocumentedPublicProperty") -package io.github.jan.supabase.auth.user + +package io.supabase.auth.user import kotlinx.serialization.SerialName diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserInfo.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/user/UserInfo.kt similarity index 98% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserInfo.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/user/UserInfo.kt index 8bb59ed7a..2bef18711 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserInfo.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/user/UserInfo.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicClass", "UndocumentedPublicFunction", "UndocumentedPublicProperty") -package io.github.jan.supabase.auth.user + +package io.supabase.auth.user import kotlinx.datetime.Instant import kotlinx.serialization.SerialName diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserSession.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/user/UserSession.kt similarity index 95% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserSession.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/user/UserSession.kt index 12ef9f9e2..78d42d712 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserSession.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/user/UserSession.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicClass", "UndocumentedPublicFunction", "UndocumentedPublicProperty") -package io.github.jan.supabase.auth.user + +package io.supabase.auth.user import kotlinx.datetime.Clock import kotlinx.datetime.Instant diff --git a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserUpdateBuilder.kt b/Auth/src/commonMain/kotlin/io/supabase/auth/user/UserUpdateBuilder.kt similarity index 84% rename from Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserUpdateBuilder.kt rename to Auth/src/commonMain/kotlin/io/supabase/auth/user/UserUpdateBuilder.kt index a4fef6c71..96ae76f86 100644 --- a/Auth/src/commonMain/kotlin/io/github/jan/supabase/auth/user/UserUpdateBuilder.kt +++ b/Auth/src/commonMain/kotlin/io/supabase/auth/user/UserUpdateBuilder.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.auth.user +package io.supabase.auth.user -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.encodeToJsonElement -import io.github.jan.supabase.serializer.KotlinXSerializer +import io.supabase.SupabaseSerializer +import io.supabase.auth.Auth +import io.supabase.encodeToJsonElement +import io.supabase.serializer.KotlinXSerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.Transient diff --git a/Auth/src/commonTest/kotlin/AccessTokenTest.kt b/Auth/src/commonTest/kotlin/AccessTokenTest.kt index ad6647495..63c3b7d53 100644 --- a/Auth/src/commonTest/kotlin/AccessTokenTest.kt +++ b/Auth/src/commonTest/kotlin/AccessTokenTest.kt @@ -1,8 +1,8 @@ -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.auth.resolveAccessToken -import io.github.jan.supabase.testing.createMockedSupabaseClient +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.auth.resolveAccessToken +import io.supabase.testing.createMockedSupabaseClient import kotlinx.coroutines.test.runTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Auth/src/commonTest/kotlin/AdminApiTest.kt b/Auth/src/commonTest/kotlin/AdminApiTest.kt index 1e899e027..6e40bce66 100644 --- a/Auth/src/commonTest/kotlin/AdminApiTest.kt +++ b/Auth/src/commonTest/kotlin/AdminApiTest.kt @@ -1,20 +1,20 @@ -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.SignOutScope -import io.github.jan.supabase.auth.admin.LinkType -import io.github.jan.supabase.auth.admin.generateLinkFor -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.auth.user.UserMfaFactor -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.respondJson -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond import io.ktor.http.HttpMethod +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.SignOutScope +import io.supabase.auth.admin.LinkType +import io.supabase.auth.admin.generateLinkFor +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.auth.user.UserInfo +import io.supabase.auth.user.UserMfaFactor +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.respondJson +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.datetime.Clock import kotlinx.serialization.encodeToString diff --git a/Auth/src/commonTest/kotlin/AuthApiTest.kt b/Auth/src/commonTest/kotlin/AuthApiTest.kt index e87b4238c..e39fc3671 100644 --- a/Auth/src/commonTest/kotlin/AuthApiTest.kt +++ b/Auth/src/commonTest/kotlin/AuthApiTest.kt @@ -1,26 +1,26 @@ -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.AuthConfig -import io.github.jan.supabase.auth.FlowType -import io.github.jan.supabase.auth.OtpType -import io.github.jan.supabase.auth.PKCEConstants -import io.github.jan.supabase.auth.SignOutScope -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.builtin.Email -import io.github.jan.supabase.auth.providers.builtin.IDToken -import io.github.jan.supabase.auth.providers.builtin.OTP -import io.github.jan.supabase.auth.providers.builtin.Phone -import io.github.jan.supabase.auth.status.SessionSource -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.respondJson -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond import io.ktor.http.HttpMethod +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.AuthConfig +import io.supabase.auth.FlowType +import io.supabase.auth.OtpType +import io.supabase.auth.PKCEConstants +import io.supabase.auth.SignOutScope +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.builtin.Email +import io.supabase.auth.providers.builtin.IDToken +import io.supabase.auth.providers.builtin.OTP +import io.supabase.auth.providers.builtin.Phone +import io.supabase.auth.status.SessionSource +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.respondJson +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonObject diff --git a/Auth/src/commonTest/kotlin/AuthRestExceptionTest.kt b/Auth/src/commonTest/kotlin/AuthRestExceptionTest.kt index 39db4412b..cbe76cf29 100644 --- a/Auth/src/commonTest/kotlin/AuthRestExceptionTest.kt +++ b/Auth/src/commonTest/kotlin/AuthRestExceptionTest.kt @@ -1,14 +1,14 @@ -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.exception.AuthRestException -import io.github.jan.supabase.auth.exception.AuthWeakPasswordException -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.auth.providers.builtin.Email -import io.github.jan.supabase.exceptions.BadRequestRestException -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.respondJson import io.ktor.http.HttpStatusCode +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.exception.AuthRestException +import io.supabase.auth.exception.AuthWeakPasswordException +import io.supabase.auth.minimalSettings +import io.supabase.auth.providers.builtin.Email +import io.supabase.exceptions.BadRequestRestException +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.respondJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.add import kotlinx.serialization.json.buildJsonObject diff --git a/Auth/src/commonTest/kotlin/AuthTest.kt b/Auth/src/commonTest/kotlin/AuthTest.kt index eeb0ee5b8..b2c73d9b2 100644 --- a/Auth/src/commonTest/kotlin/AuthTest.kt +++ b/Auth/src/commonTest/kotlin/AuthTest.kt @@ -1,17 +1,17 @@ -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.MemorySessionManager -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.auth.providers.Github -import io.github.jan.supabase.auth.status.SessionStatus -import io.github.jan.supabase.auth.user.Identity -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.respondJson import io.ktor.http.Url +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.MemorySessionManager +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.auth.providers.Github +import io.supabase.auth.status.SessionStatus +import io.supabase.auth.user.Identity +import io.supabase.auth.user.UserInfo +import io.supabase.auth.user.UserSession +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.respondJson import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.buildJsonObject import kotlin.test.Test diff --git a/Auth/src/commonTest/kotlin/AuthTestUtils.kt b/Auth/src/commonTest/kotlin/AuthTestUtils.kt index 7e7140ec4..0d91f7934 100644 --- a/Auth/src/commonTest/kotlin/AuthTestUtils.kt +++ b/Auth/src/commonTest/kotlin/AuthTestUtils.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.status.SessionStatus +import io.supabase.auth.Auth +import io.supabase.auth.status.SessionStatus fun Auth.sessionSource() = (sessionStatus.value as SessionStatus.Authenticated).source diff --git a/Auth/src/commonTest/kotlin/CodeVerifierCacheTest.kt b/Auth/src/commonTest/kotlin/CodeVerifierCacheTest.kt index bc5fe97e9..78782d4cc 100644 --- a/Auth/src/commonTest/kotlin/CodeVerifierCacheTest.kt +++ b/Auth/src/commonTest/kotlin/CodeVerifierCacheTest.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.auth.MemoryCodeVerifierCache +import io.supabase.auth.MemoryCodeVerifierCache import kotlinx.coroutines.test.runTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Auth/src/commonTest/kotlin/MemorySessionManagerTest.kt b/Auth/src/commonTest/kotlin/MemorySessionManagerTest.kt index 316c16a72..f281a1c68 100644 --- a/Auth/src/commonTest/kotlin/MemorySessionManagerTest.kt +++ b/Auth/src/commonTest/kotlin/MemorySessionManagerTest.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.auth.MemorySessionManager +import io.supabase.auth.MemorySessionManager import kotlinx.coroutines.test.runTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Auth/src/commonTest/kotlin/MfaApiTest.kt b/Auth/src/commonTest/kotlin/MfaApiTest.kt index 67571e6af..91f3baf3b 100644 --- a/Auth/src/commonTest/kotlin/MfaApiTest.kt +++ b/Auth/src/commonTest/kotlin/MfaApiTest.kt @@ -1,24 +1,24 @@ import app.cash.turbine.test -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.mfa.AuthenticatorAssuranceLevel -import io.github.jan.supabase.auth.mfa.FactorType -import io.github.jan.supabase.auth.mfa.MfaStatus -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.auth.providers.builtin.Phone -import io.github.jan.supabase.auth.user.UserInfo -import io.github.jan.supabase.auth.user.UserMfaFactor -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.respondJson -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond import io.ktor.http.HttpMethod import io.ktor.util.encodeBase64 +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.mfa.AuthenticatorAssuranceLevel +import io.supabase.auth.mfa.FactorType +import io.supabase.auth.mfa.MfaStatus +import io.supabase.auth.minimalSettings +import io.supabase.auth.providers.builtin.Phone +import io.supabase.auth.user.UserInfo +import io.supabase.auth.user.UserMfaFactor +import io.supabase.auth.user.UserSession +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.respondJson +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.datetime.Clock import kotlinx.serialization.json.buildJsonObject diff --git a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/desktopMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 89% rename from Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/desktopMain/kotlin/io/supabase/auth/AuthConfig.kt index 5304677f1..58688b2fb 100644 --- a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/desktopMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.auth.server.HttpCallbackHtml -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.auth.server.HttpCallbackHtml +import io.supabase.plugins.CustomSerializationConfig import kotlin.time.Duration import kotlin.time.Duration.Companion.minutes diff --git a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/Utils.desktop.kt b/Auth/src/desktopMain/kotlin/io/supabase/auth/Utils.desktop.kt similarity index 79% rename from Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/Utils.desktop.kt rename to Auth/src/desktopMain/kotlin/io/supabase/auth/Utils.desktop.kt index 2e052c0fe..b84211b5c 100644 --- a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/Utils.desktop.kt +++ b/Auth/src/desktopMain/kotlin/io/supabase/auth/Utils.desktop.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.auth.server.createServer -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.auth.server.createServer +import io.supabase.auth.user.UserSession import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.IO import kotlinx.coroutines.withContext diff --git a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackHtml.kt b/Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackHtml.kt similarity index 98% rename from Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackHtml.kt rename to Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackHtml.kt index 620cf2564..9c35a34c0 100644 --- a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackHtml.kt +++ b/Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackHtml.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.server +package io.supabase.auth.server internal object HttpCallbackHtml { diff --git a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackRoutes.kt b/Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackRoutes.kt similarity index 91% rename from Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackRoutes.kt rename to Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackRoutes.kt index 45c5b6575..23c5314d8 100644 --- a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackRoutes.kt +++ b/Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackRoutes.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth.server +package io.supabase.auth.server -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.logging.d +import io.supabase.auth.Auth +import io.supabase.auth.user.UserSession +import io.supabase.logging.d import io.ktor.http.ContentType import io.ktor.http.HttpStatusCode import io.ktor.server.response.respondText diff --git a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackServer.kt b/Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackServer.kt similarity index 91% rename from Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackServer.kt rename to Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackServer.kt index 9b4facba6..11874b60c 100644 --- a/Auth/src/desktopMain/kotlin/io/github/jan/supabase/auth/server/HttpCallbackServer.kt +++ b/Auth/src/desktopMain/kotlin/io/supabase/auth/server/HttpCallbackServer.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.auth.server +package io.supabase.auth.server -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.AuthImpl -import io.github.jan.supabase.auth.openExternalUrl -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.logging.d +import io.supabase.auth.Auth +import io.supabase.auth.AuthImpl +import io.supabase.auth.openExternalUrl +import io.supabase.auth.user.UserSession +import io.supabase.logging.d import io.ktor.http.ContentType import io.ktor.http.HttpStatusCode import io.ktor.server.application.ApplicationCall diff --git a/Auth/src/tvosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/iosMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 53% rename from Auth/src/tvosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/iosMain/kotlin/io/supabase/auth/AuthConfig.kt index b7229ecd9..5055dceec 100644 --- a/Auth/src/tvosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/iosMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationConfig /** * The configuration for [Auth] diff --git a/Auth/src/iosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt b/Auth/src/iosMain/kotlin/io/supabase/auth/providers/openUrl.kt similarity index 66% rename from Auth/src/iosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt rename to Auth/src/iosMain/kotlin/io/supabase/auth/providers/openUrl.kt index 123aa8a9c..f88d95a2c 100644 --- a/Auth/src/iosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt +++ b/Auth/src/iosMain/kotlin/io/supabase/auth/providers/openUrl.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e +import io.supabase.auth.Auth +import io.supabase.logging.d +import io.supabase.logging.e import platform.Foundation.NSURL import platform.UIKit.UIApplication diff --git a/Auth/src/iosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/jsMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 53% rename from Auth/src/iosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/jsMain/kotlin/io/supabase/auth/AuthConfig.kt index b7229ecd9..5055dceec 100644 --- a/Auth/src/iosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/jsMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationConfig /** * The configuration for [Auth] diff --git a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.js.kt b/Auth/src/jsMain/kotlin/io/supabase/auth/RedirectUrl.js.kt similarity index 57% rename from Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.js.kt rename to Auth/src/jsMain/kotlin/io/supabase/auth/RedirectUrl.js.kt index 9243dbb89..e008a40b9 100644 --- a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.js.kt +++ b/Auth/src/jsMain/kotlin/io/supabase/auth/RedirectUrl.js.kt @@ -1,6 +1,7 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth import kotlinx.browser.window @SupabaseInternal diff --git a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/Utils.js.kt b/Auth/src/jsMain/kotlin/io/supabase/auth/Utils.js.kt similarity index 63% rename from Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/Utils.js.kt rename to Auth/src/jsMain/kotlin/io/supabase/auth/Utils.js.kt index 44cb623db..96efe1e54 100644 --- a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/Utils.js.kt +++ b/Auth/src/jsMain/kotlin/io/supabase/auth/Utils.js.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient +import io.supabase.SupabaseClient import kotlinx.browser.window internal actual suspend fun SupabaseClient.openExternalUrl(url: String) { diff --git a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/jsMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt similarity index 61% rename from Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt rename to Auth/src/jsMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt index 267e6bf68..a9061d8b3 100644 --- a/Auth/src/androidMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ b/Auth/src/jsMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults /** * Configuration for external authentication providers like Google, Twitter, etc. diff --git a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/jsMain/kotlin/io/supabase/auth/setupPlatform.kt similarity index 84% rename from Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt rename to Auth/src/jsMain/kotlin/io/supabase/auth/setupPlatform.kt index 46db2f7db..9a4e2b7c5 100644 --- a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ b/Auth/src/jsMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -1,8 +1,11 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.status.SessionSource +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.status.SessionSource import io.ktor.util.PlatformUtils.IS_BROWSER +import io.supabase.auth.Auth +import io.supabase.auth.AuthImpl +import io.supabase.auth.parseFragmentAndImportSession import kotlinx.browser.window import kotlinx.coroutines.launch import org.w3c.dom.url.URL diff --git a/Auth/src/jsTest/kotlin/platformSettings.kt b/Auth/src/jsTest/kotlin/platformSettings.kt index f6fa8ceb8..e8d05c1bf 100644 --- a/Auth/src/jsTest/kotlin/platformSettings.kt +++ b/Auth/src/jsTest/kotlin/platformSettings.kt @@ -1,3 +1,3 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() = Unit \ No newline at end of file diff --git a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.jvm.kt b/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.jvm.kt deleted file mode 100644 index 4b039622f..000000000 --- a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.jvm.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -internal actual fun Auth.defaultPlatformRedirectUrl(): String? = null \ No newline at end of file diff --git a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt deleted file mode 100644 index a1b155557..000000000 --- a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -actual fun Auth.setupPlatform() = Unit \ No newline at end of file diff --git a/Auth/src/jvmMain/kotlin/io/supabase/auth/RedirectUrl.jvm.kt b/Auth/src/jvmMain/kotlin/io/supabase/auth/RedirectUrl.jvm.kt new file mode 100644 index 000000000..735f254b1 --- /dev/null +++ b/Auth/src/jvmMain/kotlin/io/supabase/auth/RedirectUrl.jvm.kt @@ -0,0 +1,7 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth + +@SupabaseInternal +internal actual fun Auth.defaultPlatformRedirectUrl(): String? = null \ No newline at end of file diff --git a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/Utils.jvm.kt b/Auth/src/jvmMain/kotlin/io/supabase/auth/Utils.jvm.kt similarity index 78% rename from Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/Utils.jvm.kt rename to Auth/src/jvmMain/kotlin/io/supabase/auth/Utils.jvm.kt index a81e101dc..b114c2f14 100644 --- a/Auth/src/jvmMain/kotlin/io/github/jan/supabase/auth/Utils.jvm.kt +++ b/Auth/src/jvmMain/kotlin/io/supabase/auth/Utils.jvm.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient +import io.supabase.SupabaseClient import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.awt.Desktop diff --git a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/jvmMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt similarity index 61% rename from Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt rename to Auth/src/jvmMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt index 267e6bf68..a9061d8b3 100644 --- a/Auth/src/appleMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ b/Auth/src/jvmMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults /** * Configuration for external authentication providers like Google, Twitter, etc. diff --git a/Auth/src/jvmMain/kotlin/io/supabase/auth/setupPlatform.kt b/Auth/src/jvmMain/kotlin/io/supabase/auth/setupPlatform.kt new file mode 100644 index 000000000..868af526c --- /dev/null +++ b/Auth/src/jvmMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -0,0 +1,7 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth + +@SupabaseInternal +actual fun Auth.setupPlatform() = Unit \ No newline at end of file diff --git a/Auth/src/jvmTest/kotlin/platformSettings.kt b/Auth/src/jvmTest/kotlin/platformSettings.kt index f6fa8ceb8..e8d05c1bf 100644 --- a/Auth/src/jvmTest/kotlin/platformSettings.kt +++ b/Auth/src/jvmTest/kotlin/platformSettings.kt @@ -1,3 +1,3 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() = Unit \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/SettingsUtil.kt b/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/SettingsUtil.kt deleted file mode 100644 index 30573d808..000000000 --- a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/SettingsUtil.kt +++ /dev/null @@ -1,9 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -actual fun Auth.createDefaultSessionManager(): SessionManager = MemorySessionManager() - -@SupabaseInternal -actual fun Auth.createDefaultCodeVerifierCache(): CodeVerifierCache = MemoryCodeVerifierCache() \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/generateRedirectUrl.kt b/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/generateRedirectUrl.kt deleted file mode 100644 index 4b039622f..000000000 --- a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/generateRedirectUrl.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -internal actual fun Auth.defaultPlatformRedirectUrl(): String? = null \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt deleted file mode 100644 index 267e6bf68..000000000 --- a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth.providers - -/** - * Configuration for external authentication providers like Google, Twitter, etc. - */ -actual class ExternalAuthConfig: ExternalAuthConfigDefaults() \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/supabase/auth/SettingsUtil.kt b/Auth/src/linuxMain/kotlin/io/supabase/auth/SettingsUtil.kt new file mode 100644 index 000000000..eb55f52f5 --- /dev/null +++ b/Auth/src/linuxMain/kotlin/io/supabase/auth/SettingsUtil.kt @@ -0,0 +1,14 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.auth.CodeVerifierCache +import io.supabase.auth.MemoryCodeVerifierCache +import io.supabase.auth.MemorySessionManager +import io.supabase.auth.SessionManager + +@SupabaseInternal +actual fun Auth.createDefaultSessionManager(): SessionManager = MemorySessionManager() + +@SupabaseInternal +actual fun Auth.createDefaultCodeVerifierCache(): CodeVerifierCache = MemoryCodeVerifierCache() \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/Utils.linux.kt b/Auth/src/linuxMain/kotlin/io/supabase/auth/Utils.linux.kt similarity index 62% rename from Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/Utils.linux.kt rename to Auth/src/linuxMain/kotlin/io/supabase/auth/Utils.linux.kt index 6594987ea..237ac0990 100644 --- a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/Utils.linux.kt +++ b/Auth/src/linuxMain/kotlin/io/supabase/auth/Utils.linux.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient +import io.supabase.SupabaseClient import platform.posix.system internal actual suspend fun SupabaseClient.openExternalUrl(url: String) { diff --git a/Auth/src/linuxMain/kotlin/io/supabase/auth/generateRedirectUrl.kt b/Auth/src/linuxMain/kotlin/io/supabase/auth/generateRedirectUrl.kt new file mode 100644 index 000000000..735f254b1 --- /dev/null +++ b/Auth/src/linuxMain/kotlin/io/supabase/auth/generateRedirectUrl.kt @@ -0,0 +1,7 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth + +@SupabaseInternal +internal actual fun Auth.defaultPlatformRedirectUrl(): String? = null \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/linuxMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt new file mode 100644 index 000000000..a9061d8b3 --- /dev/null +++ b/Auth/src/linuxMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -0,0 +1,8 @@ +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults + +/** + * Configuration for external authentication providers like Google, Twitter, etc. + */ +actual class ExternalAuthConfig: ExternalAuthConfigDefaults() \ No newline at end of file diff --git a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/linuxMain/kotlin/io/supabase/auth/setupPlatform.kt similarity index 51% rename from Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt rename to Auth/src/linuxMain/kotlin/io/supabase/auth/setupPlatform.kt index 3d6b9decc..b21b85236 100644 --- a/Auth/src/linuxMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ b/Auth/src/linuxMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -1,7 +1,8 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.logging.w +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.logging.w @SupabaseInternal actual fun Auth.setupPlatform() { diff --git a/Auth/src/linuxTest/kotlin/platformSettings.kt b/Auth/src/linuxTest/kotlin/platformSettings.kt index f6fa8ceb8..e8d05c1bf 100644 --- a/Auth/src/linuxTest/kotlin/platformSettings.kt +++ b/Auth/src/linuxTest/kotlin/platformSettings.kt @@ -1,3 +1,3 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() = Unit \ No newline at end of file diff --git a/Auth/src/macosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt b/Auth/src/macosMain/kotlin/io/supabase/auth/providers/openUrl.kt similarity index 71% rename from Auth/src/macosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt rename to Auth/src/macosMain/kotlin/io/supabase/auth/providers/openUrl.kt index 3ff87b96b..83300867b 100644 --- a/Auth/src/macosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt +++ b/Auth/src/macosMain/kotlin/io/supabase/auth/providers/openUrl.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e +import io.supabase.auth.Auth +import io.supabase.logging.d +import io.supabase.logging.e import platform.AppKit.NSWorkspace import platform.AppKit.NSWorkspaceOpenConfiguration import platform.Foundation.NSURL diff --git a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/generateRedirectUrl.kt b/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/generateRedirectUrl.kt deleted file mode 100644 index 4b039622f..000000000 --- a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/generateRedirectUrl.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -internal actual fun Auth.defaultPlatformRedirectUrl(): String? = null \ No newline at end of file diff --git a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/Utils.mingw.kt b/Auth/src/mingwMain/kotlin/io/supabase/auth/Utils.mingw.kt similarity index 78% rename from Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/Utils.mingw.kt rename to Auth/src/mingwMain/kotlin/io/supabase/auth/Utils.mingw.kt index 1c197eb52..375c85441 100644 --- a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/Utils.mingw.kt +++ b/Auth/src/mingwMain/kotlin/io/supabase/auth/Utils.mingw.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient +import io.supabase.SupabaseClient import kotlinx.cinterop.ExperimentalForeignApi import platform.windows.SW_SHOWNORMAL import platform.windows.ShellExecuteW diff --git a/Auth/src/mingwMain/kotlin/io/supabase/auth/generateRedirectUrl.kt b/Auth/src/mingwMain/kotlin/io/supabase/auth/generateRedirectUrl.kt new file mode 100644 index 000000000..735f254b1 --- /dev/null +++ b/Auth/src/mingwMain/kotlin/io/supabase/auth/generateRedirectUrl.kt @@ -0,0 +1,7 @@ +package io.supabase.auth + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth + +@SupabaseInternal +internal actual fun Auth.defaultPlatformRedirectUrl(): String? = null \ No newline at end of file diff --git a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/mingwMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt similarity index 61% rename from Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt rename to Auth/src/mingwMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt index 990f41387..1e68f0542 100644 --- a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ b/Auth/src/mingwMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults /** * Configuration for external authentication providers like Google, Twitter, etc. diff --git a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/mingwMain/kotlin/io/supabase/auth/setupPlatform.kt similarity index 51% rename from Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt rename to Auth/src/mingwMain/kotlin/io/supabase/auth/setupPlatform.kt index 61ef450fd..e386e86ac 100644 --- a/Auth/src/mingwMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ b/Auth/src/mingwMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -1,7 +1,8 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.logging.w +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.logging.w @SupabaseInternal actual fun Auth.setupPlatform() { diff --git a/Auth/src/mingwTest/kotlin/platformSettings.kt b/Auth/src/mingwTest/kotlin/platformSettings.kt index f6fa8ceb8..e8d05c1bf 100644 --- a/Auth/src/mingwTest/kotlin/platformSettings.kt +++ b/Auth/src/mingwTest/kotlin/platformSettings.kt @@ -1,3 +1,3 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() = Unit \ No newline at end of file diff --git a/Auth/src/nonDesktopMain/kotlin/io/github/jan/supabase/auth/Utils.kt b/Auth/src/nonDesktopMain/kotlin/io/supabase/auth/Utils.kt similarity index 68% rename from Auth/src/nonDesktopMain/kotlin/io/github/jan/supabase/auth/Utils.kt rename to Auth/src/nonDesktopMain/kotlin/io/supabase/auth/Utils.kt index 5f0b7cafa..b9b0dd86e 100644 --- a/Auth/src/nonDesktopMain/kotlin/io/github/jan/supabase/auth/Utils.kt +++ b/Auth/src/nonDesktopMain/kotlin/io/supabase/auth/Utils.kt @@ -1,7 +1,10 @@ @file:Suppress("RedundantSuspendModifier") -package io.github.jan.supabase.auth -import io.github.jan.supabase.auth.user.UserSession +package io.supabase.auth + +import io.supabase.auth.Auth +import io.supabase.auth.user.UserSession +import io.supabase.auth.openExternalUrl internal actual suspend fun Auth.startExternalAuth( redirectUrl: String?, diff --git a/Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsCodeVerifierCache.kt b/Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsCodeVerifierCache.kt similarity index 97% rename from Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsCodeVerifierCache.kt rename to Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsCodeVerifierCache.kt index 418bbac59..409bcf3d1 100644 --- a/Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsCodeVerifierCache.kt +++ b/Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsCodeVerifierCache.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import com.russhwolf.settings.ExperimentalSettingsApi import com.russhwolf.settings.Settings diff --git a/Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsSessionManager.kt b/Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsSessionManager.kt similarity index 94% rename from Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsSessionManager.kt rename to Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsSessionManager.kt index 7d22aae95..5b7f739f2 100644 --- a/Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsSessionManager.kt +++ b/Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsSessionManager.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import com.russhwolf.settings.ExperimentalSettingsApi import com.russhwolf.settings.Settings import com.russhwolf.settings.coroutines.toSuspendSettings -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.logging.e +import io.supabase.auth.user.UserSession +import io.supabase.logging.e import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonBuilder diff --git a/Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsUtil.kt b/Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsUtil.kt similarity index 92% rename from Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsUtil.kt rename to Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsUtil.kt index 1b9d4b138..b48f176ae 100644 --- a/Auth/src/settingsMain/kotlin/io/github/jan/supabase/auth/SettingsUtil.kt +++ b/Auth/src/settingsMain/kotlin/io/supabase/auth/SettingsUtil.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.auth +package io.supabase.auth import com.russhwolf.settings.Settings -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import io.ktor.util.PlatformUtils.IS_NODE @SupabaseInternal diff --git a/Auth/src/settingsTest/kotlin/SettingsCodeVerifierCacheTest.kt b/Auth/src/settingsTest/kotlin/SettingsCodeVerifierCacheTest.kt index 6a3e5fef7..9efebf98d 100644 --- a/Auth/src/settingsTest/kotlin/SettingsCodeVerifierCacheTest.kt +++ b/Auth/src/settingsTest/kotlin/SettingsCodeVerifierCacheTest.kt @@ -1,5 +1,5 @@ import com.russhwolf.settings.MapSettings -import io.github.jan.supabase.auth.SettingsCodeVerifierCache +import io.supabase.auth.SettingsCodeVerifierCache import kotlinx.coroutines.test.runTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Auth/src/settingsTest/kotlin/SettingsSessionManagerTest.kt b/Auth/src/settingsTest/kotlin/SettingsSessionManagerTest.kt index 0139c01b9..a350a5f25 100644 --- a/Auth/src/settingsTest/kotlin/SettingsSessionManagerTest.kt +++ b/Auth/src/settingsTest/kotlin/SettingsSessionManagerTest.kt @@ -1,6 +1,6 @@ import com.russhwolf.settings.MapSettings -import io.github.jan.supabase.auth.SettingsSessionManager -import io.github.jan.supabase.auth.user.UserSession +import io.supabase.auth.SettingsSessionManager +import io.supabase.auth.user.UserSession import kotlinx.coroutines.test.runTest import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/Auth/src/settingsTest/kotlin/SettingsTest.kt b/Auth/src/settingsTest/kotlin/SettingsTest.kt index a2bef23a8..d02893adc 100644 --- a/Auth/src/settingsTest/kotlin/SettingsTest.kt +++ b/Auth/src/settingsTest/kotlin/SettingsTest.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.auth.createDefaultSettingsKey +import io.supabase.auth.createDefaultSettingsKey import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Auth/src/watchosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/tvosMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 53% rename from Auth/src/watchosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/tvosMain/kotlin/io/supabase/auth/AuthConfig.kt index b7229ecd9..5055dceec 100644 --- a/Auth/src/watchosMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/tvosMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationConfig /** * The configuration for [Auth] diff --git a/Auth/src/tvosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt b/Auth/src/tvosMain/kotlin/io/supabase/auth/providers/openUrl.kt similarity index 71% rename from Auth/src/tvosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt rename to Auth/src/tvosMain/kotlin/io/supabase/auth/providers/openUrl.kt index 471b13d3c..68597af30 100644 --- a/Auth/src/tvosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt +++ b/Auth/src/tvosMain/kotlin/io/supabase/auth/providers/openUrl.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers import platform.Foundation.NSURL diff --git a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt deleted file mode 100644 index 267e6bf68..000000000 --- a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/providers/ExternalAuthConfig.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.auth.providers - -/** - * Configuration for external authentication providers like Google, Twitter, etc. - */ -actual class ExternalAuthConfig: ExternalAuthConfigDefaults() \ No newline at end of file diff --git a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 53% rename from Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/wasmJsMain/kotlin/io/supabase/auth/AuthConfig.kt index 9fd9994f5..c347d4c91 100644 --- a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationConfig /** * The configuration for [Auth] diff --git a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.kt b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/RedirectUrl.kt similarity index 55% rename from Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.kt rename to Auth/src/wasmJsMain/kotlin/io/supabase/auth/RedirectUrl.kt index 1ad88fcf5..4dc0d9343 100644 --- a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/RedirectUrl.kt +++ b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/RedirectUrl.kt @@ -1,6 +1,7 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth import kotlinx.browser.window @SupabaseInternal diff --git a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/Utils.wasmJs.kt b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/Utils.wasmJs.kt similarity index 63% rename from Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/Utils.wasmJs.kt rename to Auth/src/wasmJsMain/kotlin/io/supabase/auth/Utils.wasmJs.kt index 44cb623db..96efe1e54 100644 --- a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/Utils.wasmJs.kt +++ b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/Utils.wasmJs.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.SupabaseClient +import io.supabase.SupabaseClient import kotlinx.browser.window internal actual suspend fun SupabaseClient.openExternalUrl(url: String) { diff --git a/Auth/src/wasmJsMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt new file mode 100644 index 000000000..a9061d8b3 --- /dev/null +++ b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/providers/ExternalAuthConfig.kt @@ -0,0 +1,8 @@ +package io.supabase.auth.providers + +import io.supabase.auth.providers.ExternalAuthConfigDefaults + +/** + * Configuration for external authentication providers like Google, Twitter, etc. + */ +actual class ExternalAuthConfig: ExternalAuthConfigDefaults() \ No newline at end of file diff --git a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/setupPlatform.kt similarity index 86% rename from Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt rename to Auth/src/wasmJsMain/kotlin/io/supabase/auth/setupPlatform.kt index 8137057b1..b06c1383d 100644 --- a/Auth/src/wasmJsMain/kotlin/io/github/jan/supabase/auth/setupPlatform.kt +++ b/Auth/src/wasmJsMain/kotlin/io/supabase/auth/setupPlatform.kt @@ -1,7 +1,10 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import io.ktor.util.PlatformUtils.IS_BROWSER +import io.supabase.auth.Auth +import io.supabase.auth.AuthImpl +import io.supabase.auth.parseFragmentAndImportSession import kotlinx.browser.window import kotlinx.coroutines.launch import org.w3c.dom.url.URL diff --git a/Auth/src/wasmJsTest/kotlin/platformSettings.kt b/Auth/src/wasmJsTest/kotlin/platformSettings.kt index f6fa8ceb8..e8d05c1bf 100644 --- a/Auth/src/wasmJsTest/kotlin/platformSettings.kt +++ b/Auth/src/wasmJsTest/kotlin/platformSettings.kt @@ -1,3 +1,3 @@ -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformSettings() = Unit \ No newline at end of file diff --git a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt b/Auth/src/watchosMain/kotlin/io/supabase/auth/AuthConfig.kt similarity index 53% rename from Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt rename to Auth/src/watchosMain/kotlin/io/supabase/auth/AuthConfig.kt index b7229ecd9..5055dceec 100644 --- a/Auth/src/jsMain/kotlin/io/github/jan/supabase/auth/AuthConfig.kt +++ b/Auth/src/watchosMain/kotlin/io/supabase/auth/AuthConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.auth +package io.supabase.auth -import io.github.jan.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationConfig /** * The configuration for [Auth] diff --git a/Auth/src/watchosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt b/Auth/src/watchosMain/kotlin/io/supabase/auth/providers/openUrl.kt similarity index 71% rename from Auth/src/watchosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt rename to Auth/src/watchosMain/kotlin/io/supabase/auth/providers/openUrl.kt index d7e2f9131..e07c73cef 100644 --- a/Auth/src/watchosMain/kotlin/io/github/jan/supabase/auth/providers/openUrl.kt +++ b/Auth/src/watchosMain/kotlin/io/supabase/auth/providers/openUrl.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.auth.providers +package io.supabase.auth.providers import platform.Foundation.NSURL diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2b3c97ea6..bc9f78d87 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,5 +30,5 @@ repositories { ``` And add the following to your dependencies: ```kotlin -implementation("io.github.jan-tennert.supabase:[module]:customVersion") +implementation("io.supabase:[module]:customVersion") ``` diff --git a/Functions/README.md b/Functions/README.md index 55374b781..144632f5b 100644 --- a/Functions/README.md +++ b/Functions/README.md @@ -38,7 +38,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:functions-kt:VERSION") + implementation("io.supabase:functions-kt:VERSION") } ``` diff --git a/Functions/build.gradle.kts b/Functions/build.gradle.kts index 324abd7fa..624e52b58 100644 --- a/Functions/build.gradle.kts +++ b/Functions/build.gradle.kts @@ -27,15 +27,4 @@ kotlin { } } -android { - compileSdk = 34 - sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - namespace = "io.github.jan.supabase.functions.library" - defaultConfig { - minSdk = 21 - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } -} +configureLibraryAndroidTarget() \ No newline at end of file diff --git a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/EdgeFunction.kt b/Functions/src/commonMain/kotlin/io/supabase/functions/EdgeFunction.kt similarity index 93% rename from Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/EdgeFunction.kt rename to Functions/src/commonMain/kotlin/io/supabase/functions/EdgeFunction.kt index 3d73b95de..bd4d7284f 100644 --- a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/EdgeFunction.kt +++ b/Functions/src/commonMain/kotlin/io/supabase/functions/EdgeFunction.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.functions +package io.supabase.functions -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal import io.ktor.client.plugins.HttpRequestTimeoutException import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.setBody diff --git a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/FunctionRegion.kt b/Functions/src/commonMain/kotlin/io/supabase/functions/FunctionRegion.kt similarity index 94% rename from Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/FunctionRegion.kt rename to Functions/src/commonMain/kotlin/io/supabase/functions/FunctionRegion.kt index 8219a921f..df0169900 100644 --- a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/FunctionRegion.kt +++ b/Functions/src/commonMain/kotlin/io/supabase/functions/FunctionRegion.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicProperty") -package io.github.jan.supabase.functions + +package io.supabase.functions /** * The region where the function is invoked. diff --git a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/Functions.kt b/Functions/src/commonMain/kotlin/io/supabase/functions/Functions.kt similarity index 87% rename from Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/Functions.kt rename to Functions/src/commonMain/kotlin/io/supabase/functions/Functions.kt index 752f9f1f4..d62a85fb6 100644 --- a/Functions/src/commonMain/kotlin/io/github/jan/supabase/functions/Functions.kt +++ b/Functions/src/commonMain/kotlin/io/supabase/functions/Functions.kt @@ -1,21 +1,21 @@ -package io.github.jan.supabase.functions - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.authenticatedSupabaseApi -import io.github.jan.supabase.encode -import io.github.jan.supabase.exceptions.BadRequestRestException -import io.github.jan.supabase.exceptions.NotFoundRestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.exceptions.UnauthorizedRestException -import io.github.jan.supabase.plugins.CustomSerializationConfig -import io.github.jan.supabase.plugins.CustomSerializationPlugin -import io.github.jan.supabase.plugins.MainConfig -import io.github.jan.supabase.plugins.MainPlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.serializer.KotlinXSerializer +package io.supabase.functions + +import io.supabase.SupabaseClient +import io.supabase.SupabaseSerializer +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.auth.authenticatedSupabaseApi +import io.supabase.encode +import io.supabase.exceptions.BadRequestRestException +import io.supabase.exceptions.NotFoundRestException +import io.supabase.exceptions.RestException +import io.supabase.exceptions.UnauthorizedRestException +import io.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationPlugin +import io.supabase.plugins.MainConfig +import io.supabase.plugins.MainPlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.serializer.KotlinXSerializer import io.ktor.client.plugins.HttpRequestTimeoutException import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.header diff --git a/Functions/src/commonTest/kotlin/EdgeFunctionTest.kt b/Functions/src/commonTest/kotlin/EdgeFunctionTest.kt index b255a4c36..b7d627fbe 100644 --- a/Functions/src/commonTest/kotlin/EdgeFunctionTest.kt +++ b/Functions/src/commonTest/kotlin/EdgeFunctionTest.kt @@ -1,12 +1,12 @@ -import io.github.jan.supabase.functions.FunctionRegion -import io.github.jan.supabase.functions.functions -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond import io.ktor.http.ContentType import io.ktor.http.Headers import io.ktor.http.HttpHeaders +import io.supabase.functions.FunctionRegion +import io.supabase.functions.functions +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.jsonObject diff --git a/Functions/src/commonTest/kotlin/FunctionsTest.kt b/Functions/src/commonTest/kotlin/FunctionsTest.kt index 50ffc5116..2fe5183e4 100644 --- a/Functions/src/commonTest/kotlin/FunctionsTest.kt +++ b/Functions/src/commonTest/kotlin/FunctionsTest.kt @@ -1,17 +1,17 @@ -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.functions.FunctionRegion -import io.github.jan.supabase.functions.Functions -import io.github.jan.supabase.functions.functions -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond import io.ktor.http.ContentType import io.ktor.http.Headers import io.ktor.http.HttpHeaders +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.functions.FunctionRegion +import io.supabase.functions.Functions +import io.supabase.functions.functions +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.jsonObject diff --git a/GoTrue/README.md b/GoTrue/README.md index aa2fddbec..c5ea93f92 100644 --- a/GoTrue/README.md +++ b/GoTrue/README.md @@ -50,7 +50,7 @@ Versions above 3.0.0 are available under the `auth-kt` module. ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:gotrue-kt:VERSION") + implementation("io.supabase:gotrue-kt:VERSION") } ``` diff --git a/Postgrest/README.md b/Postgrest/README.md index c7c4f75a9..12116204c 100644 --- a/Postgrest/README.md +++ b/Postgrest/README.md @@ -38,7 +38,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:postgrest-kt:VERSION") + implementation("io.supabase:postgrest-kt:VERSION") } ``` diff --git a/Postgrest/src/androidMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt b/Postgrest/src/androidMain/kotlin/io/supabase/postgrest/getColumnName.kt similarity index 75% rename from Postgrest/src/androidMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt rename to Postgrest/src/androidMain/kotlin/io/supabase/postgrest/getColumnName.kt index 6a643054e..4369c8480 100644 --- a/Postgrest/src/androidMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt +++ b/Postgrest/src/androidMain/kotlin/io/supabase/postgrest/getColumnName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.SerialName import kotlin.reflect.KProperty1 import kotlin.reflect.full.findAnnotation diff --git a/Postgrest/src/appleMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt b/Postgrest/src/appleMain/kotlin/io/supabase/postgrest/getColumnName.kt similarity index 56% rename from Postgrest/src/appleMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt rename to Postgrest/src/appleMain/kotlin/io/supabase/postgrest/getColumnName.kt index 7397e8a12..2dc77b46f 100644 --- a/Postgrest/src/appleMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt +++ b/Postgrest/src/appleMain/kotlin/io/supabase/postgrest/getColumnName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlin.reflect.KProperty1 @SupabaseInternal diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Postgrest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/Postgrest.kt similarity index 82% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Postgrest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/Postgrest.kt index 9d163e831..554e3bbac 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Postgrest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/Postgrest.kt @@ -1,19 +1,19 @@ -package io.github.jan.supabase.postgrest - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.plugins.CustomSerializationConfig -import io.github.jan.supabase.plugins.CustomSerializationPlugin -import io.github.jan.supabase.plugins.MainConfig -import io.github.jan.supabase.plugins.MainPlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder -import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder -import io.github.jan.supabase.postgrest.query.PostgrestUpdate -import io.github.jan.supabase.postgrest.query.request.RpcRequestBuilder -import io.github.jan.supabase.postgrest.result.PostgrestResult +package io.supabase.postgrest + +import io.supabase.SupabaseClient +import io.supabase.SupabaseSerializer +import io.supabase.exceptions.RestException +import io.supabase.logging.SupabaseLogger +import io.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationPlugin +import io.supabase.plugins.MainConfig +import io.supabase.plugins.MainPlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.query.PostgrestRequestBuilder +import io.supabase.postgrest.query.PostgrestUpdate +import io.supabase.postgrest.query.request.RpcRequestBuilder +import io.supabase.postgrest.result.PostgrestResult import kotlinx.serialization.json.JsonObject /** diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestDsl.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestDsl.kt similarity index 53% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestDsl.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestDsl.kt index a4339f6e5..67f872ebd 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestDsl.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestDsl.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal @DslMarker @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPE) diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestErrorResponse.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestErrorResponse.kt similarity index 84% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestErrorResponse.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestErrorResponse.kt index 1cb4ed6bc..3fdc5d25b 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestErrorResponse.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestErrorResponse.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest import kotlinx.serialization.Serializable diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestImpl.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestImpl.kt similarity index 76% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestImpl.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestImpl.kt index f4e806326..1cfa99aa2 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestImpl.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestImpl.kt @@ -1,19 +1,19 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.authenticatedSupabaseApi -import io.github.jan.supabase.bodyOrNull -import io.github.jan.supabase.exceptions.BadRequestRestException -import io.github.jan.supabase.exceptions.NotFoundRestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.exceptions.UnauthorizedRestException -import io.github.jan.supabase.exceptions.UnknownRestException -import io.github.jan.supabase.postgrest.executor.RestRequestExecutor -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder -import io.github.jan.supabase.postgrest.query.request.RpcRequestBuilder -import io.github.jan.supabase.postgrest.request.RpcRequest -import io.github.jan.supabase.postgrest.result.PostgrestResult +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.authenticatedSupabaseApi +import io.supabase.bodyOrNull +import io.supabase.exceptions.BadRequestRestException +import io.supabase.exceptions.NotFoundRestException +import io.supabase.exceptions.RestException +import io.supabase.exceptions.UnauthorizedRestException +import io.supabase.exceptions.UnknownRestException +import io.supabase.postgrest.executor.RestRequestExecutor +import io.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.query.request.RpcRequestBuilder +import io.supabase.postgrest.request.RpcRequest +import io.supabase.postgrest.result.PostgrestResult import io.ktor.client.statement.HttpResponse import io.ktor.http.HttpStatusCode import kotlinx.serialization.json.JsonObject diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestRpc.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestRpc.kt similarity index 81% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestRpc.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestRpc.kt index 0ee05f226..e4e0062a8 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PostgrestRpc.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PostgrestRpc.kt @@ -1,10 +1,11 @@ @file:Suppress("MatchingDeclarationName") -package io.github.jan.supabase.postgrest -import io.github.jan.supabase.encodeToJsonElement -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.postgrest.query.request.RpcRequestBuilder -import io.github.jan.supabase.postgrest.result.PostgrestResult +package io.supabase.postgrest + +import io.supabase.encodeToJsonElement +import io.supabase.exceptions.RestException +import io.supabase.postgrest.query.request.RpcRequestBuilder +import io.supabase.postgrest.result.PostgrestResult import io.ktor.http.HttpMethod import kotlinx.serialization.json.jsonObject diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PropertyConversionMethod.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PropertyConversionMethod.kt similarity index 89% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PropertyConversionMethod.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PropertyConversionMethod.kt index 2e43845a3..0b337c991 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/PropertyConversionMethod.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/PropertyConversionMethod.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.reflect.KProperty1 /** diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Utils.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/Utils.kt similarity index 89% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Utils.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/Utils.kt index f1c95767f..edff54587 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/Utils.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/Utils.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.descriptors.elementNames import kotlinx.serialization.serializerOrNull diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/PostgrestHttpExtension.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/PostgrestHttpExtension.kt similarity index 74% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/PostgrestHttpExtension.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/PostgrestHttpExtension.kt index 406592329..dfb64f7b5 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/PostgrestHttpExtension.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/PostgrestHttpExtension.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.postgrest.executor +package io.supabase.postgrest.executor -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder -import io.github.jan.supabase.postgrest.query.Returning -import io.github.jan.supabase.postgrest.request.PostgrestRequest -import io.github.jan.supabase.postgrest.result.PostgrestResult +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.query.Returning +import io.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.result.PostgrestResult import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.header import io.ktor.client.request.setBody @@ -21,7 +21,7 @@ internal fun HttpRequestBuilder.configurePostgrestRequest( method = request.method contentType(ContentType.Application.Json) headers.appendAll(request.headers) - headers[PostgrestQueryBuilder.HEADER_PREFER] = request.prefer.joinToString(",") + headers[PostgrestQueryBuilder.Companion.HEADER_PREFER] = request.prefer.joinToString(",") with(url.parameters) { appendAll(parametersOf(request.urlParams.mapValues { (_, value) -> listOf(value) })) if (request.returning is Returning.Representation) { diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/RequestExecutor.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/RequestExecutor.kt similarity index 60% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/RequestExecutor.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/RequestExecutor.kt index 032f4eaf4..ed90501bf 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/RequestExecutor.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/RequestExecutor.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.postgrest.executor +package io.supabase.postgrest.executor -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.request.PostgrestRequest -import io.github.jan.supabase.postgrest.result.PostgrestResult +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.result.PostgrestResult /** * Request executor interface diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/RestRequestExecutor.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/RestRequestExecutor.kt similarity index 61% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/RestRequestExecutor.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/RestRequestExecutor.kt index 2332c5326..aa3ae0814 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/executor/RestRequestExecutor.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/executor/RestRequestExecutor.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.postgrest.executor +package io.supabase.postgrest.executor -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.PostgrestImpl -import io.github.jan.supabase.postgrest.request.PostgrestRequest -import io.github.jan.supabase.postgrest.result.PostgrestResult +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.PostgrestImpl +import io.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.result.PostgrestResult @PublishedApi internal data object RestRequestExecutor : RequestExecutor { diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/Columns.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/Columns.kt similarity index 94% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/Columns.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/Columns.kt index 4b7564c35..f829496df 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/Columns.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/Columns.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest.query +package io.supabase.postgrest.query -import io.github.jan.supabase.postgrest.classPropertyNames +import io.supabase.postgrest.classPropertyNames import kotlin.jvm.JvmInline /** diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/Order.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/Order.kt similarity index 85% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/Order.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/Order.kt index 2ac8b6970..7bedc67a5 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/Order.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/Order.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.postgrest.query +package io.supabase.postgrest.query /** * Used to order the result of a query diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestQueryBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestQueryBuilder.kt similarity index 92% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestQueryBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestQueryBuilder.kt index 7b9c832ab..40d3f9c68 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestQueryBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestQueryBuilder.kt @@ -1,22 +1,23 @@ @file:Suppress("UndocumentedPublicProperty") -package io.github.jan.supabase.postgrest.query -import io.github.jan.supabase.auth.PostgrestFilterDSL -import io.github.jan.supabase.encodeToJsonElement -import io.github.jan.supabase.exceptions.HttpRequestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.executor.RestRequestExecutor -import io.github.jan.supabase.postgrest.mapToFirstValue -import io.github.jan.supabase.postgrest.query.request.InsertRequestBuilder -import io.github.jan.supabase.postgrest.query.request.SelectRequestBuilder -import io.github.jan.supabase.postgrest.query.request.UpsertRequestBuilder -import io.github.jan.supabase.postgrest.request.DeleteRequest -import io.github.jan.supabase.postgrest.request.InsertRequest -import io.github.jan.supabase.postgrest.request.SelectRequest -import io.github.jan.supabase.postgrest.request.UpdateRequest -import io.github.jan.supabase.postgrest.result.PostgrestResult +package io.supabase.postgrest.query + import io.ktor.client.plugins.HttpRequestTimeoutException +import io.supabase.auth.PostgrestFilterDSL +import io.supabase.encodeToJsonElement +import io.supabase.exceptions.HttpRequestException +import io.supabase.exceptions.RestException +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.executor.RestRequestExecutor +import io.supabase.postgrest.mapToFirstValue +import io.supabase.postgrest.query.request.InsertRequestBuilder +import io.supabase.postgrest.query.request.SelectRequestBuilder +import io.supabase.postgrest.query.request.UpsertRequestBuilder +import io.supabase.postgrest.request.DeleteRequest +import io.supabase.postgrest.request.InsertRequest +import io.supabase.postgrest.request.SelectRequest +import io.supabase.postgrest.request.UpdateRequest +import io.supabase.postgrest.result.PostgrestResult import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonObject diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestRequestBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestRequestBuilder.kt similarity index 94% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestRequestBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestRequestBuilder.kt index 656d016cb..5d87431e3 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestRequestBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestRequestBuilder.kt @@ -1,11 +1,12 @@ @file:Suppress("UndocumentedPublicProperty", "ConstructorParameterNaming") -package io.github.jan.supabase.postgrest.query -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.auth.PostgrestFilterDSL -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.query.filter.PostgrestFilterBuilder -import io.github.jan.supabase.postgrest.result.PostgrestResult +package io.supabase.postgrest.query + +import io.supabase.annotations.SupabaseExperimental +import io.supabase.auth.PostgrestFilterDSL +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.query.filter.PostgrestFilterBuilder +import io.supabase.postgrest.result.PostgrestResult import io.ktor.http.HeadersBuilder import io.ktor.http.HttpHeaders import kotlin.js.JsName diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestUpdate.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestUpdate.kt similarity index 90% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestUpdate.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestUpdate.kt index 37bb21e66..2e32b8caa 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/PostgrestUpdate.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/PostgrestUpdate.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.postgrest.query +package io.supabase.postgrest.query -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.encodeToJsonElement -import io.github.jan.supabase.postgrest.PropertyConversionMethod +import io.supabase.SupabaseSerializer +import io.supabase.annotations.SupabaseInternal +import io.supabase.encodeToJsonElement +import io.supabase.postgrest.PropertyConversionMethod import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonNull import kotlinx.serialization.json.JsonObject @@ -124,7 +124,7 @@ class PostgrestUpdate(@PublishedApi internal val propertyConversionMethod: Prope } @SupabaseInternal -inline fun buildPostgrestUpdate(propertyConversionMethod: PropertyConversionMethod = PropertyConversionMethod.SERIAL_NAME, serializer: SupabaseSerializer, block: PostgrestUpdate.() -> Unit): JsonObject { +inline fun buildPostgrestUpdate(propertyConversionMethod: PropertyConversionMethod = PropertyConversionMethod.Companion.SERIAL_NAME, serializer: SupabaseSerializer, block: PostgrestUpdate.() -> Unit): JsonObject { val update = PostgrestUpdate(propertyConversionMethod, serializer) update.block() return update.toJson() diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/FilterOperation.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/FilterOperation.kt similarity index 84% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/FilterOperation.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/FilterOperation.kt index eb634652b..c2a53963b 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/FilterOperation.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/FilterOperation.kt @@ -3,7 +3,8 @@ "UndocumentedPublicFunction", "UndocumentedPublicProperty" ) -package io.github.jan.supabase.postgrest.query.filter + +package io.supabase.postgrest.query.filter /** * Represents a filter operation for a column using a specific operator and a value. diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/FilterOperator.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/FilterOperator.kt similarity index 91% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/FilterOperator.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/FilterOperator.kt index 41bb22eb0..d75dff84b 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/FilterOperator.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/FilterOperator.kt @@ -3,7 +3,8 @@ "UndocumentedPublicFunction", "UndocumentedPublicProperty" ) -package io.github.jan.supabase.postgrest.query.filter + +package io.supabase.postgrest.query.filter /** * Represents a single filter operation diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/PostgrestFilterBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/PostgrestFilterBuilder.kt similarity index 99% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/PostgrestFilterBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/PostgrestFilterBuilder.kt index 0021ce0ff..c833917c3 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/PostgrestFilterBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/PostgrestFilterBuilder.kt @@ -1,8 +1,9 @@ @file:Suppress("UndocumentedPublicProperty", "ConstructorParameterNaming") -package io.github.jan.supabase.postgrest.query.filter -import io.github.jan.supabase.auth.PostgrestFilterDSL -import io.github.jan.supabase.postgrest.PropertyConversionMethod +package io.supabase.postgrest.query.filter + +import io.supabase.auth.PostgrestFilterDSL +import io.supabase.postgrest.PropertyConversionMethod import kotlin.reflect.KProperty1 /** diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/TextSearchType.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/TextSearchType.kt similarity index 87% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/TextSearchType.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/TextSearchType.kt index 48b4afe12..6be0891a9 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/filter/TextSearchType.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/filter/TextSearchType.kt @@ -3,7 +3,8 @@ "UndocumentedPublicFunction", "UndocumentedPublicProperty" ) -package io.github.jan.supabase.postgrest.query.filter + +package io.supabase.postgrest.query.filter /** * Used to search rows using a full text search. See [Postgrest](https://postgrest.org/en/stable/api.html#full-text-search) for more information diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/InsertRequestBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/InsertRequestBuilder.kt similarity index 63% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/InsertRequestBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/InsertRequestBuilder.kt index 4c3f5ff28..733d9bb4a 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/InsertRequestBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/InsertRequestBuilder.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.postgrest.query.request +package io.supabase.postgrest.query.request -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder -import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.query.PostgrestRequestBuilder /** * Request builder for [PostgrestQueryBuilder.insert] diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/RpcRequestBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/RpcRequestBuilder.kt similarity index 62% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/RpcRequestBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/RpcRequestBuilder.kt index 8d7b1fe68..73341766d 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/RpcRequestBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/RpcRequestBuilder.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.postgrest.query.request +package io.supabase.postgrest.query.request -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.RpcMethod -import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.RpcMethod +import io.supabase.postgrest.query.PostgrestRequestBuilder /** * Request builder for [Postgrest.rpcRequest] diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/SelectRequestBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/SelectRequestBuilder.kt similarity index 54% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/SelectRequestBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/SelectRequestBuilder.kt index 1ac90fac3..322afb5f7 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/SelectRequestBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/SelectRequestBuilder.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.postgrest.query.request +package io.supabase.postgrest.query.request -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder -import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.query.PostgrestRequestBuilder /** * Request builder for [PostgrestQueryBuilder.select] diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/UpsertRequestBuilder.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/UpsertRequestBuilder.kt similarity index 75% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/UpsertRequestBuilder.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/UpsertRequestBuilder.kt index 024e00338..bd62efc9d 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/query/request/UpsertRequestBuilder.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/query/request/UpsertRequestBuilder.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.postgrest.query.request +package io.supabase.postgrest.query.request -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.query.PostgrestQueryBuilder /** * Request builder for [PostgrestQueryBuilder.upsert] diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/DeleteRequest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/DeleteRequest.kt similarity index 77% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/DeleteRequest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/DeleteRequest.kt index 0aba3a66d..08b073bc0 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/DeleteRequest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/DeleteRequest.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.postgrest.request +package io.supabase.postgrest.request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Returning +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Returning import io.ktor.http.Headers import io.ktor.http.HttpMethod diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/InsertRequest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/InsertRequest.kt similarity index 85% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/InsertRequest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/InsertRequest.kt index 7eb9d352c..e631efc1d 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/InsertRequest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/InsertRequest.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.postgrest.request +package io.supabase.postgrest.request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Returning +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Returning import io.ktor.http.Headers import io.ktor.http.HttpMethod import kotlinx.serialization.json.JsonArray diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/PostgrestRequest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/PostgrestRequest.kt similarity index 76% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/PostgrestRequest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/PostgrestRequest.kt index 9b6d796c9..22179d313 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/PostgrestRequest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/PostgrestRequest.kt @@ -4,10 +4,10 @@ "UndocumentedPublicProperty" ) -package io.github.jan.supabase.postgrest.request +package io.supabase.postgrest.request -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.postgrest.query.Returning +import io.supabase.annotations.SupabaseInternal +import io.supabase.postgrest.query.Returning import io.ktor.http.Headers import io.ktor.http.HttpMethod import kotlinx.serialization.json.JsonElement diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/RpcRequest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/RpcRequest.kt similarity index 83% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/RpcRequest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/RpcRequest.kt index fdd9a3094..576691622 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/RpcRequest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/RpcRequest.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest.request +package io.supabase.postgrest.request -import io.github.jan.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Count import io.ktor.http.Headers import io.ktor.http.HttpMethod import kotlinx.serialization.json.JsonElement diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/SelectRequest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/SelectRequest.kt similarity index 82% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/SelectRequest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/SelectRequest.kt index 1cd812ff2..7267ec8d9 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/SelectRequest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/SelectRequest.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest.request +package io.supabase.postgrest.request -import io.github.jan.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Count import io.ktor.http.Headers import io.ktor.http.HttpMethod diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/UpdateRequest.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/UpdateRequest.kt similarity index 80% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/UpdateRequest.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/UpdateRequest.kt index b6df1f390..28bee3b59 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/request/UpdateRequest.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/request/UpdateRequest.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.postgrest.request +package io.supabase.postgrest.request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Returning +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Returning import io.ktor.http.Headers import io.ktor.http.HttpMethod import kotlinx.serialization.json.JsonElement diff --git a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/result/PostgrestResult.kt b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/result/PostgrestResult.kt similarity index 87% rename from Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/result/PostgrestResult.kt rename to Postgrest/src/commonMain/kotlin/io/supabase/postgrest/result/PostgrestResult.kt index 144a316d7..de9274950 100644 --- a/Postgrest/src/commonMain/kotlin/io/github/jan/supabase/postgrest/result/PostgrestResult.kt +++ b/Postgrest/src/commonMain/kotlin/io/supabase/postgrest/result/PostgrestResult.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.postgrest.result +package io.supabase.postgrest.result -import io.github.jan.supabase.decode -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder +import io.supabase.decode +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.PostgrestRequestBuilder import io.ktor.http.Headers /** diff --git a/Postgrest/src/commonTest/kotlin/ColumnsTest.kt b/Postgrest/src/commonTest/kotlin/ColumnsTest.kt index 7c51d5d5c..d2e4bfab4 100644 --- a/Postgrest/src/commonTest/kotlin/ColumnsTest.kt +++ b/Postgrest/src/commonTest/kotlin/ColumnsTest.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.postgrest.query.Columns +import io.supabase.postgrest.query.Columns import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Postgrest/src/commonTest/kotlin/PostgrestFilterBuilderTest.kt b/Postgrest/src/commonTest/kotlin/PostgrestFilterBuilderTest.kt index 443a6a3e5..40de834c2 100644 --- a/Postgrest/src/commonTest/kotlin/PostgrestFilterBuilderTest.kt +++ b/Postgrest/src/commonTest/kotlin/PostgrestFilterBuilderTest.kt @@ -1,7 +1,7 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.query.filter.PostgrestFilterBuilder +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.query.filter.PostgrestFilterBuilder import io.ktor.http.decodeURLQueryComponent import io.ktor.http.formUrlEncode import io.ktor.http.parametersOf diff --git a/Postgrest/src/commonTest/kotlin/PostgrestRequestBuilderTest.kt b/Postgrest/src/commonTest/kotlin/PostgrestRequestBuilderTest.kt index 1ddc65858..56547c193 100644 --- a/Postgrest/src/commonTest/kotlin/PostgrestRequestBuilderTest.kt +++ b/Postgrest/src/commonTest/kotlin/PostgrestRequestBuilderTest.kt @@ -1,6 +1,6 @@ -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Order -import io.github.jan.supabase.postgrest.query.Returning +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Order +import io.supabase.postgrest.query.Returning import io.ktor.http.HttpHeaders import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Postgrest/src/commonTest/kotlin/PostgrestTest.kt b/Postgrest/src/commonTest/kotlin/PostgrestTest.kt index 13396d1b6..59b389c78 100644 --- a/Postgrest/src/commonTest/kotlin/PostgrestTest.kt +++ b/Postgrest/src/commonTest/kotlin/PostgrestTest.kt @@ -1,23 +1,23 @@ -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.RpcMethod -import io.github.jan.supabase.postgrest.from -import io.github.jan.supabase.postgrest.postgrest -import io.github.jan.supabase.postgrest.query.Columns -import io.github.jan.supabase.postgrest.query.request.InsertRequestBuilder -import io.github.jan.supabase.postgrest.query.request.UpsertRequestBuilder -import io.github.jan.supabase.postgrest.result.PostgrestResult -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.MockRequestHandleScope import io.ktor.client.engine.mock.respond import io.ktor.client.request.HttpRequestData import io.ktor.client.request.HttpResponseData import io.ktor.http.HttpMethod +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.RpcMethod +import io.supabase.postgrest.from +import io.supabase.postgrest.postgrest +import io.supabase.postgrest.query.Columns +import io.supabase.postgrest.query.request.InsertRequestBuilder +import io.supabase.postgrest.query.request.UpsertRequestBuilder +import io.supabase.postgrest.result.PostgrestResult +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.JsonArray import kotlinx.serialization.json.JsonObject diff --git a/Postgrest/src/commonTest/kotlin/Utils.kt b/Postgrest/src/commonTest/kotlin/Utils.kt index b1db90d84..a7240badd 100644 --- a/Postgrest/src/commonTest/kotlin/Utils.kt +++ b/Postgrest/src/commonTest/kotlin/Utils.kt @@ -1,6 +1,6 @@ -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.postgrest.PropertyConversionMethod -import io.github.jan.supabase.postgrest.query.PostgrestRequestBuilder +import io.supabase.annotations.SupabaseInternal +import io.supabase.postgrest.PropertyConversionMethod +import io.supabase.postgrest.query.PostgrestRequestBuilder @SupabaseInternal inline fun postgrestRequest(propertyConversionMethod: PropertyConversionMethod = PropertyConversionMethod.CAMEL_CASE_TO_SNAKE_CASE, block: PostgrestRequestBuilder.() -> Unit): PostgrestRequestBuilder { diff --git a/Postgrest/src/commonTest/kotlin/request/DeleteRequestTest.kt b/Postgrest/src/commonTest/kotlin/request/DeleteRequestTest.kt index 2a0da7ac1..449de6af0 100644 --- a/Postgrest/src/commonTest/kotlin/request/DeleteRequestTest.kt +++ b/Postgrest/src/commonTest/kotlin/request/DeleteRequestTest.kt @@ -1,9 +1,9 @@ package request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Returning -import io.github.jan.supabase.postgrest.request.DeleteRequest -import io.github.jan.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Returning +import io.supabase.postgrest.request.DeleteRequest +import io.supabase.postgrest.request.PostgrestRequest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Postgrest/src/commonTest/kotlin/request/InsertRequestTest.kt b/Postgrest/src/commonTest/kotlin/request/InsertRequestTest.kt index b2d080e18..8d67cd0ff 100644 --- a/Postgrest/src/commonTest/kotlin/request/InsertRequestTest.kt +++ b/Postgrest/src/commonTest/kotlin/request/InsertRequestTest.kt @@ -1,9 +1,9 @@ package request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Returning -import io.github.jan.supabase.postgrest.request.InsertRequest -import io.github.jan.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Returning +import io.supabase.postgrest.request.InsertRequest +import io.supabase.postgrest.request.PostgrestRequest import kotlinx.serialization.json.JsonArray import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Postgrest/src/commonTest/kotlin/request/RpcRequestTest.kt b/Postgrest/src/commonTest/kotlin/request/RpcRequestTest.kt index 6857e646c..3b2afdf46 100644 --- a/Postgrest/src/commonTest/kotlin/request/RpcRequestTest.kt +++ b/Postgrest/src/commonTest/kotlin/request/RpcRequestTest.kt @@ -1,8 +1,8 @@ package request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.request.PostgrestRequest -import io.github.jan.supabase.postgrest.request.RpcRequest +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.request.RpcRequest import io.ktor.http.HttpMethod import kotlinx.serialization.json.JsonArray import kotlin.test.Test diff --git a/Postgrest/src/commonTest/kotlin/request/SelectRequestTest.kt b/Postgrest/src/commonTest/kotlin/request/SelectRequestTest.kt index 1effbc044..bffcabb6b 100644 --- a/Postgrest/src/commonTest/kotlin/request/SelectRequestTest.kt +++ b/Postgrest/src/commonTest/kotlin/request/SelectRequestTest.kt @@ -1,8 +1,8 @@ package request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.request.PostgrestRequest -import io.github.jan.supabase.postgrest.request.SelectRequest +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.request.SelectRequest import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertFalse diff --git a/Postgrest/src/commonTest/kotlin/request/UpdateRequestTest.kt b/Postgrest/src/commonTest/kotlin/request/UpdateRequestTest.kt index a46cb0b3e..24c091b8a 100644 --- a/Postgrest/src/commonTest/kotlin/request/UpdateRequestTest.kt +++ b/Postgrest/src/commonTest/kotlin/request/UpdateRequestTest.kt @@ -1,9 +1,9 @@ package request -import io.github.jan.supabase.postgrest.query.Count -import io.github.jan.supabase.postgrest.query.Returning -import io.github.jan.supabase.postgrest.request.PostgrestRequest -import io.github.jan.supabase.postgrest.request.UpdateRequest +import io.supabase.postgrest.query.Count +import io.supabase.postgrest.query.Returning +import io.supabase.postgrest.request.PostgrestRequest +import io.supabase.postgrest.request.UpdateRequest import kotlinx.serialization.json.JsonArray import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Postgrest/src/wasmJsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt b/Postgrest/src/jsMain/kotlin/io/supabase/postgrest/getColumnName.kt similarity index 56% rename from Postgrest/src/wasmJsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt rename to Postgrest/src/jsMain/kotlin/io/supabase/postgrest/getColumnName.kt index f732884bb..dc77c4eb7 100644 --- a/Postgrest/src/wasmJsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt +++ b/Postgrest/src/jsMain/kotlin/io/supabase/postgrest/getColumnName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlin.reflect.KProperty1 @SupabaseInternal diff --git a/Postgrest/src/jvmMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt b/Postgrest/src/jvmMain/kotlin/io/supabase/postgrest/getColumnName.kt similarity index 75% rename from Postgrest/src/jvmMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt rename to Postgrest/src/jvmMain/kotlin/io/supabase/postgrest/getColumnName.kt index 6a643054e..4369c8480 100644 --- a/Postgrest/src/jvmMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt +++ b/Postgrest/src/jvmMain/kotlin/io/supabase/postgrest/getColumnName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.SerialName import kotlin.reflect.KProperty1 import kotlin.reflect.full.findAnnotation diff --git a/Postgrest/src/mingwX64Main/kotlin/io/github/jan/supabase/postgrest/getSerialName.kt b/Postgrest/src/linuxX64Main/kotlin/io/supabase/postgrest/getSerialName.kt similarity index 57% rename from Postgrest/src/mingwX64Main/kotlin/io/github/jan/supabase/postgrest/getSerialName.kt rename to Postgrest/src/linuxX64Main/kotlin/io/supabase/postgrest/getSerialName.kt index 50995f64a..4f7ea5307 100644 --- a/Postgrest/src/mingwX64Main/kotlin/io/github/jan/supabase/postgrest/getSerialName.kt +++ b/Postgrest/src/linuxX64Main/kotlin/io/supabase/postgrest/getSerialName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlin.reflect.KProperty1 @SupabaseInternal diff --git a/Postgrest/src/linuxX64Main/kotlin/io/github/jan/supabase/postgrest/getSerialName.kt b/Postgrest/src/mingwX64Main/kotlin/io/supabase/postgrest/getSerialName.kt similarity index 57% rename from Postgrest/src/linuxX64Main/kotlin/io/github/jan/supabase/postgrest/getSerialName.kt rename to Postgrest/src/mingwX64Main/kotlin/io/supabase/postgrest/getSerialName.kt index 50995f64a..4f7ea5307 100644 --- a/Postgrest/src/linuxX64Main/kotlin/io/github/jan/supabase/postgrest/getSerialName.kt +++ b/Postgrest/src/mingwX64Main/kotlin/io/supabase/postgrest/getSerialName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlin.reflect.KProperty1 @SupabaseInternal diff --git a/Postgrest/src/jsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt b/Postgrest/src/wasmJsMain/kotlin/io/supabase/postgrest/getColumnName.kt similarity index 56% rename from Postgrest/src/jsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt rename to Postgrest/src/wasmJsMain/kotlin/io/supabase/postgrest/getColumnName.kt index f732884bb..dc77c4eb7 100644 --- a/Postgrest/src/jsMain/kotlin/io/github/jan/supabase/postgrest/getColumnName.kt +++ b/Postgrest/src/wasmJsMain/kotlin/io/supabase/postgrest/getColumnName.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.postgrest +package io.supabase.postgrest -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlin.reflect.KProperty1 @SupabaseInternal diff --git a/README.md b/README.md index 61f5aa69d..7e7075be4 100644 --- a/README.md +++ b/README.md @@ -40,18 +40,20 @@ For information about supported Kotlin targets, see the corresponding module REA ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:[module]:VERSION") + implementation("io.supabase:[module]:VERSION") } ``` -\* Before version 3.0.0, the module was called `gotrue-kt`. +> [!NOTE] +> Before version 4.0.0, the Maven Central group id was `io.github.jan-tennert` instead of `io.supabase` \ +> \* Before version 3.0.0, the module was called `gotrue-kt`. If you use multiple modules, you can use the bom dependency to get the correct versions for all modules: ```kotlin -implementation(platform("io.github.jan-tennert.supabase:bom:VERSION")) -implementation("io.github.jan-tennert.supabase:[module]") +implementation(platform("io.supabase:bom:VERSION")) +implementation("io.supabase:[module]") ``` *Note that the minimum Android SDK version is 26. For lower versions, you need to enable [core library desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring).* @@ -74,7 +76,9 @@ For targets: `jvm`, `android`, `js`, `ios` ```kotlin val commonMain by getting { dependencies { - //supabase modules + implementation(platform("io.supabase:bom:VERSION")) + implementation("io.supabase:auth-kt") + implementation("io.supabase:postgrest-kt") } } val jvmMain by getting { diff --git a/Realtime/README.md b/Realtime/README.md index 3867f894d..5681281f1 100644 --- a/Realtime/README.md +++ b/Realtime/README.md @@ -38,7 +38,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:realtime-kt:VERSION") + implementation("io.supabase:realtime-kt:VERSION") } ``` diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RCloseEvent.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RCloseEvent.kt deleted file mode 100644 index 1ef7d52c8..000000000 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RCloseEvent.kt +++ /dev/null @@ -1,22 +0,0 @@ -package io.github.jan.supabase.realtime.event - -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage - -/** - * Event that handles the closing of a channel - */ -data object RCloseEvent : RealtimeEvent { - - override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { - channel.realtime.removeChannel(channel) - Realtime.logger.d { "Unsubscribed from channel ${message.topic}" } - } - - override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_CLOSE - } - -} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RErrorEvent.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RErrorEvent.kt deleted file mode 100644 index 1a926475b..000000000 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RErrorEvent.kt +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.jan.supabase.realtime.event - -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage - -/** - * Event that handles an error event - */ -data object RErrorEvent : RealtimeEvent { - - override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { - Realtime.logger.e { "Received an error in channel ${message.topic}. That could be as a result of an invalid access token" } - } - - override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_ERROR - } - -} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RSystemEvent.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RSystemEvent.kt deleted file mode 100644 index 39b2828f0..000000000 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RSystemEvent.kt +++ /dev/null @@ -1,23 +0,0 @@ -package io.github.jan.supabase.realtime.event - -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage -import kotlinx.serialization.json.jsonPrimitive - -/** - * Event that handles the system event - */ -data object RSystemEvent : RealtimeEvent { - - override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { - Realtime.logger.d { "Subscribed to channel ${message.topic}" } - channel.updateStatus(RealtimeChannel.Status.SUBSCRIBED) - } - - override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_SYSTEM && message.payload["status"]?.jsonPrimitive?.content == "ok" - } - -} diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RSystemReplyEvent.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RSystemReplyEvent.kt deleted file mode 100644 index 715e85ae4..000000000 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RSystemReplyEvent.kt +++ /dev/null @@ -1,26 +0,0 @@ -package io.github.jan.supabase.realtime.event - -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage -import kotlinx.serialization.json.jsonPrimitive - -/** - * Event that handles the system reply event - */ -data object RSystemReplyEvent : RealtimeEvent { - - override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { - Realtime.logger.d { "Received system reply: ${message.payload}." } - if(channel.status.value == RealtimeChannel.Status.UNSUBSCRIBING) { - channel.updateStatus(RealtimeChannel.Status.UNSUBSCRIBED) - Realtime.logger.d { "Unsubscribed from channel ${message.topic}" } - } - } - - override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_REPLY && message.payload["status"]?.jsonPrimitive?.content == "ok" - } - -} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RTokenExpiredEvent.kt b/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RTokenExpiredEvent.kt deleted file mode 100644 index fd3802c19..000000000 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RTokenExpiredEvent.kt +++ /dev/null @@ -1,22 +0,0 @@ -package io.github.jan.supabase.realtime.event - -import io.github.jan.supabase.logging.w -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage -import kotlinx.serialization.json.jsonPrimitive - -/** - * Event that handles the token expired event - */ -data object RTokenExpiredEvent : RealtimeEvent { - - override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { - Realtime.logger.w { "Received token expired event. This should not happen, please report this warning." } - } - - override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_SYSTEM && message.payload["message"]?.jsonPrimitive?.content?.contains("access token has expired") ?: false - } - -} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/CallbackManager.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/CallbackManager.kt similarity index 91% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/CallbackManager.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/CallbackManager.kt index b085149fd..7ffb778d6 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/CallbackManager.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/CallbackManager.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.collections.AtomicMutableList -import io.github.jan.supabase.serializer.KotlinXSerializer +import io.supabase.SupabaseSerializer +import io.supabase.annotations.SupabaseInternal +import io.supabase.collections.AtomicMutableList +import io.supabase.serializer.KotlinXSerializer import kotlinx.atomicfu.atomic import kotlinx.serialization.json.JsonObject diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresAction.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgresAction.kt similarity index 94% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresAction.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgresAction.kt index 25a24334e..a05b4222a 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresAction.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgresAction.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.decode -import io.github.jan.supabase.plugins.SerializableData +import io.supabase.SupabaseSerializer +import io.supabase.decode +import io.supabase.plugins.SerializableData import kotlinx.datetime.Instant import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresChangeFilter.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgresChangeFilter.kt similarity index 90% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresChangeFilter.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgresChangeFilter.kt index 8b94dac8d..b7d78b0fb 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgresChangeFilter.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgresChangeFilter.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.postgrest.query.filter.FilterOperation -import io.github.jan.supabase.postgrest.query.filter.FilterOperator +import io.supabase.annotations.SupabaseInternal +import io.supabase.postgrest.query.filter.FilterOperation +import io.supabase.postgrest.query.filter.FilterOperator /** * Used to filter postgres changes diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgrestExtensions.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgrestExtensions.kt similarity index 95% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgrestExtensions.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgrestExtensions.kt index f9e981e7a..14ee8e6e6 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PostgrestExtensions.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PostgrestExtensions.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.postgrest.query.PostgrestQueryBuilder -import io.github.jan.supabase.postgrest.query.filter.FilterOperation -import io.github.jan.supabase.postgrest.query.filter.PostgrestFilterBuilder +import io.supabase.annotations.SupabaseExperimental +import io.supabase.postgrest.query.PostgrestQueryBuilder +import io.supabase.postgrest.query.filter.FilterOperation +import io.supabase.postgrest.query.filter.PostgrestFilterBuilder import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PresenceAction.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PresenceAction.kt similarity index 97% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PresenceAction.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/PresenceAction.kt index 5d49b4694..db922d221 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/PresenceAction.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/PresenceAction.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.decode +import io.supabase.SupabaseSerializer +import io.supabase.decode import kotlinx.serialization.KSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.builtins.serializer diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/Realtime.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/Realtime.kt similarity index 88% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/Realtime.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/Realtime.kt index 6ea5aa950..4d3d92469 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/Realtime.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/Realtime.kt @@ -1,18 +1,18 @@ -package io.github.jan.supabase.realtime - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.plugins.CustomSerializationConfig -import io.github.jan.supabase.plugins.CustomSerializationPlugin -import io.github.jan.supabase.plugins.MainConfig -import io.github.jan.supabase.plugins.MainPlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.realtime.websocket.RealtimeWebsocketFactory -import io.github.jan.supabase.serializer.KotlinXSerializer -import io.github.jan.supabase.supabaseJson +package io.supabase.realtime + +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.SupabaseSerializer +import io.supabase.annotations.SupabaseInternal +import io.supabase.logging.SupabaseLogger +import io.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationPlugin +import io.supabase.plugins.MainConfig +import io.supabase.plugins.MainPlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.realtime.websocket.RealtimeWebsocketFactory +import io.supabase.serializer.KotlinXSerializer +import io.supabase.supabaseJson import io.ktor.client.plugins.websocket.WebSockets import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter import kotlinx.coroutines.flow.StateFlow diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeCallback.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeCallback.kt similarity index 87% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeCallback.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeCallback.kt index f4fe0388d..23345ca48 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeCallback.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeCallback.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.json.JsonObject @SupabaseInternal diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannel.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannel.kt similarity index 97% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannel.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannel.kt index 2c461805f..7e0c898e6 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannel.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannel.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.encodeToJsonElement +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.encodeToJsonElement import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow import kotlinx.serialization.json.JsonObject diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelBuilder.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannelBuilder.kt similarity index 87% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelBuilder.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannelBuilder.kt index 14e6d954f..14312899c 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelBuilder.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannelBuilder.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.realtime.annotations.ChannelDsl +import io.supabase.annotations.SupabaseInternal +import io.supabase.realtime.annotations.ChannelDsl /** * Used to build a realtime channel diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelImpl.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannelImpl.kt similarity index 93% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelImpl.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannelImpl.kt index 27bdca12a..4a6e930ac 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeChannelImpl.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeChannelImpl.kt @@ -1,14 +1,14 @@ -package io.github.jan.supabase.realtime - -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.resolveAccessToken -import io.github.jan.supabase.collections.AtomicMutableList -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.realtime.data.BroadcastApiBody -import io.github.jan.supabase.realtime.data.BroadcastApiMessage -import io.github.jan.supabase.realtime.event.RealtimeEvent +package io.supabase.realtime + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.resolveAccessToken +import io.supabase.collections.AtomicMutableList +import io.supabase.logging.d +import io.supabase.logging.e +import io.supabase.putJsonObject +import io.supabase.realtime.data.BroadcastApiBody +import io.supabase.realtime.data.BroadcastApiMessage +import io.supabase.realtime.event.RealtimeEvent import io.ktor.client.statement.bodyAsText import io.ktor.http.headers import kotlinx.coroutines.channels.awaitClose @@ -79,7 +79,7 @@ internal class RealtimeChannelImpl( @OptIn(SupabaseInternal::class) suspend fun onMessage(message: RealtimeMessage) { - val event = RealtimeEvent.resolveEvent(message) + val event = RealtimeEvent.Companion.resolveEvent(message) if(event == null) { Realtime.logger.e { "Received message without event: $message" } return diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeExt.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeExt.kt similarity index 95% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeExt.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeExt.kt index 39a1d115d..8cfb32357 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeExt.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeExt.kt @@ -1,14 +1,14 @@ @file:Suppress("MatchingDeclarationName") -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.collections.AtomicMutableMap -import io.github.jan.supabase.exceptions.NotFoundRestException -import io.github.jan.supabase.exceptions.UnknownRestException -import io.github.jan.supabase.postgrest.postgrest -import io.github.jan.supabase.postgrest.query.filter.FilterOperation -import io.github.jan.supabase.postgrest.query.filter.FilterOperator -import io.github.jan.supabase.postgrest.query.filter.PostgrestFilterBuilder +import io.supabase.collections.AtomicMutableMap +import io.supabase.exceptions.NotFoundRestException +import io.supabase.exceptions.UnknownRestException +import io.supabase.postgrest.postgrest +import io.supabase.postgrest.query.filter.FilterOperation +import io.supabase.postgrest.query.filter.FilterOperator +import io.supabase.postgrest.query.filter.PostgrestFilterBuilder import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.channelFlow import kotlinx.coroutines.flow.map diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeImpl.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeImpl.kt similarity index 92% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeImpl.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeImpl.kt index b05f42566..5856cbdcc 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeImpl.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeImpl.kt @@ -1,19 +1,19 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.status.SessionStatus -import io.github.jan.supabase.buildUrl -import io.github.jan.supabase.collections.AtomicMutableMap -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.exceptions.UnknownRestException -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.logging.i -import io.github.jan.supabase.logging.w -import io.github.jan.supabase.realtime.websocket.KtorRealtimeWebsocketFactory -import io.github.jan.supabase.realtime.websocket.RealtimeWebsocket +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.auth.status.SessionStatus +import io.supabase.buildUrl +import io.supabase.collections.AtomicMutableMap +import io.supabase.exceptions.RestException +import io.supabase.exceptions.UnknownRestException +import io.supabase.logging.d +import io.supabase.logging.e +import io.supabase.logging.i +import io.supabase.logging.w +import io.supabase.realtime.websocket.KtorRealtimeWebsocketFactory +import io.supabase.realtime.websocket.RealtimeWebsocket import io.ktor.client.statement.HttpResponse import io.ktor.http.URLProtocol import io.ktor.http.path diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeJoinPayload.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeJoinPayload.kt similarity index 94% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeJoinPayload.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeJoinPayload.kt index 3456c34e5..12424e7ba 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeJoinPayload.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeJoinPayload.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeMessage.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeMessage.kt similarity index 74% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeMessage.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeMessage.kt index 379017d35..91cd05718 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/RealtimeMessage.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/RealtimeMessage.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.realtime +package io.supabase.realtime -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.Serializable import kotlinx.serialization.json.JsonObject diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/annotations/ChannelDsl.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/annotations/ChannelDsl.kt similarity index 76% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/annotations/ChannelDsl.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/annotations/ChannelDsl.kt index c4f14d56f..3687e7cd0 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/annotations/ChannelDsl.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/annotations/ChannelDsl.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.realtime.annotations +package io.supabase.realtime.annotations /** * Used to mark Channel DSL functions diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/BroadcastApiBody.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/data/BroadcastApiBody.kt similarity index 90% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/BroadcastApiBody.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/data/BroadcastApiBody.kt index 393280a1f..08e743058 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/BroadcastApiBody.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/data/BroadcastApiBody.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.realtime.data +package io.supabase.realtime.data import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/PostgresActionData.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/data/PostgresActionData.kt similarity index 82% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/PostgresActionData.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/data/PostgresActionData.kt index 5c4676f84..f6a9c38e0 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/data/PostgresActionData.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/data/PostgresActionData.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.realtime.data +package io.supabase.realtime.data -import io.github.jan.supabase.realtime.Column +import io.supabase.realtime.Column import kotlinx.datetime.Instant import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RBroadcastEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RBroadcastEvent.kt similarity index 72% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RBroadcastEvent.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RBroadcastEvent.kt index e163eda1b..3bfa1e059 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RBroadcastEvent.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RBroadcastEvent.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.realtime.event +package io.supabase.realtime.event -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive @@ -17,7 +17,7 @@ data object RBroadcastEvent : RealtimeEvent { } override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_BROADCAST + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_BROADCAST } } \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RCloseEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RCloseEvent.kt new file mode 100644 index 000000000..7bd4e7966 --- /dev/null +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RCloseEvent.kt @@ -0,0 +1,22 @@ +package io.supabase.realtime.event + +import io.supabase.logging.d +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage + +/** + * Event that handles the closing of a channel + */ +data object RCloseEvent : RealtimeEvent { + + override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { + channel.realtime.removeChannel(channel) + Realtime.Companion.logger.d { "Unsubscribed from channel ${message.topic}" } + } + + override fun appliesTo(message: RealtimeMessage): Boolean { + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_CLOSE + } + +} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RErrorEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RErrorEvent.kt new file mode 100644 index 000000000..91db9c768 --- /dev/null +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RErrorEvent.kt @@ -0,0 +1,21 @@ +package io.supabase.realtime.event + +import io.supabase.logging.e +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage + +/** + * Event that handles an error event + */ +data object RErrorEvent : RealtimeEvent { + + override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { + Realtime.Companion.logger.e { "Received an error in channel ${message.topic}. That could be as a result of an invalid access token" } + } + + override fun appliesTo(message: RealtimeMessage): Boolean { + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_ERROR + } + +} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPostgresChangesEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPostgresChangesEvent.kt similarity index 83% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPostgresChangesEvent.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPostgresChangesEvent.kt index ea318ba9b..44ea6160a 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPostgresChangesEvent.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPostgresChangesEvent.kt @@ -1,11 +1,11 @@ -package io.github.jan.supabase.realtime.event +package io.supabase.realtime.event -import io.github.jan.supabase.realtime.PostgresAction -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage -import io.github.jan.supabase.realtime.data.PostgresActionData -import io.github.jan.supabase.realtime.realtime -import io.github.jan.supabase.supabaseJson +import io.supabase.realtime.PostgresAction +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage +import io.supabase.realtime.data.PostgresActionData +import io.supabase.realtime.realtime +import io.supabase.supabaseJson import kotlinx.serialization.json.decodeFromJsonElement import kotlinx.serialization.json.jsonArray import kotlinx.serialization.json.jsonObject @@ -53,7 +53,7 @@ data object RPostgresChangesEvent : RealtimeEvent { } override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_POSTGRES_CHANGES + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_POSTGRES_CHANGES } } \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPostgresServerChangesEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPostgresServerChangesEvent.kt similarity index 62% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPostgresServerChangesEvent.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPostgresServerChangesEvent.kt index 0f8834ef2..48186d16f 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPostgresServerChangesEvent.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPostgresServerChangesEvent.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.realtime.event +package io.supabase.realtime.event -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.realtime.PostgresJoinConfig -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.logging.d +import io.supabase.realtime.PostgresJoinConfig +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage import kotlinx.serialization.json.Json import kotlinx.serialization.json.decodeFromJsonElement import kotlinx.serialization.json.jsonArray @@ -19,14 +19,14 @@ data object RPostgresServerChangesEvent : RealtimeEvent { val serverPostgresChanges = message.payload["response"]?.jsonObject?.get("postgres_changes")?.jsonArray?.let { Json.decodeFromJsonElement>(it) } ?: listOf() //server postgres changes channel.callbackManager.setServerChanges(serverPostgresChanges) if(channel.status.value != RealtimeChannel.Status.SUBSCRIBED) { - Realtime.logger.d { "Joined channel ${message.topic}" } + Realtime.Companion.logger.d { "Joined channel ${message.topic}" } channel.updateStatus(RealtimeChannel.Status.SUBSCRIBED) } } override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_REPLY && message.payload["response"]?.jsonObject?.containsKey( - RealtimeChannel.CHANNEL_EVENT_POSTGRES_CHANGES + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_REPLY && message.payload["response"]?.jsonObject?.containsKey( + RealtimeChannel.Companion.CHANNEL_EVENT_POSTGRES_CHANGES ) ?: false } diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPresenceDiffEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPresenceDiffEvent.kt similarity index 65% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPresenceDiffEvent.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPresenceDiffEvent.kt index 7d2be3910..5b669e4e1 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPresenceDiffEvent.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPresenceDiffEvent.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.realtime.event +package io.supabase.realtime.event -import io.github.jan.supabase.decodeIfNotEmptyOrDefault -import io.github.jan.supabase.realtime.Presence -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.decodeIfNotEmptyOrDefault +import io.supabase.realtime.Presence +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage import kotlinx.serialization.json.jsonObject /** @@ -18,7 +18,7 @@ data object RPresenceDiffEvent : RealtimeEvent { } override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_PRESENCE_DIFF + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_PRESENCE_DIFF } } \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPresenceStateEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPresenceStateEvent.kt similarity index 56% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPresenceStateEvent.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPresenceStateEvent.kt index 53b65dbe1..a97cf6fe3 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RPresenceStateEvent.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RPresenceStateEvent.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.realtime.event +package io.supabase.realtime.event -import io.github.jan.supabase.decodeIfNotEmptyOrDefault -import io.github.jan.supabase.realtime.Presence -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.decodeIfNotEmptyOrDefault +import io.supabase.realtime.Presence +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage /** * Event that handles the presence state event @@ -16,7 +16,7 @@ data object RPresenceStateEvent : RealtimeEvent { } override fun appliesTo(message: RealtimeMessage): Boolean { - return message.event == RealtimeChannel.CHANNEL_EVENT_PRESENCE_STATE + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_PRESENCE_STATE } } \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RSystemEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RSystemEvent.kt new file mode 100644 index 000000000..f3d772f26 --- /dev/null +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RSystemEvent.kt @@ -0,0 +1,23 @@ +package io.supabase.realtime.event + +import io.supabase.logging.d +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage +import kotlinx.serialization.json.jsonPrimitive + +/** + * Event that handles the system event + */ +data object RSystemEvent : RealtimeEvent { + + override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { + Realtime.Companion.logger.d { "Subscribed to channel ${message.topic}" } + channel.updateStatus(RealtimeChannel.Status.SUBSCRIBED) + } + + override fun appliesTo(message: RealtimeMessage): Boolean { + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_SYSTEM && message.payload["status"]?.jsonPrimitive?.content == "ok" + } + +} diff --git a/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RSystemReplyEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RSystemReplyEvent.kt new file mode 100644 index 000000000..048f0bc14 --- /dev/null +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RSystemReplyEvent.kt @@ -0,0 +1,26 @@ +package io.supabase.realtime.event + +import io.supabase.logging.d +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage +import kotlinx.serialization.json.jsonPrimitive + +/** + * Event that handles the system reply event + */ +data object RSystemReplyEvent : RealtimeEvent { + + override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { + Realtime.Companion.logger.d { "Received system reply: ${message.payload}." } + if(channel.status.value == RealtimeChannel.Status.UNSUBSCRIBING) { + channel.updateStatus(RealtimeChannel.Status.UNSUBSCRIBED) + Realtime.Companion.logger.d { "Unsubscribed from channel ${message.topic}" } + } + } + + override fun appliesTo(message: RealtimeMessage): Boolean { + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_REPLY && message.payload["status"]?.jsonPrimitive?.content == "ok" + } + +} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RTokenExpiredEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RTokenExpiredEvent.kt new file mode 100644 index 000000000..a675a50ae --- /dev/null +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RTokenExpiredEvent.kt @@ -0,0 +1,22 @@ +package io.supabase.realtime.event + +import io.supabase.logging.w +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage +import kotlinx.serialization.json.jsonPrimitive + +/** + * Event that handles the token expired event + */ +data object RTokenExpiredEvent : RealtimeEvent { + + override suspend fun handle(channel: RealtimeChannel, message: RealtimeMessage) { + Realtime.Companion.logger.w { "Received token expired event. This should not happen, please report this warning." } + } + + override fun appliesTo(message: RealtimeMessage): Boolean { + return message.event == RealtimeChannel.Companion.CHANNEL_EVENT_SYSTEM && message.payload["message"]?.jsonPrimitive?.content?.contains("access token has expired") ?: false + } + +} \ No newline at end of file diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RealtimeEvent.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RealtimeEvent.kt similarity index 88% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RealtimeEvent.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RealtimeEvent.kt index d74311006..aa8b43f06 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/event/RealtimeEvent.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/event/RealtimeEvent.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.realtime.event +package io.supabase.realtime.event -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage /** * Interface for handling realtime events. diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/KtorRealtimeWebsocket.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/KtorRealtimeWebsocket.kt similarity index 89% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/KtorRealtimeWebsocket.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/KtorRealtimeWebsocket.kt index b781a3426..d2bd3cc20 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/KtorRealtimeWebsocket.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/KtorRealtimeWebsocket.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.realtime.websocket +package io.supabase.realtime.websocket -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.realtime.RealtimeMessage import io.ktor.client.plugins.websocket.DefaultClientWebSocketSession import io.ktor.client.plugins.websocket.receiveDeserialized import io.ktor.client.plugins.websocket.sendSerialized diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/KtorRealtimeWebsocketFactory.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/KtorRealtimeWebsocketFactory.kt similarity index 90% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/KtorRealtimeWebsocketFactory.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/KtorRealtimeWebsocketFactory.kt index 7c2fa864f..1d1b51475 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/KtorRealtimeWebsocketFactory.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/KtorRealtimeWebsocketFactory.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.realtime.websocket +package io.supabase.realtime.websocket import io.ktor.client.HttpClient import io.ktor.client.plugins.websocket.webSocketSession diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/RealtimeWebsocket.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/RealtimeWebsocket.kt similarity index 81% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/RealtimeWebsocket.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/RealtimeWebsocket.kt index 5057fca9c..5598c3961 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/RealtimeWebsocket.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/RealtimeWebsocket.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.realtime.websocket +package io.supabase.realtime.websocket -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.annotations.SupabaseInternal +import io.supabase.realtime.RealtimeMessage /** * Interface for a websocket connection to the Supabase Realtime service. diff --git a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/RealtimeWebsocketFactory.kt b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/RealtimeWebsocketFactory.kt similarity index 78% rename from Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/RealtimeWebsocketFactory.kt rename to Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/RealtimeWebsocketFactory.kt index 0e101af8f..2ae439a0d 100644 --- a/Realtime/src/commonMain/kotlin/io/github/jan/supabase/realtime/websocket/RealtimeWebsocketFactory.kt +++ b/Realtime/src/commonMain/kotlin/io/supabase/realtime/websocket/RealtimeWebsocketFactory.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.realtime.websocket +package io.supabase.realtime.websocket -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal /** * Interface for creating a websocket connection to the Supabase Realtime service. diff --git a/Realtime/src/commonTest/kotlin/CallbackManagerTest.kt b/Realtime/src/commonTest/kotlin/CallbackManagerTest.kt index 98250ee53..ad87a5885 100644 --- a/Realtime/src/commonTest/kotlin/CallbackManagerTest.kt +++ b/Realtime/src/commonTest/kotlin/CallbackManagerTest.kt @@ -1,10 +1,10 @@ -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.realtime.CallbackManagerImpl -import io.github.jan.supabase.realtime.HasRecord -import io.github.jan.supabase.realtime.PostgresAction -import io.github.jan.supabase.realtime.PostgresJoinConfig -import io.github.jan.supabase.realtime.Presence -import io.github.jan.supabase.serializer.KotlinXSerializer +import io.supabase.SupabaseSerializer +import io.supabase.realtime.CallbackManagerImpl +import io.supabase.realtime.HasRecord +import io.supabase.realtime.PostgresAction +import io.supabase.realtime.PostgresJoinConfig +import io.supabase.realtime.Presence +import io.supabase.serializer.KotlinXSerializer import kotlinx.datetime.Clock import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.buildJsonObject diff --git a/Realtime/src/commonTest/kotlin/RealtimeChannelTest.kt b/Realtime/src/commonTest/kotlin/RealtimeChannelTest.kt index 5079b8475..091678cb7 100644 --- a/Realtime/src/commonTest/kotlin/RealtimeChannelTest.kt +++ b/Realtime/src/commonTest/kotlin/RealtimeChannelTest.kt @@ -1,27 +1,27 @@ import app.cash.turbine.test -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.postgrest.query.filter.FilterOperation -import io.github.jan.supabase.postgrest.query.filter.FilterOperator -import io.github.jan.supabase.realtime.CallbackManagerImpl -import io.github.jan.supabase.realtime.PostgresAction -import io.github.jan.supabase.realtime.PostgresJoinConfig -import io.github.jan.supabase.realtime.Presence -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_REPLY -import io.github.jan.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_SYSTEM -import io.github.jan.supabase.realtime.RealtimeJoinPayload -import io.github.jan.supabase.realtime.RealtimeMessage -import io.github.jan.supabase.realtime.broadcastFlow -import io.github.jan.supabase.realtime.channel -import io.github.jan.supabase.realtime.postgresChangeFlow -import io.github.jan.supabase.realtime.realtime -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.postgrest.query.filter.FilterOperation +import io.supabase.postgrest.query.filter.FilterOperator +import io.supabase.realtime.CallbackManagerImpl +import io.supabase.realtime.PostgresAction +import io.supabase.realtime.PostgresJoinConfig +import io.supabase.realtime.Presence +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_REPLY +import io.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_SYSTEM +import io.supabase.realtime.RealtimeJoinPayload +import io.supabase.realtime.RealtimeMessage +import io.supabase.realtime.broadcastFlow +import io.supabase.realtime.channel +import io.supabase.realtime.postgresChangeFlow +import io.supabase.realtime.realtime +import io.supabase.testing.assertPathIs +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.toJsonElement import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch @@ -357,7 +357,7 @@ class RealtimeChannelTest { assertEquals(expectedSchema, postgresChanges.first().schema) assertEquals(expectedFilter, postgresChanges.first().filter) assertEquals(event, postgresChanges.first().event) - o.send(RealtimeMessage("realtime:$channelId", RealtimeChannel.CHANNEL_EVENT_REPLY, buildJsonObject { + o.send(RealtimeMessage("realtime:$channelId", CHANNEL_EVENT_REPLY, buildJsonObject { put("response", buildJsonObject { put("postgres_changes", Json.encodeToJsonElement(postgresServerChanges)) }) diff --git a/Realtime/src/commonTest/kotlin/RealtimeEventTest.kt b/Realtime/src/commonTest/kotlin/RealtimeEventTest.kt index 872393dc3..88a7b537e 100644 --- a/Realtime/src/commonTest/kotlin/RealtimeEventTest.kt +++ b/Realtime/src/commonTest/kotlin/RealtimeEventTest.kt @@ -1,16 +1,16 @@ -import io.github.jan.supabase.realtime.RealtimeChannel -import io.github.jan.supabase.realtime.RealtimeMessage -import io.github.jan.supabase.realtime.event.RBroadcastEvent -import io.github.jan.supabase.realtime.event.RCloseEvent -import io.github.jan.supabase.realtime.event.RErrorEvent -import io.github.jan.supabase.realtime.event.RPostgresChangesEvent -import io.github.jan.supabase.realtime.event.RPostgresServerChangesEvent -import io.github.jan.supabase.realtime.event.RPresenceDiffEvent -import io.github.jan.supabase.realtime.event.RPresenceStateEvent -import io.github.jan.supabase.realtime.event.RSystemEvent -import io.github.jan.supabase.realtime.event.RSystemReplyEvent -import io.github.jan.supabase.realtime.event.RTokenExpiredEvent -import io.github.jan.supabase.realtime.event.RealtimeEvent +import io.supabase.realtime.RealtimeChannel +import io.supabase.realtime.RealtimeMessage +import io.supabase.realtime.event.RBroadcastEvent +import io.supabase.realtime.event.RCloseEvent +import io.supabase.realtime.event.RErrorEvent +import io.supabase.realtime.event.RPostgresChangesEvent +import io.supabase.realtime.event.RPostgresServerChangesEvent +import io.supabase.realtime.event.RPresenceDiffEvent +import io.supabase.realtime.event.RPresenceStateEvent +import io.supabase.realtime.event.RSystemEvent +import io.supabase.realtime.event.RSystemReplyEvent +import io.supabase.realtime.event.RTokenExpiredEvent +import io.supabase.realtime.event.RealtimeEvent import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put import kotlin.test.Test diff --git a/Realtime/src/commonTest/kotlin/RealtimeExtTest.kt b/Realtime/src/commonTest/kotlin/RealtimeExtTest.kt index f9d0b0092..375254ae6 100644 --- a/Realtime/src/commonTest/kotlin/RealtimeExtTest.kt +++ b/Realtime/src/commonTest/kotlin/RealtimeExtTest.kt @@ -1,18 +1,18 @@ import app.cash.turbine.test -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.postgrest.query.filter.FilterOperation -import io.github.jan.supabase.postgrest.query.filter.FilterOperator -import io.github.jan.supabase.realtime.CallbackManager -import io.github.jan.supabase.realtime.PostgresAction -import io.github.jan.supabase.realtime.PostgresJoinConfig -import io.github.jan.supabase.realtime.Presence -import io.github.jan.supabase.realtime.channel -import io.github.jan.supabase.realtime.postgresListDataFlow -import io.github.jan.supabase.realtime.postgresSingleDataFlow -import io.github.jan.supabase.realtime.presenceDataFlow -import io.github.jan.supabase.serializer.KotlinXSerializer -import io.github.jan.supabase.testing.pathAfterVersion import io.ktor.client.engine.mock.respond +import io.supabase.postgrest.Postgrest +import io.supabase.postgrest.query.filter.FilterOperation +import io.supabase.postgrest.query.filter.FilterOperator +import io.supabase.realtime.CallbackManager +import io.supabase.realtime.PostgresAction +import io.supabase.realtime.PostgresJoinConfig +import io.supabase.realtime.Presence +import io.supabase.realtime.channel +import io.supabase.realtime.postgresListDataFlow +import io.supabase.realtime.postgresSingleDataFlow +import io.supabase.realtime.presenceDataFlow +import io.supabase.serializer.KotlinXSerializer +import io.supabase.testing.pathAfterVersion import kotlinx.coroutines.test.runTest import kotlinx.datetime.Clock import kotlinx.serialization.Serializable diff --git a/Realtime/src/commonTest/kotlin/RealtimeTest.kt b/Realtime/src/commonTest/kotlin/RealtimeTest.kt index 655c885ed..043fd9c35 100644 --- a/Realtime/src/commonTest/kotlin/RealtimeTest.kt +++ b/Realtime/src/commonTest/kotlin/RealtimeTest.kt @@ -1,6 +1,6 @@ -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeMessage -import io.github.jan.supabase.realtime.realtime +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeMessage +import io.supabase.realtime.realtime import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put diff --git a/Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt b/Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt index 34edb30fb..2774b75f0 100644 --- a/Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt +++ b/Realtime/src/commonTest/kotlin/RealtimeTestUtils.kt @@ -1,10 +1,10 @@ -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.user.UserSession -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.realtime.Presence -import io.github.jan.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_PRESENCE_DIFF -import io.github.jan.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_SYSTEM -import io.github.jan.supabase.realtime.RealtimeMessage +import io.supabase.auth.Auth +import io.supabase.auth.user.UserSession +import io.supabase.putJsonObject +import io.supabase.realtime.Presence +import io.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_PRESENCE_DIFF +import io.supabase.realtime.RealtimeChannel.Companion.CHANNEL_EVENT_SYSTEM +import io.supabase.realtime.RealtimeMessage import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.coroutines.channels.SendChannel import kotlinx.coroutines.flow.Flow diff --git a/Realtime/src/commonTest/kotlin/RealtimeWSMock.kt b/Realtime/src/commonTest/kotlin/RealtimeWSMock.kt index cff8b0067..7f5869b23 100644 --- a/Realtime/src/commonTest/kotlin/RealtimeWSMock.kt +++ b/Realtime/src/commonTest/kotlin/RealtimeWSMock.kt @@ -1,11 +1,11 @@ -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.createSupabaseClient -import io.github.jan.supabase.logging.LogLevel -import io.github.jan.supabase.realtime.Realtime -import io.github.jan.supabase.realtime.RealtimeMessage -import io.github.jan.supabase.realtime.websocket.RealtimeWebsocket -import io.github.jan.supabase.realtime.websocket.RealtimeWebsocketFactory +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.createSupabaseClient +import io.supabase.logging.LogLevel +import io.supabase.realtime.Realtime +import io.supabase.realtime.RealtimeMessage +import io.supabase.realtime.websocket.RealtimeWebsocket +import io.supabase.realtime.websocket.RealtimeWebsocketFactory import io.ktor.client.engine.mock.MockEngine import io.ktor.client.engine.mock.MockRequestHandleScope import io.ktor.client.engine.mock.respond diff --git a/Storage/README.md b/Storage/README.md index 5dad33b1d..34f6c2fed 100644 --- a/Storage/README.md +++ b/Storage/README.md @@ -40,7 +40,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:storage-kt:VERSION") + implementation("io.supabase:storage-kt:VERSION") } ``` diff --git a/Storage/src/androidAndJvmMain/kotlin/io/github/jan/supabase/storage/JvmUtils.kt b/Storage/src/androidAndJvmMain/kotlin/io/supabase/storage/JvmUtils.kt similarity index 82% rename from Storage/src/androidAndJvmMain/kotlin/io/github/jan/supabase/storage/JvmUtils.kt rename to Storage/src/androidAndJvmMain/kotlin/io/supabase/storage/JvmUtils.kt index 213e319fa..4bb45a724 100644 --- a/Storage/src/androidAndJvmMain/kotlin/io/github/jan/supabase/storage/JvmUtils.kt +++ b/Storage/src/androidAndJvmMain/kotlin/io/supabase/storage/JvmUtils.kt @@ -1,7 +1,16 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import io.ktor.util.cio.readChannel import io.ktor.util.cio.writeChannel +import io.supabase.storage.BucketApi +import io.supabase.storage.DownloadOptionBuilder +import io.supabase.storage.UploadData +import io.supabase.storage.UploadOptionBuilder +import io.supabase.storage.downloadAuthenticatedAsFlow +import io.supabase.storage.downloadPublicAsFlow +import io.supabase.storage.updateAsFlow +import io.supabase.storage.uploadAsFlow +import io.supabase.storage.uploadToSignedUrlAsFlow import java.io.File import java.nio.file.Path import kotlin.io.path.fileSize @@ -14,7 +23,8 @@ import kotlin.io.path.writeBytes * @param options Additional options for the upload * @return the key to the uploaded file */ -suspend fun BucketApi.upload(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = upload(path, UploadData(file.readChannel(), file.length()), options) +suspend fun BucketApi.upload(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = upload(path, + UploadData(file.readChannel(), file.length()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] @@ -23,7 +33,8 @@ suspend fun BucketApi.upload(path: String, file: File, options: UploadOptionBuil * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the uploaded file */ -fun BucketApi.uploadAsFlow(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = uploadAsFlow(path, UploadData(file.readChannel(), file.length()), options) +fun BucketApi.uploadAsFlow(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = uploadAsFlow(path, + UploadData(file.readChannel(), file.length()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] @@ -32,7 +43,8 @@ fun BucketApi.uploadAsFlow(path: String, file: File, options: UploadOptionBuilde * @param options Additional options for the upload * @return the key to the uploaded file */ -suspend fun BucketApi.upload(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = upload(path, UploadData(file.readChannel(), file.fileSize()), options) +suspend fun BucketApi.upload(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = upload(path, + UploadData(file.readChannel(), file.fileSize()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] @@ -41,7 +53,8 @@ suspend fun BucketApi.upload(path: String, file: Path, options: UploadOptionBuil * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the uploaded file */ -fun BucketApi.uploadAsFlow(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = uploadAsFlow(path, UploadData(file.readChannel(), file.fileSize()), options) +fun BucketApi.uploadAsFlow(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = uploadAsFlow(path, + UploadData(file.readChannel(), file.fileSize()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] using a presigned url @@ -51,7 +64,8 @@ fun BucketApi.uploadAsFlow(path: String, file: Path, options: UploadOptionBuilde * @param options Additional options for the upload * @return the key to the uploaded file */ -suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrl(path, token, UploadData(file.readChannel(), file.length()), options) +suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrl(path, token, + UploadData(file.readChannel(), file.length()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] using a presigned url @@ -61,7 +75,8 @@ suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, file: File, * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the uploaded file */ -fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrlAsFlow(path, token, UploadData(file.readChannel(), file.length()), options) +fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrlAsFlow(path, token, + UploadData(file.readChannel(), file.length()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] using a presigned url @@ -70,7 +85,8 @@ fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, file: File, o * @param file The file to upload * @param options Additional options for the upload */ -suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrl(path, token, UploadData(file.readChannel(), file.fileSize()), options) +suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrl(path, token, + UploadData(file.readChannel(), file.fileSize()), options) /** * Uploads a file in [BucketApi.bucketId] under [path] using a presigned url @@ -80,7 +96,8 @@ suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, file: Path, * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the uploaded file */ -fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrlAsFlow(path, token, UploadData(file.readChannel(), file.fileSize()), options) +fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrlAsFlow(path, token, + UploadData(file.readChannel(), file.fileSize()), options) /** * Updates a file in [BucketApi.bucketId] under [path] @@ -88,7 +105,8 @@ fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, file: Path, o * @param file The new file * @param options Additional options for the upload */ -suspend fun BucketApi.update(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = update(path, UploadData(file.readChannel(), file.fileSize()), options) +suspend fun BucketApi.update(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = update(path, + UploadData(file.readChannel(), file.fileSize()), options) /** * Updates a file in [BucketApi.bucketId] under [path] @@ -97,7 +115,8 @@ suspend fun BucketApi.update(path: String, file: Path, options: UploadOptionBuil * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the uploaded file */ -fun BucketApi.updateAsFlow(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = updateAsFlow(path, UploadData(file.readChannel(), file.fileSize()), options) +fun BucketApi.updateAsFlow(path: String, file: Path, options: UploadOptionBuilder.() -> Unit = {}) = updateAsFlow(path, + UploadData(file.readChannel(), file.fileSize()), options) /** * Updates a file in [BucketApi.bucketId] under [path] @@ -105,7 +124,8 @@ fun BucketApi.updateAsFlow(path: String, file: Path, options: UploadOptionBuilde * @param file The new file * @param options Additional options for the upload */ -suspend fun BucketApi.update(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = update(path, UploadData(file.readChannel(), file.length()), options) +suspend fun BucketApi.update(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = update(path, + UploadData(file.readChannel(), file.length()), options) /** * Updates a file in [BucketApi.bucketId] under [path] @@ -114,7 +134,8 @@ suspend fun BucketApi.update(path: String, file: File, options: UploadOptionBuil * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the uploaded file */ -fun BucketApi.updateAsFlow(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = updateAsFlow(path, UploadData(file.readChannel(), file.length()), options) +fun BucketApi.updateAsFlow(path: String, file: File, options: UploadOptionBuilder.() -> Unit = {}) = updateAsFlow(path, + UploadData(file.readChannel(), file.length()), options) /** * Downloads a file from [BucketApi.bucketId] under [path] and saves it to [file] diff --git a/Storage/src/androidAndJvmMain/kotlin/io/github/jan/supabase/storage/ResumableUtils.kt b/Storage/src/androidAndJvmMain/kotlin/io/supabase/storage/ResumableUtils.kt similarity index 87% rename from Storage/src/androidAndJvmMain/kotlin/io/github/jan/supabase/storage/ResumableUtils.kt rename to Storage/src/androidAndJvmMain/kotlin/io/supabase/storage/ResumableUtils.kt index 60927d315..f38892295 100644 --- a/Storage/src/androidAndJvmMain/kotlin/io/github/jan/supabase/storage/ResumableUtils.kt +++ b/Storage/src/androidAndJvmMain/kotlin/io/supabase/storage/ResumableUtils.kt @@ -1,10 +1,11 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.storage.resumable.Fingerprint -import io.github.jan.supabase.storage.resumable.ResumableClient -import io.github.jan.supabase.storage.resumable.ResumableUpload +import io.supabase.storage.resumable.Fingerprint +import io.supabase.storage.resumable.ResumableClient +import io.supabase.storage.resumable.ResumableUpload import io.ktor.util.cio.readChannel import io.ktor.utils.io.discard +import io.supabase.storage.UploadOptionBuilder import java.io.File import java.nio.file.Path import kotlin.io.path.absolutePathString diff --git a/Storage/src/androidMain/AndroidManifest.xml b/Storage/src/androidMain/AndroidManifest.xml index a4efc9731..a82acca13 100644 --- a/Storage/src/androidMain/AndroidManifest.xml +++ b/Storage/src/androidMain/AndroidManifest.xml @@ -9,7 +9,7 @@ android:exported="false" tools:node="merge"> diff --git a/Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/AndroidUtils.kt b/Storage/src/androidMain/kotlin/io/supabase/storage/AndroidUtils.kt similarity index 79% rename from Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/AndroidUtils.kt rename to Storage/src/androidMain/kotlin/io/supabase/storage/AndroidUtils.kt index e30c50706..7354778a8 100644 --- a/Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/AndroidUtils.kt +++ b/Storage/src/androidMain/kotlin/io/supabase/storage/AndroidUtils.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import android.annotation.SuppressLint import android.net.Uri @@ -12,7 +12,8 @@ import io.ktor.utils.io.jvm.javaio.toByteReadChannel * @param options Additional options for the upload * @return the key to the updated file */ -suspend fun BucketApi.upload(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = upload(path, UploadData(uri.readChannel(), uri.contentSize), options) +suspend fun BucketApi.upload(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = upload(path, + UploadData(uri.readChannel(), uri.contentSize), options) /** * Uploads a file in [BucketApi.bucketId] under [path] @@ -21,7 +22,8 @@ suspend fun BucketApi.upload(path: String, uri: Uri, options: UploadOptionBuilde * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the updated file */ -fun BucketApi.uploadAsFlow(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = uploadAsFlow(path, UploadData(uri.readChannel(), uri.contentSize), options) +fun BucketApi.uploadAsFlow(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = uploadAsFlow(path, + UploadData(uri.readChannel(), uri.contentSize), options) /** * Uploads a file in [BucketApi.bucketId] under [path] using a presigned url @@ -30,7 +32,8 @@ fun BucketApi.uploadAsFlow(path: String, uri: Uri, options: UploadOptionBuilder. * @param uri The uri to upload * @return the key to the updated file */ -suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrl(path, token, UploadData(uri.readChannel(), uri.contentSize), options) +suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrl(path, token, + UploadData(uri.readChannel(), uri.contentSize), options) /** * Uploads a file in [BucketApi.bucketId] under [path] using a presigned url @@ -40,7 +43,8 @@ suspend fun BucketApi.uploadToSignedUrl(path: String, token: String, uri: Uri, o * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the updated file */ -fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrlAsFlow(path, token, UploadData(uri.readChannel(), uri.contentSize), options) +fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = uploadToSignedUrlAsFlow(path, token, + UploadData(uri.readChannel(), uri.contentSize), options) /** * Updates a file in [BucketApi.bucketId] under [path] @@ -49,7 +53,8 @@ fun BucketApi.uploadToSignedUrlAsFlow(path: String, token: String, uri: Uri, opt * @param options Additional options for the upload * @return the key to the updated file */ -suspend fun BucketApi.update(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = update(path, UploadData(uri.readChannel(), uri.contentSize), options) +suspend fun BucketApi.update(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = update(path, + UploadData(uri.readChannel(), uri.contentSize), options) /** * Updates a file in [BucketApi.bucketId] under [path] @@ -58,7 +63,8 @@ suspend fun BucketApi.update(path: String, uri: Uri, options: UploadOptionBuilde * @param options Additional options for the upload * @return A flow that emits the upload progress and at last the key to the updated file */ -fun BucketApi.updateAsFlow(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = updateAsFlow(path, UploadData(uri.readChannel(), uri.contentSize), options) +fun BucketApi.updateAsFlow(path: String, uri: Uri, options: UploadOptionBuilder.() -> Unit = {}) = updateAsFlow(path, + UploadData(uri.readChannel(), uri.contentSize), options) @SuppressLint("Recycle") //toByteReadChannel closes the input stream automatically private fun Uri.readChannel(): ByteReadChannel { diff --git a/Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/Context.kt b/Storage/src/androidMain/kotlin/io/supabase/storage/Context.kt similarity index 92% rename from Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/Context.kt rename to Storage/src/androidMain/kotlin/io/supabase/storage/Context.kt index a984a4370..52812effe 100644 --- a/Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/Context.kt +++ b/Storage/src/androidMain/kotlin/io/supabase/storage/Context.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import android.content.Context import androidx.startup.Initializer diff --git a/Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/ResumableAndroidUtils.kt b/Storage/src/androidMain/kotlin/io/supabase/storage/ResumableAndroidUtils.kt similarity index 92% rename from Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/ResumableAndroidUtils.kt rename to Storage/src/androidMain/kotlin/io/supabase/storage/ResumableAndroidUtils.kt index d28bed0aa..6cd9db299 100644 --- a/Storage/src/androidMain/kotlin/io/github/jan/supabase/storage/ResumableAndroidUtils.kt +++ b/Storage/src/androidMain/kotlin/io/supabase/storage/ResumableAndroidUtils.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import android.annotation.SuppressLint import android.content.res.AssetFileDescriptor import android.net.Uri -import io.github.jan.supabase.storage.resumable.ResumableClient +import io.supabase.storage.resumable.ResumableClient import io.ktor.utils.io.ByteReadChannel import io.ktor.utils.io.discard import io.ktor.utils.io.jvm.javaio.toByteReadChannel diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Bucket.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/Bucket.kt similarity index 96% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Bucket.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/Bucket.kt index 19905cfe2..eca7bd0ba 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Bucket.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/Bucket.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import kotlinx.datetime.Instant diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketApi.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketApi.kt similarity index 97% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketApi.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/BucketApi.kt index 60030ffd7..64d3f3715 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketApi.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketApi.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.resolveAccessToken -import io.github.jan.supabase.exceptions.HttpRequestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.storage.resumable.ResumableClient +import io.supabase.SupabaseClient +import io.supabase.auth.resolveAccessToken +import io.supabase.exceptions.HttpRequestException +import io.supabase.exceptions.RestException +import io.supabase.storage.resumable.ResumableClient import io.ktor.client.plugins.HttpRequestTimeoutException import io.ktor.utils.io.ByteReadChannel import io.ktor.utils.io.ByteWriteChannel diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketApiImpl.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketApiImpl.kt similarity index 95% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketApiImpl.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/BucketApiImpl.kt index cbb40e7ea..2a70da277 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketApiImpl.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketApiImpl.kt @@ -1,10 +1,9 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.putJsonObject -import io.github.jan.supabase.safeBody -import io.github.jan.supabase.storage.BucketApi.Companion.UPSERT_HEADER -import io.github.jan.supabase.storage.resumable.ResumableCache -import io.github.jan.supabase.storage.resumable.ResumableClientImpl +import io.supabase.putJsonObject +import io.supabase.safeBody +import io.supabase.storage.resumable.ResumableCache +import io.supabase.storage.resumable.ResumableClientImpl import io.ktor.client.call.body import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.header @@ -57,7 +56,7 @@ internal class BucketApiImpl(override val bucketId: String, val storage: Storage override suspend fun createSignedUploadUrl(path: String, upsert: Boolean): UploadSignedUrl { val result = storage.api.post("object/upload/sign/$bucketId/$path") { - header(UPSERT_HEADER, upsert.toString()) + header(BucketApi.Companion.UPSERT_HEADER, upsert.toString()) } val urlPath = result.body()["url"]?.jsonPrimitive?.content?.substring(1) ?: error("Expected a url in create upload signed url response") @@ -257,7 +256,7 @@ internal class BucketApiImpl(override val bucketId: String, val storage: Storage override fun readFrom(): ByteReadChannel = data.stream }) header(HttpHeaders.ContentType, optionBuilder.contentType ?: ContentType.defaultForFilePath(path)) - header(UPSERT_HEADER, optionBuilder.upsert.toString()) + header(BucketApi.Companion.UPSERT_HEADER, optionBuilder.upsert.toString()) } override suspend fun changePublicStatusTo(public: Boolean) = storage.updateBucket(bucketId) { diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketBuilder.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketBuilder.kt similarity index 97% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketBuilder.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/BucketBuilder.kt index 63dd9ef31..d15201d4e 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketBuilder.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketBuilder.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicProperty") -package io.github.jan.supabase.storage + +package io.supabase.storage import io.ktor.http.ContentType import kotlin.jvm.JvmName diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketListFilter.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketListFilter.kt similarity index 92% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketListFilter.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/BucketListFilter.kt index 30314026b..da530ecb3 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/BucketListFilter.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/BucketListFilter.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put import kotlinx.serialization.json.putJsonObject diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/DownloadOptionBuilder.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/DownloadOptionBuilder.kt similarity index 87% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/DownloadOptionBuilder.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/DownloadOptionBuilder.kt index 9110f7d7b..c044061de 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/DownloadOptionBuilder.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/DownloadOptionBuilder.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.network.HttpRequestOverride +import io.supabase.network.HttpRequestOverride /** * Builder for downloading files with additional options diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileObject.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/FileObject.kt similarity index 95% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileObject.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/FileObject.kt index 8caf02a8a..ec4703b6c 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileObject.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/FileObject.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import kotlinx.datetime.Instant import kotlinx.serialization.SerialName diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileSizeLimit.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/FileSizeLimit.kt similarity index 83% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileSizeLimit.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/FileSizeLimit.kt index 38ce2bce9..c24c442b9 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileSizeLimit.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/FileSizeLimit.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import kotlin.jvm.JvmInline diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileUploadResponse.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/FileUploadResponse.kt similarity index 88% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileUploadResponse.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/FileUploadResponse.kt index a52760972..5371addbf 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FileUploadResponse.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/FileUploadResponse.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage /** * The response of a file upload diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FlowExtension.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/FlowExtension.kt similarity index 97% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FlowExtension.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/FlowExtension.kt index 146b0bbb1..1e37f410f 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/FlowExtension.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/FlowExtension.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.exceptions.HttpRequestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.network.HttpRequestOverride +import io.supabase.exceptions.HttpRequestException +import io.supabase.exceptions.RestException +import io.supabase.network.HttpRequestOverride import io.ktor.client.plugins.HttpRequestTimeoutException import io.ktor.client.plugins.onDownload import io.ktor.client.plugins.onUpload diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/ImageTransformation.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/ImageTransformation.kt similarity index 94% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/ImageTransformation.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/ImageTransformation.kt index 06f1c40b3..8433a2d90 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/ImageTransformation.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/ImageTransformation.kt @@ -1,7 +1,6 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.storage.ImageTransformation.Resize +import io.supabase.annotations.SupabaseInternal import io.ktor.http.ParametersBuilder import io.ktor.http.formUrlEncode diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/NetworkStatus.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/NetworkStatus.kt similarity index 97% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/NetworkStatus.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/NetworkStatus.kt index 9cf5f1000..7ae417376 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/NetworkStatus.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/NetworkStatus.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import io.ktor.utils.io.ByteWriteChannel import kotlin.jvm.JvmInline diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/SignedUrl.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/SignedUrl.kt similarity index 88% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/SignedUrl.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/SignedUrl.kt index dbc04ab12..228aa7af5 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/SignedUrl.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/SignedUrl.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import kotlinx.serialization.Serializable diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Storage.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/Storage.kt similarity index 87% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Storage.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/Storage.kt index 53bb5a247..c8dd31a09 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Storage.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/Storage.kt @@ -1,27 +1,27 @@ -package io.github.jan.supabase.storage - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.authenticatedSupabaseApi -import io.github.jan.supabase.bodyOrNull -import io.github.jan.supabase.collections.AtomicMutableMap -import io.github.jan.supabase.exceptions.BadRequestRestException -import io.github.jan.supabase.exceptions.HttpRequestException -import io.github.jan.supabase.exceptions.NotFoundRestException -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.exceptions.UnauthorizedRestException -import io.github.jan.supabase.exceptions.UnknownRestException -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.w -import io.github.jan.supabase.plugins.CustomSerializationConfig -import io.github.jan.supabase.plugins.CustomSerializationPlugin -import io.github.jan.supabase.plugins.MainConfig -import io.github.jan.supabase.plugins.MainPlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.safeBody -import io.github.jan.supabase.storage.resumable.ResumableCache -import io.github.jan.supabase.storage.resumable.createDefaultResumableCache +package io.supabase.storage + +import io.supabase.SupabaseClient +import io.supabase.SupabaseSerializer +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.authenticatedSupabaseApi +import io.supabase.bodyOrNull +import io.supabase.collections.AtomicMutableMap +import io.supabase.exceptions.BadRequestRestException +import io.supabase.exceptions.HttpRequestException +import io.supabase.exceptions.NotFoundRestException +import io.supabase.exceptions.RestException +import io.supabase.exceptions.UnauthorizedRestException +import io.supabase.exceptions.UnknownRestException +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.w +import io.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationPlugin +import io.supabase.plugins.MainConfig +import io.supabase.plugins.MainPlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.safeBody +import io.supabase.storage.resumable.ResumableCache +import io.supabase.storage.resumable.createDefaultResumableCache import io.ktor.client.plugins.HttpRequestTimeoutException import io.ktor.client.plugins.timeout import io.ktor.client.statement.HttpResponse @@ -140,7 +140,7 @@ sealed interface Storage : MainPlugin, CustomSerializationPlugin var defaultChunkSize: Long = DEFAULT_CHUNK_SIZE set(value) { if(value != DEFAULT_CHUNK_SIZE) { - Storage.logger.w { "Supabase currently only supports a chunk size of 6MB" } + logger.w { "Supabase currently only supports a chunk size of 6MB" } } field = value } diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/StorageErrorResponse.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/StorageErrorResponse.kt similarity index 81% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/StorageErrorResponse.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/StorageErrorResponse.kt index d0ee8131d..22b7fa65f 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/StorageErrorResponse.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/StorageErrorResponse.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import kotlinx.serialization.Serializable diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/StorageItem.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/StorageItem.kt similarity index 94% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/StorageItem.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/StorageItem.kt index 9ba6a91c1..11015779f 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/StorageItem.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/StorageItem.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage /** * Represents a file in the storage bucket. diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadData.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/UploadData.kt similarity index 86% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadData.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/UploadData.kt index b388a7723..219b08cbe 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadData.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/UploadData.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import io.ktor.utils.io.ByteReadChannel diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadOptionBuilder.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/UploadOptionBuilder.kt similarity index 83% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadOptionBuilder.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/UploadOptionBuilder.kt index 61bfa326e..c6f854a2c 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadOptionBuilder.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/UploadOptionBuilder.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.storage +package io.supabase.storage -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.network.HttpRequestOverride +import io.supabase.SupabaseSerializer +import io.supabase.network.HttpRequestOverride import io.ktor.http.ContentType /** diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadSignedUrl.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/UploadSignedUrl.kt similarity index 86% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadSignedUrl.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/UploadSignedUrl.kt index 5ae45d30b..1a6369722 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/UploadSignedUrl.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/UploadSignedUrl.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage /** * A signed url to upload a file diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Utils.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/Utils.kt similarity index 92% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Utils.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/Utils.kt index d127b4b93..1d76eb510 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/Utils.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/Utils.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage +package io.supabase.storage import kotlinx.serialization.json.JsonObjectBuilder import kotlinx.serialization.json.put diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/Fingerprint.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/Fingerprint.kt similarity index 96% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/Fingerprint.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/Fingerprint.kt index 6fc7e05ed..6a002874b 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/Fingerprint.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/Fingerprint.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.storage.resumable +package io.supabase.storage.resumable import kotlin.jvm.JvmInline diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/MemoryResumableCache.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/MemoryResumableCache.kt similarity index 91% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/MemoryResumableCache.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/MemoryResumableCache.kt index 60d426291..753e68c4c 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/MemoryResumableCache.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/MemoryResumableCache.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.storage.resumable +package io.supabase.storage.resumable -import io.github.jan.supabase.collections.AtomicMutableMap +import io.supabase.collections.AtomicMutableMap import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCache.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableCache.kt similarity index 93% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCache.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableCache.kt index e747bd94b..6d6375abd 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCache.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableCache.kt @@ -1,7 +1,6 @@ +package io.supabase.storage.resumable -package io.github.jan.supabase.storage.resumable - -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.datetime.Instant import kotlinx.serialization.Serializable diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableClient.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableClient.kt similarity index 90% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableClient.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableClient.kt index 994d0e7c2..f2aadde0b 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableClient.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableClient.kt @@ -1,15 +1,14 @@ @file:OptIn(ExperimentalEncodingApi::class, ExperimentalEncodingApi::class) -package io.github.jan.supabase.storage.resumable - -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.storage.BucketApi -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.UploadOptionBuilder -import io.github.jan.supabase.storage.resumable.ResumableClient.Companion.TUS_VERSION -import io.github.jan.supabase.storage.storage +package io.supabase.storage.resumable + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.logging.d +import io.supabase.storage.BucketApi +import io.supabase.storage.Storage +import io.supabase.storage.UploadOptionBuilder +import io.supabase.storage.storage import io.ktor.client.request.bearerAuth import io.ktor.client.request.header import io.ktor.client.request.post @@ -81,7 +80,7 @@ internal class ResumableClientImpl(private val storageApi: BucketApi, private va override suspend fun continuePreviousUploads(channelProducer: suspend (source: String, offset: Long) -> ByteReadChannel): List> { val cachedEntries = cache.entries() return cachedEntries.map { (fingerprint, cacheEntry) -> - Storage.logger.d { "Found cached upload for ${cacheEntry.path}" } + Storage.Companion.logger.d { "Found cached upload for ${cacheEntry.path}" } coroutineScope { async { resumeUpload({ channelProducer(fingerprint.source, it) }, cacheEntry, fingerprint.source, cacheEntry.path, fingerprint.size) @@ -99,7 +98,7 @@ internal class ResumableClientImpl(private val storageApi: BucketApi, private va ): ResumableUpload { val cachedEntry = cache.get(Fingerprint(source, size)) if(cachedEntry != null) { - Storage.logger.d { "Found cached upload for $path" } + Storage.Companion.logger.d { "Found cached upload for $path" } return resumeUpload(channel, cachedEntry, source, path, size) } return createUpload(channel, source, path, size, options) @@ -111,7 +110,7 @@ internal class ResumableClientImpl(private val storageApi: BucketApi, private va header("Upload-Metadata", encodeMetadata(createMetadata(path, uploadOptions.contentType))) bearerAuth(accessTokenOrApiKey()) header("Upload-Length", size) - header("Tus-Resumable", TUS_VERSION) + header("Tus-Resumable", ResumableClient.Companion.TUS_VERSION) header("x-upsert", uploadOptions.upsert) } when(response.status) { @@ -132,7 +131,7 @@ internal class ResumableClientImpl(private val storageApi: BucketApi, private va private suspend fun resumeUpload(channel: suspend (Long) -> ByteReadChannel, entry: ResumableCacheEntry, source: String, path: String, size: Long): ResumableUploadImpl { val fingerprint = Fingerprint(source, size) if(Clock.System.now() > entry.expiresAt) { - Storage.logger.d { "Upload url for $path expired. Creating new one" } + Storage.Companion.logger.d { "Upload url for $path expired. Creating new one" } cache.remove(fingerprint) return createUpload(channel, source, path, size) { upsert = entry.upsert @@ -151,11 +150,11 @@ internal class ResumableClientImpl(private val storageApi: BucketApi, private va val response = httpClient.request(url) { method = HttpMethod.Head bearerAuth(accessTokenOrApiKey()) - header("Tus-Resumable", TUS_VERSION) + header("Tus-Resumable", ResumableClient.Companion.TUS_VERSION) } if(!response.status.isSuccess()) error("Failed to retrieve server offset: ${response.status} ${response.bodyAsText()}") val offset = response.headers["Upload-Offset"]?.toLongOrNull() ?: error("No upload offset found") - Storage.logger.d { "Server offset for $path is $offset" } + Storage.Companion.logger.d { "Server offset for $path is $offset" } return offset } diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUpload.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableUpload.kt similarity index 85% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUpload.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableUpload.kt index bf91b0dd6..45254e3b0 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUpload.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableUpload.kt @@ -1,16 +1,15 @@ -package io.github.jan.supabase.storage.resumable - -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.logging.w -import io.github.jan.supabase.storage.BucketApi -import io.github.jan.supabase.storage.FileUploadResponse -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.UploadStatus -import io.github.jan.supabase.storage.resumable.ResumableClient.Companion.TUS_VERSION -import io.github.jan.supabase.storage.storage +package io.supabase.storage.resumable + +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.Auth +import io.supabase.logging.d +import io.supabase.logging.e +import io.supabase.logging.w +import io.supabase.storage.BucketApi +import io.supabase.storage.FileUploadResponse +import io.supabase.storage.Storage +import io.supabase.storage.UploadStatus +import io.supabase.storage.storage import io.ktor.client.HttpClient import io.ktor.client.plugins.onUpload import io.ktor.client.request.bearerAuth @@ -115,14 +114,14 @@ internal class ResumableUploadImpl( while (offset < size) { if(paused || !isActive) return@launch //check if paused or the scope is still active if(updateOffset) { //after an upload error we retrieve the server offset and update the data stream to avoid conflicts - Storage.logger.d { "Trying to update server offset for $path" } + Storage.Companion.logger.d { "Trying to update server offset for $path" } try { serverOffset = retrieveServerOffset() //retrieve server offset offset = serverOffset dataStream.cancel() //cancel old data stream as we are start reading from a new offset dataStream = createDataStream(offset) //create new data stream } catch(e: Exception) { - Storage.logger.e(e) { "Error while updating server offset for $path. Retrying in ${config.retryTimeout}" } + Storage.Companion.logger.e(e) { "Error while updating server offset for $path. Retrying in ${config.retryTimeout}" } delay(config.retryTimeout) continue } @@ -133,7 +132,7 @@ internal class ResumableUploadImpl( offset += uploaded } catch(e: Exception) { if(e !is IllegalStateException) { - Storage.logger.e(e) {"Error while uploading chunk. Retrying in ${config.retryTimeout}" } + Storage.Companion.logger.e(e) {"Error while uploading chunk. Retrying in ${config.retryTimeout}" } delay(config.retryTimeout) updateOffset = true //if an error occurs, we need to update the server offset to avoid conflicts continue @@ -142,7 +141,11 @@ internal class ResumableUploadImpl( _stateFlow.value = ResumableUploadState(fingerprint, cacheEntry, UploadStatus.Progress(offset, size), paused) } if(offset != serverOffset) error("Upload offset does not match server offset") - _stateFlow.value = ResumableUploadState(fingerprint, cacheEntry, UploadStatus.Success(FileUploadResponse(path = path)), false) + _stateFlow.value = ResumableUploadState(fingerprint, cacheEntry, UploadStatus.Success( + FileUploadResponse( + path = path + ) + ), false) removeFromCache() dataStream.cancel() } @@ -155,7 +158,7 @@ internal class ResumableUploadImpl( dataStream.readFully(buffer, 0, limit.toInt()) //dataStream.readFully(buffer, 0, limit.toInt()) val uploadResponse = httpClient.patch(locationUrl) { - header("Tus-Resumable", TUS_VERSION) + header("Tus-Resumable", ResumableClient.Companion.TUS_VERSION) header("Content-Type", "application/offset+octet-stream") header("Upload-Offset", offset) bearerAuth(accessTokenOrApiKey()) @@ -173,11 +176,11 @@ internal class ResumableUploadImpl( serverOffset = uploadResponse.headers["Upload-Offset"]?.toLong() ?: error("No upload offset found") } HttpStatusCode.Conflict -> { - Storage.logger.w { "Upload conflict, skipping chunk" } + Storage.Companion.logger.w { "Upload conflict, skipping chunk" } serverOffset = offset + limit } HttpStatusCode.NoContent -> { - Storage.logger.d { "Uploaded chunk" } + Storage.Companion.logger.d { "Uploaded chunk" } } else -> error("Upload failed with status ${uploadResponse.status}. ${uploadResponse.bodyAsText()}") } diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUploadState.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableUploadState.kt similarity index 89% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUploadState.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableUploadState.kt index d36962058..0689f962c 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableUploadState.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/ResumableUploadState.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.storage.resumable +package io.supabase.storage.resumable -import io.github.jan.supabase.storage.UploadStatus +import io.supabase.storage.UploadStatus /** * Represents the state of a resumable upload diff --git a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/StreamContent.kt b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/StreamContent.kt similarity index 82% rename from Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/StreamContent.kt rename to Storage/src/commonMain/kotlin/io/supabase/storage/resumable/StreamContent.kt index 1fa753a63..708c1b2b0 100644 --- a/Storage/src/commonMain/kotlin/io/github/jan/supabase/storage/resumable/StreamContent.kt +++ b/Storage/src/commonMain/kotlin/io/supabase/storage/resumable/StreamContent.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.storage.resumable +package io.supabase.storage.resumable -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import io.ktor.http.ContentType import io.ktor.http.content.OutgoingContent import io.ktor.utils.io.ByteWriteChannel diff --git a/Storage/src/commonTest/kotlin/BucketApiFlowTest.kt b/Storage/src/commonTest/kotlin/BucketApiFlowTest.kt index 939a73065..8db64145b 100644 --- a/Storage/src/commonTest/kotlin/BucketApiFlowTest.kt +++ b/Storage/src/commonTest/kotlin/BucketApiFlowTest.kt @@ -1,19 +1,19 @@ import app.cash.turbine.test -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.storage.BucketApi -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.UploadData -import io.github.jan.supabase.storage.UploadStatus -import io.github.jan.supabase.storage.resumable.MemoryResumableCache -import io.github.jan.supabase.storage.storage -import io.github.jan.supabase.storage.updateAsFlow -import io.github.jan.supabase.storage.uploadAsFlow -import io.github.jan.supabase.storage.uploadToSignedUrlAsFlow -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.storage.BucketApi +import io.supabase.storage.Storage +import io.supabase.storage.UploadData +import io.supabase.storage.UploadStatus +import io.supabase.storage.resumable.MemoryResumableCache +import io.supabase.storage.storage +import io.supabase.storage.updateAsFlow +import io.supabase.storage.uploadAsFlow +import io.supabase.storage.uploadToSignedUrlAsFlow +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion import io.ktor.client.engine.mock.MockRequestHandleScope import io.ktor.client.engine.mock.respond import io.ktor.client.engine.mock.toByteArray diff --git a/Storage/src/commonTest/kotlin/BucketApiTest.kt b/Storage/src/commonTest/kotlin/BucketApiTest.kt index ece065241..9afe73452 100644 --- a/Storage/src/commonTest/kotlin/BucketApiTest.kt +++ b/Storage/src/commonTest/kotlin/BucketApiTest.kt @@ -1,16 +1,16 @@ -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.storage.BucketApi -import io.github.jan.supabase.storage.FileUploadResponse -import io.github.jan.supabase.storage.ImageTransformation -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.resumable.MemoryResumableCache -import io.github.jan.supabase.storage.storage -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.toJsonElement +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.storage.BucketApi +import io.supabase.storage.FileUploadResponse +import io.supabase.storage.ImageTransformation +import io.supabase.storage.Storage +import io.supabase.storage.resumable.MemoryResumableCache +import io.supabase.storage.storage +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.toJsonElement import io.ktor.client.engine.mock.MockRequestHandleScope import io.ktor.client.engine.mock.respond import io.ktor.client.engine.mock.toByteArray diff --git a/Storage/src/commonTest/kotlin/BucketListFilterTest.kt b/Storage/src/commonTest/kotlin/BucketListFilterTest.kt index f05715789..616e6de96 100644 --- a/Storage/src/commonTest/kotlin/BucketListFilterTest.kt +++ b/Storage/src/commonTest/kotlin/BucketListFilterTest.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.storage.BucketListFilter +import io.supabase.storage.BucketListFilter import kotlinx.serialization.json.int import kotlinx.serialization.json.jsonObject import kotlinx.serialization.json.jsonPrimitive diff --git a/Storage/src/commonTest/kotlin/StorageTest.kt b/Storage/src/commonTest/kotlin/StorageTest.kt index ab972775f..dedc8a221 100644 --- a/Storage/src/commonTest/kotlin/StorageTest.kt +++ b/Storage/src/commonTest/kotlin/StorageTest.kt @@ -1,17 +1,17 @@ -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.resumable.MemoryResumableCache -import io.github.jan.supabase.storage.storage -import io.github.jan.supabase.testing.assertMethodIs -import io.github.jan.supabase.testing.assertPathIs -import io.github.jan.supabase.testing.createMockedSupabaseClient -import io.github.jan.supabase.testing.pathAfterVersion -import io.github.jan.supabase.testing.toJsonElement import io.ktor.client.engine.mock.respond import io.ktor.http.HttpMethod +import io.supabase.SupabaseClientBuilder +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.storage.Storage +import io.supabase.storage.resumable.MemoryResumableCache +import io.supabase.storage.storage +import io.supabase.testing.assertMethodIs +import io.supabase.testing.assertPathIs +import io.supabase.testing.createMockedSupabaseClient +import io.supabase.testing.pathAfterVersion +import io.supabase.testing.toJsonElement import kotlinx.coroutines.test.runTest import kotlinx.datetime.Clock import kotlinx.serialization.json.JsonArray diff --git a/Storage/src/linuxMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCacheUtil.kt b/Storage/src/linuxMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCacheUtil.kt deleted file mode 100644 index 8f1390d42..000000000 --- a/Storage/src/linuxMain/kotlin/io/github/jan/supabase/storage/resumable/ResumableCacheUtil.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.storage.resumable - -import io.github.jan.supabase.annotations.SupabaseInternal - -@SupabaseInternal -actual fun createDefaultResumableCache(): ResumableCache = MemoryResumableCache() \ No newline at end of file diff --git a/Storage/src/linuxMain/kotlin/io/supabase/storage/resumable/ResumableCacheUtil.kt b/Storage/src/linuxMain/kotlin/io/supabase/storage/resumable/ResumableCacheUtil.kt new file mode 100644 index 000000000..4ec6d2c4b --- /dev/null +++ b/Storage/src/linuxMain/kotlin/io/supabase/storage/resumable/ResumableCacheUtil.kt @@ -0,0 +1,8 @@ +package io.supabase.storage.resumable + +import io.supabase.annotations.SupabaseInternal +import io.supabase.storage.resumable.MemoryResumableCache +import io.supabase.storage.resumable.ResumableCache + +@SupabaseInternal +actual fun createDefaultResumableCache(): ResumableCache = MemoryResumableCache() \ No newline at end of file diff --git a/Storage/src/settingsMain/kotlin/io/github/jan/supabase/storage/resumable/SettingsResumableCache.kt b/Storage/src/settingsMain/kotlin/io/supabase/storage/resumable/SettingsResumableCache.kt similarity index 80% rename from Storage/src/settingsMain/kotlin/io/github/jan/supabase/storage/resumable/SettingsResumableCache.kt rename to Storage/src/settingsMain/kotlin/io/supabase/storage/resumable/SettingsResumableCache.kt index 9e558d836..e3c325531 100644 --- a/Storage/src/settingsMain/kotlin/io/github/jan/supabase/storage/resumable/SettingsResumableCache.kt +++ b/Storage/src/settingsMain/kotlin/io/supabase/storage/resumable/SettingsResumableCache.kt @@ -1,15 +1,15 @@ -package io.github.jan.supabase.storage.resumable +package io.supabase.storage.resumable import com.russhwolf.settings.ExperimentalSettingsApi import com.russhwolf.settings.Settings import com.russhwolf.settings.coroutines.toSuspendSettings -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import io.ktor.util.PlatformUtils.IS_NODE import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json /** - * A [ResumableCache] implementation using [com.russhwolf.settings.Settings]. This implementation saves the urls on the disk. If you want a memory only cache, use [Memory]. + * A [ResumableCache] implementation using [Settings]. This implementation saves the urls on the disk. If you want a memory only cache, use [Memory]. * Unsupported on Linux. */ @OptIn(ExperimentalSettingsApi::class) @@ -33,7 +33,8 @@ class SettingsResumableCache(settings: Settings = Settings()) : ResumableCache { override suspend fun clear() { settings.keys().forEach { - if(it.split(Fingerprint.FINGERPRINT_SEPARATOR).size == Fingerprint.FINGERPRINT_PARTS) remove(Fingerprint(it) ?: error("Invalid fingerprint $it")) + if(it.split(Fingerprint.FINGERPRINT_SEPARATOR).size == Fingerprint.FINGERPRINT_PARTS) remove( + Fingerprint(it) ?: error("Invalid fingerprint $it")) } } diff --git a/Supabase/README.md b/Supabase/README.md index af076ae14..fb04644f4 100644 --- a/Supabase/README.md +++ b/Supabase/README.md @@ -40,7 +40,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:supabase-kt:VERSION") + implementation("io.supabase:supabase-kt:VERSION") } ``` diff --git a/Supabase/build.gradle.kts b/Supabase/build.gradle.kts index 97977c3f9..aae08c526 100644 --- a/Supabase/build.gradle.kts +++ b/Supabase/build.gradle.kts @@ -13,9 +13,9 @@ val buildConfigGenerator by tasks.registering(Sync::class) { from( resources.text.fromString( """ - |package io.github.jan.supabase + |package io.supabase | - |import io.github.jan.supabase.annotations.SupabaseInternal + |import io.supabase.annotations.SupabaseInternal | |@SupabaseInternal |object BuildConfig { diff --git a/Supabase/src/androidMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/androidMain/kotlin/io/supabase/PlatformTarget.kt similarity index 63% rename from Supabase/src/androidMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/androidMain/kotlin/io/supabase/PlatformTarget.kt index 249f12bcc..3d7b61b70 100644 --- a/Supabase/src/androidMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/androidMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/androidUnitTest/kotlin/PlatformTargetTest.kt b/Supabase/src/androidUnitTest/kotlin/PlatformTargetTest.kt index 02fae7b7d..d04568c9f 100644 --- a/Supabase/src/androidUnitTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/androidUnitTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import org.junit.Test import kotlin.test.assertEquals diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/AccessTokenProvider.kt b/Supabase/src/commonMain/kotlin/io/supabase/AccessTokenProvider.kt similarity index 93% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/AccessTokenProvider.kt rename to Supabase/src/commonMain/kotlin/io/supabase/AccessTokenProvider.kt index 26d89aad3..7952c5d05 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/AccessTokenProvider.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/AccessTokenProvider.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase +package io.supabase /** * Optional function for using a third-party authentication system with diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/commonMain/kotlin/io/supabase/PlatformTarget.kt similarity index 89% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/commonMain/kotlin/io/supabase/PlatformTarget.kt index 6cc798d57..ee2278610 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicProperty") -package io.github.jan.supabase + +package io.supabase /** * Represents a target platform diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseClient.kt b/Supabase/src/commonMain/kotlin/io/supabase/SupabaseClient.kt similarity index 88% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseClient.kt rename to Supabase/src/commonMain/kotlin/io/supabase/SupabaseClient.kt index 4d5a97d2f..262b5ee65 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseClient.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/SupabaseClient.kt @@ -1,13 +1,13 @@ -package io.github.jan.supabase - -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.logging.KermitSupabaseLogger -import io.github.jan.supabase.logging.LogLevel -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.i -import io.github.jan.supabase.network.KtorSupabaseHttpClient -import io.github.jan.supabase.plugins.PluginManager -import io.github.jan.supabase.plugins.SupabasePlugin +package io.supabase + +import io.supabase.annotations.SupabaseInternal +import io.supabase.logging.KermitSupabaseLogger +import io.supabase.logging.LogLevel +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.i +import io.supabase.network.KtorSupabaseHttpClient +import io.supabase.plugins.PluginManager +import io.supabase.plugins.SupabasePlugin import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngine diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseClientBuilder.kt b/Supabase/src/commonMain/kotlin/io/supabase/SupabaseClientBuilder.kt similarity index 92% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseClientBuilder.kt rename to Supabase/src/commonMain/kotlin/io/supabase/SupabaseClientBuilder.kt index 282ea8290..645ea2c8a 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseClientBuilder.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/SupabaseClientBuilder.kt @@ -1,12 +1,12 @@ -package io.github.jan.supabase - -import io.github.jan.supabase.annotations.SupabaseDsl -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.logging.LogLevel -import io.github.jan.supabase.plugins.PluginManager -import io.github.jan.supabase.plugins.SupabasePlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.serializer.KotlinXSerializer +package io.supabase + +import io.supabase.annotations.SupabaseDsl +import io.supabase.annotations.SupabaseInternal +import io.supabase.logging.LogLevel +import io.supabase.plugins.PluginManager +import io.supabase.plugins.SupabasePlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.serializer.KotlinXSerializer import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngine import io.ktor.client.plugins.HttpRequestTimeoutException diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseSerializer.kt b/Supabase/src/commonMain/kotlin/io/supabase/SupabaseSerializer.kt similarity index 97% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseSerializer.kt rename to Supabase/src/commonMain/kotlin/io/supabase/SupabaseSerializer.kt index a4f40a235..7eee1e69f 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/SupabaseSerializer.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/SupabaseSerializer.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase +package io.supabase import kotlinx.serialization.json.Json import kotlinx.serialization.json.JsonElement diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/Utils.kt b/Supabase/src/commonMain/kotlin/io/supabase/Utils.kt similarity index 82% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/Utils.kt rename to Supabase/src/commonMain/kotlin/io/supabase/Utils.kt index ff8d0c108..e5ff851b6 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/Utils.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/Utils.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase +package io.supabase -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.exceptions.SupabaseEncodingException +import io.supabase.annotations.SupabaseInternal +import io.supabase.exceptions.SupabaseEncodingException import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.bodyAsText import io.ktor.http.URLBuilder @@ -26,7 +26,14 @@ suspend inline fun HttpResponse.safeBody(context: String? = null): T return try { supabaseJson.decodeFromString(text) } catch(e: MissingFieldException) { - throw SupabaseEncodingException("Couldn't decode payload$contextMessage as ${T::class.simpleName}. Input: ${text.replace("\n", "")}") + throw SupabaseEncodingException( + "Couldn't decode payload$contextMessage as ${T::class.simpleName}. Input: ${ + text.replace( + "\n", + "" + ) + }" + ) } } diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseDsl.kt b/Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseDsl.kt similarity index 78% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseDsl.kt rename to Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseDsl.kt index 4e263ddd6..f7414879b 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseDsl.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseDsl.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.annotations +package io.supabase.annotations /** * Used to mark DSL functions diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseExperimental.kt b/Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseExperimental.kt similarity index 81% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseExperimental.kt rename to Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseExperimental.kt index 493bc9a14..64cd69fcb 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseExperimental.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseExperimental.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.annotations +package io.supabase.annotations /** * Used to mark experimental APIs diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseInternal.kt b/Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseInternal.kt similarity index 81% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseInternal.kt rename to Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseInternal.kt index c3a108298..8b0f6475d 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/annotations/SupabaseInternal.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/annotations/SupabaseInternal.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.annotations +package io.supabase.annotations /** * Used to mark internal APIs diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/collections/AtomicMutableList.kt b/Supabase/src/commonMain/kotlin/io/supabase/collections/AtomicMutableList.kt similarity index 97% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/collections/AtomicMutableList.kt rename to Supabase/src/commonMain/kotlin/io/supabase/collections/AtomicMutableList.kt index bfd01df1e..7a5178968 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/collections/AtomicMutableList.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/collections/AtomicMutableList.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.collections +package io.supabase.collections -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.atomicfu.atomic import kotlinx.atomicfu.update diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/collections/AtomicMutableMap.kt b/Supabase/src/commonMain/kotlin/io/supabase/collections/AtomicMutableMap.kt similarity index 94% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/collections/AtomicMutableMap.kt rename to Supabase/src/commonMain/kotlin/io/supabase/collections/AtomicMutableMap.kt index 75b727008..6005131f0 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/collections/AtomicMutableMap.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/collections/AtomicMutableMap.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.collections +package io.supabase.collections -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import kotlinx.atomicfu.atomic import kotlinx.atomicfu.update diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/HttpRequestException.kt b/Supabase/src/commonMain/kotlin/io/supabase/exceptions/HttpRequestException.kt similarity index 88% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/HttpRequestException.kt rename to Supabase/src/commonMain/kotlin/io/supabase/exceptions/HttpRequestException.kt index 2f82c6965..c25ff4070 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/HttpRequestException.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/exceptions/HttpRequestException.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.exceptions +package io.supabase.exceptions import io.ktor.client.request.HttpRequestBuilder diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/RestException.kt b/Supabase/src/commonMain/kotlin/io/supabase/exceptions/RestException.kt similarity index 97% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/RestException.kt rename to Supabase/src/commonMain/kotlin/io/supabase/exceptions/RestException.kt index fd19316ce..032a342ec 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/RestException.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/exceptions/RestException.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.exceptions +package io.supabase.exceptions import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.request diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/SupabaseEncodingException.kt b/Supabase/src/commonMain/kotlin/io/supabase/exceptions/SupabaseEncodingException.kt similarity index 73% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/SupabaseEncodingException.kt rename to Supabase/src/commonMain/kotlin/io/supabase/exceptions/SupabaseEncodingException.kt index e63162e5d..ed8e391c4 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/exceptions/SupabaseEncodingException.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/exceptions/SupabaseEncodingException.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.exceptions +package io.supabase.exceptions /** * Thrown when an encoding error occurs diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/logging/LogLevel.kt b/Supabase/src/commonMain/kotlin/io/supabase/logging/LogLevel.kt similarity index 88% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/logging/LogLevel.kt rename to Supabase/src/commonMain/kotlin/io/supabase/logging/LogLevel.kt index a953041e8..82d3cdb9c 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/logging/LogLevel.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/logging/LogLevel.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.logging +package io.supabase.logging /** * Represents a log level diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/logging/SupabaseLogger.kt b/Supabase/src/commonMain/kotlin/io/supabase/logging/SupabaseLogger.kt similarity index 91% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/logging/SupabaseLogger.kt rename to Supabase/src/commonMain/kotlin/io/supabase/logging/SupabaseLogger.kt index fc73b3702..1d3752819 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/logging/SupabaseLogger.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/logging/SupabaseLogger.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.logging +package io.supabase.logging import co.touchlab.kermit.Logger import co.touchlab.kermit.Severity -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal /** * An interface for logging in Supabase plugins. @@ -11,7 +11,7 @@ import io.github.jan.supabase.annotations.SupabaseInternal abstract class SupabaseLogger { /** - * The log level for this logger. If null, the [SupabaseClient.DEFAULT_LOG_LEVEL] will be used. + * The log level for this logger. If null, the [SupabaseClient.Companion.DEFAULT_LOG_LEVEL] will be used. */ abstract val level: LogLevel? @@ -30,7 +30,7 @@ abstract class SupabaseLogger { * @param message The message to log */ inline fun log(level: LogLevel, throwable: Throwable? = null, message: () -> String) { - if (level >= (this.level ?: SupabaseClient.DEFAULT_LOG_LEVEL)) { + if (level >= (this.level ?: SupabaseClient.Companion.DEFAULT_LOG_LEVEL)) { log(level, throwable, message()) } } @@ -46,7 +46,7 @@ abstract class SupabaseLogger { /** * A logger implementation using the Kermit logger. - * @param level The log level for this logger. If null, the [SupabaseClient.DEFAULT_LOG_LEVEL] will be used. + * @param level The log level for this logger. If null, the [SupabaseClient.Companion.DEFAULT_LOG_LEVEL] will be used. * @param tag The tag for this logger * @param logger The Kermit logger */ diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/KtorSupabaseHttpClient.kt b/Supabase/src/commonMain/kotlin/io/supabase/network/KtorSupabaseHttpClient.kt similarity index 74% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/KtorSupabaseHttpClient.kt rename to Supabase/src/commonMain/kotlin/io/supabase/network/KtorSupabaseHttpClient.kt index b86c9bf2f..8870eda6b 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/KtorSupabaseHttpClient.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/network/KtorSupabaseHttpClient.kt @@ -1,13 +1,7 @@ @file:Suppress("UndocumentedPublicFunction") -package io.github.jan.supabase.network -import io.github.jan.supabase.BuildConfig -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.exceptions.HttpRequestException -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e -import io.github.jan.supabase.supabaseJson +package io.supabase.network + import io.ktor.client.HttpClient import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngine @@ -24,6 +18,13 @@ import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.HttpStatement import io.ktor.http.encodedPath import io.ktor.serialization.kotlinx.json.json +import io.supabase.BuildConfig +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.exceptions.HttpRequestException +import io.supabase.logging.d +import io.supabase.logging.e +import io.supabase.supabaseJson import kotlin.coroutines.cancellation.CancellationException import kotlin.time.Duration.Companion.milliseconds @@ -56,22 +57,22 @@ class KtorSupabaseHttpClient @SupabaseInternal constructor( builder() } val endPoint = request.url.encodedPath - SupabaseClient.LOGGER.d { "Starting ${request.method.value} request to endpoint $endPoint" } + SupabaseClient.Companion.LOGGER.d { "Starting ${request.method.value} request to endpoint $endPoint" } val response = try { httpClient.request(url, builder) } catch(e: HttpRequestTimeoutException) { - SupabaseClient.LOGGER.e { "${request.method.value} request to endpoint $endPoint timed out after $requestTimeout ms" } + SupabaseClient.Companion.LOGGER.e { "${request.method.value} request to endpoint $endPoint timed out after $requestTimeout ms" } throw e } catch(e: CancellationException) { - SupabaseClient.LOGGER.e { "${request.method.value} request to endpoint $endPoint was cancelled"} + SupabaseClient.Companion.LOGGER.e { "${request.method.value} request to endpoint $endPoint was cancelled"} throw e } catch(e: Exception) { - SupabaseClient.LOGGER.e(e) { "${request.method.value} request to endpoint $endPoint failed with exception ${e.message}" } + SupabaseClient.Companion.LOGGER.e(e) { "${request.method.value} request to endpoint $endPoint failed with exception ${e.message}" } throw HttpRequestException(e.message ?: "", request) } val responseTime = (response.responseTime.timestamp - response.requestTime.timestamp).milliseconds - SupabaseClient.LOGGER.d { "${request.method.value} request to endpoint $endPoint successfully finished in $responseTime" } + SupabaseClient.Companion.LOGGER.d { "${request.method.value} request to endpoint $endPoint successfully finished in $responseTime" } return response } @@ -86,13 +87,13 @@ class KtorSupabaseHttpClient @SupabaseInternal constructor( val response = try { httpClient.prepareRequest(url, builder) } catch(e: HttpRequestTimeoutException) { - SupabaseClient.LOGGER.e { "Request timed out after $requestTimeout ms on url $url" } + SupabaseClient.Companion.LOGGER.e { "Request timed out after $requestTimeout ms on url $url" } throw e } catch(e: CancellationException) { - SupabaseClient.LOGGER.e { "Request was cancelled on url $url" } + SupabaseClient.Companion.LOGGER.e { "Request was cancelled on url $url" } throw e } catch(e: Exception) { - SupabaseClient.LOGGER.e(e) { "Request failed with ${e.message} on url $url" } + SupabaseClient.Companion.LOGGER.e(e) { "Request failed with ${e.message} on url $url" } throw HttpRequestException(e.message ?: "", request) } return response diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/SupabaseApi.kt b/Supabase/src/commonMain/kotlin/io/supabase/network/SupabaseApi.kt similarity index 90% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/SupabaseApi.kt rename to Supabase/src/commonMain/kotlin/io/supabase/network/SupabaseApi.kt index a4d312a29..8af825552 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/SupabaseApi.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/network/SupabaseApi.kt @@ -1,10 +1,11 @@ @file:Suppress("UndocumentedPublicFunction", "UndocumentedPublicClass") -package io.github.jan.supabase.network -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.plugins.MainPlugin +package io.supabase.network + +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.exceptions.RestException +import io.supabase.plugins.MainPlugin import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.HttpStatement diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/SupabaseHttpClient.kt b/Supabase/src/commonMain/kotlin/io/supabase/network/SupabaseHttpClient.kt similarity index 98% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/SupabaseHttpClient.kt rename to Supabase/src/commonMain/kotlin/io/supabase/network/SupabaseHttpClient.kt index 7a5d243d6..ee8ebf25d 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/network/SupabaseHttpClient.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/network/SupabaseHttpClient.kt @@ -1,5 +1,6 @@ @file:Suppress("UndocumentedPublicFunction", "UndocumentedPublicClass") -package io.github.jan.supabase.network + +package io.supabase.network import io.ktor.client.request.HttpRequestBuilder import io.ktor.client.request.setBody diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/CustomSerializationConfig.kt b/Supabase/src/commonMain/kotlin/io/supabase/plugins/CustomSerializationConfig.kt similarity index 67% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/CustomSerializationConfig.kt rename to Supabase/src/commonMain/kotlin/io/supabase/plugins/CustomSerializationConfig.kt index ac3336dfe..7233f8afa 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/CustomSerializationConfig.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/plugins/CustomSerializationConfig.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.plugins +package io.supabase.plugins -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.SupabaseSerializer +import io.supabase.SupabaseClientBuilder +import io.supabase.SupabaseSerializer /** * A configuration for a plugin, which allows to customize the serialization diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/CustomSerializationPlugin.kt b/Supabase/src/commonMain/kotlin/io/supabase/plugins/CustomSerializationPlugin.kt similarity index 66% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/CustomSerializationPlugin.kt rename to Supabase/src/commonMain/kotlin/io/supabase/plugins/CustomSerializationPlugin.kt index 79f1a2c05..6fc7561be 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/CustomSerializationPlugin.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/plugins/CustomSerializationPlugin.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.plugins +package io.supabase.plugins -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.SupabaseSerializer +import io.supabase.SupabaseClientBuilder +import io.supabase.SupabaseSerializer /** * A plugin, which allows to customize the serialization diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/MainPlugin.kt b/Supabase/src/commonMain/kotlin/io/supabase/plugins/MainPlugin.kt similarity index 82% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/MainPlugin.kt rename to Supabase/src/commonMain/kotlin/io/supabase/plugins/MainPlugin.kt index 8a8a3e1bc..a9448befb 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/MainPlugin.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/plugins/MainPlugin.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.plugins +package io.supabase.plugins -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.buildUrl -import io.github.jan.supabase.exceptions.RestException +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseInternal +import io.supabase.buildUrl +import io.supabase.exceptions.RestException import io.ktor.client.statement.HttpResponse import io.ktor.http.appendEncodedPathSegments @@ -46,10 +46,10 @@ interface MainPlugin : SupabasePlugin { fun resolveUrl(path: String = ""): String { val isBase = config.customUrl == null return buildUrl(config.customUrl ?: supabaseClient.supabaseHttpUrl) { - if(isBase) { + if (isBase) { appendEncodedPathSegments(pluginKey, "v${apiVersion}") } - if(path.isNotBlank()) { + if (path.isNotBlank()) { appendEncodedPathSegments(path) } } diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/PluginManager.kt b/Supabase/src/commonMain/kotlin/io/supabase/plugins/PluginManager.kt similarity index 93% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/PluginManager.kt rename to Supabase/src/commonMain/kotlin/io/supabase/plugins/PluginManager.kt index d9009738c..fb5b48fd6 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/PluginManager.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/plugins/PluginManager.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.plugins +package io.supabase.plugins -import io.github.jan.supabase.SupabaseClientBuilder +import io.supabase.SupabaseClientBuilder /** * The plugin manager is used to manage installed plugins diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/SerializableData.kt b/Supabase/src/commonMain/kotlin/io/supabase/plugins/SerializableData.kt similarity index 62% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/SerializableData.kt rename to Supabase/src/commonMain/kotlin/io/supabase/plugins/SerializableData.kt index 86b5fc763..ff0ad2b2b 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/SerializableData.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/plugins/SerializableData.kt @@ -1,7 +1,7 @@ -package io.github.jan.supabase.plugins +package io.supabase.plugins -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.SupabaseSerializer +import io.supabase.annotations.SupabaseInternal /** * An interface for data that can be serialized with [SupabaseSerializer] diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/SupabasePlugin.kt b/Supabase/src/commonMain/kotlin/io/supabase/plugins/SupabasePlugin.kt similarity index 88% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/SupabasePlugin.kt rename to Supabase/src/commonMain/kotlin/io/supabase/plugins/SupabasePlugin.kt index 3d85ff0f1..d15a37adf 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/plugins/SupabasePlugin.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/plugins/SupabasePlugin.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.plugins +package io.supabase.plugins -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.logging.LogLevel -import io.github.jan.supabase.logging.SupabaseLogger +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.logging.LogLevel +import io.supabase.logging.SupabaseLogger /** * A plugin is a feature that can be installed into the supabase client diff --git a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/serializer/KotlinXSerializer.kt b/Supabase/src/commonMain/kotlin/io/supabase/serializer/KotlinXSerializer.kt similarity index 85% rename from Supabase/src/commonMain/kotlin/io/github/jan/supabase/serializer/KotlinXSerializer.kt rename to Supabase/src/commonMain/kotlin/io/supabase/serializer/KotlinXSerializer.kt index fb18fa0a0..dc28c52de 100644 --- a/Supabase/src/commonMain/kotlin/io/github/jan/supabase/serializer/KotlinXSerializer.kt +++ b/Supabase/src/commonMain/kotlin/io/supabase/serializer/KotlinXSerializer.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.serializer +package io.supabase.serializer -import io.github.jan.supabase.SupabaseSerializer +import io.supabase.SupabaseSerializer import kotlinx.serialization.json.Json import kotlinx.serialization.serializer import kotlin.reflect.KType diff --git a/Supabase/src/iosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/iosMain/kotlin/io/supabase/PlatformTarget.kt similarity index 62% rename from Supabase/src/iosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/iosMain/kotlin/io/supabase/PlatformTarget.kt index 272512b50..720a8f511 100644 --- a/Supabase/src/iosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/iosMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/iosTest/kotlin/PlatformTargetTest.kt b/Supabase/src/iosTest/kotlin/PlatformTargetTest.kt index 84598776a..9c97565ed 100644 --- a/Supabase/src/iosTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/iosTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/jsMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/jsMain/kotlin/io/supabase/PlatformTarget.kt similarity index 66% rename from Supabase/src/jsMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/jsMain/kotlin/io/supabase/PlatformTarget.kt index 78b69b9bf..38995e2dc 100644 --- a/Supabase/src/jsMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/jsMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/jsTest/kotlin/PlatformTargetTest.kt b/Supabase/src/jsTest/kotlin/PlatformTargetTest.kt index 8686d5077..f93f53623 100644 --- a/Supabase/src/jsTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/jsTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/jvmMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/jvmMain/kotlin/io/supabase/PlatformTarget.kt similarity index 62% rename from Supabase/src/jvmMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/jvmMain/kotlin/io/supabase/PlatformTarget.kt index c3014f65d..3656260b4 100644 --- a/Supabase/src/jvmMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/jvmMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/jvmTest/kotlin/PlatformTargetTest.kt b/Supabase/src/jvmTest/kotlin/PlatformTargetTest.kt index 6b9197e43..763c94883 100644 --- a/Supabase/src/jvmTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/jvmTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/linuxMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/linuxMain/kotlin/io/supabase/PlatformTarget.kt similarity index 63% rename from Supabase/src/linuxMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/linuxMain/kotlin/io/supabase/PlatformTarget.kt index 74fd18e1c..c398b4430 100644 --- a/Supabase/src/linuxMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/linuxMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/linuxTest/kotlin/PlatformTargetTest.kt b/Supabase/src/linuxTest/kotlin/PlatformTargetTest.kt index 96a258b3c..fe5126d94 100644 --- a/Supabase/src/linuxTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/linuxTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/macosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/macosMain/kotlin/io/supabase/PlatformTarget.kt similarity index 63% rename from Supabase/src/macosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/macosMain/kotlin/io/supabase/PlatformTarget.kt index 5c1a9c1af..290857404 100644 --- a/Supabase/src/macosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/macosMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/macosTest/kotlin/PlatformTargetTest.kt b/Supabase/src/macosTest/kotlin/PlatformTargetTest.kt index 7be6012ac..a4ab43658 100644 --- a/Supabase/src/macosTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/macosTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/mingwX64Main/kotlin/io/github/jan/supabase/CurrentPlatformTarget.kt b/Supabase/src/mingwX64Main/kotlin/io/supabase/CurrentPlatformTarget.kt similarity index 67% rename from Supabase/src/mingwX64Main/kotlin/io/github/jan/supabase/CurrentPlatformTarget.kt rename to Supabase/src/mingwX64Main/kotlin/io/supabase/CurrentPlatformTarget.kt index ef4e0068c..6157666ec 100644 --- a/Supabase/src/mingwX64Main/kotlin/io/github/jan/supabase/CurrentPlatformTarget.kt +++ b/Supabase/src/mingwX64Main/kotlin/io/supabase/CurrentPlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/mingwX64Test/kotlin/PlatformTargetTest.kt b/Supabase/src/mingwX64Test/kotlin/PlatformTargetTest.kt index 9ae0c0036..b826fb6f4 100644 --- a/Supabase/src/mingwX64Test/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/mingwX64Test/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/tvosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/tvosMain/kotlin/io/supabase/PlatformTarget.kt similarity index 66% rename from Supabase/src/tvosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/tvosMain/kotlin/io/supabase/PlatformTarget.kt index 3169f5624..5e8c8269b 100644 --- a/Supabase/src/tvosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/tvosMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/tvosTest/kotlin/PlatformTargetTest.kt b/Supabase/src/tvosTest/kotlin/PlatformTargetTest.kt index 27769b7bd..ac23281de 100644 --- a/Supabase/src/tvosTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/tvosTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/wasmJsMain/kotlin/io/github/jan/supabase/PlatformTarget.wasmJs.kt b/Supabase/src/wasmJsMain/kotlin/io/supabase/PlatformTarget.wasmJs.kt similarity index 67% rename from Supabase/src/wasmJsMain/kotlin/io/github/jan/supabase/PlatformTarget.wasmJs.kt rename to Supabase/src/wasmJsMain/kotlin/io/supabase/PlatformTarget.wasmJs.kt index ea6e549ee..3eaf6fca2 100644 --- a/Supabase/src/wasmJsMain/kotlin/io/github/jan/supabase/PlatformTarget.wasmJs.kt +++ b/Supabase/src/wasmJsMain/kotlin/io/supabase/PlatformTarget.wasmJs.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/wasmJsTest/kotlin/PlatformTargetTest.kt b/Supabase/src/wasmJsTest/kotlin/PlatformTargetTest.kt index 41a03d9a5..eb20d9134 100644 --- a/Supabase/src/wasmJsTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/wasmJsTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/Supabase/src/watchosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt b/Supabase/src/watchosMain/kotlin/io/supabase/PlatformTarget.kt similarity index 67% rename from Supabase/src/watchosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt rename to Supabase/src/watchosMain/kotlin/io/supabase/PlatformTarget.kt index f23b13a70..8dd160748 100644 --- a/Supabase/src/watchosMain/kotlin/io/github/jan/supabase/PlatformTarget.kt +++ b/Supabase/src/watchosMain/kotlin/io/supabase/PlatformTarget.kt @@ -1,4 +1,6 @@ -package io.github.jan.supabase +package io.supabase + +import io.supabase.PlatformTarget /** * The current target platform diff --git a/Supabase/src/watchosTest/kotlin/PlatformTargetTest.kt b/Supabase/src/watchosTest/kotlin/PlatformTargetTest.kt index ee714580c..46c36fb57 100644 --- a/Supabase/src/watchosTest/kotlin/PlatformTargetTest.kt +++ b/Supabase/src/watchosTest/kotlin/PlatformTargetTest.kt @@ -1,5 +1,5 @@ -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget import kotlin.test.Test import kotlin.test.assertEquals diff --git a/buildSrc/src/main/kotlin/Android.kt b/buildSrc/src/main/kotlin/Android.kt index 77ad7c50d..ad2bcb9dd 100644 --- a/buildSrc/src/main/kotlin/Android.kt +++ b/buildSrc/src/main/kotlin/Android.kt @@ -31,12 +31,12 @@ fun Project.configureLibraryAndroidTarget( fun BaseAppModuleExtension.configureApplicationAndroidTarget() { compileSdk = 35 defaultConfig { - applicationId = "io.github.jan.supabase.android" + applicationId = "io.supabase.android" minSdk = 26 versionCode = 1 versionName = "1.0-SNAPSHOT" } - namespace = "io.github.jan.supabase.android" + namespace = "io.supabase.android" compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/buildSrc/src/main/kotlin/Dokka.kt b/buildSrc/src/main/kotlin/Dokka.kt index 65ade563b..7d5dc0ee9 100644 --- a/buildSrc/src/main/kotlin/Dokka.kt +++ b/buildSrc/src/main/kotlin/Dokka.kt @@ -24,7 +24,7 @@ fun Project.applyDokkaWithConfiguration() { else -> "" } localDirectory.set(projectDir.resolve("src")) - remoteUrl.set(URL("https://github.com/supabase-community/supabase-kt/tree/master/$name/src")) + remoteUrl.set(URL("https://github.com/supabase/supabase-kt/tree/master/$name/src")) remoteLineSuffix.set("#L") } } diff --git a/buildSrc/src/main/kotlin/KotlinPlugin.kt b/buildSrc/src/main/kotlin/KotlinPlugin.kt index ad9119619..da3aeafd3 100644 --- a/buildSrc/src/main/kotlin/KotlinPlugin.kt +++ b/buildSrc/src/main/kotlin/KotlinPlugin.kt @@ -5,8 +5,8 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension fun KotlinMultiplatformExtension.defaultConfig() { sourceSets.all { languageSettings.optIn("kotlin.RequiresOptIn") - languageSettings.optIn("io.github.jan.supabase.annotations.SupabaseInternal") - languageSettings.optIn("io.github.jan.supabase.annotations.SupabaseExperimental") + languageSettings.optIn("io.supabase.annotations.SupabaseInternal") + languageSettings.optIn("io.supabase.annotations.SupabaseExperimental") } compilerOptions.freeCompilerArgs.add("-Xexpect-actual-classes") applyDefaultHierarchyTemplate() diff --git a/demos/android-login/.gitignore b/demos/android-login/.gitignore deleted file mode 100644 index 56d95bfd7..000000000 --- a/demos/android-login/.gitignore +++ /dev/null @@ -1,46 +0,0 @@ -.gradle -build/ -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store - -local.properties - -/wix311/ \ No newline at end of file diff --git a/demos/android-login/README.md b/demos/android-login/README.md deleted file mode 100644 index 1e0b32ffd..000000000 --- a/demos/android-login/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# Deprecation note - -This sample has been deprecated. Checkout the [official video](https://www.youtube.com/watch?v=P_jZMDmodG4&pp=ygUWc3VwYWJhc2UgZ29vZ2xlIGtvdGxpbg%3D%3D) on how to use the Google Credential Manager to natively sign in with Google or checkout [Compose Auth](/plugins/ComposeAuth) - -# Android Login Demo - -This is a demo of an android app using Google OneTap/Native Sign-In & WebView for authentication - -**Available platforms:** Android - -**Modules used:** Auth - -https://user-images.githubusercontent.com/26686035/235766941-6a62c415-e07e-4d18-9706-0a246e6821eb.mp4 - -# Configuration - -> If you want to implement Native Google Auth in your Android app and use Jetpack Compose/Compose Multiplatform, take a look at the [ComposeAuth](https://github.com/supabase-community/supabase-kt/tree/master/plugins/ComposeAuth) plugin - -Then you need to specify your supabase url and key in [supabaseModule.kt](https://github.com/supabase-community/supabase-kt/blob/master/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt) - -If you want the Native Google Sign In, -1. Create a project in the [Google Cloud dashboard](https://console.cloud.google.com/) -2. Create OAuth credentials for both a web (using your supabase callback url https://SUPABASE_ID.supabase.co/auth/v1/callback) and android application (using `io.github.jan.supabase.android` as package name and SHA1-certificate which you can get using `gradlew signingReport`) -3. Put the web OAuth client id and the web oauth secret in the supabase dashboard for the google provider and the android one to the authorized client ids -4. Put in the `web` client id `supabaseModule.kt` (not the android one) - -For Spotify login you obviously need to enable that in the Supabase Dashboard, but you can replace that with any provider you want - -# Running - -Use the IDE to run the app. diff --git a/demos/android-login/android/build.gradle.kts b/demos/android-login/android/build.gradle.kts deleted file mode 100644 index b2731198d..000000000 --- a/demos/android-login/android/build.gradle.kts +++ /dev/null @@ -1,42 +0,0 @@ -plugins { - id("org.jetbrains.compose") - id("com.android.application") - kotlin("android") - kotlin("plugin.serialization") -} - -group "io.github.jan.supabase" -version "1.0-SNAPSHOT" - -repositories { - maven { url = uri("https://jitpack.io") } - mavenLocal() -} - -dependencies { - api(project(":common")) - implementation(libs.androidx.activity.compose) -} - -android { - compileSdk = 34 - defaultConfig { - applicationId = "io.github.jan.supabase.android" - minSdk = 26 - versionCode = 1 - versionName = "1.0-SNAPSHOT" - } - namespace = "io.github.jan.supabase.android" - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" - } - buildTypes { - getByName("release") { - isMinifyEnabled = false - } - } -} diff --git a/demos/android-login/android/src/main/AndroidManifest.xml b/demos/android-login/android/src/main/AndroidManifest.xml deleted file mode 100644 index 15b344e6a..000000000 --- a/demos/android-login/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/demos/android-login/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt b/demos/android-login/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt deleted file mode 100644 index 6fd7c4370..000000000 --- a/demos/android-login/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt +++ /dev/null @@ -1,83 +0,0 @@ -package io.github.jan.supabase.android - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.Button -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.common.AppViewModel -import io.github.jan.supabase.common.ui.screen.LoginScreen -import io.github.jan.supabase.common.ui.screen.LoginType -import io.github.jan.supabase.common.ui.screen.OAuthScreen -import io.github.jan.supabase.compose.auth.composable.rememberLoginWithGoogle -import io.github.jan.supabase.compose.auth.composeAuth -import io.github.jan.supabase.gotrue.SessionStatus -import io.github.jan.supabase.gotrue.gotrue -import io.github.jan.supabase.gotrue.handleDeeplinks -import io.github.jan.supabase.gotrue.providers.Spotify -import org.koin.android.ext.android.inject - - -class MainActivity : ComponentActivity() { - - private val viewModel: AppViewModel by inject() - private val supabaseClient: SupabaseClient by inject() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - supabaseClient.handleDeeplinks(intent) - setContent { - MaterialTheme { - val status by viewModel.sessionStatus.collectAsState() - when (status) { - is SessionStatus.Authenticated -> { - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center - ) { - Button({ - viewModel.logout() - }) { - Text("Logout") - } - } - } - else -> { - val googleState = supabaseClient.composeAuth.rememberLoginWithGoogle() - var showInAppGoogleWebView by remember { mutableStateOf(false) } - LoginScreen { - when (it) { - LoginType.GoogleNative -> googleState.startFlow() - LoginType.SpotifyInApp -> showInAppGoogleWebView = true - is LoginType.Login -> viewModel.login(it.email, it.password) - is LoginType.SignUp -> viewModel.signUp(it.email, it.password) - } - } - if (showInAppGoogleWebView) { - OAuthScreen( - url = supabaseClient.gotrue.oAuthUrl( - Spotify, - "http://localhost" - ), - parseFragment = { - viewModel.parseFragment(it) - }, - disable = { - showInAppGoogleWebView = false - } - ) - } - } - } - } - } - } - -} \ No newline at end of file diff --git a/demos/android-login/android/src/main/java/io/github/jan/supabase/android/MainApplication.kt b/demos/android-login/android/src/main/java/io/github/jan/supabase/android/MainApplication.kt deleted file mode 100644 index 085679355..000000000 --- a/demos/android-login/android/src/main/java/io/github/jan/supabase/android/MainApplication.kt +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.jan.supabase.android - -import android.app.Application -import io.github.jan.supabase.common.di.initKoin - -class MainApplication: Application() { - - override fun onCreate() { - super.onCreate() - initKoin() - } - -} \ No newline at end of file diff --git a/demos/android-login/build.gradle.kts b/demos/android-login/build.gradle.kts deleted file mode 100644 index 4ef1a3f5f..000000000 --- a/demos/android-login/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -group = "io.github.jan.supabase" -version = "1.0-SNAPSHOT" - -plugins { - alias(libs.plugins.kotlin.multiplatform) apply false - alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.kotlinx.plugin.serialization) apply false - alias(libs.plugins.android.application) apply false - alias(libs.plugins.android.library) apply false - alias(libs.plugins.compose) apply false -} - -allprojects { - repositories { - google() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } -} - diff --git a/demos/android-login/buildSrc/build.gradle.kts b/demos/android-login/buildSrc/build.gradle.kts deleted file mode 100644 index 3753e1835..000000000 --- a/demos/android-login/buildSrc/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - `kotlin-dsl` -} - -repositories { - mavenCentral() -} - - diff --git a/demos/android-login/buildSrc/src/main/kotlin/Versions.kt b/demos/android-login/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index 1a9030451..000000000 --- a/demos/android-login/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,8 +0,0 @@ -object Versions { - - const val KOIN = "3.3.3" - const val SUPABASE = "0.8.4" - const val LIFECYCLE = "2.6.0" - const val KTOR = "2.2.4" - -} \ No newline at end of file diff --git a/demos/android-login/common/build.gradle.kts b/demos/android-login/common/build.gradle.kts deleted file mode 100644 index 82a0c6ae5..000000000 --- a/demos/android-login/common/build.gradle.kts +++ /dev/null @@ -1,61 +0,0 @@ -@file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) - -plugins { - kotlin("multiplatform") - id("org.jetbrains.compose") - id("com.android.library") - kotlin("plugin.serialization") -} - -group = "io.github.jan.supabase" -version = "1.0-SNAPSHOT" - -repositories { - mavenLocal() -} - -kotlin { - jvmToolchain(8) - androidTarget() - sourceSets { - val commonMain by getting { - dependencies { - api(compose.runtime) - api(compose.foundation) - api(compose.material3) - api(compose.materialIconsExtended) - api(libs.bundles.supabase) - api(libs.koin.core) - implementation("com.google.accompanist:accompanist-webview:0.31.1-alpha") - } - } - val nonJsMain by creating { - dependencies { - api(libs.ktor.cio) - } - } - val androidMain by getting { - dependsOn(nonJsMain) - dependencies { - api(libs.androidx.compat) - api(libs.androidx.core) - api(libs.koin.android) - api(libs.androidx.lifecycle.viewmodel.ktx) - api(libs.androidx.lifecycle.viewmodel.compose) - } - } - } -} - -android { - compileSdk = 34 - sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - namespace = "io.github.jan.supabase.common" - defaultConfig { - minSdk = 26 - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } -} \ No newline at end of file diff --git a/demos/android-login/common/src/androidMain/AndroidManifest.xml b/demos/android-login/common/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 162b68251..000000000 --- a/demos/android-login/common/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt b/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt deleted file mode 100644 index 02d8228db..000000000 --- a/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt +++ /dev/null @@ -1,10 +0,0 @@ -package io.github.jan.supabase.common - -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope - -actual open class MPViewModel actual constructor(): ViewModel() { - - actual val coroutineScope = viewModelScope - -} \ No newline at end of file diff --git a/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt deleted file mode 100644 index e7f95a376..000000000 --- a/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ /dev/null @@ -1,8 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.gotrue.GoTrueConfig - -actual fun GoTrueConfig.platformGoTrueConfig() { - scheme = "io.jan.supabase" - host = "login" -} \ No newline at end of file diff --git a/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt b/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt deleted file mode 100644 index 4f17e99bb..000000000 --- a/demos/android-login/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.jan.supabase.common.di - -import org.koin.core.module.Module - -actual fun Module.viewModel() { - viewModel { createViewModule() } -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt deleted file mode 100644 index a95d113b9..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt +++ /dev/null @@ -1,99 +0,0 @@ -package io.github.jan.supabase.common - - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.gotrue.gotrue -import io.github.jan.supabase.gotrue.parseFragmentAndImportSession -import io.github.jan.supabase.gotrue.providers.Google -import io.github.jan.supabase.gotrue.providers.builtin.Email -import io.github.jan.supabase.gotrue.providers.builtin.IDToken -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.launch - -expect open class MPViewModel() { - - val coroutineScope: CoroutineScope - -} - -class AppViewModel( - val supabaseClient: SupabaseClient, -) : MPViewModel() { - - val sessionStatus = supabaseClient.gotrue.sessionStatus - val loginAlert = MutableStateFlow(null) - - //Auth - - fun signUp(email: String, password: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.signUpWith(Email) { - this.email = email - this.password = password - } - }.onSuccess { - loginAlert.value = "Successfully registered! Check your E-Mail to verify your account." - }.onFailure { - loginAlert.value = "There was an error while registering: ${it.message}" - } - } - } - - fun login(email: String, password: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.loginWith(Email) { - this.email = email - this.password = password - } - }.onFailure { - it.printStackTrace() - loginAlert.value = "There was an error while logging in. Check your credentials and try again." - } - } - } - - fun loginWithIdToken(idToken: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.loginWith(IDToken) { - this.idToken = idToken - provider = Google - } - }.onFailure { - it.printStackTrace() - } - } - } - - @OptIn(SupabaseInternal::class) - fun parseFragment(fragment: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.parseFragmentAndImportSession(fragment) - }.onFailure { - it.printStackTrace() - } - } - } - - fun loginWithGoogle() { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.loginWith(Google) - } - } - } - - fun logout() { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.logout() - } - } - } - -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/koin.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/koin.kt deleted file mode 100644 index eea38fce5..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/koin.kt +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.jan.supabase.common.di - -import org.koin.core.KoinApplication -import org.koin.core.context.startKoin - -fun initKoin(additionalConfiguration: KoinApplication.() -> Unit = {}) { - startKoin { - modules(supabaseModule, viewModelModule) - additionalConfiguration() - } -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt deleted file mode 100644 index 01a3f8e67..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt +++ /dev/null @@ -1,28 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.googleNativeLogin -import io.github.jan.supabase.createSupabaseClient -import io.github.jan.supabase.gotrue.GoTrue -import io.github.jan.supabase.gotrue.GoTrueConfig -import org.koin.dsl.module - -expect fun GoTrueConfig.platformGoTrueConfig() - -const val SERVER_CLIENT_ID = "1009828726778-ofegbrc0pg8hs9hc8hnb817e52jpjuh2.apps.googleusercontent.com" //Don't put in your android client id - -val supabaseModule = module { - single { - createSupabaseClient( - supabaseUrl = "https://uafjlnwkkmubykxywuds.supabase.co", - supabaseKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InVhZmpsbndra211YnlreHl3dWRzIiwicm9sZSI6ImFub24iLCJpYXQiOjE2ODg4NTE5MTQsImV4cCI6MjAwNDQyNzkxNH0.ZUGbB-9dHz18Cfwl8CgSpli-xw06JOBTRiY2NnV_Fo0" - ) { - install(GoTrue) { - platformGoTrueConfig() - } - install(ComposeAuth) { - googleNativeLogin(SERVER_CLIENT_ID) - } - } - } -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/viewModelModule.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/viewModelModule.kt deleted file mode 100644 index f262659c6..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/viewModelModule.kt +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.common.AppViewModel -import org.koin.core.module.Module -import org.koin.core.scope.Scope -import org.koin.dsl.module - -expect fun Module.viewModel() - -fun Scope.createViewModule() = AppViewModel(get()) - -val viewModelModule = module { - viewModel() -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/OAuthWebView.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/OAuthWebView.kt deleted file mode 100644 index 31c5d6854..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/OAuthWebView.kt +++ /dev/null @@ -1,32 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.ui.Modifier -import com.google.accompanist.web.WebView -import com.google.accompanist.web.WebViewNavigator -import com.google.accompanist.web.WebViewState -import io.ktor.http.Url - -@Composable -fun OAuthWebView(state: WebViewState, navigator: WebViewNavigator, modifier: Modifier = Modifier, parseFragment: (url: String) -> Unit) { - LaunchedEffect(key1 = state.lastLoadedUrl) { - state.lastLoadedUrl?.let { - val url = Url(it) - if(url.host == "localhost") { - navigator.loadUrl("about:blank") - parseFragment(url.fragment) - } - } - } - WebView( - modifier = modifier, - state = state, - navigator = navigator, - onCreated = { - it.settings.javaScriptEnabled = true - it.settings.userAgentString = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) " + - "Ubuntu Chromium/70.0.3538.77 Chrome/70.0.3538.77 Safari/537.36" - } - ) -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordField.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordField.kt deleted file mode 100644 index 56c19ac91..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordField.kt +++ /dev/null @@ -1,46 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Key -import androidx.compose.material.icons.filled.Visibility -import androidx.compose.material.icons.filled.VisibilityOff -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.input.ImeAction -import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.text.input.PasswordVisualTransformation -import androidx.compose.ui.text.input.VisualTransformation - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun PasswordField( - password: String, - onPasswordChanged: (String) -> Unit, - label: String = "Password", - modifier: Modifier = Modifier, - imeAction: ImeAction = ImeAction.Default, - keyboardActions: KeyboardActions = KeyboardActions() -) { - var visible by remember { mutableStateOf(false) } - OutlinedTextField( - password, - onValueChange = onPasswordChanged, - leadingIcon = { Icon(Icons.Filled.Key, "Password") }, - label = { Text(label) }, - visualTransformation = if (visible) VisualTransformation.None else PasswordVisualTransformation(), - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = imeAction), - keyboardActions = keyboardActions, - singleLine = true, - trailingIcon = { - IconButton({ - visible = !visible - }) { - Icon(if(visible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff, "", tint = MaterialTheme.colorScheme.onBackground) - } - }, - modifier = modifier - ) -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt deleted file mode 100644 index 15c3f4a4e..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt +++ /dev/null @@ -1,83 +0,0 @@ -package io.github.jan.supabase.common.ui.screen - -import androidx.compose.foundation.layout.* -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.unit.dp -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.compose.auth.ui.AuthForm -import io.github.jan.supabase.compose.auth.ui.LocalAuthState -import io.github.jan.supabase.compose.auth.ui.ProviderIcon -import io.github.jan.supabase.compose.auth.ui.email.OutlinedEmailField -import io.github.jan.supabase.compose.auth.ui.password.OutlinedPasswordField -import io.github.jan.supabase.gotrue.providers.Google - -sealed interface LoginType { - data class Login(val email: String, val password: String) : LoginType - data class SignUp(val email: String, val password: String) : LoginType - data object GoogleNative : LoginType - data object SpotifyInApp: LoginType -} - -@OptIn(ExperimentalMaterial3Api::class, SupabaseExperimental::class) -@Composable -fun LoginScreen(onLogin: (LoginType) -> Unit) { - var signUp by remember { mutableStateOf(false) } - var email by remember { mutableStateOf("") } - var password by remember { mutableStateOf("") } - val passwordFocus = remember { FocusRequester() } - Column( - modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - AuthForm { - OutlinedEmailField( - value = email, - onValueChange = { email = it }, - label = { Text("E-Mail") }, - ) - OutlinedPasswordField( - value = password, - onValueChange = { password = it }, - label = { Text("Password") }, - ) - - Button( - onClick = { - onLogin( - if (signUp) LoginType.SignUp(email, password) else LoginType.Login( - email, - password - ) - ) - }, - modifier = Modifier.padding(top = 10.dp), - enabled = LocalAuthState.current.validForm - ) { - Text(if (signUp) "Register" else "Login") - } - } - OutlinedButton( - onClick = { onLogin(LoginType.GoogleNative) } - ) { - ProviderIcon(Google, null) - Spacer(Modifier.width(4.dp)) - Text(if (signUp) "Sign Up with Google OneTap" else "Login with Google OneTap") - } - OutlinedButton( - onClick = { onLogin(LoginType.SpotifyInApp) } - ) { - Text(if (signUp) "Sign Up with Spotify using WebView" else "Login with Spotify using WebView") - } - - } - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) { - TextButton(onClick = { signUp = !signUp }) { - Text(if (signUp) "Already have an account? Login" else "Not registered? Register") - } - } -} \ No newline at end of file diff --git a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/OAuthScreen.kt b/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/OAuthScreen.kt deleted file mode 100644 index 19c895edb..000000000 --- a/demos/android-login/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/OAuthScreen.kt +++ /dev/null @@ -1,69 +0,0 @@ -package io.github.jan.supabase.common.ui.screen - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Refresh -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.style.TextOverflow -import com.google.accompanist.web.rememberWebViewNavigator -import com.google.accompanist.web.rememberWebViewState -import io.github.jan.supabase.common.ui.components.OAuthWebView - -@Composable -fun OAuthScreen(url: String, parseFragment: (url: String) -> Unit, disable: () -> Unit) { - val state = rememberWebViewState(url) - val navigator = rememberWebViewNavigator() - Column( - modifier = Modifier.fillMaxSize() - ) { - Row( - modifier = Modifier.fillMaxWidth(), - verticalAlignment = Alignment.CenterVertically - ) { - Box { - IconButton( - onClick = { - if (state.isLoading) navigator.reload() else navigator.stopLoading() - }, - modifier = Modifier - ) { - if (state.isLoading) { - CircularProgressIndicator() - } else { - Icon(Icons.Filled.Refresh, contentDescription = null) - } - } - } - Text( - state.lastLoadedUrl ?: "", - modifier = Modifier.weight(1f), - maxLines = 1, - overflow = TextOverflow.Ellipsis - ) - IconButton( - onClick = { - disable() - } - ) { - Icon(Icons.Filled.Close, contentDescription = null) - } - } - OAuthWebView( - modifier = Modifier.weight(1f), - state = state, - navigator = navigator, - parseFragment = parseFragment - ) - } -} \ No newline at end of file diff --git a/demos/android-login/gradle.properties b/demos/android-login/gradle.properties deleted file mode 100644 index 8bec89d8a..000000000 --- a/demos/android-login/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -kotlin.code.style=official -kotlin.native.enableDependencyPropagation=false -android.useAndroidX=true -org.jetbrains.compose.experimental.jscanvas.enabled=true -org.gradle.jvmargs=-Xmx4096m -kotlin.mpp.androidSourceSetLayoutVersion=2 \ No newline at end of file diff --git a/demos/android-login/gradle/libs.versions.toml b/demos/android-login/gradle/libs.versions.toml deleted file mode 100644 index cf0f1ac5d..000000000 --- a/demos/android-login/gradle/libs.versions.toml +++ /dev/null @@ -1,42 +0,0 @@ -[versions] -kotlin = "1.9.0" -agp = "8.0.0" -compose = "1.4.3" -supabase = "1.3.0-rc-2" -koin = "3.4.2" -ktor = "2.3.2" - -androidx-core = "1.10.1" -androidx-compat = "1.6.1" -androidx-lifecycle = "2.6.1" -androidx-activity = "1.7.2" - -[plugins] -kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } - -kotlinx-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } - -android-application = { id = "com.android.application", version.ref = "agp" } -android-library = { id = "com.android.library", version.ref = "agp" } - -compose = { id = "org.jetbrains.compose", version.ref = "compose" } - -[libraries] -gotrue-kt = { module = "io.github.jan-tennert.supabase:gotrue-kt", version.ref = "supabase" } -compose-auth = { module = "io.github.jan-tennert.supabase:compose-auth", version.ref = "supabase" } -compose-auth-ui = { module = "io.github.jan-tennert.supabase:compose-auth-ui", version.ref = "supabase" } - -koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } -koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } - -androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } -androidx-compat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-compat" } -androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } -androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } -androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } - -ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } - -[bundles] -supabase = [ "gotrue-kt", "compose-auth", "compose-auth-ui" ] \ No newline at end of file diff --git a/demos/android-login/gradle/wrapper/gradle-wrapper.jar b/demos/android-login/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index ccebba771..000000000 Binary files a/demos/android-login/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/demos/android-login/gradle/wrapper/gradle-wrapper.properties b/demos/android-login/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 37aef8d3f..000000000 --- a/demos/android-login/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip -networkTimeout=10000 -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/demos/android-login/gradlew b/demos/android-login/gradlew deleted file mode 100644 index 79a61d421..000000000 --- a/demos/android-login/gradlew +++ /dev/null @@ -1,244 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/demos/android-login/gradlew.bat b/demos/android-login/gradlew.bat deleted file mode 100644 index 93e3f59f1..000000000 --- a/demos/android-login/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/demos/android-login/kotlin-js-store/yarn.lock b/demos/android-login/kotlin-js-store/yarn.lock deleted file mode 100644 index 52a49eb68..000000000 --- a/demos/android-login/kotlin-js-store/yarn.lock +++ /dev/null @@ -1,3081 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@^7.10.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/helper-validator-identifier@^7.18.6": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" - integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@js-joda/core@3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273" - integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg== - -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== - -"@rollup/plugin-commonjs@^21.0.1": - version "21.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz#45576d7b47609af2db87f55a6d4b46e44fc3a553" - integrity sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA== - dependencies: - "@rollup/pluginutils" "^3.1.0" - commondir "^1.0.1" - estree-walker "^2.0.1" - glob "^7.1.6" - is-reference "^1.2.1" - magic-string "^0.25.7" - resolve "^1.17.0" - -"@rollup/plugin-node-resolve@^13.1.3": - version "13.3.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c" - integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw== - dependencies: - "@rollup/pluginutils" "^3.1.0" - "@types/resolve" "1.17.1" - deepmerge "^4.2.2" - is-builtin-module "^3.1.0" - is-module "^1.0.0" - resolve "^1.19.0" - -"@rollup/plugin-typescript@^8.3.0": - version "8.5.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.5.0.tgz#7ea11599a15b0a30fa7ea69ce3b791d41b862515" - integrity sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ== - dependencies: - "@rollup/pluginutils" "^3.1.0" - resolve "^1.17.0" - -"@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" - integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - picomatch "^2.2.2" - -"@socket.io/component-emitter@~3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" - integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== - -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== - dependencies: - "@types/node" "*" - -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/cookie@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" - integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== - -"@types/cors@^2.8.12": - version "2.8.13" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" - integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA== - 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.4.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb" - integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== - -"@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@*", "@types/express-serve-static-core@^4.17.31": - version "4.17.33" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" - integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*", "@types/express@^4.17.13": - version "4.17.16" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.16.tgz#986caf0b4b850611254505355daa24e1b8323de8" - integrity sha512-LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.31" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== - dependencies: - "@types/node" "*" - -"@types/json-schema@*", "@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== - -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== - -"@types/node@*", "@types/node@>=10.0.0": - version "18.11.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" - integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== - -"@types/node@^12.12.14": - version "12.20.55" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" - integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/resolve@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" - integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== - dependencies: - "@types/node" "*" - -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== - -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== - dependencies: - "@types/express" "*" - -"@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" - integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== - dependencies: - "@types/mime" "*" - "@types/node" "*" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== - dependencies: - "@types/node" "*" - -"@types/ws@^8.5.1": - version "8.5.4" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" - integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== - dependencies: - "@types/node" "*" - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== - -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -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" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== - -acorn@^8.5.0, acorn@^8.7.1: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.0, ajv@^8.8.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== - -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64id@2.0.0, base64id@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== - -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== - -body-parser@1.20.1, body-parser@^1.19.0: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.1" - type-is "~1.6.18" - unpipe "1.0.0" - -bonjour-service@^1.0.11: - version "1.1.0" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.0.tgz#424170268d68af26ff83a5c640b95def01803a13" - integrity sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q== - dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.5" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2, 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== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -browserslist@^4.14.5: - version "4.21.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" - integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== - dependencies: - caniuse-lite "^1.0.30001449" - electron-to-chromium "^1.4.284" - node-releases "^2.0.8" - update-browserslist-db "^1.0.10" - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -builtin-modules@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - -call-bind@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -camelcase@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -caniuse-lite@^1.0.30001449: - version "1.0.30001450" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz#022225b91200589196b814b51b1bbe45144cf74f" - integrity sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew== - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@3.5.3, chokidar@^3.5.1, 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" - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colorette@^2.0.10, colorette@^2.0.14: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -connect-history-api-fallback@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" - integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== - -connect@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" - integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.2" - parseurl "~1.3.3" - utils-merge "1.0.1" - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== - -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== - -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== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cors@~2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^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== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -custom-event@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" - integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg== - -date-format@^4.0.14: - version "4.0.14" - resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" - integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg== - -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4.3.4, debug@^4.1.0, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -decode-uri-component@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" - integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== - -deepmerge@^4.2.2: - version "4.3.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" - integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== - dependencies: - execa "^5.0.0" - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - -depd@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -di@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" - integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - -dns-packet@^5.2.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" - -dom-serialize@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" - integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ== - dependencies: - custom-event "~1.0.0" - ent "~2.2.0" - extend "^3.0.0" - void-elements "^2.0.0" - -dukat@0.5.8-rc.4: - version "0.5.8-rc.4" - resolved "https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21" - integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA== - dependencies: - google-protobuf "3.12.2" - typescript "3.9.5" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -electron-to-chromium@^1.4.284: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - -engine.io-parser@~5.0.3: - version "5.0.6" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45" - integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== - -engine.io@~6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.1.tgz#e3f7826ebc4140db9bbaa9021ad6b1efb175878f" - integrity sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA== - dependencies: - "@types/cookie" "^0.4.1" - "@types/cors" "^2.8.12" - "@types/node" ">=10.0.0" - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - -enhanced-resolve@^5.10.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -ent@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - -escape-string-regexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -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 sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -estree-walker@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" - integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== - -estree-walker@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" - integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== - -etag@~1.8.1: - version "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" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -express@^4.17.3: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.1" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.5.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.2.0" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.11.0" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extend@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fastest-levenshtein@^1.0.12: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -flatted@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== - -follow-redirects@^1.0.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== - -format-util@1.0.5, format-util@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" - integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -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== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -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" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3, glob@^7.1.6, glob@^7.1.7: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -google-protobuf@3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53" - integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -he@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== - -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" - integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== - -http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== - -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-builtin-module@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" - integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== - dependencies: - builtin-modules "^3.3.0" - -is-core-module@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== - dependencies: - has "^1.0.3" - -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -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== - dependencies: - is-extglob "^2.1.1" - -is-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-reference@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" - integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== - dependencies: - "@types/estree" "*" - -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-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isbinaryfile@^4.0.8: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -jest-worker@^26.2.1: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" - integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^27.4.5: - 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" - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -karma-chrome-launcher@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz#baca9cc071b1562a1db241827257bfe5cab597ea" - integrity sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ== - dependencies: - which "^1.2.1" - -karma-mocha@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d" - integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ== - dependencies: - minimist "^1.2.3" - -karma-sourcemap-loader@0.3.8: - version "0.3.8" - resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz#d4bae72fb7a8397328a62b75013d2df937bdcf9c" - integrity sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g== - dependencies: - graceful-fs "^4.1.2" - -karma-webpack@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840" - integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA== - dependencies: - glob "^7.1.3" - minimatch "^3.0.4" - webpack-merge "^4.1.5" - -karma@6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508" - integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w== - dependencies: - "@colors/colors" "1.5.0" - body-parser "^1.19.0" - braces "^3.0.2" - chokidar "^3.5.1" - connect "^3.7.0" - di "^0.0.1" - dom-serialize "^2.2.1" - glob "^7.1.7" - graceful-fs "^4.2.6" - http-proxy "^1.18.1" - isbinaryfile "^4.0.8" - lodash "^4.17.21" - log4js "^6.4.1" - mime "^2.5.2" - minimatch "^3.0.4" - mkdirp "^0.5.5" - qjobs "^1.2.0" - range-parser "^1.2.1" - rimraf "^3.0.2" - socket.io "^4.4.1" - source-map "^0.6.1" - tmp "^0.2.1" - ua-parser-js "^0.7.30" - yargs "^16.1.1" - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash@^4.17.15, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log4js@^6.4.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.7.1.tgz#06e12b1ac915dd1067146ffad8215f666f7d2c51" - integrity sha512-lzbd0Eq1HRdWM2abSD7mk6YIVY0AogGJzb/z+lqzRk+8+XJP+M6L1MS5FUSc3jjGru4dbKjEMJmqlsoYYpuivQ== - dependencies: - date-format "^4.0.14" - debug "^4.3.4" - flatted "^3.2.7" - rfdc "^1.3.0" - streamroller "^3.1.3" - -magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== - dependencies: - sourcemap-codec "^1.4.8" - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - -memfs@^3.4.3: - version "3.4.13" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" - integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== - dependencies: - fs-monkey "^1.0.3" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== - -micromatch@^4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0, "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.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -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== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^3.0.4, minimatch@^3.1.1: - 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.3, minimist@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== - -mkdirp@^0.5.5: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -mocha@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" - integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "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: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multicast-dns@^7.2.5: - version "7.2.5" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" - integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== - dependencies: - dns-packet "^5.2.2" - thunky "^1.0.2" - -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -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" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - -node-releases@^2.0.8: - version "2.0.9" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.9.tgz#fe66405285382b0c4ac6bcfbfbe7e8a510650b4d" - integrity sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA== - -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== - -npm-run-path@^4.0.1: - 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: - path-key "^3.0.0" - -object-assign@^4: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -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.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -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== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - -picocolors@^1.0.0: - version "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.1, picomatch@^2.2.2, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -punycode@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== - -qjobs@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" - integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== - -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, range-parser@~1.2.1: - version "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.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - -readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.6: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve@^1.17.0, resolve@^1.19.0: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== - dependencies: - is-core-module "^2.11.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.9.0: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - -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" - -rollup-plugin-sourcemaps@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz#bf93913ffe056e414419607f1d02780d7ece84ed" - integrity sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw== - dependencies: - "@rollup/pluginutils" "^3.0.9" - source-map-resolve "^0.6.0" - -rollup-plugin-terser@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" - integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== - dependencies: - "@babel/code-frame" "^7.10.4" - jest-worker "^26.2.1" - serialize-javascript "^4.0.0" - terser "^5.0.0" - -rollup@^2.68.0: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== - optionalDependencies: - fsevents "~2.3.2" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== - -selfsigned@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== - dependencies: - node-forge "^1" - -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.18.0" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.3: - 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== - -socket.io-adapter@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" - integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== - -socket.io-parser@~4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" - integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - -socket.io@^4.4.1: - version "4.5.4" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.4.tgz#a4513f06e87451c17013b8d13fdfaf8da5a86a90" - integrity sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ== - dependencies: - accepts "~1.3.4" - base64id "~2.0.0" - debug "~4.3.2" - engine.io "~6.2.1" - socket.io-adapter "~2.4.0" - socket.io-parser "~4.2.1" - -sockjs@^0.3.24: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-loader@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.0.tgz#bdc6b118bc6c87ee4d8d851f2d4efcc5abdb2ef5" - integrity sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw== - dependencies: - abab "^2.0.6" - iconv-lite "^0.6.3" - source-map-js "^1.0.2" - -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - -source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0, source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -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== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - -"statuses@>= 1.4.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - -streamroller@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.4.tgz#844a18e795d39c1089a8216e66a1cf1151271df0" - integrity sha512-Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw== - dependencies: - date-format "^4.0.14" - debug "^4.3.4" - fs-extra "^8.1.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -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.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -supports-color@8.1.1, supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -terser-webpack-plugin@^5.1.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.14" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - -terser@^5.0.0: - version "5.17.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69" - integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -terser@^5.14.1: - version "5.16.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.2.tgz#8f495819439e8b5c150e7530fc434a6e70ea18b2" - integrity sha512-JKuM+KvvWVqT7muHVyrwv7FVRPnmHDwF6XwoIxdbF5Witi0vu99RYpxDexpJndXt3jbZZmmWr2/mQa6HvSNdSg== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.1: - version "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.3.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== - -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typescript@3.9.5: - version "3.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36" - integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ== - -typescript@4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== - -typescript@^3.7.2: - version "3.9.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" - integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== - -ua-parser-js@^0.7.30: - version "0.7.33" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" - integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - -update-browserslist-db@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -vary@^1, vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - -void-elements@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== - -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - 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@4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" - colorette "^2.0.14" - commander "^7.0.0" - cross-spawn "^7.0.3" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - webpack-merge "^5.7.3" - -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== - dependencies: - colorette "^2.0.10" - memfs "^3.4.3" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -webpack-dev-server@4.9.3: - version "4.9.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz#2360a5d6d532acb5410a668417ad549ee3b8a3c9" - integrity sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.0.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" - -webpack-merge@^4.1.5: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" - integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== - dependencies: - lodash "^4.17.15" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -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.74.0: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== - dependencies: - "@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" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - 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@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -ws@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== - -ws@^8.4.2: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== - -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: - 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-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0, yargs@^16.1.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/demos/android-login/settings.gradle.kts b/demos/android-login/settings.gradle.kts deleted file mode 100644 index 1a65d24ba..000000000 --- a/demos/android-login/settings.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -pluginManagement { - repositories { - google() - gradlePluginPortal() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - } -} - -rootProject.name = "android-login" - -include(":android", ":desktop", ":web", ":common") diff --git a/demos/multiplatform-deeplinks/.gitignore b/demos/multiplatform-deeplinks/.gitignore deleted file mode 100644 index 8ad61368a..000000000 --- a/demos/multiplatform-deeplinks/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -.gradle -build/ -desktop/output -!gradle/wrapper/gradle-wrapper.jar -!**/src/main/**/build/ -!**/src/test/**/build/ - -### IntelliJ IDEA ### -.idea/modules.xml -.idea/jarRepositories.xml -.idea/compiler.xml -.idea/libraries/ -*.iws -*.iml -*.ipr -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store - -local.properties - -/wix311/ \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/README.md b/demos/multiplatform-deeplinks/README.md deleted file mode 100644 index 5c8fd4bc6..000000000 --- a/demos/multiplatform-deeplinks/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# Deprecation note - -This sample has been deprecated. - -# Multiplatform Deeplinking Demo - -This is a demo of integrating deeplink authentication with Supabase on Desktop and Android. - -**Available platforms:** Android, Desktop - -**Modules used:** GoTrue - -## How it works (Desktop) - -On Desktop, it uses [Conveyor](https://conveyor.hydraulic.dev/9.2/) to create an installer which registers the url protocol on installation. -To allow the app to have a single instance running, this demo uses [unique4j](https://github.com/prat-man/unique4j). - -Unique4j uses a server to let different instance communicate with each other. If you are for example after you successfully log in with Google, you get redirected to the registered url protocol and a second instance opens. This second instance sends the data to the first instance and closes itself. (If there is another instance running) - -# Configuration - -You need to specify your Supabase url and key in [supabaseModule.kt](https://github.com/supabase-community/supabase-kt/blob/master/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt). - -If you want Google login to work, [set it up](https://supabase.com/docs/guides/auth/social-login) in the Supabase dashboard and add `io.github.jan.supabase://login` to the registered urls. - -### Building - -On Android just build the APK with the IDE. Authentication should work without any additional setup. - -On Desktop, you have to install [Conveyor](https://conveyor.hydraulic.dev/9.2/) and run `conveyor make site` in `/desktop`. - -Then you can serve the download site e.g. with npx: `npx serve desktop/output` - -To test it, go to **localhost:3000/download** and download the installer. This will register the url protocol and install the app. -After it installed, provider login and sign up should work without even having the application open. - -**Note:** Desktop and Android use the same url protocol, so your users can open sign up emails on either platform. - - diff --git a/demos/multiplatform-deeplinks/android/build.gradle.kts b/demos/multiplatform-deeplinks/android/build.gradle.kts deleted file mode 100644 index c02458dec..000000000 --- a/demos/multiplatform-deeplinks/android/build.gradle.kts +++ /dev/null @@ -1,37 +0,0 @@ -plugins { - id("org.jetbrains.compose") - id("com.android.application") - kotlin("android") - kotlin("plugin.serialization") -} - -group "io.github.jan.supabase" -version "1.0-SNAPSHOT" - -dependencies { - implementation(project(":common")) - implementation(libs.androidx.activity.compose) -} - -android { - compileSdk = 34 - defaultConfig { - applicationId = "io.github.jan.supabase.android" - minSdk = 26 - versionCode = 1 - versionName = "1.0-SNAPSHOT" - } - namespace = "io.github.jan.supabase.android" - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" - } - buildTypes { - getByName("release") { - isMinifyEnabled = false - } - } -} diff --git a/demos/multiplatform-deeplinks/android/src/main/AndroidManifest.xml b/demos/multiplatform-deeplinks/android/src/main/AndroidManifest.xml deleted file mode 100644 index 5ad8fa0df..000000000 --- a/demos/multiplatform-deeplinks/android/src/main/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt b/demos/multiplatform-deeplinks/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt deleted file mode 100644 index 68e64192f..000000000 --- a/demos/multiplatform-deeplinks/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt +++ /dev/null @@ -1,29 +0,0 @@ -package io.github.jan.supabase.android - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.compose.material3.MaterialTheme - -import co.touchlab.kermit.Logger -import io.github.jan.supabase.common.App -import io.github.jan.supabase.common.AppViewModel -import io.github.jan.supabase.gotrue.handleDeeplinks -import org.koin.android.ext.android.inject - -class MainActivity : ComponentActivity() { - - private val viewModel: AppViewModel by inject() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - Logger.base(DebugAntilog()) - viewModel.supabaseClient.handleDeeplinks(intent) - setContent { - MaterialTheme { - App(viewModel) - } - } - } - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/android/src/main/java/io/github/jan/supabase/android/MainApplication.kt b/demos/multiplatform-deeplinks/android/src/main/java/io/github/jan/supabase/android/MainApplication.kt deleted file mode 100644 index 085679355..000000000 --- a/demos/multiplatform-deeplinks/android/src/main/java/io/github/jan/supabase/android/MainApplication.kt +++ /dev/null @@ -1,13 +0,0 @@ -package io.github.jan.supabase.android - -import android.app.Application -import io.github.jan.supabase.common.di.initKoin - -class MainApplication: Application() { - - override fun onCreate() { - super.onCreate() - initKoin() - } - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/build.gradle.kts b/demos/multiplatform-deeplinks/build.gradle.kts deleted file mode 100644 index 3716794dc..000000000 --- a/demos/multiplatform-deeplinks/build.gradle.kts +++ /dev/null @@ -1,20 +0,0 @@ -group = "io.github.jan.supabase" -version = "1.0-SNAPSHOT" - -allprojects { - repositories { - google() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - mavenLocal() - } -} - -plugins { - alias(libs.plugins.kotlin.multiplatform) apply false - alias(libs.plugins.kotlin.android) apply false - alias(libs.plugins.kotlinx.plugin.serialization) apply false - alias(libs.plugins.android.application) apply false - alias(libs.plugins.android.library) apply false - alias(libs.plugins.compose) apply false -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/buildSrc/build.gradle.kts b/demos/multiplatform-deeplinks/buildSrc/build.gradle.kts deleted file mode 100644 index 3753e1835..000000000 --- a/demos/multiplatform-deeplinks/buildSrc/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - `kotlin-dsl` -} - -repositories { - mavenCentral() -} - - diff --git a/demos/multiplatform-deeplinks/buildSrc/src/main/kotlin/Versions.kt b/demos/multiplatform-deeplinks/buildSrc/src/main/kotlin/Versions.kt deleted file mode 100644 index 1a9030451..000000000 --- a/demos/multiplatform-deeplinks/buildSrc/src/main/kotlin/Versions.kt +++ /dev/null @@ -1,8 +0,0 @@ -object Versions { - - const val KOIN = "3.3.3" - const val SUPABASE = "0.8.4" - const val LIFECYCLE = "2.6.0" - const val KTOR = "2.2.4" - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/build.gradle.kts b/demos/multiplatform-deeplinks/common/build.gradle.kts deleted file mode 100644 index 9b92bc68b..000000000 --- a/demos/multiplatform-deeplinks/common/build.gradle.kts +++ /dev/null @@ -1,71 +0,0 @@ -@file:OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) - -plugins { - kotlin("multiplatform") - id("org.jetbrains.compose") - id("com.android.library") - kotlin("plugin.serialization") -} - -group = "io.github.jan.supabase" -version = "1.0-SNAPSHOT" - -kotlin { - jvm("desktop") { - jvmToolchain(8) - } - android() - sourceSets { - val commonMain by getting { - dependencies { - api(compose.runtime) - api(compose.foundation) - api(compose.material3) - api(compose.materialIconsExtended) - api(libs.bundles.supabase) - api(libs.koin.core) - } - } - val nonJsMain by creating { - dependencies { - api(libs.ktor.cio) - } - } - val androidMain by getting { - dependsOn(nonJsMain) - dependencies { - api(libs.androidx.compat) - api(libs.androidx.core) - api(libs.koin.android) - api(libs.androidx.lifecycle.viewmodel.ktx) - api(libs.androidx.lifecycle.viewmodel.compose) - } - } - val desktopMain by getting { - dependsOn(nonJsMain) - dependencies { - api(compose.preview) - } - } - } -} - -android { - compileSdk = 34 - sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - namespace = "io.github.jan.supabase.common" - defaultConfig { - minSdk = 26 - } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } -} - -configurations.all { - attributes { - // https://github.com/JetBrains/compose-jb/issues/1404#issuecomment-1146894731 - attribute(Attribute.of("ui", String::class.java), "awt") - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/androidMain/AndroidManifest.xml b/demos/multiplatform-deeplinks/common/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 162b68251..000000000 --- a/demos/multiplatform-deeplinks/common/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt b/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt deleted file mode 100644 index 02d8228db..000000000 --- a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt +++ /dev/null @@ -1,10 +0,0 @@ -package io.github.jan.supabase.common - -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope - -actual open class MPViewModel actual constructor(): ViewModel() { - - actual val coroutineScope = viewModelScope - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt deleted file mode 100644 index 303e5aeef..000000000 --- a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ /dev/null @@ -1,8 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.gotrue.GoTrueConfig - -actual fun GoTrueConfig.platformGoTrueConfig() { - scheme = "io.github.jan.supabase" - host = "login" -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt b/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt deleted file mode 100644 index 4f17e99bb..000000000 --- a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.jan.supabase.common.di - -import org.koin.core.module.Module - -actual fun Module.viewModel() { - viewModel { createViewModule() } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt b/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt deleted file mode 100644 index 0def07edb..000000000 --- a/demos/multiplatform-deeplinks/common/src/androidMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.material3.Button -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable - -@Composable -actual fun AlertDialog(text: String, close: () -> Unit) { - androidx.compose.material3.AlertDialog( - text = { Text(text) }, - onDismissRequest = close, - confirmButton = { Button(onClick = close) { Text("Ok") } } - ) -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt deleted file mode 100644 index 93bbc89a6..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt +++ /dev/null @@ -1,45 +0,0 @@ -package io.github.jan.supabase.common - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.size -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Surface -import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import io.github.jan.supabase.common.ui.components.AlertDialog -import io.github.jan.supabase.common.ui.screen.AppScreen -import io.github.jan.supabase.common.ui.screen.LoginScreen -import io.github.jan.supabase.gotrue.SessionStatus - -@Composable -fun App(viewModel: AppViewModel) { - val loginAlert by viewModel.loginAlert.collectAsState() - val sessionStatus by viewModel.sessionStatus.collectAsState() - Surface { - when(sessionStatus) { - is SessionStatus.Authenticated -> { - AppScreen(viewModel) - } - is SessionStatus.NotAuthenticated -> { - LoginScreen(viewModel) - } - else -> { - Box(contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize()) { - CircularProgressIndicator(modifier = Modifier.size(64.dp)) - } - } - } - } - - if(loginAlert != null) { - AlertDialog(loginAlert!!) { - viewModel.loginAlert.value = null - } - } - -} diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt deleted file mode 100644 index 9f1a45adf..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt +++ /dev/null @@ -1,88 +0,0 @@ -package io.github.jan.supabase.common - - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.gotrue.gotrue -import io.github.jan.supabase.gotrue.parseFragmentAndImportSession -import io.github.jan.supabase.gotrue.providers.Google -import io.github.jan.supabase.gotrue.providers.builtin.Email -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.launch - -const val URL_PROTOCOL = "io.github.jan.supabase://login" - -expect open class MPViewModel() { - - val coroutineScope: CoroutineScope - -} - -class AppViewModel( - val supabaseClient: SupabaseClient -) : MPViewModel() { - - val sessionStatus = supabaseClient.gotrue.sessionStatus - val loginAlert = MutableStateFlow(null) - - //Auth - - fun signUp(email: String, password: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.signUpWith(Email, redirectUrl = URL_PROTOCOL) { - this.email = email - this.password = password - } - }.onSuccess { - loginAlert.value = "Successfully registered! Check your E-Mail to verify your account." - }.onFailure { - loginAlert.value = "There was an error while registering: ${it.message}" - } - } - } - - fun login(email: String, password: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.loginWith(Email) { - this.email = email - this.password = password - } - }.onFailure { - it.printStackTrace() - loginAlert.value = "There was an error while logging in. Check your credentials and try again." - } - } - } - - @OptIn(SupabaseInternal::class) - fun importSession(fragment: String) { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.parseFragmentAndImportSession(fragment) - }.onFailure { - it.printStackTrace() - loginAlert.value = "There was an error while logging in." - } - } - } - - fun loginWithGoogle() { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.loginWith(Google, redirectUrl = URL_PROTOCOL) - } - } - } - - fun logout() { - coroutineScope.launch { - kotlin.runCatching { - supabaseClient.gotrue.logout() - } - } - } - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/koin.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/koin.kt deleted file mode 100644 index 94b4dafad..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/koin.kt +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.jan.supabase.common.di - -import org.koin.core.KoinApplication -import org.koin.core.context.startKoin - -fun initKoin(additionalConfiguration: KoinApplication.() -> Unit = {}) { - startKoin { - modules(supabaseModule, netModule, viewModelModule) - additionalConfiguration() - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/netModule.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/netModule.kt deleted file mode 100644 index 7e6730695..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/netModule.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.jan.supabase.common.di - -import org.koin.dsl.module - -val netModule = module { - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt deleted file mode 100644 index c8766ebc0..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.createSupabaseClient -import io.github.jan.supabase.gotrue.GoTrue -import io.github.jan.supabase.gotrue.GoTrueConfig -import org.koin.dsl.module - -expect fun GoTrueConfig.platformGoTrueConfig() - -val supabaseModule = module { - single { - createSupabaseClient( - supabaseUrl = "YOUR_URL", - supabaseKey = "YOUR_KEY" - ) { - install(GoTrue) { - platformGoTrueConfig() - } - } - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/viewModelModule.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/viewModelModule.kt deleted file mode 100644 index f262659c6..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/viewModelModule.kt +++ /dev/null @@ -1,14 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.common.AppViewModel -import org.koin.core.module.Module -import org.koin.core.scope.Scope -import org.koin.dsl.module - -expect fun Module.viewModel() - -fun Scope.createViewModule() = AppViewModel(get()) - -val viewModelModule = module { - viewModel() -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt deleted file mode 100644 index 01ae0a863..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.runtime.Composable - -@Composable -expect fun AlertDialog(text: String, close: () -> Unit) \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/GoogleButton.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/GoogleButton.kt deleted file mode 100644 index 86457fe0d..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/GoogleButton.kt +++ /dev/null @@ -1,30 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.width -import androidx.compose.material.icons.Icons -import androidx.compose.material3.Icon -import androidx.compose.material3.OutlinedButton -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.unit.dp -import io.github.jan.supabase.common.ui.icons.Google - -@Composable -fun GoogleButton( - modifier: Modifier = Modifier, - text: String = "Sign Up with Google", - onClicked: () -> Unit -) { - OutlinedButton(onClicked, modifier) { - Icon( - imageVector = Icons.Filled.Google, - contentDescription = "Google Button", - tint = Color.Unspecified - ) - Spacer(modifier = Modifier.width(8.dp)) - Text(text = text) - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordField.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordField.kt deleted file mode 100644 index 56c19ac91..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordField.kt +++ /dev/null @@ -1,46 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Key -import androidx.compose.material.icons.filled.Visibility -import androidx.compose.material.icons.filled.VisibilityOff -import androidx.compose.material3.* -import androidx.compose.runtime.* -import androidx.compose.ui.Modifier -import androidx.compose.ui.text.input.ImeAction -import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.text.input.PasswordVisualTransformation -import androidx.compose.ui.text.input.VisualTransformation - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun PasswordField( - password: String, - onPasswordChanged: (String) -> Unit, - label: String = "Password", - modifier: Modifier = Modifier, - imeAction: ImeAction = ImeAction.Default, - keyboardActions: KeyboardActions = KeyboardActions() -) { - var visible by remember { mutableStateOf(false) } - OutlinedTextField( - password, - onValueChange = onPasswordChanged, - leadingIcon = { Icon(Icons.Filled.Key, "Password") }, - label = { Text(label) }, - visualTransformation = if (visible) VisualTransformation.None else PasswordVisualTransformation(), - keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = imeAction), - keyboardActions = keyboardActions, - singleLine = true, - trailingIcon = { - IconButton({ - visible = !visible - }) { - Icon(if(visible) Icons.Filled.Visibility else Icons.Filled.VisibilityOff, "", tint = MaterialTheme.colorScheme.onBackground) - } - }, - modifier = modifier - ) -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/icons/Google.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/icons/Google.kt deleted file mode 100644 index 41abfc548..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/icons/Google.kt +++ /dev/null @@ -1,49 +0,0 @@ -package io.github.jan.supabase.common.ui.icons - -import androidx.compose.material.icons.Icons -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.PathFillType.Companion.NonZero -import androidx.compose.ui.graphics.SolidColor -import androidx.compose.ui.graphics.StrokeCap.Companion.Butt -import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.graphics.vector.path -import androidx.compose.ui.unit.dp - -//From SimpleIcons https://github.com/DevSrSouza/compose-icons/ -val Icons.Filled.Google: ImageVector - get() { - if (_google != null) { - return _google!! - } - _google = ImageVector.Builder( - name = "Google", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp, - viewportWidth = 24.0f, viewportHeight = 24.0f - ).apply { - path(fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, - strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, - pathFillType = NonZero) { - moveTo(12.48f, 10.92f) - verticalLineToRelative(3.28f) - horizontalLineToRelative(7.84f) - curveToRelative(-0.24f, 1.84f, -0.853f, 3.187f, -1.787f, 4.133f) - curveToRelative(-1.147f, 1.147f, -2.933f, 2.4f, -6.053f, 2.4f) - curveToRelative(-4.827f, 0.0f, -8.6f, -3.893f, -8.6f, -8.72f) - reflectiveCurveToRelative(3.773f, -8.72f, 8.6f, -8.72f) - curveToRelative(2.6f, 0.0f, 4.507f, 1.027f, 5.907f, 2.347f) - lineToRelative(2.307f, -2.307f) - curveTo(18.747f, 1.44f, 16.133f, 0.0f, 12.48f, 0.0f) - curveTo(5.867f, 0.0f, 0.307f, 5.387f, 0.307f, 12.0f) - reflectiveCurveToRelative(5.56f, 12.0f, 12.173f, 12.0f) - curveToRelative(3.573f, 0.0f, 6.267f, -1.173f, 8.373f, -3.36f) - curveToRelative(2.16f, -2.16f, 2.84f, -5.213f, 2.84f, -7.667f) - curveToRelative(0.0f, -0.76f, -0.053f, -1.467f, -0.173f, -2.053f) - horizontalLineTo(12.48f) - close() - } - } - .build() - return _google!! - } - -private var _google: ImageVector? = null \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/AppScreen.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/AppScreen.kt deleted file mode 100644 index 16b176838..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/AppScreen.kt +++ /dev/null @@ -1,27 +0,0 @@ -package io.github.jan.supabase.common.ui.screen - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.Button -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import io.github.jan.supabase.common.AppViewModel - -@Composable -fun AppScreen(viewModel: AppViewModel) { - Column( - modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - Text("Logged in!") - Button( - onClick = { viewModel.logout() } - ) { - Text("Logout") - } - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt b/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt deleted file mode 100644 index ec2591321..000000000 --- a/demos/multiplatform-deeplinks/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt +++ /dev/null @@ -1,94 +0,0 @@ -package io.github.jan.supabase.common.ui.screen - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.text.KeyboardActions -import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Mail -import androidx.compose.material3.Button -import androidx.compose.material3.ExperimentalMaterial3Api -import androidx.compose.material3.Icon -import androidx.compose.material3.OutlinedTextField -import androidx.compose.material3.Text -import androidx.compose.material3.TextButton -import androidx.compose.runtime.Composable -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.focus.FocusRequester -import androidx.compose.ui.focus.focusRequester -import androidx.compose.ui.text.input.ImeAction -import androidx.compose.ui.text.input.KeyboardType -import androidx.compose.ui.unit.dp -import io.github.jan.supabase.common.AppViewModel -import io.github.jan.supabase.common.ui.components.GoogleButton -import io.github.jan.supabase.common.ui.components.PasswordField - -@OptIn(ExperimentalMaterial3Api::class) -@Composable -fun LoginScreen(viewModel: AppViewModel) { - var signUp by remember { mutableStateOf(false) } - var email by remember { mutableStateOf("") } - - Column( - modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.Center, - horizontalAlignment = Alignment.CenterHorizontally - ) { - var password by remember { mutableStateOf("") } - val passwordFocus = remember { FocusRequester() } - OutlinedTextField( - value = email, - onValueChange = { email = it }, - singleLine = true, - label = { Text("E-Mail") }, - keyboardOptions = KeyboardOptions( - keyboardType = KeyboardType.Email, - imeAction = ImeAction.Next - ), - keyboardActions = KeyboardActions(onNext = { passwordFocus.requestFocus() }), - leadingIcon = { Icon(Icons.Filled.Mail, "Mail") }, - ) - PasswordField( - password = password, - onPasswordChanged = { password = it }, - modifier = Modifier.focusRequester(passwordFocus) - .padding(top = 10.dp), - imeAction = ImeAction.Done, - keyboardActions = KeyboardActions(onDone = { - authenticate(signUp, viewModel, email, password) - }), - ) - Button( - onClick = { authenticate(signUp, viewModel, email, password) }, - modifier = Modifier.padding(top = 10.dp), - enabled = email.isNotBlank() && password.isNotBlank() - ) { - Text(if (signUp) "Register" else "Login") - } - GoogleButton( - text = if (signUp) "Sign Up with Google" else "Login with Google" - ) { viewModel.loginWithGoogle() } - - } - Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) { - TextButton(onClick = { signUp = !signUp }) { - Text(if (signUp) "Already have an account? Login" else "Not registered? Register") - } - } -} - -fun authenticate(signUp: Boolean, viewModel: AppViewModel, email: String, password: String) { - if (signUp) { - viewModel.signUp(email, password) - } else { - viewModel.login(email, password) - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt b/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt deleted file mode 100644 index 41143d507..000000000 --- a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/MPViewModel.kt +++ /dev/null @@ -1,10 +0,0 @@ -package io.github.jan.supabase.common - -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers - -actual open class MPViewModel actual constructor() { - - actual val coroutineScope = CoroutineScope(Dispatchers.Default) - -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt deleted file mode 100644 index 643a981d9..000000000 --- a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.jan.supabase.common.di - -import io.github.jan.supabase.gotrue.GoTrueConfig - -actual fun GoTrueConfig.platformGoTrueConfig() { - htmlTitle = "Chat App" -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt b/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt deleted file mode 100644 index d49caff38..000000000 --- a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/viewModel.kt +++ /dev/null @@ -1,7 +0,0 @@ -package io.github.jan.supabase.common.di - -import org.koin.core.module.Module - -actual fun Module.viewModel() { - single { createViewModule() } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt b/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt deleted file mode 100644 index 72b2e88f3..000000000 --- a/demos/multiplatform-deeplinks/common/src/desktopMain/kotlin/io/github/jan/supabase/common/ui/components/AlertDialog.kt +++ /dev/null @@ -1,26 +0,0 @@ -package io.github.jan.supabase.common.ui.components - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Button -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import androidx.compose.ui.window.Dialog -import androidx.compose.ui.window.rememberDialogState - -@Composable -actual fun AlertDialog(text: String, close: () -> Unit) { - Dialog(close, title = "Alert", resizable = false, state = rememberDialogState(height = 150.dp, width = 450.dp)) { - Column(verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, modifier = Modifier.fillMaxSize()) { - Text(text, modifier = Modifier.padding(10.dp)) - Button(close) { - Text("Ok") - } - } - } -} \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/desktop/build.gradle.kts b/demos/multiplatform-deeplinks/desktop/build.gradle.kts deleted file mode 100644 index 637993e6a..000000000 --- a/demos/multiplatform-deeplinks/desktop/build.gradle.kts +++ /dev/null @@ -1,44 +0,0 @@ -plugins { - kotlin("jvm") - id("org.jetbrains.compose") - kotlin("plugin.serialization") - id("dev.hydraulic.conveyor") version "1.6" -} - -group = "io.github.jan.supabase" -version = "1.0" - - -kotlin { - jvmToolchain(8) - //withJava() -} - -dependencies { - implementation(project(":common")) - implementation(compose.desktop.currentOs) - implementation(libs.unique4j) -} - -dependencies { - // Use the configurations created by the Conveyor plugin to tell Gradle/Conveyor where to find the artifacts for each platform. - linuxAmd64(compose.desktop.linux_x64) - macAmd64(compose.desktop.macos_x64) - macAarch64(compose.desktop.macos_arm64) - windowsAmd64(compose.desktop.windows_x64) -} - -compose.desktop { - application { - mainClass = "MainKt" - } -} - -// region Work around temporary Compose bugs. -configurations.all { - attributes { - // https://github.com/JetBrains/compose-jb/issues/1404#issuecomment-1146894731 - attribute(Attribute.of("ui", String::class.java), "awt") - } -} -// endregion \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/desktop/conveyor.conf b/demos/multiplatform-deeplinks/desktop/conveyor.conf deleted file mode 100644 index 35bb75007..000000000 --- a/demos/multiplatform-deeplinks/desktop/conveyor.conf +++ /dev/null @@ -1,31 +0,0 @@ -// This is a hashbang include. You can run the command after the #! to see what -// configuration is being extracted from the Gradle build using the Conveyor plugin. -include "#!..\\gradlew -q printConveyorConfig" - -// This enables native library extraction, which improves app startup time and robustness. -// It's optional but a good idea to have it. You can remove this if you get tired of specifying -// system properties for Java libraries with native components. -// -// See https://hydraulic.dev/blog/11-in-jar-signing.html for more. -include required("https://raw.githubusercontent.com/hydraulic-software/conveyor/master/configs/jvm/extract-native-libraries.conf") - -// Config file documentation: https://conveyor.hydraulic.dev/latest/configs -app { - // The base URL is where the download site will be placed. Packages will check here for updates. - site.base-url = "localhost:3000" - - // This is optional. If not specified the last component of the rdns name will be turned into a display name. - display-name = "Supabase" - - // A global identifier for the app. - rdns-name = "io.github.jan.supabase" - - // Use the Compose logo as an icon and include it so we can pass it to the Window constructor. - icons = icons/icon.svg - windows.inputs += TASK/rendered-icons/windows - linux.inputs += TASK/rendered-icons/linux - - url-schemes = [ io.github.jan.supabase ] -} - -conveyor.compatibility-level = 9 diff --git a/demos/multiplatform-deeplinks/desktop/icons/icon.svg b/demos/multiplatform-deeplinks/desktop/icons/icon.svg deleted file mode 100644 index b69f0930c..000000000 --- a/demos/multiplatform-deeplinks/desktop/icons/icon.svg +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/demos/multiplatform-deeplinks/desktop/src/main/kotlin/Main.kt b/demos/multiplatform-deeplinks/desktop/src/main/kotlin/Main.kt deleted file mode 100644 index 7205af98e..000000000 --- a/demos/multiplatform-deeplinks/desktop/src/main/kotlin/Main.kt +++ /dev/null @@ -1,52 +0,0 @@ -import androidx.compose.ui.window.Window -import androidx.compose.ui.window.application -import io.github.jan.supabase.common.App -import io.github.jan.supabase.common.AppViewModel -import io.github.jan.supabase.common.URL_PROTOCOL -import io.github.jan.supabase.common.di.initKoin -import org.koin.core.component.KoinComponent -import org.koin.core.component.inject -import tk.pratanumandal.unique4j.Unique4j - -const val APP_ID = "io.github.jan.supabase.desktop-deeplinks-202306-jvm" - -class RootComponent : KoinComponent { - - val viewModel: AppViewModel by inject() - -} - -class Unique4jImpl(private val args: List, private val onReceiveMessage: (message: String) -> Unit): Unique4j(APP_ID) { - - override fun receiveMessage(message: String) = onReceiveMessage(message) - - override fun sendMessage(): String { - return args.firstOrNull { it.startsWith(URL_PROTOCOL) } ?: "" - } - -} - -fun main(args: Array) { - initKoin() - val root = RootComponent() - val unique4j = Unique4jImpl(args.toList()) { - if(it.startsWith(URL_PROTOCOL)) { // handle received message - val fragment = it.substringAfter("#") - root.viewModel.importSession(fragment) - } - } - val lockFlag = unique4j.acquireLock() - if(lockFlag) { // if there is no other instance running and we acquired the lock, we check for a deeplink in the args - val protocol = args.firstOrNull { it.startsWith(URL_PROTOCOL) } - if(protocol != null) { - val fragment = protocol.substringAfter("#") - root.viewModel.importSession(fragment) - } - } - application { - Window(onCloseRequest = ::exitApplication, title = "Desktop Login App") { - App(root.viewModel) - } - } - unique4j.freeLock() -} diff --git a/demos/multiplatform-deeplinks/gradle.properties b/demos/multiplatform-deeplinks/gradle.properties deleted file mode 100644 index 8bec89d8a..000000000 --- a/demos/multiplatform-deeplinks/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -kotlin.code.style=official -kotlin.native.enableDependencyPropagation=false -android.useAndroidX=true -org.jetbrains.compose.experimental.jscanvas.enabled=true -org.gradle.jvmargs=-Xmx4096m -kotlin.mpp.androidSourceSetLayoutVersion=2 \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/gradle/libs.versions.toml b/demos/multiplatform-deeplinks/gradle/libs.versions.toml deleted file mode 100644 index b853356b1..000000000 --- a/demos/multiplatform-deeplinks/gradle/libs.versions.toml +++ /dev/null @@ -1,44 +0,0 @@ -[versions] -kotlin = "1.8.20" -agp = "8.0.1" -compose = "1.4.0" -supabase = "1.1.0" -koin = "3.4.1" -ktor = "2.3.2" -coil = "2.3.0" - -androidx-core = "1.10.1" -androidx-compat = "1.6.1" -androidx-lifecycle = "2.6.1" -androidx-activity = "1.7.2" -unique4j = "1.4" - -[plugins] -kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } - -kotlinx-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } - -android-application = { id = "com.android.application", version.ref = "agp" } -android-library = { id = "com.android.library", version.ref = "agp" } - -compose = { id = "org.jetbrains.compose", version.ref = "compose" } - -[libraries] -supabase-gotrue = { module = "io.github.jan-tennert.supabase:gotrue-kt", version.ref = "supabase" } - -koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } -koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } - -androidx-core = { module = "androidx.core:core-ktx", version.ref = "androidx-core" } -androidx-compat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-compat" } -androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" } -androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } -androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" } - -ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } - -unique4j = { module = "tk.pratanumandal:unique4j", version.ref = "unique4j" } - -[bundles] -supabase = [ "supabase-gotrue" ] \ No newline at end of file diff --git a/demos/multiplatform-deeplinks/gradle/wrapper/gradle-wrapper.jar b/demos/multiplatform-deeplinks/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index ccebba771..000000000 Binary files a/demos/multiplatform-deeplinks/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/demos/multiplatform-deeplinks/gradle/wrapper/gradle-wrapper.properties b/demos/multiplatform-deeplinks/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 37aef8d3f..000000000 --- a/demos/multiplatform-deeplinks/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip -networkTimeout=10000 -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/demos/multiplatform-deeplinks/gradlew b/demos/multiplatform-deeplinks/gradlew deleted file mode 100644 index 79a61d421..000000000 --- a/demos/multiplatform-deeplinks/gradlew +++ /dev/null @@ -1,244 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/demos/multiplatform-deeplinks/gradlew.bat b/demos/multiplatform-deeplinks/gradlew.bat deleted file mode 100644 index 93e3f59f1..000000000 --- a/demos/multiplatform-deeplinks/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/demos/multiplatform-deeplinks/kotlin-js-store/yarn.lock b/demos/multiplatform-deeplinks/kotlin-js-store/yarn.lock deleted file mode 100644 index 52a49eb68..000000000 --- a/demos/multiplatform-deeplinks/kotlin-js-store/yarn.lock +++ /dev/null @@ -1,3081 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@^7.10.4": - version "7.21.4" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" - integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/helper-validator-identifier@^7.18.6": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" - integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.7" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" - integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== - -"@jridgewell/gen-mapping@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@js-joda/core@3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-3.2.0.tgz#3e61e21b7b2b8a6be746df1335cf91d70db2a273" - integrity sha512-PMqgJ0sw5B7FKb2d5bWYIoxjri+QlW/Pys7+Rw82jSH0QN3rB05jZ/VrrsUdh1w4+i2kw9JOejXGq/KhDOX7Kg== - -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== - -"@rollup/plugin-commonjs@^21.0.1": - version "21.1.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz#45576d7b47609af2db87f55a6d4b46e44fc3a553" - integrity sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA== - dependencies: - "@rollup/pluginutils" "^3.1.0" - commondir "^1.0.1" - estree-walker "^2.0.1" - glob "^7.1.6" - is-reference "^1.2.1" - magic-string "^0.25.7" - resolve "^1.17.0" - -"@rollup/plugin-node-resolve@^13.1.3": - version "13.3.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c" - integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw== - dependencies: - "@rollup/pluginutils" "^3.1.0" - "@types/resolve" "1.17.1" - deepmerge "^4.2.2" - is-builtin-module "^3.1.0" - is-module "^1.0.0" - resolve "^1.19.0" - -"@rollup/plugin-typescript@^8.3.0": - version "8.5.0" - resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.5.0.tgz#7ea11599a15b0a30fa7ea69ce3b791d41b862515" - integrity sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ== - dependencies: - "@rollup/pluginutils" "^3.1.0" - resolve "^1.17.0" - -"@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" - integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - picomatch "^2.2.2" - -"@socket.io/component-emitter@~3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" - integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== - -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== - dependencies: - "@types/node" "*" - -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/cookie@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d" - integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== - -"@types/cors@^2.8.12": - version "2.8.13" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.13.tgz#b8ade22ba455a1b8cb3b5d3f35910fd204f84f94" - integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA== - 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.4.10" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb" - integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== - -"@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@*", "@types/express-serve-static-core@^4.17.31": - version "4.17.33" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543" - integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*", "@types/express@^4.17.13": - version "4.17.16" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.16.tgz#986caf0b4b850611254505355daa24e1b8323de8" - integrity sha512-LkKpqRZ7zqXJuvoELakaFYuETHjZkSol8EV6cNnyishutDBCCdv6+dsKPbKkCcIk57qRphOLY5sEgClw1bO3gA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.31" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== - dependencies: - "@types/node" "*" - -"@types/json-schema@*", "@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== - -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== - -"@types/node@*", "@types/node@>=10.0.0": - version "18.11.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" - integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== - -"@types/node@^12.12.14": - version "12.20.55" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" - integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/resolve@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" - integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== - dependencies: - "@types/node" "*" - -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== - -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== - dependencies: - "@types/express" "*" - -"@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" - integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== - dependencies: - "@types/mime" "*" - "@types/node" "*" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== - dependencies: - "@types/node" "*" - -"@types/ws@^8.5.1": - version "8.5.4" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.4.tgz#bb10e36116d6e570dd943735f86c933c1587b8a5" - integrity sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg== - dependencies: - "@types/node" "*" - -"@ungap/promise-all-settled@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44" - integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q== - -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" - integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== - -"@webpack-cli/info@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" - integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.7.0": - version "1.7.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" - integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -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" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== - dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== - -acorn@^8.5.0, acorn@^8.7.1: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.0, ajv@^8.8.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" - integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-colors@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" - integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== - -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -anymatch@~3.1.2: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" - integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== - -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64id@2.0.0, base64id@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== - -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== - -body-parser@1.20.1, body-parser@^1.19.0: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.1" - type-is "~1.6.18" - unpipe "1.0.0" - -bonjour-service@^1.0.11: - version "1.1.0" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.1.0.tgz#424170268d68af26ff83a5c640b95def01803a13" - integrity sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q== - dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.5" - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2, 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== - dependencies: - fill-range "^7.0.1" - -browser-stdout@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" - integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== - -browserslist@^4.14.5: - version "4.21.5" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7" - integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w== - dependencies: - caniuse-lite "^1.0.30001449" - electron-to-chromium "^1.4.284" - node-releases "^2.0.8" - update-browserslist-db "^1.0.10" - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -builtin-modules@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - -call-bind@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -camelcase@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -caniuse-lite@^1.0.30001449: - version "1.0.30001450" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001450.tgz#022225b91200589196b814b51b1bbe45144cf74f" - integrity sha512-qMBmvmQmFXaSxexkjjfMvD5rnDL0+m+dUMZKoDYsGG8iZN29RuYh9eRoMvKsT6uMAWlyUUGDEQGJJYjzCIO9ew== - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chokidar@3.5.3, chokidar@^3.5.1, 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" - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colorette@^2.0.10, colorette@^2.0.14: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - -commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -connect-history-api-fallback@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" - integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== - -connect@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" - integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.2" - parseurl "~1.3.3" - utils-merge "1.0.1" - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" - integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== - -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== - -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== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cors@~2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^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== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -custom-event@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" - integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg== - -date-format@^4.0.14: - version "4.0.14" - resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400" - integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg== - -debug@2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4.3.4, debug@^4.1.0, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -decamelize@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" - integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ== - -decode-uri-component@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9" - integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ== - -deepmerge@^4.2.2: - version "4.3.1" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" - integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== - dependencies: - execa "^5.0.0" - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - -depd@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -di@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" - integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== - -diff@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - -dns-packet@^5.2.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" - -dom-serialize@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" - integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ== - dependencies: - custom-event "~1.0.0" - ent "~2.2.0" - extend "^3.0.0" - void-elements "^2.0.0" - -dukat@0.5.8-rc.4: - version "0.5.8-rc.4" - resolved "https://registry.yarnpkg.com/dukat/-/dukat-0.5.8-rc.4.tgz#90384dcb50b14c26f0e99dae92b2dea44f5fce21" - integrity sha512-ZnMt6DGBjlVgK2uQamXfd7uP/AxH7RqI0BL9GLrrJb2gKdDxvJChWy+M9AQEaL+7/6TmxzJxFOsRiInY9oGWTA== - dependencies: - google-protobuf "3.12.2" - typescript "3.9.5" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -electron-to-chromium@^1.4.284: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - -engine.io-parser@~5.0.3: - version "5.0.6" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45" - integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw== - -engine.io@~6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.1.tgz#e3f7826ebc4140db9bbaa9021ad6b1efb175878f" - integrity sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA== - dependencies: - "@types/cookie" "^0.4.1" - "@types/cors" "^2.8.12" - "@types/node" ">=10.0.0" - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - cors "~2.8.5" - debug "~4.3.1" - engine.io-parser "~5.0.3" - ws "~8.2.3" - -enhanced-resolve@^5.10.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -ent@~2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - -escape-string-regexp@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -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 sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -estree-walker@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" - integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== - -estree-walker@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" - integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== - -etag@~1.8.1: - version "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" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -express@^4.17.3: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.1" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.5.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.2.0" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.11.0" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extend@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fastest-levenshtein@^1.0.12: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -flat@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" - integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== - -flatted@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== - -follow-redirects@^1.0.0: - version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" - integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== - -format-util@1.0.5, format-util@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271" - integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg== - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -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== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -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" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" - integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.3, glob@^7.1.6, glob@^7.1.7: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.1.1" - once "^1.3.0" - path-is-absolute "^1.0.0" - -google-protobuf@3.12.2: - version "3.12.2" - resolved "https://registry.yarnpkg.com/google-protobuf/-/google-protobuf-3.12.2.tgz#50ce9f9b6281235724eb243d6a83e969a2176e53" - integrity sha512-4CZhpuRr1d6HjlyrxoXoocoGFnRYgKULgMtikMddA9ztRyYR59Aondv2FioyxWVamRo0rF2XpYawkTCBEQOSkA== - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -he@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - -html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== - -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" - integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== - -http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -iconv-lite@0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -import-local@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" - integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== - -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-builtin-module@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" - integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== - dependencies: - builtin-modules "^3.3.0" - -is-core-module@^2.11.0: - version "2.12.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" - integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== - dependencies: - has "^1.0.3" - -is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== - dependencies: - has "^1.0.3" - -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -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== - dependencies: - is-extglob "^2.1.1" - -is-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-plain-obj@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" - integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== - -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-reference@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7" - integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ== - dependencies: - "@types/estree" "*" - -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-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isbinaryfile@^4.0.8: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -jest-worker@^26.2.1: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" - integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest-worker@^27.4.5: - 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" - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -karma-chrome-launcher@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz#baca9cc071b1562a1db241827257bfe5cab597ea" - integrity sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ== - dependencies: - which "^1.2.1" - -karma-mocha@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d" - integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ== - dependencies: - minimist "^1.2.3" - -karma-sourcemap-loader@0.3.8: - version "0.3.8" - resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz#d4bae72fb7a8397328a62b75013d2df937bdcf9c" - integrity sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g== - dependencies: - graceful-fs "^4.1.2" - -karma-webpack@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840" - integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA== - dependencies: - glob "^7.1.3" - minimatch "^3.0.4" - webpack-merge "^4.1.5" - -karma@6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508" - integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w== - dependencies: - "@colors/colors" "1.5.0" - body-parser "^1.19.0" - braces "^3.0.2" - chokidar "^3.5.1" - connect "^3.7.0" - di "^0.0.1" - dom-serialize "^2.2.1" - glob "^7.1.7" - graceful-fs "^4.2.6" - http-proxy "^1.18.1" - isbinaryfile "^4.0.8" - lodash "^4.17.21" - log4js "^6.4.1" - mime "^2.5.2" - minimatch "^3.0.4" - mkdirp "^0.5.5" - qjobs "^1.2.0" - range-parser "^1.2.1" - rimraf "^3.0.2" - socket.io "^4.4.1" - source-map "^0.6.1" - tmp "^0.2.1" - ua-parser-js "^0.7.30" - yargs "^16.1.1" - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash@^4.17.15, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log4js@^6.4.1: - version "6.7.1" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.7.1.tgz#06e12b1ac915dd1067146ffad8215f666f7d2c51" - integrity sha512-lzbd0Eq1HRdWM2abSD7mk6YIVY0AogGJzb/z+lqzRk+8+XJP+M6L1MS5FUSc3jjGru4dbKjEMJmqlsoYYpuivQ== - dependencies: - date-format "^4.0.14" - debug "^4.3.4" - flatted "^3.2.7" - rfdc "^1.3.0" - streamroller "^3.1.3" - -magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== - dependencies: - sourcemap-codec "^1.4.8" - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - -memfs@^3.4.3: - version "3.4.13" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.13.tgz#248a8bd239b3c240175cd5ec548de5227fc4f345" - integrity sha512-omTM41g3Skpvx5dSYeZIbXKcXoAVc/AoMNwn9TKx++L/gaen/+4TTttmu8ZSch5vfVJ8uJvGbroTsIlslRg6lg== - dependencies: - fs-monkey "^1.0.3" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== - -micromatch@^4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0, "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.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -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== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^3.0.4, minimatch@^3.1.1: - 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.3, minimist@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== - -mkdirp@^0.5.5: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -mocha@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9" - integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.3" - debug "4.3.4" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.2.0" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "5.0.1" - ms "2.1.3" - nanoid "3.3.3" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - workerpool "6.2.1" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "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: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -multicast-dns@^7.2.5: - version "7.2.5" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" - integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== - dependencies: - dns-packet "^5.2.2" - thunky "^1.0.2" - -nanoid@3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" - integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w== - -negotiator@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -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" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - -node-releases@^2.0.8: - version "2.0.9" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.9.tgz#fe66405285382b0c4ac6bcfbfbe7e8a510650b4d" - integrity sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA== - -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== - -npm-run-path@^4.0.1: - 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: - path-key "^3.0.0" - -object-assign@^4: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-inspect@^1.9.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" - integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g== - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== - -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -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.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -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== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - -picocolors@^1.0.0: - version "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.1, picomatch@^2.2.2, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -punycode@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== - -qjobs@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071" - integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg== - -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, range-parser@~1.2.1: - version "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.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - -readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.6: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve@^1.17.0, resolve@^1.19.0: - version "1.22.2" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" - integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== - dependencies: - is-core-module "^2.11.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -resolve@^1.9.0: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - -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" - -rollup-plugin-sourcemaps@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz#bf93913ffe056e414419607f1d02780d7ece84ed" - integrity sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw== - dependencies: - "@rollup/pluginutils" "^3.0.9" - source-map-resolve "^0.6.0" - -rollup-plugin-terser@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" - integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== - dependencies: - "@babel/code-frame" "^7.10.4" - jest-worker "^26.2.1" - serialize-javascript "^4.0.0" - terser "^5.0.0" - -rollup@^2.68.0: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== - optionalDependencies: - fsevents "~2.3.2" - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" - -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== - -selfsigned@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== - dependencies: - node-forge "^1" - -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" - integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.18.0" - -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.3: - 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== - -socket.io-adapter@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6" - integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg== - -socket.io-parser@~4.2.1: - version "4.2.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.2.tgz#1dd384019e25b7a3d374877f492ab34f2ad0d206" - integrity sha512-DJtziuKypFkMMHCm2uIshOYC7QaylbtzQwiMYDuCKy3OPkjLzu4B2vAhTlqipRHHzrI0NJeBAizTK7X+6m1jVw== - dependencies: - "@socket.io/component-emitter" "~3.1.0" - debug "~4.3.1" - -socket.io@^4.4.1: - version "4.5.4" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.4.tgz#a4513f06e87451c17013b8d13fdfaf8da5a86a90" - integrity sha512-m3GC94iK9MfIEeIBfbhJs5BqFibMtkRk8ZpKwG2QwxV0m/eEhPIV4ara6XCF1LWNAus7z58RodiZlAH71U3EhQ== - dependencies: - accepts "~1.3.4" - base64id "~2.0.0" - debug "~4.3.2" - engine.io "~6.2.1" - socket.io-adapter "~2.4.0" - socket.io-parser "~4.2.1" - -sockjs@^0.3.24: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-loader@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.0.tgz#bdc6b118bc6c87ee4d8d851f2d4efcc5abdb2ef5" - integrity sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw== - dependencies: - abab "^2.0.6" - iconv-lite "^0.6.3" - source-map-js "^1.0.2" - -source-map-resolve@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2" - integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - -source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0, source-map@^0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -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== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - -"statuses@>= 1.4.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - -streamroller@^3.1.3: - version "3.1.4" - resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.4.tgz#844a18e795d39c1089a8216e66a1cf1151271df0" - integrity sha512-Ha1Ccw2/N5C/IF8Do6zgNe8F3jQo8MPBnMBGvX0QjNv/I97BcNRzK6/mzOpZHHK7DjMLTI3c7Xw7Y1KvdChkvw== - dependencies: - date-format "^4.0.14" - debug "^4.3.4" - fs-extra "^8.1.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -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.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -supports-color@8.1.1, supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -terser-webpack-plugin@^5.1.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.14" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - -terser@^5.0.0: - version "5.17.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69" - integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -terser@^5.14.1: - version "5.16.2" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.2.tgz#8f495819439e8b5c150e7530fc434a6e70ea18b2" - integrity sha512-JKuM+KvvWVqT7muHVyrwv7FVRPnmHDwF6XwoIxdbF5Witi0vu99RYpxDexpJndXt3jbZZmmWr2/mQa6HvSNdSg== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -tmp@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -toidentifier@1.0.1: - version "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.3.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" - integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== - -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typescript@3.9.5: - version "3.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36" - integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ== - -typescript@4.7.4: - version "4.7.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235" - integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ== - -typescript@^3.7.2: - version "3.9.10" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8" - integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q== - -ua-parser-js@^0.7.30: - version "0.7.33" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532" - integrity sha512-s8ax/CeZdK9R/56Sui0WM6y9OFREJarMRHqLB2EwkovemBxNQ+Bqu8GAsUnVcXKgphb++ghr/B2BZx4mahujPw== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - -update-browserslist-db@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -vary@^1, vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - -void-elements@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== - -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - 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@4.10.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" - integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.2.0" - "@webpack-cli/info" "^1.5.0" - "@webpack-cli/serve" "^1.7.0" - colorette "^2.0.14" - commander "^7.0.0" - cross-spawn "^7.0.3" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - webpack-merge "^5.7.3" - -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== - dependencies: - colorette "^2.0.10" - memfs "^3.4.3" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -webpack-dev-server@4.9.3: - version "4.9.3" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz#2360a5d6d532acb5410a668417ad549ee3b8a3c9" - integrity sha512-3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.0.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" - -webpack-merge@^4.1.5: - version "4.2.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" - integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== - dependencies: - lodash "^4.17.15" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -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.74.0: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== - dependencies: - "@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" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - 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@^1.2.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -workerpool@6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" - integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -ws@8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f" - integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg== - -ws@^8.4.2: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== - -ws@~8.2.3: - version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" - integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: - 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-unparser@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" - integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA== - dependencies: - camelcase "^6.0.0" - decamelize "^4.0.0" - flat "^5.0.2" - is-plain-obj "^2.1.0" - -yargs@16.2.0, yargs@^16.1.1: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== diff --git a/demos/multiplatform-deeplinks/settings.gradle.kts b/demos/multiplatform-deeplinks/settings.gradle.kts deleted file mode 100644 index 36ecf3fb3..000000000 --- a/demos/multiplatform-deeplinks/settings.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -pluginManagement { - repositories { - google() - gradlePluginPortal() - mavenCentral() - maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") - maven("https://maven.hq.hydraulic.software") - } -} - -rootProject.name = "multiplatform-deeplinks" - -include(":desktop", ":common", ":android") diff --git a/gradle.properties b/gradle.properties index 6324a6aea..6d7d098ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,5 @@ org.jetbrains.compose.experimental.uikit.enabled=true org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.wasm.enabled=true -supabase-version = 3.0.2 -base-group = io.github.jan-tennert.supabase +supabase-version = 4.0.0-SNAPSHOT +base-group = io.supabase diff --git a/plugins/ApolloGraphQL/README.md b/plugins/ApolloGraphQL/README.md index 73440032a..ce1501895 100644 --- a/plugins/ApolloGraphQL/README.md +++ b/plugins/ApolloGraphQL/README.md @@ -34,7 +34,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:apollo-graphql:VERSION") + implementation("io.supabase:apollo-graphql:VERSION") } ``` diff --git a/plugins/ApolloGraphQL/src/commonMain/kotlin/io/github/jan/supabase/graphql/ApolloHttpInterceptor.kt b/plugins/ApolloGraphQL/src/commonMain/kotlin/io/supabase/graphql/ApolloHttpInterceptor.kt similarity index 84% rename from plugins/ApolloGraphQL/src/commonMain/kotlin/io/github/jan/supabase/graphql/ApolloHttpInterceptor.kt rename to plugins/ApolloGraphQL/src/commonMain/kotlin/io/supabase/graphql/ApolloHttpInterceptor.kt index 608d37fd7..f1e40868b 100644 --- a/plugins/ApolloGraphQL/src/commonMain/kotlin/io/github/jan/supabase/graphql/ApolloHttpInterceptor.kt +++ b/plugins/ApolloGraphQL/src/commonMain/kotlin/io/supabase/graphql/ApolloHttpInterceptor.kt @@ -1,11 +1,11 @@ -package io.github.jan.supabase.graphql +package io.supabase.graphql import com.apollographql.apollo.network.http.HttpInterceptor import com.apollographql.apollo.network.http.HttpInterceptorChain -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.resolveAccessToken -import io.github.jan.supabase.logging.d import io.ktor.http.HttpHeaders +import io.supabase.SupabaseClient +import io.supabase.auth.resolveAccessToken +import io.supabase.logging.d import com.apollographql.apollo.api.http.HttpRequest as ApolloHttpRequest import com.apollographql.apollo.api.http.HttpResponse as ApolloHttpResponse diff --git a/plugins/ApolloGraphQL/src/commonMain/kotlin/io/github/jan/supabase/graphql/GraphQL.kt b/plugins/ApolloGraphQL/src/commonMain/kotlin/io/supabase/graphql/GraphQL.kt similarity index 86% rename from plugins/ApolloGraphQL/src/commonMain/kotlin/io/github/jan/supabase/graphql/GraphQL.kt rename to plugins/ApolloGraphQL/src/commonMain/kotlin/io/supabase/graphql/GraphQL.kt index b6f752ba6..9e33dbd80 100644 --- a/plugins/ApolloGraphQL/src/commonMain/kotlin/io/github/jan/supabase/graphql/GraphQL.kt +++ b/plugins/ApolloGraphQL/src/commonMain/kotlin/io/supabase/graphql/GraphQL.kt @@ -1,14 +1,14 @@ -package io.github.jan.supabase.graphql +package io.supabase.graphql import com.apollographql.apollo.ApolloClient -import io.github.jan.supabase.BuildConfig -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.exceptions.RestException -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.plugins.MainConfig -import io.github.jan.supabase.plugins.MainPlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider import io.ktor.client.statement.HttpResponse +import io.supabase.BuildConfig +import io.supabase.SupabaseClient +import io.supabase.exceptions.RestException +import io.supabase.logging.SupabaseLogger +import io.supabase.plugins.MainConfig +import io.supabase.plugins.MainPlugin +import io.supabase.plugins.SupabasePluginProvider /** * Adds an Apollo GraphQL client to supabase-kt with all necessary headers automatically managed. diff --git a/plugins/ApolloGraphQL/src/commonTest/kotlin/ApolloHttpInterceptorTest.kt b/plugins/ApolloGraphQL/src/commonTest/kotlin/ApolloHttpInterceptorTest.kt index 27d500de5..b5b85bc6e 100644 --- a/plugins/ApolloGraphQL/src/commonTest/kotlin/ApolloHttpInterceptorTest.kt +++ b/plugins/ApolloGraphQL/src/commonTest/kotlin/ApolloHttpInterceptorTest.kt @@ -4,14 +4,14 @@ import com.apollographql.apollo.api.http.HttpRequest import com.apollographql.apollo.api.http.HttpResponse import com.apollographql.apollo.api.http.get import com.apollographql.apollo.network.http.HttpInterceptorChain -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.minimalSettings -import io.github.jan.supabase.graphql.ApolloHttpInterceptor -import io.github.jan.supabase.graphql.GraphQL -import io.github.jan.supabase.graphql.graphql -import io.github.jan.supabase.testing.createMockedSupabaseClient +import io.supabase.SupabaseClient +import io.supabase.auth.Auth +import io.supabase.auth.auth +import io.supabase.auth.minimalSettings +import io.supabase.graphql.ApolloHttpInterceptor +import io.supabase.graphql.GraphQL +import io.supabase.graphql.graphql +import io.supabase.testing.createMockedSupabaseClient import kotlinx.coroutines.test.runTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/plugins/ApolloGraphQL/src/commonTest/kotlin/GraphQLTest.kt b/plugins/ApolloGraphQL/src/commonTest/kotlin/GraphQLTest.kt index bc9baf677..9d86a5313 100644 --- a/plugins/ApolloGraphQL/src/commonTest/kotlin/GraphQLTest.kt +++ b/plugins/ApolloGraphQL/src/commonTest/kotlin/GraphQLTest.kt @@ -1,9 +1,9 @@ import com.apollographql.apollo.api.http.HttpHeader -import io.github.jan.supabase.BuildConfig -import io.github.jan.supabase.graphql.ApolloHttpInterceptor -import io.github.jan.supabase.graphql.GraphQL -import io.github.jan.supabase.graphql.graphql -import io.github.jan.supabase.testing.createMockedSupabaseClient +import io.supabase.BuildConfig +import io.supabase.graphql.ApolloHttpInterceptor +import io.supabase.graphql.GraphQL +import io.supabase.graphql.graphql +import io.supabase.testing.createMockedSupabaseClient import kotlin.test.Test import kotlin.test.assertContains import kotlin.test.assertEquals diff --git a/plugins/Coil3Integration/README.md b/plugins/Coil3Integration/README.md index 99cf4cda9..e4dcd34ef 100644 --- a/plugins/Coil3Integration/README.md +++ b/plugins/Coil3Integration/README.md @@ -29,7 +29,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:coil3-integration:VERSION") + implementation("io.supabase:coil3-integration:VERSION") } ``` diff --git a/plugins/Coil3Integration/src/commonMain/kotlin/io/github/jan/supabase/coil/Coil3Integration.kt b/plugins/Coil3Integration/src/commonMain/kotlin/io/supabase/coil/Coil3Integration.kt similarity index 78% rename from plugins/Coil3Integration/src/commonMain/kotlin/io/github/jan/supabase/coil/Coil3Integration.kt rename to plugins/Coil3Integration/src/commonMain/kotlin/io/supabase/coil/Coil3Integration.kt index f6a740412..aa5bd5d03 100644 --- a/plugins/Coil3Integration/src/commonMain/kotlin/io/github/jan/supabase/coil/Coil3Integration.kt +++ b/plugins/Coil3Integration/src/commonMain/kotlin/io/supabase/coil/Coil3Integration.kt @@ -1,17 +1,17 @@ -package io.github.jan.supabase.coil +package io.supabase.coil import coil3.ImageLoader import coil3.fetch.Fetcher import coil3.request.ImageRequest import coil3.request.Options -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.plugins.SupabasePlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.storage.StorageItem -import io.github.jan.supabase.storage.storage +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.d +import io.supabase.plugins.SupabasePlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.storage.StorageItem +import io.supabase.storage.storage /** * A plugin that implements [Fetcher.Factory] to support using [StorageItem] as data when creating an [ImageRequest] or using it as a model in Compose Multiplatform. diff --git a/plugins/Coil3Integration/src/commonMain/kotlin/io/github/jan/supabase/coil/SupabaseStorageFetcher.kt b/plugins/Coil3Integration/src/commonMain/kotlin/io/supabase/coil/SupabaseStorageFetcher.kt similarity index 85% rename from plugins/Coil3Integration/src/commonMain/kotlin/io/github/jan/supabase/coil/SupabaseStorageFetcher.kt rename to plugins/Coil3Integration/src/commonMain/kotlin/io/supabase/coil/SupabaseStorageFetcher.kt index b1d4d8d6e..c565f11df 100644 --- a/plugins/Coil3Integration/src/commonMain/kotlin/io/github/jan/supabase/coil/SupabaseStorageFetcher.kt +++ b/plugins/Coil3Integration/src/commonMain/kotlin/io/supabase/coil/SupabaseStorageFetcher.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.coil +package io.supabase.coil import coil3.Extras import coil3.ImageLoader @@ -8,10 +8,10 @@ import coil3.fetch.Fetcher import coil3.network.httpHeaders import coil3.request.Options import coil3.toUri -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.StorageItem -import io.github.jan.supabase.storage.authenticatedRequest +import io.supabase.logging.d +import io.supabase.storage.Storage +import io.supabase.storage.StorageItem +import io.supabase.storage.authenticatedRequest internal class SupabaseStorageFetcher( private val storage: Storage, diff --git a/plugins/CoilIntegration/README.md b/plugins/CoilIntegration/README.md index fe6a67644..3f145a6e0 100644 --- a/plugins/CoilIntegration/README.md +++ b/plugins/CoilIntegration/README.md @@ -16,7 +16,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:coil-integration:VERSION") + implementation("io.supabase:coil-integration:VERSION") } ``` diff --git a/plugins/CoilIntegration/src/commonMain/kotlin/io/github/jan/supabase/coil/CoilIntegration.kt b/plugins/CoilIntegration/src/commonMain/kotlin/io/supabase/coil/CoilIntegration.kt similarity index 78% rename from plugins/CoilIntegration/src/commonMain/kotlin/io/github/jan/supabase/coil/CoilIntegration.kt rename to plugins/CoilIntegration/src/commonMain/kotlin/io/supabase/coil/CoilIntegration.kt index bc35f0ff0..3dd22cc70 100644 --- a/plugins/CoilIntegration/src/commonMain/kotlin/io/github/jan/supabase/coil/CoilIntegration.kt +++ b/plugins/CoilIntegration/src/commonMain/kotlin/io/supabase/coil/CoilIntegration.kt @@ -1,17 +1,17 @@ -package io.github.jan.supabase.coil +package io.supabase.coil import coil.ImageLoader import coil.fetch.Fetcher import coil.request.ImageRequest import coil.request.Options -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.plugins.SupabasePlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.storage.StorageItem -import io.github.jan.supabase.storage.storage +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.d +import io.supabase.plugins.SupabasePlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.storage.StorageItem +import io.supabase.storage.storage /** * A plugin that implements [Fetcher.Factory] to support using [StorageItem] as data when creating an [ImageRequest] or using it as a model in Jetpack Compose. diff --git a/plugins/CoilIntegration/src/commonMain/kotlin/io/github/jan/supabase/coil/SupabaseStorageFetcher.kt b/plugins/CoilIntegration/src/commonMain/kotlin/io/supabase/coil/SupabaseStorageFetcher.kt similarity index 82% rename from plugins/CoilIntegration/src/commonMain/kotlin/io/github/jan/supabase/coil/SupabaseStorageFetcher.kt rename to plugins/CoilIntegration/src/commonMain/kotlin/io/supabase/coil/SupabaseStorageFetcher.kt index 71a9611e6..a624599c6 100644 --- a/plugins/CoilIntegration/src/commonMain/kotlin/io/github/jan/supabase/coil/SupabaseStorageFetcher.kt +++ b/plugins/CoilIntegration/src/commonMain/kotlin/io/supabase/coil/SupabaseStorageFetcher.kt @@ -1,14 +1,14 @@ -package io.github.jan.supabase.coil +package io.supabase.coil import android.net.Uri import coil.ImageLoader import coil.fetch.FetchResult import coil.fetch.Fetcher import coil.request.Options -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.StorageItem -import io.github.jan.supabase.storage.authenticatedRequest +import io.supabase.logging.d +import io.supabase.storage.Storage +import io.supabase.storage.StorageItem +import io.supabase.storage.authenticatedRequest internal class SupabaseStorageFetcher( private val storage: Storage, diff --git a/plugins/ComposeAuth/README.md b/plugins/ComposeAuth/README.md index eea2ad884..814556aa4 100644 --- a/plugins/ComposeAuth/README.md +++ b/plugins/ComposeAuth/README.md @@ -28,7 +28,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:compose-auth:VERSION") + implementation("io.supabase:compose-auth:VERSION") } ``` diff --git a/plugins/ComposeAuth/src/androidMain/AndroidManifest.xml b/plugins/ComposeAuth/src/androidMain/AndroidManifest.xml index 56be5426f..844298315 100644 --- a/plugins/ComposeAuth/src/androidMain/AndroidManifest.xml +++ b/plugins/ComposeAuth/src/androidMain/AndroidManifest.xml @@ -9,7 +9,7 @@ android:exported="false" tools:node="merge"> diff --git a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/SupabaseInitializer.kt b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/SupabaseInitializer.kt similarity index 91% rename from plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/SupabaseInitializer.kt rename to plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/SupabaseInitializer.kt index 2fdff43e1..4291ac1ce 100644 --- a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/SupabaseInitializer.kt +++ b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/SupabaseInitializer.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth +package io.supabase.compose.auth import android.content.Context import androidx.startup.Initializer diff --git a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/Utils.kt b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/Utils.kt similarity index 89% rename from plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/Utils.kt rename to plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/Utils.kt index b4c00fe47..12fc60bd1 100644 --- a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/Utils.kt +++ b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/Utils.kt @@ -1,9 +1,10 @@ -package io.github.jan.supabase.compose.auth +package io.supabase.compose.auth import android.app.Activity import android.content.Context import android.content.ContextWrapper import com.google.android.libraries.identity.googleid.GetSignInWithGoogleOption +import io.supabase.compose.auth.GoogleLoginConfig internal fun getSignInWithGoogleOptions( config: GoogleLoginConfig?, diff --git a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt similarity index 74% rename from plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt rename to plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt index b7c7ba561..83b31205a 100644 --- a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt +++ b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.defaultLoginBehavior +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.defaultLoginBehavior /** * Composable function that implements Native Apple Auth. diff --git a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt similarity index 89% rename from plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt rename to plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt index 91c11e5c8..1993074eb 100644 --- a/plugins/ComposeAuth/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt +++ b/plugins/ComposeAuth/src/androidMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt @@ -1,5 +1,7 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable +import android.app.Activity +import android.content.Context import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember @@ -14,14 +16,14 @@ import androidx.credentials.exceptions.GetCredentialCancellationException import androidx.credentials.exceptions.GetCredentialException import com.google.android.libraries.identity.googleid.GoogleIdTokenCredential import com.google.android.libraries.identity.googleid.GoogleIdTokenParsingException -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.applicationContext -import io.github.jan.supabase.compose.auth.getActivity -import io.github.jan.supabase.compose.auth.getSignInWithGoogleOptions -import io.github.jan.supabase.compose.auth.hash -import io.github.jan.supabase.compose.auth.signInWithGoogle -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.logging.e +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.applicationContext +import io.supabase.compose.auth.getActivity +import io.supabase.compose.auth.getSignInWithGoogleOptions +import io.supabase.compose.auth.hash +import io.supabase.compose.auth.signInWithGoogle +import io.supabase.logging.d +import io.supabase.logging.e /** * Composable function that implements Native Google Auth. @@ -38,7 +40,7 @@ actual fun ComposeAuth.rememberSignInWithGoogle(onResult: (NativeSignInResult) - } @Composable -internal fun ComposeAuth.signInWithCM(onResult: (NativeSignInResult) -> Unit, fallback: suspend () -> Unit): NativeSignInState{ +internal fun ComposeAuth.signInWithCM(onResult: (NativeSignInResult) -> Unit, fallback: suspend () -> Unit): NativeSignInState { val state = remember { NativeSignInState(serializer) } val context = LocalContext.current @@ -136,8 +138,8 @@ internal actual suspend fun handleGoogleSignOut() { } private suspend fun tryRequest( - context: android.content.Context, - activity: android.app.Activity, + context: Context, + activity: Activity, config: ComposeAuth.Config, nonce: String? ): GetCredentialResponse { @@ -148,8 +150,8 @@ private suspend fun tryRequest( } private suspend fun makeRequest( - context: android.content.Context, - activity: android.app.Activity, + context: Context, + activity: Activity, config: ComposeAuth.Config, nonce: String? ): GetCredentialResponse? { diff --git a/plugins/ComposeAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt b/plugins/ComposeAuth/src/appleMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt similarity index 96% rename from plugins/ComposeAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt rename to plugins/ComposeAuth/src/appleMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt index 1720ecdd0..a49a75162 100644 --- a/plugins/ComposeAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt +++ b/plugins/ComposeAuth/src/appleMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt @@ -1,12 +1,12 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.hash -import io.github.jan.supabase.compose.auth.signInWithApple +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.hash +import io.supabase.compose.auth.signInWithApple import kotlinx.cinterop.BetaInteropApi import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/plugins/ComposeAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt b/plugins/ComposeAuth/src/appleMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt similarity index 76% rename from plugins/ComposeAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt rename to plugins/ComposeAuth/src/appleMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt index aeb1b0000..8dd722e1c 100644 --- a/plugins/ComposeAuth/src/appleMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt +++ b/plugins/ComposeAuth/src/appleMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.defaultLoginBehavior +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.defaultLoginBehavior /** * Composable function that implements Native Google Auth. diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/AppleLoginConfig.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/AppleLoginConfig.kt similarity index 86% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/AppleLoginConfig.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/AppleLoginConfig.kt index 736ed96b2..e7b8b5f15 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/AppleLoginConfig.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/AppleLoginConfig.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth +package io.supabase.compose.auth /** * Config for Apple's Authorization API diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ComposeAuth.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/ComposeAuth.kt similarity index 82% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ComposeAuth.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/ComposeAuth.kt index 198470a6e..444055a3a 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ComposeAuth.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/ComposeAuth.kt @@ -1,20 +1,20 @@ -package io.github.jan.supabase.compose.auth - -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.providers.Apple -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.IDTokenProvider -import io.github.jan.supabase.auth.providers.builtin.IDToken -import io.github.jan.supabase.auth.status.SessionStatus -import io.github.jan.supabase.compose.auth.composable.NativeSignInState -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.plugins.CustomSerializationConfig -import io.github.jan.supabase.plugins.CustomSerializationPlugin -import io.github.jan.supabase.plugins.SupabasePlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider +package io.supabase.compose.auth + +import io.supabase.SupabaseClient +import io.supabase.SupabaseSerializer +import io.supabase.auth.auth +import io.supabase.auth.providers.Apple +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.IDTokenProvider +import io.supabase.auth.providers.builtin.IDToken +import io.supabase.auth.status.SessionStatus +import io.supabase.compose.auth.composable.NativeSignInState +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.d +import io.supabase.plugins.CustomSerializationConfig +import io.supabase.plugins.CustomSerializationPlugin +import io.supabase.plugins.SupabasePlugin +import io.supabase.plugins.SupabasePluginProvider import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/DefaultBehavior.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/DefaultBehavior.kt similarity index 71% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/DefaultBehavior.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/DefaultBehavior.kt index dddd91f1f..e3123a77d 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/DefaultBehavior.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/DefaultBehavior.kt @@ -1,12 +1,12 @@ -package io.github.jan.supabase.compose.auth +package io.supabase.compose.auth import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.remember -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.compose.auth.composable.NativeSignInState -import io.github.jan.supabase.compose.auth.composable.NativeSignInStatus -import io.github.jan.supabase.logging.d +import io.supabase.annotations.SupabaseInternal +import io.supabase.compose.auth.composable.NativeSignInState +import io.supabase.compose.auth.composable.NativeSignInStatus +import io.supabase.logging.d /** * Composable of default behavior if Native Auth is not supported on the platform diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/GoogleLoginConfig.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/GoogleLoginConfig.kt similarity index 92% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/GoogleLoginConfig.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/GoogleLoginConfig.kt index 991f0db87..c958a2119 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/GoogleLoginConfig.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/GoogleLoginConfig.kt @@ -1,6 +1,6 @@ -package io.github.jan.supabase.compose.auth +package io.supabase.compose.auth -import io.github.jan.supabase.compose.auth.composable.handleGoogleSignOut +import io.supabase.compose.auth.composable.handleGoogleSignOut /** * Config for requesting IDToken from play-auth API diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/Utils.common.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/Utils.common.kt similarity index 80% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/Utils.common.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/Utils.common.kt index 634108dee..517805ced 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/Utils.common.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/Utils.common.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth +package io.supabase.compose.auth import io.ktor.utils.io.core.toByteArray import korlibs.crypto.SHA256 diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeAppleAuth.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeAppleAuth.kt similarity index 69% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeAppleAuth.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeAppleAuth.kt index 71655a27b..2c7a50fd7 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeAppleAuth.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeAppleAuth.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable -import io.github.jan.supabase.auth.providers.Apple -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.fallbackLogin +import io.supabase.auth.providers.Apple +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.fallbackLogin /** * Composable function that implements Native Apple Auth. diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeGoogleAuth.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeGoogleAuth.kt similarity index 72% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeGoogleAuth.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeGoogleAuth.kt index 8fbb4899d..7180ec36a 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeGoogleAuth.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeGoogleAuth.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.fallbackLogin +import io.supabase.auth.providers.Google +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.fallbackLogin /** * Composable function that implements Native Google Auth. diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeSignInResult.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeSignInResult.kt similarity index 92% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeSignInResult.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeSignInResult.kt index 150466a61..e4518ee57 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeSignInResult.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeSignInResult.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable /** * Represents the response of a Native SignIn diff --git a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeSignInState.kt b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeSignInState.kt similarity index 92% rename from plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeSignInState.kt rename to plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeSignInState.kt index 24968e149..207552c4c 100644 --- a/plugins/ComposeAuth/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/composable/NativeSignInState.kt +++ b/plugins/ComposeAuth/src/commonMain/kotlin/io/supabase/compose/auth/composable/NativeSignInState.kt @@ -1,10 +1,10 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue -import io.github.jan.supabase.SupabaseSerializer -import io.github.jan.supabase.encodeToJsonElement +import io.supabase.SupabaseSerializer +import io.supabase.encodeToJsonElement import io.ktor.util.generateNonce import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonObject diff --git a/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt b/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt similarity index 62% rename from plugins/ComposeAuth/src/noDefaultMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt rename to plugins/ComposeAuth/src/noDefaultMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt index 7efb9b6aa..965949963 100644 --- a/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/github/jan/supabase/compose/auth/composable/AppleAuth.kt +++ b/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/supabase/compose/auth/composable/AppleAuth.kt @@ -1,8 +1,8 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.defaultLoginBehavior +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.defaultLoginBehavior /** * Composable for Apple login with default behavior diff --git a/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt b/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt similarity index 68% rename from plugins/ComposeAuth/src/noDefaultMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt rename to plugins/ComposeAuth/src/noDefaultMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt index aeb1b0000..6d73cc5c0 100644 --- a/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/github/jan/supabase/compose/auth/composable/GoogleAuth.kt +++ b/plugins/ComposeAuth/src/noDefaultMain/kotlin/io/supabase/compose/auth/composable/GoogleAuth.kt @@ -1,8 +1,10 @@ -package io.github.jan.supabase.compose.auth.composable +package io.supabase.compose.auth.composable import androidx.compose.runtime.Composable -import io.github.jan.supabase.compose.auth.ComposeAuth -import io.github.jan.supabase.compose.auth.defaultLoginBehavior +import io.supabase.compose.auth.ComposeAuth +import io.supabase.compose.auth.defaultLoginBehavior +import io.supabase.compose.auth.composable.NativeSignInResult +import io.supabase.compose.auth.composable.NativeSignInState /** * Composable function that implements Native Google Auth. diff --git a/plugins/ComposeAuthUI/README.md b/plugins/ComposeAuthUI/README.md index 8d5dbc2fb..06d418c41 100644 --- a/plugins/ComposeAuthUI/README.md +++ b/plugins/ComposeAuthUI/README.md @@ -26,7 +26,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:compose-auth-ui:VERSION") + implementation("io.supabase:compose-auth-ui:VERSION") } ``` diff --git a/plugins/ComposeAuthUI/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/ui/AndroidSvgPainter.kt b/plugins/ComposeAuthUI/src/androidMain/kotlin/io/supabase/compose/auth/ui/AndroidSvgPainter.kt similarity index 95% rename from plugins/ComposeAuthUI/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/ui/AndroidSvgPainter.kt rename to plugins/ComposeAuthUI/src/androidMain/kotlin/io/supabase/compose/auth/ui/AndroidSvgPainter.kt index d67e98712..20dd5d1e8 100644 --- a/plugins/ComposeAuthUI/src/androidMain/kotlin/io/github/jan/supabase/compose/auth/ui/AndroidSvgPainter.kt +++ b/plugins/ComposeAuthUI/src/androidMain/kotlin/io/supabase/compose/auth/ui/AndroidSvgPainter.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.ui.geometry.Size import androidx.compose.ui.geometry.isSpecified @@ -11,9 +11,9 @@ import androidx.compose.ui.unit.IntSize import androidx.compose.ui.unit.toSize import com.caverock.androidsvg.PreserveAspectRatio import com.caverock.androidsvg.SVG -import io.github.jan.supabase.annotations.SupabaseInternal import io.ktor.utils.io.ByteReadChannel import io.ktor.utils.io.jvm.javaio.toInputStream +import io.supabase.annotations.SupabaseInternal import kotlin.math.ceil @SupabaseInternal diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/AuthIcons.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/AuthIcons.kt similarity index 99% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/AuthIcons.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/AuthIcons.kt index c3b675507..9fd7c28f8 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/AuthIcons.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/AuthIcons.kt @@ -1,5 +1,6 @@ @file:Suppress("MagicNumber", "UndocumentedPublicFunction", "LongMethod") -package io.github.jan.supabase.compose.auth.ui + +package io.supabase.compose.auth.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -11,7 +12,7 @@ import androidx.compose.ui.graphics.StrokeJoin import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.path import androidx.compose.ui.unit.dp -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal @SupabaseInternal object AuthIcons diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/AuthState.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/AuthState.kt similarity index 91% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/AuthState.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/AuthState.kt index c025b63bd..b2e8ac61b 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/AuthState.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/AuthState.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -6,8 +6,8 @@ import androidx.compose.runtime.compositionLocalOf import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.saveable.mapSaver import androidx.compose.runtime.saveable.rememberSaveable -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.annotations.SupabaseInternal +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental /** * Represents the state of auth forms. diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/FormComponent.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/FormComponent.kt similarity index 90% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/FormComponent.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/FormComponent.kt index 5294c3449..c201a59cb 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/FormComponent.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/FormComponent.kt @@ -1,11 +1,11 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental /** * A component that represents a form field. diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/FormValidator.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/FormValidator.kt similarity index 93% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/FormValidator.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/FormValidator.kt index 956b3bc9a..3b04758e8 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/FormValidator.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/FormValidator.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui /** * FormValidator interface used to validate text fields. diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/ProviderButton.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/ProviderButton.kt similarity index 91% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/ProviderButton.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/ProviderButton.kt index abaf0d7eb..5f9c85bee 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/ProviderButton.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/ProviderButton.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.Spacer @@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp -import io.github.jan.supabase.auth.providers.OAuthProvider -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.auth.providers.OAuthProvider +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental internal val DEFAULT_ICON_SIZE = 24.dp //from Material3 diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/ProviderIcons.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/ProviderIcons.kt similarity index 99% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/ProviderIcons.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/ProviderIcons.kt index 737dea63f..a4f45f787 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/ProviderIcons.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/ProviderIcons.kt @@ -1,7 +1,8 @@ @file:Suppress("MagicNumber", "UndocumentedPublicFunction", "LongMethod") -package io.github.jan.supabase.compose.auth.ui -import io.github.jan.supabase.annotations.SupabaseInternal +package io.supabase.compose.auth.ui + +import io.supabase.annotations.SupabaseInternal @SupabaseInternal object ProviderIcons { diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainter.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/SvgPainter.kt similarity index 56% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainter.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/SvgPainter.kt index 21218df44..216afc8bb 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainter.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/SvgPainter.kt @@ -1,30 +1,30 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.produceState import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.unit.Density -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.auth.providers.Apple -import io.github.jan.supabase.auth.providers.Azure -import io.github.jan.supabase.auth.providers.Bitbucket -import io.github.jan.supabase.auth.providers.Discord -import io.github.jan.supabase.auth.providers.Facebook -import io.github.jan.supabase.auth.providers.Figma -import io.github.jan.supabase.auth.providers.Github -import io.github.jan.supabase.auth.providers.Gitlab -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.Kakao -import io.github.jan.supabase.auth.providers.Keycloak -import io.github.jan.supabase.auth.providers.LinkedIn -import io.github.jan.supabase.auth.providers.Notion -import io.github.jan.supabase.auth.providers.OAuthProvider -import io.github.jan.supabase.auth.providers.Slack -import io.github.jan.supabase.auth.providers.Spotify -import io.github.jan.supabase.auth.providers.Twitch -import io.github.jan.supabase.auth.providers.Twitter -import io.github.jan.supabase.auth.providers.WorkOS +import io.supabase.annotations.SupabaseInternal +import io.supabase.auth.providers.Apple +import io.supabase.auth.providers.Azure +import io.supabase.auth.providers.Bitbucket +import io.supabase.auth.providers.Discord +import io.supabase.auth.providers.Facebook +import io.supabase.auth.providers.Figma +import io.supabase.auth.providers.Github +import io.supabase.auth.providers.Gitlab +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.Kakao +import io.supabase.auth.providers.Keycloak +import io.supabase.auth.providers.LinkedIn +import io.supabase.auth.providers.Notion +import io.supabase.auth.providers.OAuthProvider +import io.supabase.auth.providers.Slack +import io.supabase.auth.providers.Spotify +import io.supabase.auth.providers.Twitch +import io.supabase.auth.providers.Twitter +import io.supabase.auth.providers.WorkOS @SupabaseInternal expect fun svgPainter(bytes: ByteArray, density: Density): Painter diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/annotations/AuthUiExperimental.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/annotations/AuthUiExperimental.kt similarity index 77% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/annotations/AuthUiExperimental.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/annotations/AuthUiExperimental.kt index ebc8cac34..c29dd6bb2 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/annotations/AuthUiExperimental.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/annotations/AuthUiExperimental.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui.annotations +package io.supabase.compose.auth.ui.annotations /** * Used to mark experimental Compose Auth Ui APIs diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/email/EmailField.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/email/EmailField.kt similarity index 95% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/email/EmailField.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/email/EmailField.kt index a656fd82e..920a1814c 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/email/EmailField.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/email/EmailField.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui.email +package io.supabase.compose.auth.ui.email import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.text.KeyboardActions @@ -20,19 +20,19 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue -import io.github.jan.supabase.compose.auth.ui.AuthIcons -import io.github.jan.supabase.compose.auth.ui.AuthState -import io.github.jan.supabase.compose.auth.ui.FormComponent -import io.github.jan.supabase.compose.auth.ui.FormValidator -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental -import io.github.jan.supabase.compose.auth.ui.rememberMailIcon +import io.supabase.compose.auth.ui.AuthIcons +import io.supabase.compose.auth.ui.AuthState +import io.supabase.compose.auth.ui.FormComponent +import io.supabase.compose.auth.ui.FormValidator +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.rememberMailIcon /** * A custom email input field with validation and pre-defined styling. * * @param value The current value of the email field. * @param onValueChange The callback function for when the value of the email field changes. - * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.EMAIL]. + * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.Companion.EMAIL]. * @param modifier The modifier for styling the email field. Defaults to Modifier. * @param label The label for the email field. Defaults to null. * @param keyboardOptions The keyboard options for the email field. Defaults to KeyboardOptions(keyboardType = KeyboardType.Email). @@ -57,7 +57,7 @@ import io.github.jan.supabase.compose.auth.ui.rememberMailIcon fun EmailField( value: String, onValueChange: (String) -> Unit, - validator: FormValidator = FormValidator.EMAIL, + validator: FormValidator = FormValidator.Companion.EMAIL, modifier: Modifier = Modifier, label: (@Composable () -> Unit)? = null, keyboardOptions: KeyboardOptions = KeyboardOptions( @@ -115,7 +115,7 @@ fun EmailField( * * @param value The current value of the email field. * @param onValueChange The callback function for when the value of the email field changes. - * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.EMAIL]. + * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.Companion.EMAIL]. * @param modifier The modifier for styling the email field. Defaults to Modifier. * @param label The label for the email field. Defaults to null. * @param keyboardOptions The keyboard options for the email field. Defaults to KeyboardOptions(keyboardType = KeyboardType.Email). @@ -140,7 +140,7 @@ fun EmailField( fun EmailField( value: TextFieldValue, onValueChange: (TextFieldValue) -> Unit, - validator: FormValidator = FormValidator.EMAIL, + validator: FormValidator = FormValidator.Companion.EMAIL, modifier: Modifier = Modifier, label: (@Composable () -> Unit)? = null, keyboardOptions: KeyboardOptions = KeyboardOptions( @@ -198,7 +198,7 @@ fun EmailField( * * @param value The current value of the email field. * @param onValueChange The callback function for when the value of the email field changes. - * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.EMAIL]. + * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.Companion.EMAIL]. * @param modifier The modifier for styling the email field. Defaults to Modifier. * @param label The label for the email field. Defaults to null. * @param keyboardOptions The keyboard options for the email field. Defaults to KeyboardOptions(keyboardType = KeyboardType.Email). @@ -223,7 +223,7 @@ fun EmailField( fun OutlinedEmailField( value: String, onValueChange: (String) -> Unit, - validator: FormValidator = FormValidator.EMAIL, + validator: FormValidator = FormValidator.Companion.EMAIL, modifier: Modifier = Modifier, label: (@Composable () -> Unit)? = null, keyboardOptions: KeyboardOptions = KeyboardOptions( @@ -281,7 +281,7 @@ fun OutlinedEmailField( * * @param value The current value of the email field. * @param onValueChange The callback function for when the value of the email field changes. - * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.EMAIL]. + * @param validator The form validator used to validate the email field value. Defaults to [FormValidator.Companion.EMAIL]. * @param modifier The modifier for styling the email field. Defaults to Modifier. * @param label The label for the email field. Defaults to null. * @param keyboardOptions The keyboard options for the email field. Defaults to KeyboardOptions(keyboardType = KeyboardType.Email). @@ -306,7 +306,7 @@ fun OutlinedEmailField( fun OutlinedEmailField( value: TextFieldValue, onValueChange: (TextFieldValue) -> Unit, - validator: FormValidator = FormValidator.EMAIL, + validator: FormValidator = FormValidator.Companion.EMAIL, modifier: Modifier = Modifier, label: (@Composable () -> Unit)? = null, keyboardOptions: KeyboardOptions = KeyboardOptions( diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/password/PasswordField.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/password/PasswordField.kt similarity index 94% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/password/PasswordField.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/password/PasswordField.kt index 99b7fefea..136a6192c 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/password/PasswordField.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/password/PasswordField.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui.password +package io.supabase.compose.auth.ui.password import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.text.KeyboardActions @@ -25,12 +25,12 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation -import io.github.jan.supabase.compose.auth.ui.AuthIcons -import io.github.jan.supabase.compose.auth.ui.FormComponent -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental -import io.github.jan.supabase.compose.auth.ui.rememberLockIcon -import io.github.jan.supabase.compose.auth.ui.rememberVisibilityIcon -import io.github.jan.supabase.compose.auth.ui.rememberVisibilityOffIcon +import io.supabase.compose.auth.ui.AuthIcons +import io.supabase.compose.auth.ui.FormComponent +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.rememberLockIcon +import io.supabase.compose.auth.ui.rememberVisibilityIcon +import io.supabase.compose.auth.ui.rememberVisibilityOffIcon /** * A custom password input field with custom rules and pre-defined styling. @@ -81,7 +81,7 @@ fun PasswordField( if (value.isNotEmpty()) it.firstUnfulfilled()?.let { rule -> Text(rule.description) } - }, trailingIcon: @Composable ((showPassword: MutableState) -> Unit)? = { showPassword -> + }, trailingIcon: @Composable ((showPassword: MutableState) -> Unit)? = { showPassword -> IconButton(onClick = { showPassword.value = !showPassword.value }) { Icon(if(showPassword.value) AuthIcons.rememberVisibilityIcon() else AuthIcons.rememberVisibilityOffIcon(), "Visibility") } @@ -92,7 +92,8 @@ fun PasswordField( ) { FormComponent(formKey, mandatory) { val showPassword = remember { mutableStateOf(false) } - val ruleResults = remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value)) } } + val ruleResults = + remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value)) } } LaunchedEffect(value) { it.value = ruleResults.all { it.isFulfilled } } @@ -181,7 +182,8 @@ fun PasswordField( ) { FormComponent(formKey, mandatory) { val showPassword = remember { mutableStateOf(false) } - val ruleResults = remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value.text)) } } + val ruleResults = + remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value.text)) } } LaunchedEffect(value) { it.value = ruleResults.all { it.isFulfilled } } @@ -258,7 +260,7 @@ fun OutlinedPasswordField( if (value.isNotEmpty()) it.firstUnfulfilled()?.let { rule -> Text(rule.description) } - }, trailingIcon: @Composable ((showPassword: MutableState) -> Unit)? = { showPassword -> + }, trailingIcon: @Composable ((showPassword: MutableState) -> Unit)? = { showPassword -> IconButton(onClick = { showPassword.value = !showPassword.value }) { Icon(if(showPassword.value) AuthIcons.rememberVisibilityIcon() else AuthIcons.rememberVisibilityOffIcon(), "Visibility") } @@ -269,7 +271,8 @@ fun OutlinedPasswordField( ) { FormComponent(formKey, mandatory) { val showPassword = remember { mutableStateOf(false) } - val ruleResults = remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value)) } } + val ruleResults = + remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value)) } } LaunchedEffect(value) { it.value = ruleResults.all { it.isFulfilled } } @@ -357,7 +360,8 @@ fun OutlinedPasswordField( ) { FormComponent(formKey, mandatory) { val showPassword = remember { mutableStateOf(false) } - val ruleResults = remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value.text)) } } + val ruleResults = + remember(value, rules) { rules.map { PasswordRuleResult(it.description, it.predicate(value.text)) } } LaunchedEffect(value) { it.value = ruleResults.all { it.isFulfilled } } diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/password/PasswordRule.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/password/PasswordRule.kt similarity index 98% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/password/PasswordRule.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/password/PasswordRule.kt index a264e888f..c524a7e72 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/password/PasswordRule.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/password/PasswordRule.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui.password +package io.supabase.compose.auth.ui.password import androidx.compose.runtime.Composable import androidx.compose.runtime.remember diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/phone/PhoneField.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/phone/PhoneField.kt similarity index 95% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/phone/PhoneField.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/phone/PhoneField.kt index 2ad762986..9e5ef5955 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/phone/PhoneField.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/phone/PhoneField.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui.phone +package io.supabase.compose.auth.ui.phone import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.text.KeyboardActions @@ -20,11 +20,11 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.VisualTransformation -import io.github.jan.supabase.compose.auth.ui.AuthIcons -import io.github.jan.supabase.compose.auth.ui.FormComponent -import io.github.jan.supabase.compose.auth.ui.FormValidator -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental -import io.github.jan.supabase.compose.auth.ui.rememberCallIcon +import io.supabase.compose.auth.ui.AuthIcons +import io.supabase.compose.auth.ui.FormComponent +import io.supabase.compose.auth.ui.FormValidator +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.rememberCallIcon private const val DEFAULT_MASK = "+## ### #########" private const val DEFAULT_MASK_CHAR = '#' @@ -34,7 +34,7 @@ private const val DEFAULT_MASK_CHAR = '#' * * @param value The current value of the phone field. * @param onValueChange The callback function for when the value of the phone field changes. - * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.PHONE]. + * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.Companion.PHONE]. * @param mask The mask for the phone field. This changes how the phone number gets displayed. The value will still be the raw number. Defaults to "+## ### #########". * @param maskChar The mask character for the phone field. Defaults to '#'. * @param modifier The modifier for styling the phone field. Defaults to Modifier. @@ -60,7 +60,7 @@ private const val DEFAULT_MASK_CHAR = '#' fun PhoneField( value: String, onValueChange: (String) -> Unit, - validator: FormValidator = remember { FormValidator.PHONE }, + validator: FormValidator = remember { FormValidator.Companion.PHONE }, mask: String? = DEFAULT_MASK, maskChar: Char = DEFAULT_MASK_CHAR, modifier: Modifier = Modifier, @@ -125,7 +125,7 @@ fun PhoneField( * * @param value The current value of the phone field. * @param onValueChange The callback function for when the value of the phone field changes. - * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.PHONE]. + * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.Companion.PHONE]. * @param mask The mask for the phone field. This changes how the phone number gets displayed. The value will still be the raw number. Defaults to "+## ### #########". * @param maskChar The mask character for the phone field. Defaults to '#'. * @param modifier The modifier for styling the phone field. Defaults to Modifier. @@ -151,7 +151,7 @@ fun PhoneField( fun PhoneField( value: TextFieldValue, onValueChange: (TextFieldValue) -> Unit, - validator: FormValidator = remember { FormValidator.PHONE }, + validator: FormValidator = remember { FormValidator.Companion.PHONE }, mask: String? = DEFAULT_MASK, maskChar: Char = DEFAULT_MASK_CHAR, modifier: Modifier = Modifier, @@ -216,7 +216,7 @@ fun PhoneField( * * @param value The current value of the phone field. * @param onValueChange The callback function for when the value of the phone field changes. - * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.PHONE]. + * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.Companion.PHONE]. * @param mask The mask for the phone field. This changes how the phone number gets displayed. The value will still be the raw number. Defaults to "+## ### #########". * @param maskChar The mask character for the phone field. Defaults to '#'. * @param modifier The modifier for styling the phone field. Defaults to Modifier. @@ -242,7 +242,7 @@ fun PhoneField( fun OutlinedPhoneField( value: TextFieldValue, onValueChange: (TextFieldValue) -> Unit, - validator: FormValidator = remember { FormValidator.PHONE }, + validator: FormValidator = remember { FormValidator.Companion.PHONE }, mask: String? = DEFAULT_MASK, maskChar: Char = DEFAULT_MASK_CHAR, modifier: Modifier = Modifier, @@ -307,7 +307,7 @@ fun OutlinedPhoneField( * * @param value The current value of the phone field. * @param onValueChange The callback function for when the value of the phone field changes. - * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.PHONE]. + * @param validator The form validator used to validate the phone field value. Defaults to [FormValidator.Companion.PHONE]. * @param mask The mask for the phone field. This changes how the phone number gets displayed. The value will still be the raw number. Defaults to "+## ### #########". * @param maskChar The mask character for the phone field. Defaults to '#'. * @param modifier The modifier for styling the phone field. Defaults to Modifier. @@ -333,7 +333,7 @@ fun OutlinedPhoneField( fun OutlinedPhoneField( value: String, onValueChange: (String) -> Unit, - validator: FormValidator = remember { FormValidator.PHONE }, + validator: FormValidator = remember { FormValidator.Companion.PHONE }, mask: String? = DEFAULT_MASK, maskChar: Char = DEFAULT_MASK_CHAR, modifier: Modifier = Modifier, @@ -369,7 +369,9 @@ fun OutlinedPhoneField( } OutlinedTextField( value = value, - onValueChange = { onValueChange(it.filter { char -> char.isDigit() }.take(mask?.count { it == maskChar } ?: it.length)) }, + onValueChange = { + onValueChange(it.filter { char -> char.isDigit() }.take(mask?.count { it == maskChar } ?: it.length)) + }, modifier = modifier, label = label, keyboardOptions = keyboardOptions, diff --git a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/phone/PhoneVisualTransformation.kt b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/phone/PhoneVisualTransformation.kt similarity index 94% rename from plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/phone/PhoneVisualTransformation.kt rename to plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/phone/PhoneVisualTransformation.kt index a645fa4d0..b417f5e00 100644 --- a/plugins/ComposeAuthUI/src/commonMain/kotlin/io/github/jan/supabase/compose/auth/ui/phone/PhoneVisualTransformation.kt +++ b/plugins/ComposeAuthUI/src/commonMain/kotlin/io/supabase/compose/auth/ui/phone/PhoneVisualTransformation.kt @@ -1,11 +1,11 @@ -package io.github.jan.supabase.compose.auth.ui.phone +package io.supabase.compose.auth.ui.phone import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.input.OffsetMapping import androidx.compose.ui.text.input.TransformedText import androidx.compose.ui.text.input.VisualTransformation -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental /** * Represents a phone number visual transformation. diff --git a/plugins/ComposeAuthUI/src/jvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainterJvm.kt b/plugins/ComposeAuthUI/src/jvmMain/kotlin/io/supabase/compose/auth/ui/SvgPainterJvm.kt similarity index 71% rename from plugins/ComposeAuthUI/src/jvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainterJvm.kt rename to plugins/ComposeAuthUI/src/jvmMain/kotlin/io/supabase/compose/auth/ui/SvgPainterJvm.kt index 140149c00..46868a33e 100644 --- a/plugins/ComposeAuthUI/src/jvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainterJvm.kt +++ b/plugins/ComposeAuthUI/src/jvmMain/kotlin/io/supabase/compose/auth/ui/SvgPainterJvm.kt @@ -1,9 +1,9 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.loadSvgPainter import androidx.compose.ui.unit.Density -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal @SupabaseInternal actual fun svgPainter(bytes: ByteArray, density: Density): Painter = loadSvgPainter(bytes.inputStream(), density) \ No newline at end of file diff --git a/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/DrawCache.kt b/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/supabase/compose/auth/ui/DrawCache.kt similarity index 98% rename from plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/DrawCache.kt rename to plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/supabase/compose/auth/ui/DrawCache.kt index 7de040177..c3cd5a980 100644 --- a/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/DrawCache.kt +++ b/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/supabase/compose/auth/ui/DrawCache.kt @@ -1,5 +1,6 @@ @file:Suppress("ComplexCondition") -package io.github.jan.supabase.compose.auth.ui + +package io.supabase.compose.auth.ui import androidx.compose.ui.graphics.BlendMode import androidx.compose.ui.graphics.Canvas diff --git a/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainterNonJvm.kt b/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/supabase/compose/auth/ui/SvgPainterNonJvm.kt similarity index 97% rename from plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainterNonJvm.kt rename to plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/supabase/compose/auth/ui/SvgPainterNonJvm.kt index a5c86aa3f..2faf9803a 100644 --- a/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/github/jan/supabase/compose/auth/ui/SvgPainterNonJvm.kt +++ b/plugins/ComposeAuthUI/src/nonJvmMain/kotlin/io/supabase/compose/auth/ui/SvgPainterNonJvm.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.compose.auth.ui +package io.supabase.compose.auth.ui import androidx.compose.ui.geometry.Size import androidx.compose.ui.geometry.isSpecified @@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.nativeCanvas import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.unit.Density import androidx.compose.ui.unit.IntSize -import io.github.jan.supabase.annotations.SupabaseInternal +import io.supabase.annotations.SupabaseInternal import org.jetbrains.skia.Data import org.jetbrains.skia.Rect import org.jetbrains.skia.svg.SVGDOM diff --git a/plugins/ImageLoaderIntegration/README.md b/plugins/ImageLoaderIntegration/README.md index 57fb831e6..ee9be105e 100644 --- a/plugins/ImageLoaderIntegration/README.md +++ b/plugins/ImageLoaderIntegration/README.md @@ -26,7 +26,7 @@ Newest version: [![](https://img.shields.io/github/release/supabase-community/su ```kotlin dependencies { - implementation("io.github.jan-tennert.supabase:imageloader-integration:VERSION") + implementation("io.supabase:imageloader-integration:VERSION") } ``` diff --git a/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/github/jan/supabase/imageloader/ImageLoaderIntegration.kt b/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/supabase/imageloader/ImageLoaderIntegration.kt similarity index 84% rename from plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/github/jan/supabase/imageloader/ImageLoaderIntegration.kt rename to plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/supabase/imageloader/ImageLoaderIntegration.kt index ab1d59542..b08c0f175 100644 --- a/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/github/jan/supabase/imageloader/ImageLoaderIntegration.kt +++ b/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/supabase/imageloader/ImageLoaderIntegration.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.imageloader +package io.supabase.imageloader import com.seiko.imageloader.ImageLoader import com.seiko.imageloader.component.ComponentRegistryBuilder @@ -6,14 +6,14 @@ import com.seiko.imageloader.component.fetcher.Fetcher import com.seiko.imageloader.component.keyer.Keyer import com.seiko.imageloader.model.ImageRequest import com.seiko.imageloader.option.Options -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.logging.d -import io.github.jan.supabase.plugins.SupabasePlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider -import io.github.jan.supabase.storage.StorageItem -import io.github.jan.supabase.storage.storage +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.logging.SupabaseLogger +import io.supabase.logging.d +import io.supabase.plugins.SupabasePlugin +import io.supabase.plugins.SupabasePluginProvider +import io.supabase.storage.StorageItem +import io.supabase.storage.storage /** * A plugin that implements [Fetcher.Factory] and [Keyer] for [ImageLoader] to support using [StorageItem] as data when creating a [ImageRequest]. diff --git a/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/github/jan/supabase/imageloader/SupabaseStorageFetcher.kt b/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/supabase/imageloader/SupabaseStorageFetcher.kt similarity index 88% rename from plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/github/jan/supabase/imageloader/SupabaseStorageFetcher.kt rename to plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/supabase/imageloader/SupabaseStorageFetcher.kt index 5113b8234..bdeeb6519 100644 --- a/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/github/jan/supabase/imageloader/SupabaseStorageFetcher.kt +++ b/plugins/ImageLoaderIntegration/src/commonMain/kotlin/io/supabase/imageloader/SupabaseStorageFetcher.kt @@ -1,12 +1,12 @@ -package io.github.jan.supabase.imageloader +package io.supabase.imageloader import com.seiko.imageloader.component.fetcher.FetchResult import com.seiko.imageloader.component.fetcher.Fetcher import com.seiko.imageloader.model.ImageSource import com.seiko.imageloader.model.ImageSourceFrom import com.seiko.imageloader.model.extraData -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.StorageItem +import io.supabase.storage.Storage +import io.supabase.storage.StorageItem import io.ktor.http.ContentType import io.ktor.http.defaultForFileExtension import kotlin.collections.set diff --git a/sample/chat-demo-mpp/android/build.gradle.kts b/sample/chat-demo-mpp/android/build.gradle.kts index b76ee5032..d02746570 100644 --- a/sample/chat-demo-mpp/android/build.gradle.kts +++ b/sample/chat-demo-mpp/android/build.gradle.kts @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" dependencies { diff --git a/sample/chat-demo-mpp/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt b/sample/chat-demo-mpp/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt index 746c205de..c778b2485 100644 --- a/sample/chat-demo-mpp/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt +++ b/sample/chat-demo-mpp/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.material3.MaterialTheme -import io.github.jan.supabase.auth.handleDeeplinks +import io.supabase.auth.handleDeeplinks import io.github.jan.supabase.common.App import io.github.jan.supabase.common.ChatViewModel import org.koin.android.ext.android.inject diff --git a/sample/chat-demo-mpp/common/build.gradle.kts b/sample/chat-demo-mpp/common/build.gradle.kts index b4c4e25e2..7481befe9 100644 --- a/sample/chat-demo-mpp/common/build.gradle.kts +++ b/sample/chat-demo-mpp/common/build.gradle.kts @@ -11,7 +11,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" kotlin { @@ -82,4 +82,4 @@ kotlin { } } -configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8) \ No newline at end of file +configureLibraryAndroidTarget("io.supabase.common", 26, JavaVersion.VERSION_1_8) \ No newline at end of file diff --git a/sample/chat-demo-mpp/common/src/androidMain/AndroidManifest.xml b/sample/chat-demo-mpp/common/src/androidMain/AndroidManifest.xml index 162b68251..568741e54 100644 --- a/sample/chat-demo-mpp/common/src/androidMain/AndroidManifest.xml +++ b/sample/chat-demo-mpp/common/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/sample/chat-demo-mpp/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/chat-demo-mpp/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index 6deb296ea..d5c13c19e 100644 --- a/sample/chat-demo-mpp/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/chat-demo-mpp/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,7 +1,7 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig -import io.github.jan.supabase.auth.ExternalAuthAction +import io.supabase.auth.AuthConfig +import io.supabase.auth.ExternalAuthAction actual fun AuthConfig.platformGoTrueConfig() { scheme = "io.jan.supabase" diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt index 055acdf15..b2adad211 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt @@ -11,9 +11,9 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import io.github.jan.supabase.auth.status.SessionStatus import io.github.jan.supabase.common.ui.screen.ChatScreen import io.github.jan.supabase.common.ui.screen.LoginScreen +import io.supabase.auth.status.SessionStatus @Composable fun App(viewModel: ChatViewModel) { diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt index 0fb064e5e..bd09f7ef2 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ChatViewModel.kt @@ -2,12 +2,12 @@ package io.github.jan.supabase.common import co.touchlab.kermit.Logger -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.status.SessionStatus +import io.supabase.SupabaseClient +import io.supabase.auth.status.SessionStatus import io.github.jan.supabase.common.net.AuthApi import io.github.jan.supabase.common.net.Message import io.github.jan.supabase.common.net.MessageApi -import io.github.jan.supabase.realtime.realtime +import io.supabase.realtime.realtime import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt index 42060f8e8..ae03f1934 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt @@ -1,12 +1,12 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.AuthConfig -import io.github.jan.supabase.auth.FlowType -import io.github.jan.supabase.createSupabaseClient -import io.github.jan.supabase.logging.LogLevel -import io.github.jan.supabase.postgrest.Postgrest -import io.github.jan.supabase.realtime.Realtime +import io.supabase.auth.Auth +import io.supabase.auth.AuthConfig +import io.supabase.auth.FlowType +import io.supabase.createSupabaseClient +import io.supabase.logging.LogLevel +import io.supabase.postgrest.Postgrest +import io.supabase.realtime.Realtime import org.koin.dsl.module expect fun AuthConfig.platformGoTrueConfig() diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/AuthApi.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/AuthApi.kt index aded209de..82ad282c5 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/AuthApi.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/AuthApi.kt @@ -1,11 +1,11 @@ package io.github.jan.supabase.common.net -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.OtpType -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.builtin.Email -import io.github.jan.supabase.auth.status.SessionStatus +import io.supabase.SupabaseClient +import io.supabase.auth.OtpType +import io.supabase.auth.auth +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.builtin.Email +import io.supabase.auth.status.SessionStatus import kotlinx.coroutines.flow.Flow sealed interface AuthApi { diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/MessageApi.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/MessageApi.kt index a45d7be41..b1c72e3c8 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/MessageApi.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/net/MessageApi.kt @@ -1,10 +1,10 @@ package io.github.jan.supabase.common.net -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.postgrest.postgrest -import io.github.jan.supabase.realtime.selectAsFlow +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.auth.auth +import io.supabase.postgrest.postgrest +import io.supabase.realtime.selectAsFlow import kotlinx.coroutines.flow.Flow import kotlinx.datetime.Instant import kotlinx.serialization.SerialName diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordChangeDialog.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordChangeDialog.kt index 638fb015c..f2da2c61d 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordChangeDialog.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/PasswordChangeDialog.kt @@ -14,10 +14,10 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import io.github.jan.supabase.compose.auth.ui.AuthForm -import io.github.jan.supabase.compose.auth.ui.LocalAuthState -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental -import io.github.jan.supabase.compose.auth.ui.password.OutlinedPasswordField +import io.supabase.compose.auth.ui.AuthForm +import io.supabase.compose.auth.ui.LocalAuthState +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.password.OutlinedPasswordField @OptIn(AuthUiExperimental::class, ExperimentalMaterial3Api::class) @Composable diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/ChatScreen.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/ChatScreen.kt index 12d4274d8..8704f2e8d 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/ChatScreen.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/ChatScreen.kt @@ -29,9 +29,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import io.github.jan.supabase.CurrentPlatformTarget -import io.github.jan.supabase.PlatformTarget -import io.github.jan.supabase.auth.user.UserInfo +import io.supabase.CurrentPlatformTarget +import io.supabase.PlatformTarget +import io.supabase.auth.user.UserInfo import io.github.jan.supabase.common.ChatViewModel import io.github.jan.supabase.common.ui.components.MessageCard import io.github.jan.supabase.common.ui.components.PasswordChangeDialog diff --git a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt index 7ec089f16..9af4a81ff 100644 --- a/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt +++ b/sample/chat-demo-mpp/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/LoginScreen.kt @@ -30,15 +30,15 @@ import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.unit.dp -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.auth.providers.Google +import io.supabase.annotations.SupabaseExperimental +import io.supabase.auth.providers.Google import io.github.jan.supabase.common.ChatViewModel import io.github.jan.supabase.common.ui.components.OTPDialog import io.github.jan.supabase.common.ui.components.OTPDialogState import io.github.jan.supabase.common.ui.components.PasswordField import io.github.jan.supabase.common.ui.components.PasswordRecoveryDialog -import io.github.jan.supabase.compose.auth.ui.ProviderButtonContent -import io.github.jan.supabase.compose.auth.ui.annotations.AuthUiExperimental +import io.supabase.compose.auth.ui.ProviderButtonContent +import io.supabase.compose.auth.ui.annotations.AuthUiExperimental @OptIn(ExperimentalMaterial3Api::class, SupabaseExperimental::class, AuthUiExperimental::class) @Composable diff --git a/sample/chat-demo-mpp/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/chat-demo-mpp/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index 9db4758c4..53a1da16f 100644 --- a/sample/chat-demo-mpp/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/chat-demo-mpp/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,6 +1,6 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformGoTrueConfig() { httpCallbackConfig { diff --git a/sample/chat-demo-mpp/common/src/iosMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/chat-demo-mpp/common/src/iosMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index efac2ce79..36d09a597 100644 --- a/sample/chat-demo-mpp/common/src/iosMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/chat-demo-mpp/common/src/iosMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,6 +1,6 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformGoTrueConfig() { scheme = "io.jan.supabase" diff --git a/sample/chat-demo-mpp/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/chat-demo-mpp/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index 494af766f..4e2982b2e 100644 --- a/sample/chat-demo-mpp/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/chat-demo-mpp/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,5 +1,5 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformGoTrueConfig() = Unit \ No newline at end of file diff --git a/sample/chat-demo-mpp/desktop/build.gradle.kts b/sample/chat-demo-mpp/desktop/build.gradle.kts index c10d86ef2..d25f2b617 100644 --- a/sample/chat-demo-mpp/desktop/build.gradle.kts +++ b/sample/chat-demo-mpp/desktop/build.gradle.kts @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" diff --git a/sample/chat-demo-mpp/web/build.gradle.kts b/sample/chat-demo-mpp/web/build.gradle.kts index c83841871..145a330db 100644 --- a/sample/chat-demo-mpp/web/build.gradle.kts +++ b/sample/chat-demo-mpp/web/build.gradle.kts @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" diff --git a/sample/file-upload/android/build.gradle.kts b/sample/file-upload/android/build.gradle.kts index c891011cb..107e26f7b 100644 --- a/sample/file-upload/android/build.gradle.kts +++ b/sample/file-upload/android/build.gradle.kts @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" dependencies { diff --git a/sample/file-upload/common/build.gradle.kts b/sample/file-upload/common/build.gradle.kts index 3319ee38e..5b98031ad 100644 --- a/sample/file-upload/common/build.gradle.kts +++ b/sample/file-upload/common/build.gradle.kts @@ -12,7 +12,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" kotlin { @@ -62,4 +62,4 @@ kotlin { } } -configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8) \ No newline at end of file +configureLibraryAndroidTarget("io.supabase.common", 26, JavaVersion.VERSION_1_8) \ No newline at end of file diff --git a/sample/file-upload/common/src/androidMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt b/sample/file-upload/common/src/androidMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt index cce04b0cd..c3a21dd64 100644 --- a/sample/file-upload/common/src/androidMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt +++ b/sample/file-upload/common/src/androidMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt @@ -1,7 +1,7 @@ package io.github.jan.supabase.common -import io.github.jan.supabase.storage.resumable.ResumableClient -import io.github.jan.supabase.storage.resumable.ResumableUpload +import io.supabase.storage.resumable.ResumableClient +import io.supabase.storage.resumable.ResumableUpload import io.github.vinceglb.filekit.core.PlatformFile import kotlinx.coroutines.Deferred diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/UploadViewModel.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/UploadViewModel.kt index 7fd8e9fb1..707bfb17f 100644 --- a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/UploadViewModel.kt +++ b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/UploadViewModel.kt @@ -1,12 +1,12 @@ package io.github.jan.supabase.common import androidx.compose.ui.ExperimentalComposeUiApi -import io.github.jan.supabase.annotations.SupabaseInternal -import io.github.jan.supabase.collections.AtomicMutableMap -import io.github.jan.supabase.storage.UploadStatus -import io.github.jan.supabase.storage.resumable.Fingerprint -import io.github.jan.supabase.storage.resumable.ResumableClient -import io.github.jan.supabase.storage.resumable.ResumableUpload +import io.supabase.annotations.SupabaseInternal +import io.supabase.collections.AtomicMutableMap +import io.supabase.storage.UploadStatus +import io.supabase.storage.resumable.Fingerprint +import io.supabase.storage.resumable.ResumableClient +import io.supabase.storage.resumable.ResumableUpload import io.github.vinceglb.filekit.core.PlatformFile import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Uploads.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Uploads.kt index f750e5cf7..f4f6bddd8 100644 --- a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Uploads.kt +++ b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Uploads.kt @@ -1,7 +1,7 @@ package io.github.jan.supabase.common -import io.github.jan.supabase.storage.resumable.Fingerprint -import io.github.jan.supabase.storage.resumable.ResumableUploadState +import io.supabase.storage.resumable.Fingerprint +import io.supabase.storage.resumable.ResumableUploadState import io.github.vinceglb.filekit.core.PlatformFile import io.ktor.utils.io.ByteReadChannel diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Utils.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Utils.kt index 782ffcd24..63cc0d327 100644 --- a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Utils.kt +++ b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/Utils.kt @@ -1,8 +1,8 @@ package io.github.jan.supabase.common import androidx.compose.ui.ExperimentalComposeUiApi -import io.github.jan.supabase.storage.resumable.ResumableClient -import io.github.jan.supabase.storage.resumable.ResumableUpload +import io.supabase.storage.resumable.ResumableClient +import io.supabase.storage.resumable.ResumableUpload import io.github.vinceglb.filekit.core.PlatformFile import kotlinx.coroutines.Deferred diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt index 49c91eff6..4f612d467 100644 --- a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt +++ b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt @@ -1,11 +1,11 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.annotations.SupabaseExperimental -import io.github.jan.supabase.createSupabaseClient -import io.github.jan.supabase.storage.Storage -import io.github.jan.supabase.storage.resumable.SettingsResumableCache -import io.github.jan.supabase.storage.storage +import io.supabase.SupabaseClient +import io.supabase.annotations.SupabaseExperimental +import io.supabase.createSupabaseClient +import io.supabase.storage.Storage +import io.supabase.storage.resumable.SettingsResumableCache +import io.supabase.storage.storage import org.koin.dsl.module const val BUCKET = "YOUR_BUCKET" diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/UploadCard.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/UploadCard.kt index 3e10259fc..fe7657b2d 100644 --- a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/UploadCard.kt +++ b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/components/UploadCard.kt @@ -34,8 +34,8 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import io.github.jan.supabase.common.ui.utils.fileSize -import io.github.jan.supabase.storage.UploadStatus -import io.github.jan.supabase.storage.resumable.ResumableUploadState +import io.supabase.storage.UploadStatus +import io.supabase.storage.resumable.ResumableUploadState fun fileIcon(extension: String): ImageVector { return when (extension) { diff --git a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/UploadScreen.kt b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/UploadScreen.kt index f948dde66..ce0bef675 100644 --- a/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/UploadScreen.kt +++ b/sample/file-upload/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/UploadScreen.kt @@ -42,7 +42,7 @@ import io.github.jan.supabase.common.UploadState import io.github.jan.supabase.common.UploadViewModel import io.github.jan.supabase.common.ui.components.UploadCard import io.github.jan.supabase.common.ui.utils.applyDragging -import io.github.jan.supabase.storage.resumable.Fingerprint +import io.supabase.storage.resumable.Fingerprint import io.github.vinceglb.filekit.compose.rememberFilePickerLauncher import io.github.vinceglb.filekit.core.PickerType diff --git a/sample/file-upload/common/src/desktopMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt b/sample/file-upload/common/src/desktopMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt index e7d57d630..fae4b1962 100644 --- a/sample/file-upload/common/src/desktopMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt +++ b/sample/file-upload/common/src/desktopMain/kotlin/io/github/jan/supabase/common/parseFileTreeFromPath.kt @@ -1,8 +1,8 @@ package io.github.jan.supabase.common -import io.github.jan.supabase.storage.continuePreviousFileUploads -import io.github.jan.supabase.storage.resumable.ResumableClient -import io.github.jan.supabase.storage.resumable.ResumableUpload +import io.supabase.storage.continuePreviousFileUploads +import io.supabase.storage.resumable.ResumableClient +import io.supabase.storage.resumable.ResumableUpload import io.github.vinceglb.filekit.core.PlatformFile import kotlinx.coroutines.Deferred import java.net.URI diff --git a/sample/file-upload/desktop/build.gradle.kts b/sample/file-upload/desktop/build.gradle.kts index 06bcd43cb..6956ae3e4 100644 --- a/sample/file-upload/desktop/build.gradle.kts +++ b/sample/file-upload/desktop/build.gradle.kts @@ -7,7 +7,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" diff --git a/sample/multi-factor-auth/android/build.gradle.kts b/sample/multi-factor-auth/android/build.gradle.kts index ce93657c9..1a3067fc1 100644 --- a/sample/multi-factor-auth/android/build.gradle.kts +++ b/sample/multi-factor-auth/android/build.gradle.kts @@ -6,7 +6,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" dependencies { diff --git a/sample/multi-factor-auth/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt b/sample/multi-factor-auth/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt index 66f6464a7..7684f600d 100644 --- a/sample/multi-factor-auth/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt +++ b/sample/multi-factor-auth/android/src/main/java/io/github/jan/supabase/android/MainActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.material3.MaterialTheme -import io.github.jan.supabase.auth.handleDeeplinks +import io.supabase.auth.handleDeeplinks import io.github.jan.supabase.common.App import io.github.jan.supabase.common.AppViewModel import org.koin.android.ext.android.inject diff --git a/sample/multi-factor-auth/common/build.gradle.kts b/sample/multi-factor-auth/common/build.gradle.kts index 148d73afc..d4c83e400 100644 --- a/sample/multi-factor-auth/common/build.gradle.kts +++ b/sample/multi-factor-auth/common/build.gradle.kts @@ -9,7 +9,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" @OptIn(ExperimentalKotlinGradlePluginApi::class) @@ -69,4 +69,4 @@ kotlin { } } -configureLibraryAndroidTarget("io.github.jan.supabase.common", 26, JavaVersion.VERSION_1_8) \ No newline at end of file +configureLibraryAndroidTarget("io.supabase.common", 26, JavaVersion.VERSION_1_8) \ No newline at end of file diff --git a/sample/multi-factor-auth/common/src/androidMain/AndroidManifest.xml b/sample/multi-factor-auth/common/src/androidMain/AndroidManifest.xml index 162b68251..568741e54 100644 --- a/sample/multi-factor-auth/common/src/androidMain/AndroidManifest.xml +++ b/sample/multi-factor-auth/common/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/sample/multi-factor-auth/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/multi-factor-auth/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index efac2ce79..36d09a597 100644 --- a/sample/multi-factor-auth/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/multi-factor-auth/common/src/androidMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,6 +1,6 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformGoTrueConfig() { scheme = "io.jan.supabase" diff --git a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt index ee81434f4..1c5151619 100644 --- a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt +++ b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/App.kt @@ -11,10 +11,10 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import io.github.jan.supabase.auth.status.SessionStatus import io.github.jan.supabase.common.ui.components.AlertDialog import io.github.jan.supabase.common.ui.screen.LoginScreen import io.github.jan.supabase.common.ui.screen.MfaScreen +import io.supabase.auth.status.SessionStatus @Composable fun App(viewModel: AppViewModel) { diff --git a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt index f0e6f6b5f..839702972 100644 --- a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt +++ b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/AppViewModel.kt @@ -1,13 +1,13 @@ package io.github.jan.supabase.common -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.auth.auth -import io.github.jan.supabase.auth.mfa.FactorType -import io.github.jan.supabase.auth.mfa.MfaFactor -import io.github.jan.supabase.auth.providers.Google -import io.github.jan.supabase.auth.providers.builtin.Email -import io.github.jan.supabase.exceptions.RestException +import io.supabase.SupabaseClient +import io.supabase.auth.auth +import io.supabase.auth.mfa.FactorType +import io.supabase.auth.mfa.MfaFactor +import io.supabase.auth.providers.Google +import io.supabase.auth.providers.builtin.Email +import io.supabase.exceptions.RestException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch diff --git a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt index c5aadbe0c..a44742337 100644 --- a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt +++ b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/di/supabaseModule.kt @@ -1,8 +1,8 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.auth.AuthConfig -import io.github.jan.supabase.createSupabaseClient +import io.supabase.auth.Auth +import io.supabase.auth.AuthConfig +import io.supabase.createSupabaseClient import org.koin.dsl.module expect fun AuthConfig.platformGoTrueConfig() diff --git a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaScreen.kt b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaScreen.kt index 2a5d04ec8..706666096 100644 --- a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaScreen.kt +++ b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaScreen.kt @@ -3,7 +3,7 @@ package io.github.jan.supabase.common.ui.screen import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue -import io.github.jan.supabase.auth.mfa.MfaStatus +import io.supabase.auth.mfa.MfaStatus import io.github.jan.supabase.common.AppViewModel @Composable diff --git a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaSetupScreen.kt b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaSetupScreen.kt index 8ad5636fd..9f9f69a92 100644 --- a/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaSetupScreen.kt +++ b/sample/multi-factor-auth/common/src/commonMain/kotlin/io/github/jan/supabase/common/ui/screen/MfaSetupScreen.kt @@ -25,8 +25,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.unit.dp -import io.github.jan.supabase.auth.mfa.FactorType -import io.github.jan.supabase.auth.mfa.MfaFactor +import io.supabase.auth.mfa.FactorType +import io.supabase.auth.mfa.MfaFactor import io.github.jan.supabase.common.AppViewModel import io.github.jan.supabase.common.ui.components.QRCode diff --git a/sample/multi-factor-auth/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/multi-factor-auth/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index daa63e2b1..91353c687 100644 --- a/sample/multi-factor-auth/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/multi-factor-auth/common/src/desktopMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,6 +1,6 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformGoTrueConfig() { httpCallbackConfig { htmlTitle = "Chat App" } diff --git a/sample/multi-factor-auth/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt b/sample/multi-factor-auth/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt index a0e2b25b3..57edcabea 100644 --- a/sample/multi-factor-auth/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt +++ b/sample/multi-factor-auth/common/src/jsMain/kotlin/io/github/jan/supabase/common/di/platformGoTrueConfig.kt @@ -1,6 +1,6 @@ package io.github.jan.supabase.common.di -import io.github.jan.supabase.auth.AuthConfig +import io.supabase.auth.AuthConfig actual fun AuthConfig.platformGoTrueConfig() { } \ No newline at end of file diff --git a/sample/multi-factor-auth/desktop/build.gradle.kts b/sample/multi-factor-auth/desktop/build.gradle.kts index 6d50bc950..ce5b1ce8b 100644 --- a/sample/multi-factor-auth/desktop/build.gradle.kts +++ b/sample/multi-factor-auth/desktop/build.gradle.kts @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" diff --git a/sample/multi-factor-auth/web/build.gradle.kts b/sample/multi-factor-auth/web/build.gradle.kts index 396e51c92..529b0f44d 100644 --- a/sample/multi-factor-auth/web/build.gradle.kts +++ b/sample/multi-factor-auth/web/build.gradle.kts @@ -5,7 +5,7 @@ plugins { alias(libs.plugins.kotlinx.plugin.serialization) } -group = "io.github.jan.supabase" +group = "io.supabase" version = "1.0-SNAPSHOT" diff --git a/serializers/Jackson/src/commonMain/kotlin/io/github/jan/supabase/serializer/JacksonSerializer.kt b/serializers/Jackson/src/commonMain/kotlin/io/github/jan/supabase/serializer/JacksonSerializer.kt index c6bedd760..d004e71f4 100644 --- a/serializers/Jackson/src/commonMain/kotlin/io/github/jan/supabase/serializer/JacksonSerializer.kt +++ b/serializers/Jackson/src/commonMain/kotlin/io/github/jan/supabase/serializer/JacksonSerializer.kt @@ -2,7 +2,7 @@ package io.github.jan.supabase.serializer import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import io.github.jan.supabase.SupabaseSerializer +import io.supabase.SupabaseSerializer import kotlin.reflect.KType import kotlin.reflect.javaType diff --git a/serializers/Jackson/src/commonTest/kotlin/JacksonSerializerTest.kt b/serializers/Jackson/src/commonTest/kotlin/JacksonSerializerTest.kt index 1690dda18..555630cf6 100644 --- a/serializers/Jackson/src/commonTest/kotlin/JacksonSerializerTest.kt +++ b/serializers/Jackson/src/commonTest/kotlin/JacksonSerializerTest.kt @@ -1,6 +1,6 @@ -import io.github.jan.supabase.encode import io.github.jan.supabase.serializer.JacksonSerializer -import io.github.jan.supabase.testing.createMockedSupabaseClient +import io.supabase.encode +import io.supabase.testing.createMockedSupabaseClient import kotlin.reflect.typeOf import kotlin.test.Test import kotlin.test.assertEquals diff --git a/serializers/Moshi/src/commonMain/kotlin/io/github/jan/supabase/serializer/MoshiSerializer.kt b/serializers/Moshi/src/commonMain/kotlin/io/github/jan/supabase/serializer/MoshiSerializer.kt index 230336fb3..8771b898b 100644 --- a/serializers/Moshi/src/commonMain/kotlin/io/github/jan/supabase/serializer/MoshiSerializer.kt +++ b/serializers/Moshi/src/commonMain/kotlin/io/github/jan/supabase/serializer/MoshiSerializer.kt @@ -3,7 +3,7 @@ package io.github.jan.supabase.serializer import com.squareup.moshi.Moshi import com.squareup.moshi.adapter import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory -import io.github.jan.supabase.SupabaseSerializer +import io.supabase.SupabaseSerializer import kotlin.reflect.KType /** diff --git a/serializers/Moshi/src/commonTest/kotlin/MoshiSerializerTest.kt b/serializers/Moshi/src/commonTest/kotlin/MoshiSerializerTest.kt index 0f2e925a2..0981c038c 100644 --- a/serializers/Moshi/src/commonTest/kotlin/MoshiSerializerTest.kt +++ b/serializers/Moshi/src/commonTest/kotlin/MoshiSerializerTest.kt @@ -1,6 +1,6 @@ -import io.github.jan.supabase.encode import io.github.jan.supabase.serializer.MoshiSerializer -import io.github.jan.supabase.testing.createMockedSupabaseClient +import io.supabase.encode +import io.supabase.testing.createMockedSupabaseClient import org.junit.Test import kotlin.reflect.typeOf import kotlin.test.assertEquals diff --git a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/KtorUtils.kt b/test-common/src/commonMain/kotlin/io/supabase/testing/KtorUtils.kt similarity index 96% rename from test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/KtorUtils.kt rename to test-common/src/commonMain/kotlin/io/supabase/testing/KtorUtils.kt index a36a4d7fd..e4c55a9dc 100644 --- a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/KtorUtils.kt +++ b/test-common/src/commonMain/kotlin/io/supabase/testing/KtorUtils.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.testing +package io.supabase.testing import io.ktor.client.engine.mock.MockRequestHandleScope import io.ktor.client.engine.mock.respond diff --git a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/RouteUtils.kt b/test-common/src/commonMain/kotlin/io/supabase/testing/RouteUtils.kt similarity index 73% rename from test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/RouteUtils.kt rename to test-common/src/commonMain/kotlin/io/supabase/testing/RouteUtils.kt index 0fcdf0cfa..bdf13b239 100644 --- a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/RouteUtils.kt +++ b/test-common/src/commonMain/kotlin/io/supabase/testing/RouteUtils.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.testing +package io.supabase.testing import io.ktor.http.Url diff --git a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/SupabaseClientMock.kt b/test-common/src/commonMain/kotlin/io/supabase/testing/SupabaseClientMock.kt similarity index 80% rename from test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/SupabaseClientMock.kt rename to test-common/src/commonMain/kotlin/io/supabase/testing/SupabaseClientMock.kt index 6ec774f9a..7338708c2 100644 --- a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/SupabaseClientMock.kt +++ b/test-common/src/commonMain/kotlin/io/supabase/testing/SupabaseClientMock.kt @@ -1,13 +1,13 @@ -package io.github.jan.supabase.testing +package io.supabase.testing -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.createSupabaseClient import io.ktor.client.engine.mock.MockEngine import io.ktor.client.engine.mock.MockRequestHandleScope import io.ktor.client.engine.mock.respond import io.ktor.client.request.HttpRequestData import io.ktor.client.request.HttpResponseData +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.createSupabaseClient fun createMockedSupabaseClient( supabaseUrl: String = "https://projectref.supabase.co", diff --git a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/TestUtils.kt b/test-common/src/commonMain/kotlin/io/supabase/testing/TestUtils.kt similarity index 88% rename from test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/TestUtils.kt rename to test-common/src/commonMain/kotlin/io/supabase/testing/TestUtils.kt index c819d1986..87a5a9e1a 100644 --- a/test-common/src/commonMain/kotlin/io/github/jan/supabase/testing/TestUtils.kt +++ b/test-common/src/commonMain/kotlin/io/supabase/testing/TestUtils.kt @@ -1,4 +1,4 @@ -package io.github.jan.supabase.testing +package io.supabase.testing import io.ktor.http.HttpMethod import kotlin.test.assertEquals diff --git a/test-common/src/commonTest/kotlin/DummySerializer.kt b/test-common/src/commonTest/kotlin/DummySerializer.kt index eeb912f79..d2728a6aa 100644 --- a/test-common/src/commonTest/kotlin/DummySerializer.kt +++ b/test-common/src/commonTest/kotlin/DummySerializer.kt @@ -1,4 +1,4 @@ -import io.github.jan.supabase.SupabaseSerializer +import io.supabase.SupabaseSerializer import kotlin.reflect.KType class DummySerializer: SupabaseSerializer { diff --git a/test-common/src/commonTest/kotlin/SupabaseClientTest.kt b/test-common/src/commonTest/kotlin/SupabaseClientTest.kt index 50a896852..343129183 100644 --- a/test-common/src/commonTest/kotlin/SupabaseClientTest.kt +++ b/test-common/src/commonTest/kotlin/SupabaseClientTest.kt @@ -1,8 +1,8 @@ -import io.github.jan.supabase.BuildConfig -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.logging.LogLevel -import io.github.jan.supabase.testing.createMockedSupabaseClient import io.ktor.client.engine.mock.respond +import io.supabase.BuildConfig +import io.supabase.SupabaseClient +import io.supabase.logging.LogLevel +import io.supabase.testing.createMockedSupabaseClient import kotlinx.coroutines.test.runTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/test-common/src/commonTest/kotlin/TestPlugin.kt b/test-common/src/commonTest/kotlin/TestPlugin.kt index de5aec80f..510e6465e 100644 --- a/test-common/src/commonTest/kotlin/TestPlugin.kt +++ b/test-common/src/commonTest/kotlin/TestPlugin.kt @@ -1,8 +1,8 @@ -import io.github.jan.supabase.SupabaseClient -import io.github.jan.supabase.SupabaseClientBuilder -import io.github.jan.supabase.logging.SupabaseLogger -import io.github.jan.supabase.plugins.SupabasePlugin -import io.github.jan.supabase.plugins.SupabasePluginProvider +import io.supabase.SupabaseClient +import io.supabase.SupabaseClientBuilder +import io.supabase.logging.SupabaseLogger +import io.supabase.plugins.SupabasePlugin +import io.supabase.plugins.SupabasePluginProvider class TestPlugin(override val config: Config, override val supabaseClient: SupabaseClient) : SupabasePlugin {