chore: update tauri

plugins/barcode-scanner/Cargo.toml

@@ -29,6 +29,3 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
-
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }

plugins/clipboard-manager/Cargo.toml

@@ -31,8 +31,6 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 arboard = { version = "3", features = ["wayland-data-control"] }

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

@@ -14,7 +14,7 @@
     "@tauri-apps/plugin-deep-link": "2.4.9"
   },
   "devDependencies": {
-    "@tauri-apps/cli-cef": "3.0.0-alpha.6",
+    "@tauri-apps/cli-cef": "3.0.0-alpha.26",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   }

plugins/deep-link/examples/app/src-tauri/Cargo.toml

@@ -19,7 +19,13 @@ tauri-build = { workspace = true }
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
+# The webview runtime is picked by depending on its crate and handing its
+# attributes to `tauri::Builder::runtime`.
+tauri-runtime-wry = { workspace = true, optional = true, features = [
+  "common-controls-v6",
+] }
+tauri-runtime-cef = { workspace = true, optional = true }
 tauri-plugin-deep-link = { path = "../../../" }
 tauri-plugin-log = { path = "../../../../log" }
 tauri-plugin-single-instance = { path = "../../../../single-instance", features = [
@@ -28,6 +34,9 @@ tauri-plugin-single-instance = { path = "../../../../single-instance", features
 log = "0.4"
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 # this feature is used for production builds or when `devUrl` points to the filesystem and the built-in dev server is disabled.
 # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
 # DO NOT REMOVE!!

plugins/deep-link/examples/app/src-tauri/src/lib.rs

@@ -10,10 +10,19 @@ fn greet(name: &str) -> String {
     format!("Hello, {name}! You've been greeted from Rust!")
 }
 
+// Every CEF application is also its own renderer, GPU, network and utility
+// process. This attribute runs the helper side of that and returns before the
+// Tauri application is built, for any process Chromium launched with `--type=`.
+#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)]
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    #[cfg(feature = "cef")]
+    let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default());
+    #[cfg(not(feature = "cef"))]
+    let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default());
+
     #[allow(unused_mut)]
-    let mut builder = tauri::Builder::default();
+    let mut builder = builder;
 
     #[cfg(desktop)]
     {

plugins/deep-link/package.json

@@ -28,6 +28,6 @@
     "@tauri-apps/api": "^2.11.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli-cef": "3.0.0-alpha.6"
+    "@tauri-apps/cli-cef": "3.0.0-alpha.26"
   }
 }

plugins/dialog/Cargo.toml

@@ -27,8 +27,6 @@ ios = { level = "partial", notes = "Does not support folder picker" }
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 
-[dev-dependencies]
-tauri = { workspace = true, features = ["wry"] }
 
 [dependencies]
 serde = { workspace = true }
@@ -39,8 +37,6 @@ thiserror = { workspace = true }
 url = { workspace = true }
 tauri-plugin-fs = { path = "../fs", version = "2.5.1" }
 
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 rfd = { version = "0.16", default-features = false, features = [

plugins/geolocation/Cargo.toml

@@ -29,8 +29,6 @@ log = { workspace = true }
 thiserror = { workspace = true }
 specta = { workspace = true, optional = true }
 
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
 
 [features]
 specta = ["dep:specta", "tauri/specta"]

plugins/haptics/Cargo.toml

@@ -29,8 +29,6 @@ log = { workspace = true }
 thiserror = { workspace = true }
 specta = { workspace = true, optional = true }
 
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
 
 [features]
 specta = ["dep:specta", "tauri/specta"]

plugins/notification/Cargo.toml

@@ -33,8 +33,6 @@ time = { version = "0.3", features = ["serde", "parsing", "formatting"] }
 url = { version = "2", features = ["serde"] }
 serde_repr = "0.1"
 
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
 
 [target."cfg(windows)".dependencies]
 win7-notifications = { version = "0.4.5", optional = true }

plugins/opener/Cargo.toml

@@ -57,6 +57,3 @@ features = ["std", "NSWorkspace"]
 version = "0.3"
 default-features = false
 features = ["std", "NSURL", "NSArray", "NSString"]
-
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }

plugins/shell/Cargo.toml

@@ -33,6 +33,3 @@ regex = "1"
 open = { version = "5", features = ["shellexecute-on-windows"] }
 encoding_rs = "0.8"
 os_pipe = "1"
-
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }

plugins/single-instance/examples/vanilla/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@tauri-apps/cli-cef": "3.0.0-alpha.6"
+    "@tauri-apps/cli-cef": "3.0.0-alpha.26"
   }
 }

plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml

@@ -10,7 +10,13 @@ rust-version = "1.77.2"
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
+# The webview runtime is picked by depending on its crate and handing its
+# attributes to `tauri::Builder::runtime`.
+tauri-runtime-wry = { workspace = true, optional = true, features = [
+  "common-controls-v6",
+] }
+tauri-runtime-cef = { workspace = true, optional = true }
 tauri-plugin-single-instance = { path = "../../../" }
 tauri-plugin-cli = { path = "../../../../cli" }
 
@@ -18,4 +24,7 @@ tauri-plugin-cli = { path = "../../../../cli" }
 tauri-build = { workspace = true }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 prod = ["tauri/custom-protocol"]

plugins/single-instance/examples/vanilla/src-tauri/src/main.rs

@@ -7,8 +7,17 @@
     windows_subsystem = "windows"
 )]
 
