Skip to content

Commit 9013854

Browse files
fix(deps): update tauri monorepo (#1382)
* fix(deps): update tauri monorepo * fix positioner * Update lib.rs * Update lib.rs * fix build * change file --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: amrbashir <[email protected]>
1 parent 0678af3 commit 9013854

File tree

35 files changed

+278
-212
lines changed

35 files changed

+278
-212
lines changed

.changes/tauri-beta-22.md

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
"authenticator": patch
3+
"autostart": patch
4+
"barcode-scanner": patch
5+
"biometric": patch
6+
"cli": patch
7+
"clipboard-manager": patch
8+
"deep-link": patch
9+
"dialog": patch
10+
"fs": patch
11+
"global-shortcut": patch
12+
"http": patch
13+
"localhost": patch
14+
"log-plugin": patch
15+
"nfc": patch
16+
"notification": patch
17+
"os": patch
18+
"persisted-scope": patch
19+
"positioner": patch
20+
"process": patch
21+
"shell": patch
22+
"single-instance": patch
23+
"sql": patch
24+
"store": patch
25+
"stronghold": patch
26+
"updater": patch
27+
"upload": patch
28+
"websocket": patch
29+
"window-state": patch
30+
"authenticator-js": patch
31+
"autostart-js": patch
32+
"barcode-scanner-js": patch
33+
"biometric-js": patch
34+
"cli-js": patch
35+
"clipboard-manager-js": patch
36+
"deep-link-js": patch
37+
"dialog-js": patch
38+
"fs-js": patch
39+
"global-shortcut-js": patch
40+
"http-js": patch
41+
"log-js": patch
42+
"nfc-js": patch
43+
"notification-js": patch
44+
"os-js": patch
45+
"positioner-js": patch
46+
"process-js": patch
47+
"shell-js": patch
48+
"sql-js": patch
49+
"store-js": patch
50+
"stronghold-js": patch
51+
"updater-js": patch
52+
"upload-js": patch
53+
"websocket-js": patch
54+
"window-state-js": patch
55+
---
56+
57+
Update to tauri beta.22.

Cargo.lock

+18-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ resolver = "2"
1010
[workspace.dependencies]
1111
serde = { version = "1", features = ["derive"] }
1212
log = "0.4"
13-
tauri = "2.0.0-beta.20"
14-
tauri-build = "2.0.0-beta.16"
15-
tauri-plugin = "2.0.0-beta.16"
16-
tauri-utils = "2.0.0-beta.16"
13+
tauri = "2.0.0-beta.22"
14+
tauri-build = "2.0.0-beta.17"
15+
tauri-plugin = "2.0.0-beta.17"
16+
tauri-utils = "2.0.0-beta.17"
1717
serde_json = "1"
1818
thiserror = "1"
1919
url = "2"

examples/api/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serve": "vite preview"
1010
},
1111
"dependencies": {
12-
"@tauri-apps/api": "2.0.0-beta.12",
12+
"@tauri-apps/api": "2.0.0-beta.13",
1313
"@tauri-apps/plugin-barcode-scanner": "2.0.0-beta.4",
1414
"@tauri-apps/plugin-biometric": "2.0.0-beta.4",
1515
"@tauri-apps/plugin-cli": "2.0.0-beta.4",
@@ -30,7 +30,7 @@
3030
"@iconify-json/codicon": "^1.1.37",
3131
"@iconify-json/ph": "^1.1.8",
3232
"@sveltejs/vite-plugin-svelte": "^3.0.1",
33-
"@tauri-apps/cli": "2.0.0-beta.18",
33+
"@tauri-apps/cli": "2.0.0-beta.19",
3434
"@unocss/extractor-svelte": "^0.60.0",
3535
"internal-ip": "7.0.0",
3636
"svelte": "^4.2.8",

plugins/authenticator/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/autostart/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/barcode-scanner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/biometric/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/clipboard-manager/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

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

+2-2
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-beta.12",
13+
"@tauri-apps/api": "2.0.0-beta.13",
1414
"@tauri-apps/plugin-deep-link": "2.0.0-beta.5"
1515
},
1616
"devDependencies": {
17-
"@tauri-apps/cli": "2.0.0-beta.18",
17+
"@tauri-apps/cli": "2.0.0-beta.19",
1818
"internal-ip": "7.0.0",
1919
"typescript": "^5.2.2",
2020
"vite": "^5.0.13"

plugins/deep-link/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/dialog/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/fs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/global-shortcut/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/http/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/log/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/nfc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/notification/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/os/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/positioner/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@
2424
"LICENSE"
2525
],
2626
"dependencies": {
27-
"@tauri-apps/api": "2.0.0-beta.12"
27+
"@tauri-apps/api": "2.0.0-beta.13"
2828
}
2929
}

plugins/positioner/src/lib.rs

+15-5
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,22 @@ struct Tray(std::sync::Mutex<Option<(PhysicalPosition<f64>, PhysicalSize<f64>)>>
3535

3636
#[cfg(feature = "tray-icon")]
3737
pub fn on_tray_event<R: Runtime>(app: &AppHandle<R>, event: &TrayIconEvent) {
38-
let position = PhysicalPosition {
39-
x: event.position.x,
40-
y: event.position.y,
38+
let (position, size) = {
39+
match event {
40+
TrayIconEvent::Click { rect, .. }
41+
| TrayIconEvent::Enter { rect, .. }
42+
| TrayIconEvent::Leave { rect, .. }
43+
| TrayIconEvent::Move { rect, .. } => {
44+
// tray-icon emits PhysicalSize so the scale factor should not matter.
45+
let size = rect.size.to_physical(1.0);
46+
let position = rect.position.to_physical(1.0);
47+
(position, size)
48+
}
49+
50+
_ => return,
51+
}
4152
};
42-
// tray-icon emits PhysicalSize so the scale factor should not matter.
43-
let size = event.icon_rect.size.to_physical(1.0);
53+
4454
app.state::<Tray>()
4555
.0
4656
.lock()

plugins/process/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

plugins/shell/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
"LICENSE"
2424
],
2525
"dependencies": {
26-
"@tauri-apps/api": "2.0.0-beta.12"
26+
"@tauri-apps/api": "2.0.0-beta.13"
2727
}
2828
}

0 commit comments

Comments
 (0)