CLI fixes for hotpatching the playground

Cargo.toml

@@ -182,6 +182,7 @@ dioxus-native = { path = "packages/native", version = "0.7.0-rc.0" }
 dioxus-native-dom = { path = "packages/native-dom", version = "0.7.0-rc.0" }
 dioxus-asset-resolver = { path = "packages/asset-resolver", version = "0.7.0-rc.0" }
 dioxus-config-macros = { path = "packages/config-macros", version = "0.7.0-rc.0" }
+dioxus-component-manifest = { path = "packages/component-manifest", version = "0.7.0-rc.0" }
 
 generational-box = { path = "packages/generational-box", version = "0.7.0-rc.0" }
 lazy-js-bundle = { path = "packages/lazy-js-bundle", version = "0.7.0-rc.0" }
@@ -244,7 +245,7 @@ futures-util = { version = "0.3", default-features = false }
 rustc-hash = "2.1.1"
 wasm-bindgen = "0.2.100"
 wasm-bindgen-futures = "0.4.50"
-js-sys = "0.3.77"
+js-sys = "0.3"
 web-sys = { version = "0.3.77", default-features = false }
 html_parser = "0.7.0"
 thiserror = "2.0.12"

packages/cli/Cargo.toml

@@ -27,6 +27,7 @@ wasm-split-cli = { workspace = true }
 depinfo = { workspace = true }
 subsecond-types = { workspace = true }
 dioxus-cli-telemetry = { workspace =  true }
+dioxus-component-manifest = { workspace = true }
 
 clap = { workspace = true, features = ["derive", "cargo"] }
 convert_case = { workspace = true }
@@ -78,6 +79,7 @@ dunce = { workspace = true }
 dirs = { workspace = true }
 reqwest = { workspace = true, features = ["rustls-tls", "trust-dns", "json"] }
 tower = { workspace = true }
+git2 = "0.20.2"
 
 # path lookup
 which = { version = "8.0.0" }

packages/cli/src/build/builder.rs

@@ -1,6 +1,6 @@
 use crate::{
-    serve::WebServer, BuildArtifacts, BuildRequest, BuildStage, BuilderUpdate, BundleFormat,
-    ProgressRx, ProgressTx, Result, RustcArgs, StructuredOutput,
+    serve::WebServer, verbosity_or_default, BuildArtifacts, BuildRequest, BuildStage,
+    BuilderUpdate, BundleFormat, ProgressRx, ProgressTx, Result, RustcArgs, StructuredOutput,
 };
 use anyhow::{bail, Context};
 use dioxus_cli_opt::process_file_to;
@@ -484,11 +484,7 @@ impl AppBuilder {
             ));
         }
 
