Update to latest GUI dependencies

gui/package.json

@@ -9,12 +9,12 @@
     "@formatjs/intl-localematcher": "^0.2.32",
     "@react-three/drei": "^9.80.3",
     "@react-three/fiber": "^8.13.6",
-    "@tauri-apps/api": "=2.0.0-alpha.8",
+    "@tauri-apps/api": "=2.0.0-alpha.11",
     "@tauri-apps/plugin-app": "=2.0.0-alpha.1",
-    "@tauri-apps/plugin-dialog": "=2.0.0-alpha.1",
-    "@tauri-apps/plugin-fs": "=2.0.0-alpha.1",
-    "@tauri-apps/plugin-os": "=2.0.0-alpha.2",
-    "@tauri-apps/plugin-shell": "=2.0.0-alpha.1",
+    "@tauri-apps/plugin-dialog": "=2.0.0-alpha.3",
+    "@tauri-apps/plugin-fs": "=2.0.0-alpha.3",
+    "@tauri-apps/plugin-os": "=2.0.0-alpha.4",
+    "@tauri-apps/plugin-shell": "=2.0.0-alpha.3",
     "@tauri-apps/plugin-window": "=2.0.0-alpha.1",
     "@vitejs/plugin-react": "^3.0.0",
     "browser-fs-access": "^0.34.1",
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@dword-design/eslint-plugin-import-alias": "^4.0.8",
     "@tailwindcss/forms": "^0.5.3",
-    "@tauri-apps/cli": "=2.0.0-alpha.17",
+    "@tauri-apps/cli": "=2.0.0-alpha.18",
     "@types/file-saver": "^2.0.5",
     "@types/react": "^18.0.25",
     "@types/react-dom": "^18.0.5",

gui/src-tauri/Cargo.toml

@@ -21,20 +21,20 @@ default = ["custom-protocol"]
 custom-protocol = ["tauri/custom-protocol"]
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-alpha", features = [] }
+tauri-build = { version = "=2.0.0-alpha.12", features = [] }
 cfg_aliases = "0.1"
 shadow-rs = "0.23"
 
 [dependencies]
 serde_json = "1"
 serde = { version = "1", features = ["derive"] }
-tauri = { version = "2.0.0-alpha", features = ["devtools"] }
-tauri-runtime = "1.0.0-alpha"
-tauri-plugin-dialog = "2.0.0-alpha"
-tauri-plugin-fs = "2.0.0-alpha"
-tauri-plugin-os = "2.0.0-alpha"
-tauri-plugin-shell = "2.0.0-alpha"
-tauri-plugin-window = { version = "2.0.0-alpha", features = ["devtools"] }
+tauri = { version = "=2.0.0-alpha.18", features = ["devtools"] }
+tauri-runtime = "=1.0.0-alpha.5"
+tauri-plugin-dialog = "=2.0.0-alpha.4"
+tauri-plugin-fs = "=2.0.0-alpha.4"
+tauri-plugin-os = "=2.0.0-alpha.4"
+tauri-plugin-shell = "=2.0.0-alpha.4"
+tauri-plugin-window = { version = "=2.0.0-alpha.2", features = ["devtools"] }
 flexi_logger = "0.25"
 log-panics = { version = "2", features = ["with-backtrace"] }
 log = "0.4"
@@ -49,7 +49,7 @@ shadow-rs = { version = "0.23", default-features = false }
 const_format = "0.2.30"
 cfg-if = "1"
 color-eyre = "0.6"
-rfd = "0.11.4"
+rfd = "0.12.1"
 dirs-next = "2.0.0"
 
 [target.'cfg(windows)'.dependencies]

gui/src-tauri/src/main.rs

@@ -122,15 +122,15 @@ fn main() -> Result<()> {
 		if !webview2_exists() {
 			// This makes a dialog appear which let's you press Ok or Cancel
 			// If you press Ok it will open the SlimeVR installer documentation
-			use rfd::{MessageButtons, MessageDialog, MessageLevel};
+			use rfd::{MessageButtons, MessageDialog, MessageLevel, MessageDialogResult};
 
 			let confirm = MessageDialog::new()
 				.set_title("SlimeVR")
 				.set_description("Couldn't find WebView2 installed. You can install it with the SlimeVR installer")
 				.set_buttons(MessageButtons::OkCancel)
 				.set_level(MessageLevel::Error)
 				.show();
-			if confirm {
+			if confirm == MessageDialogResult::Ok {
 				open::that("https://docs.slimevr.dev/server-setup/installing-and-connecting.html#install-the-latest-slimevr-installer").unwrap();
 			}
 			return Ok(());
@@ -236,12 +236,12 @@ fn main() -> Result<()> {
 							_ => ("other", "".to_string()),
 						};
 						app_handle
-							.emit_all("server-status", emit_me)
+							.emit("server-status", emit_me)
 							.expect("Check server log files. \nFailed to emit");
 					}
 					log::error!("Java server receiver died");
 					app_handle
-						.emit_all("server-status", ("other", "receiver cancelled"))
+						.emit("server-status", ("other", "receiver cancelled"))
 						.expect("Failed to emit");
 				});
 			}
@@ -298,15 +298,15 @@ fn main() -> Result<()> {
 			// I should log this anyways, don't want to dig a grave by not logging the error.
 			log::error!("CreateWebview error {}", error);
 
-			use rfd::{MessageButtons, MessageDialog, MessageLevel};
+			use rfd::{MessageButtons, MessageDialog, MessageLevel, MessageDialogResult};
 
 			let confirm = MessageDialog::new()
 				.set_title("SlimeVR")
 				.set_description("You seem to have a faulty installation of WebView2. You can check a guide on how to fix that in the docs!")
 				.set_buttons(MessageButtons::OkCancel)
 				.set_level(MessageLevel::Error)
 				.show();
-			if confirm {
+			if confirm == MessageDialogResult::Ok {
 				open::that("https://docs.slimevr.dev/common-issues.html#webview2-is-missing--slimevr-gui-crashes-immediately--panicked-at--webview2error").unwrap();
 			}
 		}

gui/src-tauri/src/util.rs

@@ -95,7 +95,7 @@ pub fn spawn_java(java: &OsStr, java_version: &OsStr) -> std::io::Result<Child>
 #[cfg(desktop)]
 pub fn show_error(text: &str) -> bool {
 	use rand::{seq::SliceRandom, thread_rng};
-	use rfd::{MessageButtons, MessageDialog, MessageLevel};
+	use rfd::{MessageButtons, MessageDialog, MessageLevel, MessageDialogResult};
 
 	MessageDialog::new()
 		.set_title(&format!(
@@ -105,7 +105,7 @@ pub fn show_error(text: &str) -> bool {
 		.set_description(text)
 		.set_buttons(MessageButtons::Ok)
 		.set_level(MessageLevel::Error)
-		.show()
+		.show() == MessageDialogResult::Ok
 }
 
 #[cfg(mobile)]

gui/src/components/TopBar.tsx

@@ -21,7 +21,7 @@ import classNames from 'classnames';
 import { QuestionIcon } from './commons/icon/QuestionIcon';
 import { useBreakpoint, useIsTauri } from '@/hooks/breakpoint';
 import { GearIcon } from './commons/icon/GearIcon';
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/primitives';
 import { useTrackers } from '@/hooks/tracker';
 import { TrackersStillOnModal } from './TrackersStillOnModal';
 import { useConfig } from '@/hooks/config';

gui/src/utils/logging.ts

@@ -1,4 +1,4 @@
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/primitives';
 
 export function log(...msgs: any[]) {
   console.log(...msgs);