Merge branch 'master' into gui_search

theseus_gui/src-tauri/Cargo.toml

@@ -8,12 +8,12 @@ rust-version = "1.57"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.0.0-rc.3", features = [] }
+tauri-build = { version = "1.0.4", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.0.0-rc.3", features = ["api-all"] }
+tauri = { version = "1.0.4", features = ["api-all"] }
 
 [features]
 # by default Tauri runs in production mode

theseus_gui/src-tauri/src/main.rs

@@ -9,12 +9,12 @@ use tauri::{
 };
 
 fn main() {
-    let ctx = tauri::generate_context!();
+    let ctx = tauri::generate_context!(); // Run `pnpm build:web` (builds the web app) to get rid of the error.
 
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![])
-        .create_window("main", WindowUrl::default(), |win, webview| {
-            let win = win
+        .setup(|app| {
+            let _win = WindowBuilder::new(app, "main", WindowUrl::default())
                 .title("Modrinth")
                 .resizable(true)
                 .decorations(true)
@@ -22,15 +22,16 @@ fn main() {
                 .inner_size(800.0, 550.0)
                 .min_inner_size(400.0, 200.0)
                 .skip_taskbar(false)
-                .fullscreen(false);
-            return (win, webview);
+                .fullscreen(false)
+                .build()?;
+            Ok(())
         })
         .menu(Menu::with_items([
             #[cfg(target_os = "macos")]
             MenuEntry::Submenu(Submenu::new(
                 &ctx.package_info().name,
                 Menu::with_items([
-                    MenuItem::About(ctx.package_info().name.clone()).into(),
+                    // MenuItem::About(ctx.package_info().name.clone()).into(),
                     MenuItem::Separator.into(),
                     MenuItem::Services.into(),
                     MenuItem::Separator.into(),

theseus_gui/src-tauri/tauri.conf.json

@@ -4,7 +4,7 @@
   },
   "build": {
     "distDir": "../build",
-    "devPath": "http://localhost:3000",
+    "devPath": "http://localhost:5173",
     "beforeDevCommand": "pnpm dev:web",
     "beforeBuildCommand": "pnpm run build:web"
   },
@@ -32,13 +32,11 @@
       "shortDescription": "",
       "longDescription": "",
       "deb": {
-        "depends": [],
-        "useBootstrapper": false
+        "depends": []
       },
       "macOS": {
         "frameworks": [],
         "minimumSystemVersion": "",
-        "useBootstrapper": false,
         "exceptionDomain": "",
         "signingIdentity": null,
         "providerShortName": null,