-        if crate::VERBOSITY
-            .get()
-            .map(|f| f.verbose)
-            .unwrap_or_default()
-        {
+        if verbosity_or_default().verbose {
             envs.push(("RUST_BACKTRACE".into(), "1".to_string()));
         }
 
@@ -687,7 +683,10 @@ impl AppBuilder {
 
         tracing::debug!("Patching {} -> {}", original.display(), new.display());
 
-        let mut jump_table = crate::build::create_jump_table(&new, &triple, cache)?;
+        let root_dir = self.build.root_dir();
+        let base_path = self.build.base_path();
+        let mut jump_table =
+            crate::build::create_jump_table(&new, &triple, &root_dir, base_path.as_deref(), cache)?;
 
         // If it's android, we need to copy the assets to the device and then change the location of the patch
         if self.build.bundle == BundleFormat::Android {
@@ -696,16 +695,6 @@ impl AppBuilder {
                 .await?;
         }
 
-        // Rebase the wasm binary to be relocatable once the jump table is generated
-        if triple.architecture == target_lexicon::Architecture::Wasm32 {
-            // Make sure we use the dir relative to the public dir, so the web can load it as a proper URL
-            //
-            // ie we would've shipped `/Users/foo/Projects/dioxus/target/dx/project/debug/web/public/wasm/lib.wasm`
-            //    but we want to ship `/wasm/lib.wasm`
-            jump_table.lib =
-                PathBuf::from("/").join(jump_table.lib.strip_prefix(self.build.root_dir()).unwrap())
-        }
-
         let changed_files = match &res.mode {
             BuildMode::Thin { changed_files, .. } => changed_files.clone(),
             _ => vec![],

packages/cli/src/build/patch.rs

@@ -294,17 +294,32 @@ impl HotpatchModuleCache {
 pub fn create_jump_table(
     patch: &Path,
     triple: &Triple,
+    root_dir: &Path,
+    base_path: Option<&str>,
     cache: &HotpatchModuleCache,
 ) -> Result<JumpTable> {
     // Symbols are stored differently based on the platform, so we need to handle them differently.
     // - Wasm requires the walrus crate and actually modifies the patch file
     // - windows requires the pdb crate and pdb files
     // - nix requires the object crate
-    match triple.operating_system {
-        OperatingSystem::Windows => create_windows_jump_table(patch, cache),
-        _ if triple.architecture == Architecture::Wasm32 => create_wasm_jump_table(patch, cache),
-        _ => create_native_jump_table(patch, triple, cache),
+    let mut jump_table = match triple.operating_system {
+        OperatingSystem::Windows => create_windows_jump_table(patch, cache)?,
+        _ if triple.architecture == Architecture::Wasm32 => create_wasm_jump_table(patch, cache)?,
+        _ => create_native_jump_table(patch, triple, cache)?,
+    };
+
+    // Rebase the wasm binary to be relocatable once the jump table is generated
+    if triple.architecture == target_lexicon::Architecture::Wasm32 {
+        // Make sure we use the dir relative to the public dir, so the web can load it as a proper URL
+        //
+        // ie we would've shipped `/Users/foo/Projects/dioxus/target/dx/project/debug/web/public/wasm/lib.wasm`
+        //    but we want to ship `/wasm/lib.wasm`
+        jump_table.lib =
+            PathBuf::from("/".to_string() + base_path.unwrap_or_default().trim_start_matches('/'))
+                .join(jump_table.lib.strip_prefix(root_dir).unwrap())
     }
+
+    Ok(jump_table)
 }
 
 fn create_windows_jump_table(patch: &Path, cache: &HotpatchModuleCache) -> Result<JumpTable> {

packages/cli/src/build/request.rs

@@ -320,9 +320,9 @@
 //! - xbuild: <https://github.com/rust-mobile/xbuild/blob/master/xbuild/src/command/build.rs>
 
 use crate::{
-    AndroidTools, BuildContext, BundleFormat, DioxusConfig, Error, LinkAction, LinkerFlavor,
-    Platform, Renderer, Result, RustcArgs, TargetArgs, TraceSrc, WasmBindgen, WasmOptConfig,
-    Workspace, DX_RUSTC_WRAPPER_ENV_VAR,
+    verbosity_or_default, AndroidTools, BuildContext, BundleFormat, DioxusConfig, Error,
+    LinkAction, LinkerFlavor, Platform, Renderer, Result, RustcArgs, TargetArgs, TraceSrc,
+    WasmBindgen, WasmOptConfig, Workspace, DX_RUSTC_WRAPPER_ENV_VAR,
 };
 use anyhow::{bail, Context};
 use cargo_metadata::diagnostic::Diagnostic;
@@ -2512,7 +2512,7 @@ impl BuildRequest {
         cargo_args.push(self.executable_name().to_string());
 
         // Set offline/locked/frozen
-        let lock_opts = crate::VERBOSITY.get().cloned().unwrap_or_default();
+        let lock_opts = verbosity_or_default();
         if lock_opts.frozen {
             cargo_args.push("--frozen".to_string());
         }