wip: tauri v2

src-tauri/Cargo.toml

@@ -11,45 +11,35 @@ rust-version = "1.66"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.5", features = [] }
+tauri-build = { version = "2.0.0-alpha.8", features = [] }
 
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5", features = [
+tauri = { version = "2.0.0-alpha", features = [
   "macos-private-api",
-  "window-close",
-  "window-print",
-  "window-create",
-  "fs-read-dir",
-  "fs-read-file",
-  "window-start-dragging",
-  "path-all",
-  "http-all",
-  "clipboard-write-text",
-  "os-all",
-  "notification-all",
-  "clipboard-read-text",
-  "window-set-resizable",
-  "window-set-size",
-  "shell-open",
-  "fs-write-file",
-  "app-all",
-  "fs-remove-file",
-  "window-center",
-  "dialog-all",
-  "http-multipart",
+  "native-tls-vendored",
 ] }
-tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v1", features = [
+tauri-plugin-app = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-cli = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-window = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
   "sqlite",
 ] }
-tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" }
-window-shadows = { git = "https://github.com/tauri-apps/window-shadows", branch = "dev" }
+tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 sqlx-cli = { version = "0.7.0", default-features = false, features = [
   "sqlite",
 ] }

src-tauri/src/main.rs

@@ -106,16 +106,6 @@ fn main() {
   tauri::Builder::default()
     .setup(|app| {
       let window = app.get_window("main").unwrap();
-      let splashscreen = app.get_window("splashscreen").unwrap();
-      
-      #[cfg(target_os = "windows")]
-      set_shadow(&window, true).expect("Unsupported platform!");
-      #[cfg(target_os = "windows")]
-      set_shadow(&splashscreen, true).expect("Unsupported platform!");
-
-      #[cfg(target_os = "macos")]
-      apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None)
-        .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS");
 
       #[cfg(target_os = "macos")]
       window.position_traffic_lights(16.0, 25.0);
@@ -129,6 +119,18 @@ fn main() {
         window.position_traffic_lights(16.0, 25.0);
       }
     })
+    .plugin(tauri_plugin_app::init())
+    .plugin(tauri_plugin_cli::init())
+    .plugin(tauri_plugin_clipboard_manager::init())
+    .plugin(tauri_plugin_dialog::init())
+    .plugin(tauri_plugin_fs::init())
+    .plugin(tauri_plugin_http::init())
+    .plugin(tauri_plugin_notification::init())
+    .plugin(tauri_plugin_os::init())
+    .plugin(tauri_plugin_process::init())
+    .plugin(tauri_plugin_shell::init())
+    .plugin(tauri_plugin_updater::Builder::new().build())
+    .plugin(tauri_plugin_window::init())
     .plugin(
       tauri_plugin_sql::Builder::default()
         .add_migrations(

src-tauri/tauri.conf.json

@@ -11,76 +11,38 @@
     "productName": "Lume",
     "version": "1.2.6"
   },
-  "tauri": {
-    "allowlist": {
-      "app": {
-        "all": true,
-        "show": true,
-        "hide": true
-      },
-      "path": {
-        "all": true
-      },
-      "dialog": {
-        "all": true,
-        "ask": true,
-        "confirm": true,
-        "message": true,
-        "open": true,
-        "save": true
-      },
-      "fs": {
-        "all": false,
-        "removeFile": true,
-        "writeFile": true,
-        "readDir": true,
-        "readFile": true,
-        "scope": [
-          "$APPDATA/*",
-          "$DATA/*",
-          "$LOCALDATA/*",
-          "$DESKTOP/*",
-          "$DOCUMENT/*",
-          "$DOWNLOAD/*",
-          "$HOME/*",
-          "$PICTURE/*",
-          "$PUBLIC/*",
-          "$VIDEO/*"
-        ]
-      },
-      "http": {
-        "all": true,
-        "scope": [
-          "http://**",
-          "https://**"
-        ]
-      },
-      "shell": {
-        "all": false,
-        "open": true
-      },
-      "os": {
-        "all": true
-      },
-      "window": {
-        "all": false,
-        "center": true,
-        "setResizable": true,
-        "setSize": true,
-        "startDragging": true,
-        "create": true,
-        "close": true,
-        "print": true
-      },
-      "clipboard": {
-        "all": false,
-        "writeText": true,
-        "readText": true
-      },
-      "notification": {
-        "all": true
-      }
+  "plugins": {
+    "fs": {
+      "scope": [
+        "$APPDATA/*",
+        "$DATA/*",
+        "$LOCALDATA/*",
+        "$DESKTOP/*",
+        "$DOCUMENT/*",
+        "$DOWNLOAD/*",
+        "$HOME/*",
+        "$PICTURE/*",
+        "$PUBLIC/*",
+        "$VIDEO/*"
+      ]
     },
+    "http": {
+      "scope": [
+        "http://**/",
+        "https://**/"
+      ]
+    },
+    "shell": {
+      "open": true
+    },
+    "updater": {
+      "endpoints": [
+        "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
+        "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
+      ]
+    }
+  },
+  "tauri": {
     "bundle": {
       "active": true,
       "appimage": {
@@ -105,36 +67,32 @@
         "entitlements": null,
         "exceptionDomain": "",
         "frameworks": [],
-        "providerShortName": null,
-        "signingIdentity": null,
+        "license": "../LICENSE",
         "minimumSystemVersion": "10.15.0",
-        "license": "../LICENSE"
+        "providerShortName": null,
+        "signingIdentity": null
       },
       "resources": [],
       "shortDescription": "",
       "targets": "all",
+      "updater": {},
       "windows": {
         "certificateThumbprint": null,
         "digestAlgorithm": "sha256",
         "timestampUrl": ""
       }
     },
-    "updater": {
-      "endpoints": [
-        "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
-        "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
-      ]
-    },
+    "macOSPrivateApi": true,
     "security": {
       "dangerousRemoteDomainIpcAccess": [
         {
-          "scheme": "https",
           "domain": "nwc.getalby.com",
-          "windows": ["alby"],
-          "enableTauriAPI": true
+          "scheme": "https",
+          "windows": [
+            "alby"
+          ]
         }
       ]
-    },
-    "macOSPrivateApi": true
+    }
   }
-}
+}