Skip to content

Commit

Permalink
fix(cli): process spawn not working on Node.js for mobile commands, c…
Browse files Browse the repository at this point in the history
…loses #6203 (#8949)
  • Loading branch information
lucasfernog authored Feb 22, 2024
1 parent 84c783f commit e538ba5
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .changes/fix-mobile-process-spawn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---

Fixes android and iOS process spawning not working on Node.js.
8 changes: 8 additions & 0 deletions core/tauri/permissions/window/autogenerated/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,14 @@ Enables the primary_monitor command without any pre-configured scope.

Denies the primary_monitor command without any pre-configured scope.

## allow-reparent

Enables the reparent command without any pre-configured scope.

## deny-reparent

Denies the reparent command without any pre-configured scope.

## allow-request-user-attention

Enables the request_user_attention command without any pre-configured scope.
Expand Down
4 changes: 2 additions & 2 deletions core/tauri/src/window/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::{
runtime::{
monitor::Monitor as RuntimeMonitor,
window::{DetachedWindow, PendingWindow, WindowBuilder as _},
ProgressBarStatus, RuntimeHandle, WindowDispatch,
RuntimeHandle, WindowDispatch,
},
sealed::ManagerBase,
sealed::RuntimeOrDispatch,
Expand Down Expand Up @@ -1939,7 +1939,7 @@ tauri::Builder::default()
#[derive(serde::Deserialize)]
pub struct ProgressBarState {
/// The progress bar status.
pub status: Option<ProgressBarStatus>,
pub status: Option<crate::runtime::ProgressBarStatus>,
/// The progress bar progress. This can be a value ranging from `0` to `100`
pub progress: Option<u64>,
}
Expand Down
5 changes: 3 additions & 2 deletions tooling/cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tooling/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ name = "cargo-tauri"
path = "src/main.rs"

[dependencies]
cargo-mobile2 = { version = "0.10", default-features = false }
cargo-mobile2 = { version = "0.10.1", default-features = false }
jsonrpsee = { version = "0.20", features = [ "server" ] }
jsonrpsee-core = "0.20"
jsonrpsee-client-transport = { version = "0.20", features = [ "ws" ] }
Expand Down
4 changes: 4 additions & 0 deletions tooling/cli/src/mobile/ios/project.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ pub fn gen(
&dest.join("project.yml").to_string_lossy(),
],
)
.stdout_file(os_pipe::dup_stdout().unwrap())
.stderr_file(os_pipe::dup_stderr().unwrap())
.run()
.with_context(|| "failed to run `xcodegen`")?;

Expand All @@ -201,6 +203,8 @@ pub fn gen(
&format!("--project-directory={}", dest.display()),
],
)
.stdout_file(os_pipe::dup_stdout().unwrap())
.stderr_file(os_pipe::dup_stderr().unwrap())
.run()
.with_context(|| "failed to run `pod install`")?;
}
Expand Down

0 comments on commit e538ba5

Please sign in to comment.