fix(shell): use serde untagged not flatten (#1328)

tauri-apps · May 21, 2024 · cb0a788 · cb0a788
1 parent db45dfa
commit cb0a788
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.changes/shell-execute-return.md b/.changes/shell-execute-return.md
@@ -0,0 +1,5 @@
+---
+"shell": "patch"
+---
+
+Fix a regression introduce in the last release where The JS API `Command.execute()` returned malformed response.
diff --git a/plugins/shell/src/commands.rs b/plugins/shell/src/commands.rs
@@ -170,6 +170,7 @@ fn prepare_cmd<R: Runtime>(
 }
 
 #[derive(Serialize)]
+#[serde(untagged)]
 enum Output {
     String(String),
     Raw(Vec<u8>),
@@ -179,9 +180,7 @@ enum Output {
 pub struct ChildProcessReturn {
     code: Option<i32>,
     signal: Option<i32>,
-    #[serde(flatten)]
     stdout: Output,
-    #[serde(flatten)]
     stderr: Output,
 }