chore: minor cleanups

crates/deskulpt-core/src/events.rs

@@ -18,13 +18,12 @@ pub enum ShowToastPayload {
 pub trait EventsExt<R: Runtime>: Emitter<R> {
     /// Emit the `show-toast` event to the canvas.
     fn emit_show_toast_to_canvas(&self, payload: ShowToastPayload) -> Result<()> {
-        self.emit_to("canvas", "show-toast", payload)
-            .map_err(Into::into)
+        Ok(self.emit_to("canvas", "show-toast", payload)?)
     }
 
     /// Emit the `exit-app` event to the manager.
     fn emit_exit_app_to_manager(&self) -> Result<()> {
-        self.emit_to("manager", "exit-app", ()).map_err(Into::into)
+        Ok(self.emit_to("manager", "exit-app", ())?)
     }
 }
 

crates/deskulpt-core/src/tray.rs

@@ -6,15 +6,15 @@ use anyhow::Result;
 use tauri::image::Image;
 use tauri::menu::{MenuBuilder, MenuEvent, MenuItemBuilder};
 use tauri::tray::{MouseButton, MouseButtonState, TrayIcon, TrayIconBuilder, TrayIconEvent};
-use tauri::{App, AppHandle, Manager, Runtime};
+use tauri::{App, AppHandle, Runtime};
 use tokio::time::sleep;
 
 use crate::events::EventsExt;
 use crate::states::StatesExtCanvasClickThrough;
 use crate::window::WindowExt;
 
 /// Extention trait for system tray-related operations.
-pub trait TrayExt<R: Runtime>: Manager<R> + StatesExtCanvasClickThrough<R> {
+pub trait TrayExt<R: Runtime>: StatesExtCanvasClickThrough<R> {
     /// Create the system tray.
     fn create_tray(&self, icon: Image) -> Result<()>
     where

crates/deskulpt-core/src/window/script.rs

@@ -1,4 +1,5 @@
 //! Window initialization scripts.
+
 use anyhow::Result;
 use serialize_to_javascript::{default_template, DefaultTemplate, Template};
 

crates/deskulpt/src/lib.rs

@@ -41,7 +41,6 @@ pub fn run() {
 
             app.create_manager(&settings)?;
             app.create_canvas(&settings)?;
-
             app.create_tray(DESKULPT_ICON)?;
 
             Ok(())

packages/apis/rollup.config.ts

@@ -70,7 +70,7 @@ function cleanDir(path: string) {
   let dir: Dir;
   try {
     dir = opendirSync(path);
-  } catch (err: unknown) {
+  } catch (err) {
     if (err instanceof Error && "code" in err) {
       switch (err.code) {
         case "ENOENT":

packages/react/rollup.config.ts

@@ -49,7 +49,7 @@ function cleanDir(path: string) {
   let dir: Dir;
   try {
     dir = opendirSync(path);
-  } catch (err: unknown) {
+  } catch (err) {
     if (err instanceof Error && "code" in err) {
       switch (err.code) {
         case "ENOENT":

packages/ui/rollup.config.ts

@@ -60,7 +60,7 @@ function cleanDir(path: string) {
   let dir: Dir;
   try {
     dir = opendirSync(path);
-  } catch (err: unknown) {
+  } catch (err) {
     if (err instanceof Error && "code" in err) {
       switch (err.code) {
         case "ENOENT":

packages/ui/src/jsx-runtime.js

@@ -1,3 +1 @@
-import { Fragment, jsx, jsxs } from "@emotion/react/jsx-runtime";
-
-export { jsx, jsxs, Fragment };
+export { Fragment, jsx, jsxs } from "@emotion/react/jsx-runtime";