resolve merge issues

plugins/log/src/lib.rs

@@ -278,7 +278,6 @@ impl Default for Builder {
             timezone_strategy: DEFAULT_TIMEZONE_STRATEGY,
             max_file_size: DEFAULT_MAX_FILE_SIZE,
             targets: DEFAULT_LOG_TARGETS.into(),
-            log_name: None,
         }
     }
 }
@@ -377,29 +376,6 @@ impl Builder {
         self
     }
 
-    /// Writes logs to the given file. Default: <app_name>.log)
-    ///
-    /// Note: This does not modify the directory logs go into. For that refer to `LogTarget::Folder`.
-    ///
-    /// # Examples
-    ///
-    /// ```
-    /// use tauri_plugin_log::Builder;
-    /// let name = "custom-name";
-    /// let builder = Builder::default()
-    ///     .targets([
-    ///         LogTarget::LogDir
-    ///     ])
-    ///     .log_name(name)
-    ///     .build()
-    /// ); // Outputs content to custom-name.log
-    ///
-    /// ```
-    pub fn log_name<S: Into<String>>(mut self, log_name: S) -> Self {
-        self.log_name = Some(log_name.into());
-        self
-    }
-
     #[cfg(feature = "colored")]
     pub fn with_colors(self, colors: fern::colors::ColoredLevelConfig) -> Self {
         let format =

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

@@ -16,7 +16,6 @@
     "@tauri-apps/cli": "2.0.0-alpha.17",
     "svelte": "4.2.7",
     "svelte-check": "3.6.1",
-    "tslib": "2.6.2",
     "typescript": "5.3.2",
     "vite": "5.0.2"
   },

plugins/websocket/guest-js/index.ts

@@ -13,15 +13,6 @@ export interface ConnectionConfig {
   headers?: HeadersInit;
 }
 
-export interface ConnectionConfig {
-  writeBufferSize?: number;
-  maxWriteBufferSize?: number;
-  maxMessageSize?: number;
-  maxFrameSize?: number;
-  acceptUnmaskedFrames?: boolean;
-  headers?: HeadersInit;
-}
-
 export interface MessageKind<T, D> {
   type: T;
   data: D;

plugins/window-state/package.json

@@ -23,10 +23,7 @@
     "README.md",
     "LICENSE"
   ],
-  "devDependencies": {
-    "tslib": "2.6.2"
-  },
   "dependencies": {
-    "@tauri-apps/api": "1.5.1"
+    "@tauri-apps/api": "2.0.0-alpha.11"
   }
 }