diff --git a/packages/cli/src/build/builder.rs b/packages/cli/src/build/builder.rs index 9099242213..f29d877763 100644 --- a/packages/cli/src/build/builder.rs +++ b/packages/cli/src/build/builder.rs @@ -758,10 +758,10 @@ impl AppBuilder { /// Check if we need to use https or not, and if so, add the protocol. /// Go to the basepath if that's set too. fn open_web(&self, address: SocketAddr) { - let base_path = self.build.config.web.app.base_path.clone(); + let base_path = self.build.base_path(); let https = self.build.config.web.https.enabled.unwrap_or_default(); let protocol = if https { "https" } else { "http" }; - let base_path = match base_path.as_deref() { + let base_path = match base_path { Some(base_path) => format!("/{}", base_path.trim_matches('/')), None => "".to_owned(), }; @@ -1380,10 +1380,10 @@ We checked the folder: {} // code --open-url "vscode://DioxusLabs.dioxus/debugger?uri=http://127.0.0.1:8080" // todo - debugger could open to the *current* page afaik we don't have a way to have that info let address = server.devserver_address(); - let base_path = self.build.config.web.app.base_path.clone(); + let base_path = self.build.base_path(); let https = self.build.config.web.https.enabled.unwrap_or_default(); let protocol = if https { "https" } else { "http" }; - let base_path = match base_path.as_deref() { + let base_path = match base_path { Some(base_path) => format!("/{}", base_path.trim_matches('/')), None => "".to_owned(), }; diff --git a/packages/cli/src/build/request.rs b/packages/cli/src/build/request.rs index 96f129bed0..ab16830b46 100644 --- a/packages/cli/src/build/request.rs +++ b/packages/cli/src/build/request.rs @@ -388,6 +388,7 @@ pub(crate) struct BuildRequest { pub(crate) link_args_file: Arc, pub(crate) link_err_file: Arc, pub(crate) rustc_wrapper_args_file: Arc, + pub(crate) base_path: Option, } /// dx can produce different "modes" of a build. A "regular" build is a "base" build. The Fat and Thin @@ -727,6 +728,7 @@ impl BuildRequest { release, package, skip_assets: args.skip_assets, + base_path: args.base_path.clone(), wasm_split: args.wasm_split, debug_symbols: args.debug_symbols, inject_loading_scripts: args.inject_loading_scripts, @@ -4045,11 +4047,9 @@ r#"