+// Every CEF application is also its own renderer, GPU, network and utility
+// process. This attribute runs the helper side of that and returns before the
+// Tauri application is built, for any process Chromium launched with `--type=`.
+#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)]
 fn main() {
-    tauri::Builder::default()
+    #[cfg(feature = "cef")]
+    let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default());
+    #[cfg(not(feature = "cef"))]
+    let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default());
+
+    builder
         .plugin(
             tauri_plugin_single_instance::Builder::new()
                 .callback(move |app, argv, cwd| {

plugins/store/Cargo.toml

@@ -27,9 +27,3 @@ tracing = { workspace = true }
 thiserror = { workspace = true }
 dunce = { workspace = true }
 tokio = { version = "1", features = ["sync", "time", "macros"] }
-
-[target.'cfg(target_os = "ios")'.dependencies]
-tauri = { workspace = true, features = ["wry"] }
-
-[dev-dependencies]
-tauri = { workspace = true, features = ["wry"] }

plugins/store/examples/AppSettingsManager/package.json

@@ -8,7 +8,7 @@
     "tauri": "tauri"
   },
   "devDependencies": {
-    "@tauri-apps/cli-cef": "3.0.0-alpha.6",
+    "@tauri-apps/cli-cef": "3.0.0-alpha.26",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   }

plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml

@@ -13,12 +13,21 @@ edition = "2021"
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
+# The webview runtime is picked by depending on its crate and handing its
+# attributes to `tauri::Builder::runtime`.
+tauri-runtime-wry = { workspace = true, optional = true, features = [
+  "common-controls-v6",
+] }
+tauri-runtime-cef = { workspace = true, optional = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-store = { path = "../../../" }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 # this feature is used for production builds or when `devPath` points to the filesystem
 # DO NOT REMOVE!!
 prod = ["tauri/custom-protocol"]

plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs

@@ -12,8 +12,17 @@ use tauri_plugin_store::StoreExt;
 mod app;
 use app::settings::AppSettings;
 
+// Every CEF application is also its own renderer, GPU, network and utility
+// process. This attribute runs the helper side of that and returns before the
+// Tauri application is built, for any process Chromium launched with `--type=`.
+#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)]
 fn main() {
-    tauri::Builder::default()
+    #[cfg(feature = "cef")]
+    let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default());
+    #[cfg(not(feature = "cef"))]
+    let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default());
+
+    builder
         .plugin(tauri_plugin_store::Builder::new().build())
         .setup(|app| {
             // Init store and load it from disk

plugins/updater/tests/app-updater/Cargo.toml

@@ -7,7 +7,8 @@ edition = { workspace = true }
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
+tauri-runtime-wry = { workspace = true, features = ["common-controls-v6"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-updater = { path = "../.." }

plugins/updater/tests/app-updater/src/main.rs

@@ -11,6 +11,7 @@ fn main() {
     let mut context = tauri::generate_context!();
 
     tauri::Builder::default()
+        .runtime(tauri_runtime_wry::Wry::default())
         .plugin(tauri_plugin_updater::Builder::new().build())
         .setup(|app| {
             let handle = app.handle().clone();

plugins/updater/tests/updater-migration/Cargo.toml

@@ -7,7 +7,7 @@ edition = { workspace = true }
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-updater = { path = "../.." }

plugins/updater/tests/updater-migration/v2-app/Cargo.toml

@@ -7,7 +7,8 @@ edition = { workspace = true }
 tauri-build = { workspace = true }
 
 [dependencies]
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
+tauri-runtime-wry = { workspace = true, features = ["common-controls-v6"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tauri-plugin-updater = { path = "../../.." }

plugins/updater/tests/updater-migration/v2-app/src/main.rs

@@ -11,6 +11,7 @@ fn main() {
     let mut context = tauri::generate_context!();
 
     tauri::Builder::default()
+        .runtime(tauri_runtime_wry::Wry::default())
         .plugin(tauri_plugin_updater::Builder::new().build())
         .setup(|app| {
             println!("version={}", app.package_info().version);

plugins/websocket/examples/tauri-app/package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@tauri-apps/cli-cef": "3.0.0-alpha.6",
+    "@tauri-apps/cli-cef": "3.0.0-alpha.26",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   },

plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml

@@ -7,7 +7,13 @@ edition = "2021"
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
-tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] }
+tauri = { workspace = true, features = ["common-controls-v6"] }
+# The webview runtime is picked by depending on its crate and handing its
+# attributes to `tauri::Builder::runtime`.
+tauri-runtime-wry = { workspace = true, optional = true, features = [
+  "common-controls-v6",
+] }
+tauri-runtime-cef = { workspace = true, optional = true }
 tokio = { version = "1", features = ["net"] }
 futures-util = "0.3"
 tauri-plugin-websocket = { path = "../../../" }
@@ -17,4 +23,7 @@ tokio-tungstenite = "0.29"
 tauri-build = { workspace = true }
 
 [features]
+default = ["wry"]
+wry = ["dep:tauri-runtime-wry"]
+cef = ["dep:tauri-runtime-cef"]
 prod = ["tauri/custom-protocol"]

plugins/websocket/examples/tauri-app/src-tauri/src/main.rs

@@ -33,9 +33,19 @@ async fn accept_connection(stream: TcpStream) {
   }
 }
 
+// Every CEF application is also its own renderer, GPU, network and utility
+// process. This attribute runs the helper side of that and returns before the
+// Tauri application is built, for any process Chromium launched with `--type=`.
+#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)]
 fn main() {
   tauri::async_runtime::spawn(start_server());
-  tauri::Builder::default()
+
+  #[cfg(feature = "cef")]
+  let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default());
+  #[cfg(not(feature = "cef"))]
+  let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default());
+
+  builder
     .plugin(tauri_plugin_websocket::init())
     .run(tauri::generate_context!())
     .expect("error while running tauri application");