From bb2592a63bef4813f7351401e3a0f97c5857f042 Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 28 Nov 2024 10:18:07 +0100 Subject: [PATCH 1/2] fix(core): Remove os check on `data_store_identifier` --- crates/tauri/src/webview/mod.rs | 3 +-- crates/tauri/src/webview/webview_window.rs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/tauri/src/webview/mod.rs b/crates/tauri/src/webview/mod.rs index 5600a46626cd..8e99d38100bc 100644 --- a/crates/tauri/src/webview/mod.rs +++ b/crates/tauri/src/webview/mod.rs @@ -818,8 +818,7 @@ fn main() { /// Can be used as a replacement for data_directory not being available in WKWebView. /// /// - **macOS / iOS**: Available on macOS >= 14 and iOS >= 17 - #[cfg(any(target_os = "macos", target_os = "ios"))] - #[cfg_attr(docsrs, doc(any(target_os = "macos", target_os = "ios")))] + /// - **Windows / LinUx \ Android**: Unsupported. #[must_use] pub fn data_store_identifier(mut self, data_store_identifier: [u8; 16]) -> Self { self.webview_attributes.data_store_identifier = Some(data_store_identifier); diff --git a/crates/tauri/src/webview/webview_window.rs b/crates/tauri/src/webview/webview_window.rs index 23a00eb17079..aab6807c7fff 100644 --- a/crates/tauri/src/webview/webview_window.rs +++ b/crates/tauri/src/webview/webview_window.rs @@ -922,8 +922,7 @@ impl<'a, R: Runtime, M: Manager> WebviewWindowBuilder<'a, R, M> { /// Can be used as a replacement for data_directory not being available in WKWebView. /// /// - **macOS / iOS**: Available on macOS >= 14 and iOS >= 17 - #[cfg(any(target_os = "macos", target_os = "ios"))] - #[cfg_attr(docsrs, doc(any(target_os = "macos", target_os = "ios")))] + /// - **Windows / LinUx \ Android**: Unsupported. #[must_use] pub fn data_store_identifier(mut self, data_store_identifier: [u8; 16]) -> Self { self.webview_builder = self From 570c2ff135d937846c823c888c084862ecee691d Mon Sep 17 00:00:00 2001 From: FabianLars Date: Thu, 28 Nov 2024 10:19:47 +0100 Subject: [PATCH 2/2] typo --- crates/tauri/src/webview/mod.rs | 2 +- crates/tauri/src/webview/webview_window.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/tauri/src/webview/mod.rs b/crates/tauri/src/webview/mod.rs index 8e99d38100bc..fbbb539b9aea 100644 --- a/crates/tauri/src/webview/mod.rs +++ b/crates/tauri/src/webview/mod.rs @@ -818,7 +818,7 @@ fn main() { /// Can be used as a replacement for data_directory not being available in WKWebView. /// /// - **macOS / iOS**: Available on macOS >= 14 and iOS >= 17 - /// - **Windows / LinUx \ Android**: Unsupported. + /// - **Windows / Linux / Android**: Unsupported. #[must_use] pub fn data_store_identifier(mut self, data_store_identifier: [u8; 16]) -> Self { self.webview_attributes.data_store_identifier = Some(data_store_identifier); diff --git a/crates/tauri/src/webview/webview_window.rs b/crates/tauri/src/webview/webview_window.rs index aab6807c7fff..ec4aebbd2067 100644 --- a/crates/tauri/src/webview/webview_window.rs +++ b/crates/tauri/src/webview/webview_window.rs @@ -922,7 +922,7 @@ impl<'a, R: Runtime, M: Manager> WebviewWindowBuilder<'a, R, M> { /// Can be used as a replacement for data_directory not being available in WKWebView. /// /// - **macOS / iOS**: Available on macOS >= 14 and iOS >= 17 - /// - **Windows / LinUx \ Android**: Unsupported. + /// - **Windows / Linux / Android**: Unsupported. #[must_use] pub fn data_store_identifier(mut self, data_store_identifier: [u8; 16]) -> Self { self.webview_builder = self