refactor(core): remove the clipboard APIs (#6728)

tauri-apps · Apr 17, 2023 · cebd752 · cebd752
1 parent 276e4a3
commit cebd752
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 192 deletions.
diff --git a/.changes/remove-clipboard.md b/.changes/remove-clipboard.md
@@ -0,0 +1,6 @@
+---
+"tauri": patch
+"api": patch
+---
+
+Moved the `clipboard` feature to its own plugin in the plugins-workspace repository.
diff --git a/core/tauri/scripts/bundle.global.js b/core/tauri/scripts/bundle.global.js
diff --git a/core/tauri/src/app.rs b/core/tauri/src/app.rs
@@ -264,8 +264,6 @@ pub struct AppHandle<R: Runtime> {
   pub(crate) manager: WindowManager<R>,
   #[cfg(all(desktop, feature = "global-shortcut"))]
   global_shortcut_manager: R::GlobalShortcutManager,
-  #[cfg(feature = "clipboard")]
-  clipboard_manager: R::ClipboardManager,
   /// The updater configuration.
   #[cfg(updater)]
   pub(crate) updater_settings: UpdaterSettings,
@@ -320,8 +318,6 @@ impl<R: Runtime> Clone for AppHandle<R> {
       manager: self.manager.clone(),
       #[cfg(all(desktop, feature = "global-shortcut"))]
       global_shortcut_manager: self.global_shortcut_manager.clone(),
-      #[cfg(feature = "clipboard")]
-      clipboard_manager: self.clipboard_manager.clone(),
       #[cfg(updater)]
       updater_settings: self.updater_settings.clone(),
     }
@@ -480,8 +476,6 @@ pub struct App<R: Runtime> {
   manager: WindowManager<R>,
   #[cfg(all(desktop, feature = "global-shortcut"))]
   global_shortcut_manager: R::GlobalShortcutManager,
-  #[cfg(feature = "clipboard")]
-  clipboard_manager: R::ClipboardManager,
   handle: AppHandle<R>,
 }
 
@@ -494,8 +488,6 @@ impl<R: Runtime> fmt::Debug for App<R> {
 
     #[cfg(all(desktop, feature = "global-shortcut"))]
     d.field("global_shortcut_manager", &self.global_shortcut_manager);
-    #[cfg(feature = "clipboard")]
-    d.field("clipboard_manager", &self.clipboard_manager);
 
     d.finish()
   }
@@ -639,13 +631,6 @@ macro_rules! shared_app_impl {
         self.global_shortcut_manager.clone()
       }
 
-      /// Gets a copy of the clipboard manager instance.
-      #[cfg(feature = "clipboard")]
-      #[cfg_attr(doc_cfg, doc(cfg(feature = "clipboard")))]
-      pub fn clipboard_manager(&self) -> R::ClipboardManager {
-        self.clipboard_manager.clone()
-      }
-
       /// Gets the app's configuration, defined on the `tauri.conf.json` file.
       pub fn config(&self) -> Arc<Config> {
         self.manager.config()
@@ -1513,9 +1498,6 @@ impl<R: Runtime> Builder<R> {
     #[cfg(all(desktop, feature = "global-shortcut"))]
     let global_shortcut_manager = runtime.global_shortcut_manager();
 
-    #[cfg(feature = "clipboard")]
-    let clipboard_manager = runtime.clipboard_manager();
-
     #[allow(unused_mut)]
     let mut app = App {
       runtime: Some(runtime),
@@ -1524,15 +1506,11 @@ impl<R: Runtime> Builder<R> {
       manager: manager.clone(),
       #[cfg(all(desktop, feature = "global-shortcut"))]
       global_shortcut_manager: global_shortcut_manager.clone(),
-      #[cfg(feature = "clipboard")]
-      clipboard_manager: clipboard_manager.clone(),
       handle: AppHandle {
         runtime_handle,
         manager,
         #[cfg(all(desktop, feature = "global-shortcut"))]
         global_shortcut_manager,
-        #[cfg(feature = "clipboard")]
-        clipboard_manager,
         #[cfg(updater)]
         updater_settings: self.updater_settings,
       },

diff --git a/core/tauri/src/endpoints.rs b/core/tauri/src/endpoints.rs
@@ -13,8 +13,6 @@ use serde_json::Value as JsonValue;
 use std::sync::Arc;
 
 mod app;
-#[cfg(clipboard_any)]
-mod clipboard;
 #[cfg(dialog_any)]
 mod dialog;
 mod event;
@@ -81,8 +79,6 @@ enum Module {
   Http(http::Cmd),
   #[cfg(global_shortcut_any)]
   GlobalShortcut(global_shortcut::Cmd),
-  #[cfg(clipboard_any)]
-  Clipboard(clipboard::Cmd),
 }
 
 impl Module {
@@ -167,13 +163,6 @@ impl Module {
           .and_then(|r| r.json)
           .map_err(InvokeError::from_anyhow)
       }),
-      #[cfg(clipboard_any)]
-      Self::Clipboard(cmd) => resolver.respond_async(async move {
-        cmd
-          .run(context)
-          .and_then(|r| r.json)
-          .map_err(InvokeError::from_anyhow)
-      }),
     }
   }
 }

diff --git a/core/tauri/src/endpoints/clipboard.rs b/core/tauri/src/endpoints/clipboard.rs
diff --git a/tooling/api/docs/js-api.json b/tooling/api/docs/js-api.json
diff --git a/tooling/api/src/clipboard.ts b/tooling/api/src/clipboard.ts
diff --git a/tooling/api/src/index.ts b/tooling/api/src/index.ts
@@ -14,7 +14,6 @@
  */
 
 import * as app from './app'
-import * as clipboard from './clipboard'
 import * as dialog from './dialog'
 import * as event from './event'
 import * as globalShortcut from './globalShortcut'
@@ -34,7 +33,6 @@ const invoke = tauri.invoke
 export {
   invoke,
   app,
-  clipboard,
   dialog,
   event,
   globalShortcut,