CalvinBackup/tauri
1
0
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2026-04-01 10:01:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): ios command wrong cwd on bun 1.2, closes #12965 (#12977)

Browse Source 
bun 1.2 changed the current working directory behavior to match NPM managers, so we must adapt our xcode-script logic to check the bun version

see https://bun.sh/blog/bun-v1.2#bun-run-uses-the-correct-directory
This commit is contained in:
Lucas Fernandes Nogueira
2025-03-14 16:20:39 -03:00
committed by GitHub
parent 3cc4ad3c38
commit b83921226c
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/fix-ios-bun-1.2.md Normal file
View File

@@ -0,0 +1,6 @@
---
"tauri-cli": patch:bug
"@tauri-apps/cli": patch:bug
---
Fix `tauri ios` commands using the wrong working directory with `bun@>1.2`.

8
crates/tauri-cli/src/mobile/ios/xcode_script.rs
View File

@@ -65,10 +65,14 @@ pub fn command(options: Options) -> Result<()> {
}
}
// `xcode-script` is ran from the `gen/apple` folder when not using NPM.
// `xcode-script` is ran from the `gen/apple` folder when not using NPM/yarn/pnpm.
// so we must change working directory to the src-tauri folder to resolve the tauri dir
// additionally, bun@<1.2 does not modify the current working directory, so it is also runs this script from `gen/apple`
// bun@>1.2 now actually moves the CWD to the package root so we shouldn't modify CWD in that case
// see https://bun.sh/blog/bun-v1.2#bun-run-uses-the-correct-directory
if (var_os("npm_lifecycle_event").is_none() && var_os("PNPM_PACKAGE_NAME").is_none())
|| var("npm_config_user_agent").is_ok_and(|agent| agent.starts_with("bun"))
|| var("npm_config_user_agent")
.is_ok_and(|agent| agent.starts_with("bun/1.0") || agent.starts_with("bun/1.1"))
{
set_current_dir(current_dir()?.parent().unwrap().parent().unwrap()).unwrap();
}