chore: merge with main

This commit is contained in:
Zack Fu Zi Xiang 2024-10-29 09:49:42 +08:00
commit 7bcb6cf5f4
No known key found for this signature in database
1 changed files with 15 additions and 15 deletions

View File

@ -5,28 +5,28 @@ use std::env;
use tracing::warn;
use uuid::Uuid;
//
// #[cfg(not(target_arch = "wasm32"))]
// lazy_static! {
// pub static ref LOCALHOST_URL: Cow<'static, str> =
// get_env_var("LOCALHOST_URL", "http://localhost:8000");
// pub static ref LOCALHOST_WS: Cow<'static, str> =
// get_env_var("LOCALHOST_WS", "ws://localhost:8000/ws/v1");
// pub static ref LOCALHOST_GOTRUE: Cow<'static, str> =
// get_env_var("LOCALHOST_GOTRUE", "http://localhost:9999");
// }
// Use following configuration when using local server with nginx
//
#[cfg(not(target_arch = "wasm32"))]
lazy_static! {
pub static ref LOCALHOST_URL: Cow<'static, str> =
get_env_var("LOCALHOST_URL", "http://localhost");
get_env_var("LOCALHOST_URL", "http://localhost:8000");
pub static ref LOCALHOST_WS: Cow<'static, str> =
get_env_var("LOCALHOST_WS", "ws://localhost/ws/v1");
get_env_var("LOCALHOST_WS", "ws://localhost:8000/ws/v1");
pub static ref LOCALHOST_GOTRUE: Cow<'static, str> =
get_env_var("LOCALHOST_GOTRUE", "http://localhost/gotrue");
get_env_var("LOCALHOST_GOTRUE", "http://localhost:9999");
}
// Use following configuration when using local server with nginx
//
// #[cfg(not(target_arch = "wasm32"))]
// lazy_static! {
// pub static ref LOCALHOST_URL: Cow<'static, str> =
// get_env_var("LOCALHOST_URL", "http://localhost");
// pub static ref LOCALHOST_WS: Cow<'static, str> =
// get_env_var("LOCALHOST_WS", "ws://localhost/ws/v1");
// pub static ref LOCALHOST_GOTRUE: Cow<'static, str> =
// get_env_var("LOCALHOST_GOTRUE", "http://localhost/gotrue");
// }
// The env vars are not available in wasm32-unknown-unknown
#[cfg(target_arch = "wasm32")]
lazy_static! {