Merge branch 'main' into develop

darksoil-studio · Oct 24, 2024 · 601ce5a · 601ce5a
2 parents c5e3476 + b78ab78
commit 601ce5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/crates/scaffold-tauri-happ/src/lib.rs b/crates/scaffold-tauri-happ/src/lib.rs
@@ -205,7 +205,7 @@ pub fn scaffold_tauri_happ(
             let package_json_content = add_npm_script_to_package(
                 &(root_package_json_path.clone(), package_json_content),
                 &String::from("build:zomes"),
-                &format!("CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown --workspace --exclude {app_name}"),
+                &format!("CARGO_TARGET_DIR=target cargo build --release --target wasm32-unknown-unknown --workspace --exclude {app_name}-tauri"),
             )?;
             let package_json_content = add_npm_script_to_package(
                 &(root_package_json_path.clone(), package_json_content),

diff --git a/crates/scaffold-tauri-happ/templates/end-user-happ/src-tauri/Cargo.toml.hbs b/crates/scaffold-tauri-happ/templates/end-user-happ/src-tauri/Cargo.toml.hbs
@@ -1,5 +1,5 @@
 [package]
-name = "{{app_name}}"
+name = "{{app_name}}-tauri"
 version = "0.0.0"
 description = "{{title_case app_name}}"
 authors = ["you"]