Skip to content

Commit e538ba5

Browse files
authored
fix(cli): process spawn not working on Node.js for mobile commands, closes #6203 (#8949)
1 parent 84c783f commit e538ba5

File tree

6 files changed

+24
-5
lines changed

6 files changed

+24
-5
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"tauri-cli": patch:bug
3+
"@tauri-apps/cli": patch:bug
4+
---
5+
6+
Fixes android and iOS process spawning not working on Node.js.

core/tauri/permissions/window/autogenerated/reference.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,14 @@ Enables the primary_monitor command without any pre-configured scope.
200200

201201
Denies the primary_monitor command without any pre-configured scope.
202202

203+
## allow-reparent
204+
205+
Enables the reparent command without any pre-configured scope.
206+
207+
## deny-reparent
208+
209+
Denies the reparent command without any pre-configured scope.
210+
203211
## allow-request-user-attention
204212

205213
Enables the request_user_attention command without any pre-configured scope.

core/tauri/src/window/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use crate::{
2020
runtime::{
2121
monitor::Monitor as RuntimeMonitor,
2222
window::{DetachedWindow, PendingWindow, WindowBuilder as _},
23-
ProgressBarStatus, RuntimeHandle, WindowDispatch,
23+
RuntimeHandle, WindowDispatch,
2424
},
2525
sealed::ManagerBase,
2626
sealed::RuntimeOrDispatch,
@@ -1939,7 +1939,7 @@ tauri::Builder::default()
19391939
#[derive(serde::Deserialize)]
19401940
pub struct ProgressBarState {
19411941
/// The progress bar status.
1942-
pub status: Option<ProgressBarStatus>,
1942+
pub status: Option<crate::runtime::ProgressBarStatus>,
19431943
/// The progress bar progress. This can be a value ranging from `0` to `100`
19441944
pub progress: Option<u64>,
19451945
}

tooling/cli/Cargo.lock

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tooling/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ name = "cargo-tauri"
3939
path = "src/main.rs"
4040

4141
[dependencies]
42-
cargo-mobile2 = { version = "0.10", default-features = false }
42+
cargo-mobile2 = { version = "0.10.1", default-features = false }
4343
jsonrpsee = { version = "0.20", features = [ "server" ] }
4444
jsonrpsee-core = "0.20"
4545
jsonrpsee-client-transport = { version = "0.20", features = [ "ws" ] }

tooling/cli/src/mobile/ios/project.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ pub fn gen(
190190
&dest.join("project.yml").to_string_lossy(),
191191
],
192192
)
193+
.stdout_file(os_pipe::dup_stdout().unwrap())
194+
.stderr_file(os_pipe::dup_stderr().unwrap())
193195
.run()
194196
.with_context(|| "failed to run `xcodegen`")?;
195197

@@ -201,6 +203,8 @@ pub fn gen(
201203
&format!("--project-directory={}", dest.display()),
202204
],
203205
)
206+
.stdout_file(os_pipe::dup_stdout().unwrap())
207+
.stderr_file(os_pipe::dup_stderr().unwrap())
204208
.run()
205209
.with_context(|| "failed to run `pod install`")?;
206210
}

0 commit comments

Comments
 (0)