From 1ed814668a733bc261453cb1e0a720baf635ef0a Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Fri, 18 Aug 2023 11:12:56 -0500 Subject: [PATCH] Set an environment variable during serve for bundling --- packages/cli/src/server/desktop/mod.rs | 5 ++++- packages/desktop/src/protocol.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/server/desktop/mod.rs b/packages/cli/src/server/desktop/mod.rs index 9b79bdea9..0cd21d1b6 100644 --- a/packages/cli/src/server/desktop/mod.rs +++ b/packages/cli/src/server/desktop/mod.rs @@ -240,7 +240,10 @@ pub fn start_desktop(config: &CrateConfig) -> Result<(Child, BuildResult)> { if cfg!(windows) { file.set_extension("exe"); } - let child = Command::new(file.to_str().unwrap()).spawn()?; + let active = "DIOXUS_ACTIVE"; + let child = Command::new(file.to_str().unwrap()) + .env(active, "true") + .spawn()?; Ok((child, result)) } diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs index 8ec5e1821..3d03ac3eb 100644 --- a/packages/desktop/src/protocol.rs +++ b/packages/desktop/src/protocol.rs @@ -158,7 +158,7 @@ fn get_asset_root() -> Option { */ - if std::env::var_os("CARGO").is_some() { + if std::env::var_os("CARGO").is_some() || std::env::var_os("DIOXUS_ACTIVE").is_some() { return None; }