From f6eb8dbe994e1c853de3e0dac3f0c07484aa7e65 Mon Sep 17 00:00:00 2001
From: Lucas Nogueira <lucas@tauri.app>
Date: Tue, 2 Sep 2025 21:20:08 -0300
Subject: [PATCH] update

---
 Cargo.lock                                    | 24 +++++++++----------
 crates/tauri-cli/src/mobile/mod.rs            |  1 +
 .../mobile/open-harmony/entry/hvigorfile.ts   |  4 ++--
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f07e06b7..45b4c6f5c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1058,7 +1058,7 @@ dependencies = [
 [[package]]
 name = "cargo-mobile2"
 version = "0.20.7"
-source = "git+https://github.com/tauri-apps/cargo-mobile2?branch=feat/ohos#7e25240a471c7e17b7a77e8ef215061d19866dcc"
+source = "git+https://github.com/tauri-apps/cargo-mobile2?branch=feat/ohos#5a7802104989d125a6962c87c1cc1ef89440f6c7"
 dependencies = [
  "colored",
  "core-foundation 0.10.0",
@@ -1321,7 +1321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2388,7 +2388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4357,7 +4357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -6666,7 +6666,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7385,7 +7385,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7398,7 +7398,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.9.4",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -8681,8 +8681,8 @@ dependencies = [
 
 [[package]]
 name = "tao"
-version = "0.34.2"
-source = "git+https://github.com/richerfu/tao?branch=feat-ohos-webview#efdfe5d002879fa51c0d6508cc2c295c1f3b31b6"
+version = "0.34.3"
+source = "git+https://github.com/richerfu/tao?branch=feat-ohos-webview#fd7ce5c8dcc02df3f5a955eec317db62cbe5ea46"
 dependencies = [
  "bitflags 2.7.0",
  "block2 0.6.0",
@@ -8734,7 +8734,7 @@ dependencies = [
 [[package]]
 name = "tao-macros"
 version = "0.1.3"
-source = "git+https://github.com/richerfu/tao?branch=feat-ohos-webview#efdfe5d002879fa51c0d6508cc2c295c1f3b31b6"
+source = "git+https://github.com/richerfu/tao?branch=feat-ohos-webview#fd7ce5c8dcc02df3f5a955eec317db62cbe5ea46"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9281,7 +9281,7 @@ dependencies = [
  "getrandom 0.2.15",
  "once_cell",
  "rustix 0.38.43",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -10597,7 +10597,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
diff --git a/crates/tauri-cli/src/mobile/mod.rs b/crates/tauri-cli/src/mobile/mod.rs
index 00db4e444..f7164d38d 100644
--- a/crates/tauri-cli/src/mobile/mod.rs
+++ b/crates/tauri-cli/src/mobile/mod.rs
@@ -354,6 +354,7 @@ fn env_vars() -> HashMap<String, OsString> {
       || k.starts_with("WRY")
       || k.starts_with("CARGO_")
       || k.starts_with("RUST_")
+      || k.starts_with("OHOS")
       || k == "TMPDIR"
       || k == "PATH"
     {
diff --git a/crates/tauri-cli/templates/mobile/open-harmony/entry/hvigorfile.ts b/crates/tauri-cli/templates/mobile/open-harmony/entry/hvigorfile.ts
index 1600dc3a8..970de55e6 100644
--- a/crates/tauri-cli/templates/mobile/open-harmony/entry/hvigorfile.ts
+++ b/crates/tauri-cli/templates/mobile/open-harmony/entry/hvigorfile.ts
@@ -16,13 +16,13 @@ function tauriPlugin(): HvigorPlugin {
         const properties = hvigor.getParameter().getProperties();
         const target = properties.target || "aarch64";
         execFileSync(`{{tauri-binary}}`,
-          [{{quote-and-join tauri-binary-args}}, "--target", target], {
+          [{{quote-and-join tauri-binary-args}}, "--target", target.toString()], {
             cwd: resolve(__dirname, "{{root-dir-rel}}"),
             stdio: "inherit",
           });
       }
 
-      node.getTaskByName('default@ConfigureCmake').afterRun(buildRustCode);
+      node.getTaskByName('default@ConfigureCmake')!.afterRun(buildRustCode);
     }
   }
 }