Skip to content

Commit e5f29da

Browse files
Merge branch 'v2' into download-progress-speed
2 parents 93071e6 + 221f50f commit e5f29da

File tree

20 files changed

+395
-258
lines changed

20 files changed

+395
-258
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"deep-link": patch
3+
---
4+
5+
Fix fails to start when having spaces in the main binary path on Windows

.changes/dialog-rfd-015.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"dialog": patch
3+
---
4+
5+
Update rfd to 0.15
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'updater': 'patch'
3+
---
4+
5+
Encode `+` when making updater requests which can be cause incorrectly interpolating the endpoint when using `{{current_version}}` in the endpoint where the current version contains a build number, for example `1.8.0+1`.

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ resolver = "2"
1111
[workspace.dependencies]
1212
serde = { version = "1", features = ["derive"] }
1313
log = "0.4"
14-
tauri = { version = "2.0.0-rc.14", default-features = false }
15-
tauri-build = "2.0.0-rc.11"
16-
tauri-plugin = "2.0.0-rc.11"
17-
tauri-utils = "2.0.0-rc.11"
14+
tauri = { version = "2.0.0-rc.15", default-features = false }
15+
tauri-build = "2.0.0-rc.12"
16+
tauri-plugin = "2.0.0-rc.12"
17+
tauri-utils = "2.0.0-rc.12"
1818
serde_json = "1"
1919
thiserror = "1"
2020
url = "2"

examples/api/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
"serve": "vite preview"
1010
},
1111
"dependencies": {
12-
"@tauri-apps/api": "2.0.0-rc.4",
12+
"@tauri-apps/api": "2.0.0-rc.5",
1313
"@tauri-apps/plugin-barcode-scanner": "2.0.0-rc.2",
1414
"@tauri-apps/plugin-biometric": "2.0.0-rc.1",
1515
"@tauri-apps/plugin-cli": "2.0.0-rc.1",
1616
"@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.2",
1717
"@tauri-apps/plugin-dialog": "2.0.0-rc.1",
1818
"@tauri-apps/plugin-fs": "2.0.0-rc.2",
19-
"@tauri-apps/plugin-geolocation": "2.0.0-rc.1",
19+
"@tauri-apps/plugin-geolocation": "2.0.0-rc.2",
2020
"@tauri-apps/plugin-global-shortcut": "2.0.0-rc.1",
2121
"@tauri-apps/plugin-haptics": "2.0.0-rc.1",
2222
"@tauri-apps/plugin-http": "2.0.0-rc.2",
@@ -33,7 +33,7 @@
3333
"@iconify-json/codicon": "^1.1.37",
3434
"@iconify-json/ph": "^1.1.8",
3535
"@sveltejs/vite-plugin-svelte": "^3.0.1",
36-
"@tauri-apps/cli": "2.0.0-rc.15",
36+
"@tauri-apps/cli": "2.0.0-rc.16",
3737
"@unocss/extractor-svelte": "^0.62.0",
3838
"svelte": "^4.2.19",
3939
"unocss": "^0.62.0",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"eslint-config-prettier": "9.1.0",
2121
"eslint-plugin-security": "3.0.1",
2222
"prettier": "3.3.3",
23-
"rollup": "4.21.3",
23+
"rollup": "4.22.0",
2424
"tslib": "2.7.0",
2525
"typescript": "5.6.2",
2626
"typescript-eslint": "8.6.0"

plugins/deep-link/examples/app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"tauri": "tauri"
1111
},
1212
"dependencies": {
13-
"@tauri-apps/api": "2.0.0-rc.4",
13+
"@tauri-apps/api": "2.0.0-rc.5",
1414
"@tauri-apps/plugin-deep-link": "2.0.0-rc.2"
1515
},
1616
"devDependencies": {
17-
"@tauri-apps/cli": "2.0.0-rc.15",
17+
"@tauri-apps/cli": "2.0.0-rc.16",
1818
"typescript": "^5.2.2",
1919
"vite": "^5.0.13"
2020
}

plugins/deep-link/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,11 +274,11 @@ mod imp {
274274
key_reg.set_string("URL Protocol", "")?;
275275

276276
let icon_reg = CURRENT_USER.create(format!("{key_base}\\DefaultIcon"))?;
277-
icon_reg.set_string("", &format!("{},0", &exe))?;
277+
icon_reg.set_string("", &format!("{exe},0"))?;
278278

279279
let cmd_reg = CURRENT_USER.create(format!("{key_base}\\shell\\open\\command"))?;
280280

281-
cmd_reg.set_string("", &format!("{} \"%1\"", &exe))?;
281+
cmd_reg.set_string("", &format!("\"{exe}\" \"%1\""))?;
282282

283283
Ok(())
284284
}
@@ -408,13 +408,13 @@ mod imp {
408408
_protocol.as_ref()
409409
))?;
410410

411-
let registered_cmd: String = cmd_reg.get_string("")?;
411+
let registered_cmd = cmd_reg.get_string("")?;
412412

413413
let exe = dunce::simplified(&tauri::utils::platform::current_exe()?)
414414
.display()
415415
.to_string();
416416

417-
Ok(registered_cmd == format!("{} \"%1\"", &exe))
417+
Ok(registered_cmd == format!("\"{exe}\" \"%1\""))
418418
}
419419
#[cfg(target_os = "linux")]
420420
{

plugins/dialog/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.5" }
3333
tauri = { workspace = true, features = ["wry"] }
3434

3535
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
36-
rfd = { version = "0.14", default-features = false, features = [
36+
rfd = { version = "0.15", default-features = false, features = [
3737
"tokio",
3838
"gtk3",
3939
"common-controls-v6",

0 commit comments

Comments
 (0)