Skip to content

Commit 01d3b20

Browse files
authored
Merge branch 'tauri-apps:dev' into patch-pub-runtime-wry
2 parents 9076e0e + b821796 commit 01d3b20

File tree

31 files changed

+1115
-471
lines changed

31 files changed

+1115
-471
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
tauri-bundler: patch:bug
3+
---
4+
5+
Fix NSIS per-machine installer not requesting elevation when run by non-admin users.

.changes/install-ios-deps.md

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+
Install iOS dependencies when needed.

.changes/mobile-external-urls.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri": patch:bug
3+
---
4+
5+
Fixes loading external URLs in mobile development mode.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
tauri: "minor:feat"
3+
---
4+
5+
Added `tauri::plugin::Builder::js_init_script_on_all_frames` that allows plugins to add initialization scripts that runs on all frames
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
tauri: "minor:enhance"
3+
---
4+
5+
`tauri::plugin::Builder::js_init_script` now takes `impl Into<String>` instead of `String`

.changes/proxy-body.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"tauri": patch:bug
3+
---
4+
5+
Forward request body on the mobile frontend proxy.

.changes/runner-object-config.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'tauri-cli': 'minor:feat'
3+
'tauri-utils': 'minor:feat'
4+
---
5+
6+
Allow runner configuration to be an object with cmd, cwd, and args properties. The runner can now be configured as `{ "cmd": "my_runner", "cwd": "/path", "args": ["--quiet"] }` while maintaining backwards compatibility with the existing string format.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@tauri-apps/api": "patch:bug"
3+
---
4+
5+
Add missing `trafficLightPosition` TypeScript type definition

Cargo.lock

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

crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ VIAddVersionKey "ProductVersion" "${VERSION}"
9595

9696
; Handle install mode, `perUser`, `perMachine` or `both`
9797
!if "${INSTALLMODE}" == "perMachine"
98-
RequestExecutionLevel highest
98+
RequestExecutionLevel admin
9999
!endif
100100

101101
!if "${INSTALLMODE}" == "currentUser"

0 commit comments

Comments
 (0)