Merge pull request #1659 from safing/feature/update-tauri

Update tauri 2.0.0-rc.3

Earthfile

@@ -2,7 +2,7 @@ VERSION --arg-scope-and-set --global-cache 0.8
 
 ARG --global go_version = 1.22
 ARG --global node_version = 18
-ARG --global rust_version = 1.76
+ARG --global rust_version = 1.79
 ARG --global golangci_lint_version = 1.57.1
 
 ARG --global go_builder_image = "golang:${go_version}-alpine"

desktop/tauri/src-tauri/Cargo.toml

@@ -12,21 +12,21 @@ rust-version = "1.60"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta.19", features = [] }
+tauri-build = { version = "2.0.0-rc.3", features = [] }
 
 [dependencies]
 # Tauri
-tauri = { version = "2.0.0-beta.24", features = ["tray-icon", "image-png", "config-json5", "devtools"] }
-tauri-plugin-shell = "2.0.0-beta"
-tauri-plugin-dialog = "2.0.0-beta"
-tauri-plugin-clipboard-manager = "2.0.0-beta"
-tauri-plugin-os = "2.0.0-beta"
-tauri-plugin-single-instance = "2.0.0-beta"
-tauri-plugin-notification = "2.0.0-beta"
-tauri-plugin-log = "2.0.0-beta"
-tauri-plugin-window-state = "2.0.0-beta"
+tauri = { version = "2.0.0-rc.3", features = ["tray-icon", "image-png", "config-json5", "devtools"] }
+tauri-plugin-shell = "2.0.0-rc"
+tauri-plugin-dialog = "2.0.0-rc"
+tauri-plugin-clipboard-manager = "2.0.0-rc"
+tauri-plugin-os = "2.0.0-rc"
+tauri-plugin-single-instance = "2.0.0-rc"
+tauri-plugin-notification = "2.0.0-rc"
+tauri-plugin-log = "2.0.0-rc"
+tauri-plugin-window-state = "2.0.0-rc"
 
-tauri-cli = "2.0.0-beta.21"
+tauri-cli = "2.0.0-rc.4"
 clap = { version = "4" }
 
 # General

desktop/tauri/src-tauri/capabilities/default.json

@@ -12,21 +12,21 @@
     ]
   },
   "permissions": [
-    "path:default",
-    "event:allow-listen",
-    "event:allow-unlisten",
-    "event:allow-emit",
-    "event:allow-emit-to",
-    "window:allow-hide",
-    "window:allow-show",
-    "window:allow-is-visible",
-    "window:allow-set-focus",
-    "window:allow-close",
-    "app:default",
-    "image:default",
-    "resources:default",
-    "menu:default",
-    "tray:default",
+    "core:path:default",
+    "core:event:allow-listen",
+    "core:event:allow-unlisten",
+    "core:event:allow-emit",
+    "core:event:allow-emit-to",
+    "core:window:allow-hide",
+    "core:window:allow-show",
+    "core:window:allow-is-visible",
+    "core:window:allow-set-focus",
+    "core:window:allow-close",
+    "core:app:default",
+    "core:image:default",
+    "core:resources:default",
+    "core:menu:default",
+    "core:tray:default",
     "shell:allow-open",
     "notification:default",
     "window-state:allow-save-window-state",

desktop/tauri/src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"default":{"identifier":"default","description":"Capability for the main window","remote":{"urls":["http://localhost:817"]},"local":true,"windows":["main","splash"],"permissions":["path:default","event:allow-listen","event:allow-unlisten","event:allow-emit","event:allow-emit-to","window:allow-hide","window:allow-show","window:allow-is-visible","window:allow-set-focus","window:allow-close","app:default","image:default","resources:default","menu:default","tray:default","shell:allow-open","notification:default","window-state:allow-save-window-state","window-state:allow-restore-state"]}}
+{"default":{"identifier":"default","description":"Capability for the main window","remote":{"urls":["http://localhost:817"]},"local":true,"windows":["main","splash"],"permissions":["core:path:default","core:event:allow-listen","core:event:allow-unlisten","core:event:allow-emit","core:event:allow-emit-to","core:window:allow-hide","core:window:allow-show","core:window:allow-is-visible","core:window:allow-set-focus","core:window:allow-close","core:app:default","core:image:default","core:resources:default","core:menu:default","core:tray:default","shell:allow-open","notification:default","window-state:allow-save-window-state","window-state:allow-restore-state"]}}

desktop/tauri/src-tauri/src/window.rs

@@ -115,6 +115,7 @@ pub fn open_window(app: &AppHandle) -> Result<WebviewWindow> {
         match app.get_webview_window("main") {
             Some(win) => {
                 app.portmaster().show_window();
+                let _ = win.show();
                 let _ = win.set_focus();
                 Ok(win)
             }

desktop/tauri/src-tauri/tauri.conf.json5

@@ -43,6 +43,7 @@
   "identifier": "io.safing.portmaster", // this is added as a property to the shortcut on windows (ApplicationUserModelID). Used for notifications.
   "app": {
     "withGlobalTauri": true,
+    "enableGTKAppId": false,
     "security": {
       "csp": null
     }
@@ -91,10 +92,6 @@
         "template": "templates/main.wxs"
       }
     },
-    "externalBin": [
-      "binaries/portmaster-start",
-      "binaries/portmaster-core"
-    ],
     "targets": [
       "deb",
       "rpm",