From 783a4538a449f123db588374b3187f53ec976fe6 Mon Sep 17 00:00:00 2001 From: reya <123083837+reyamir@users.noreply.github.com> Date: Tue, 2 Jul 2024 15:54:00 +0700 Subject: [PATCH] Revert "chore: update ci" This reverts commit 04706a6d7cc471f8c05bb1736eba54a331cc7949. --- apps/desktop2/src/components/column.tsx | 4 ---- apps/desktop2/src/routes/panel.$account.tsx | 4 ++-- packages/system/src/commands.ts | 3 --- src-tauri/Cargo.toml | 1 - src-tauri/src/commands/window.rs | 6 ------ src-tauri/src/main.rs | 1 - src-tauri/tauri.conf.json | 2 +- 7 files changed, 3 insertions(+), 18 deletions(-) diff --git a/apps/desktop2/src/components/column.tsx b/apps/desktop2/src/components/column.tsx index 59d9d5c4..3af62a1d 100644 --- a/apps/desktop2/src/components/column.tsx +++ b/apps/desktop2/src/components/column.tsx @@ -24,8 +24,6 @@ export const Column = memo(function Column({ const [isCreated, setIsCreated] = useState(false); const repositionWebview = useCallback(async () => { - if (!container?.current) return console.log("something wrong."); - const newRect = container.current.getBoundingClientRect(); await invoke("reposition_column", { label: webviewLabel, @@ -35,8 +33,6 @@ export const Column = memo(function Column({ }, []); const resizeWebview = useCallback(async () => { - if (!container?.current) return console.log("something wrong."); - const newRect = container.current.getBoundingClientRect(); await invoke("resize_column", { label: webviewLabel, diff --git a/apps/desktop2/src/routes/panel.$account.tsx b/apps/desktop2/src/routes/panel.$account.tsx index e0ee69d6..7c7df400 100644 --- a/apps/desktop2/src/routes/panel.$account.tsx +++ b/apps/desktop2/src/routes/panel.$account.tsx @@ -13,9 +13,9 @@ import * as ScrollArea from "@radix-ui/react-scroll-area"; import * as Tabs from "@radix-ui/react-tabs"; import { useQuery } from "@tanstack/react-query"; import { createFileRoute } from "@tanstack/react-router"; -import { invoke } from "@tauri-apps/api/core"; import { Menu, MenuItem, PredefinedMenuItem } from "@tauri-apps/api/menu"; import { getCurrent } from "@tauri-apps/api/window"; +import { exit } from "@tauri-apps/plugin-process"; import { open } from "@tauri-apps/plugin-shell"; import { type ReactNode, useCallback, useEffect, useRef } from "react"; import { Virtualizer } from "virtua"; @@ -98,7 +98,7 @@ function Screen() { PredefinedMenuItem.new({ item: "Separator" }), MenuItem.new({ text: "Quit", - action: async () => await invoke("force_quit"), + action: async () => await exit(0), }), ]); diff --git a/packages/system/src/commands.ts b/packages/system/src/commands.ts index 3804c318..cf522b9f 100644 --- a/packages/system/src/commands.ts +++ b/packages/system/src/commands.ts @@ -447,9 +447,6 @@ try { async openMainWindow() : Promise { await TAURI_INVOKE("open_main_window"); }, -async forceQuit() : Promise { -await TAURI_INVOKE("force_quit"); -}, async setBadge(count: number) : Promise { await TAURI_INVOKE("set_badge", { count }); } diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index b3caa54b..d1b6ed3e 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -21,7 +21,6 @@ tauri = { version = "2.0.0-beta", features = [ "macos-private-api", "native-tls-vendored", "protocol-asset", - "devtools", ] } tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } diff --git a/src-tauri/src/commands/window.rs b/src-tauri/src/commands/window.rs index f3dce6f3..bad1fc44 100644 --- a/src-tauri/src/commands/window.rs +++ b/src-tauri/src/commands/window.rs @@ -255,9 +255,3 @@ pub fn open_main_window(app: tauri::AppHandle) { window.make_transparent().unwrap(); } } - -#[tauri::command] -#[specta::specta] -pub fn force_quit() { - std::process::exit(0); -} diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 92301fa3..c2348f01 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -127,7 +127,6 @@ fn main() { commands::window::reload_column, commands::window::open_window, commands::window::open_main_window, - commands::window::force_quit, commands::window::set_badge ]); diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index de2b91ec..e6f92839 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "../node_modules/@tauri-apps/cli/schema.json", "productName": "Lume", - "version": "4.0.14", + "version": "4.0.13", "identifier": "nu.lume.Lume", "build": { "beforeBuildCommand": "pnpm desktop:build",