chore: update deps (#195)

apps/desktop2/package.json

@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-		"@lume/system": "workspace:^",
     "@lume/icons": "workspace:^",
+    "@lume/system": "workspace:^",
     "@lume/ui": "workspace:^",
     "@lume/utils": "workspace:^",
     "@radix-ui/react-avatar": "^1.0.4",
@@ -22,42 +22,42 @@
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-switch": "^1.0.3",
     "@radix-ui/react-tooltip": "^1.0.7",
-		"@tanstack/query-sync-storage-persister": "^5.36.0",
+    "@tanstack/query-sync-storage-persister": "^5.40.0",
-		"@tanstack/react-query": "^5.36.0",
+    "@tanstack/react-query": "^5.40.0",
-		"@tanstack/react-query-persist-client": "^5.36.0",
+    "@tanstack/react-query-persist-client": "^5.40.0",
-		"@tanstack/react-router": "1.32.5",
+    "@tanstack/react-router": "^1.34.5",
-		"i18next": "^23.11.4",
+    "i18next": "^23.11.5",
     "i18next-resources-to-backend": "^1.2.1",
     "minidenticons": "^4.2.1",
     "nanoid": "^5.0.7",
-		"nostr-tools": "^2.5.2",
+    "nostr-tools": "^2.6.0",
     "react": "^18.3.1",
     "react-currency-input-field": "^3.8.0",
     "react-dom": "^18.3.1",
-		"react-hook-form": "^7.51.4",
+    "react-hook-form": "^7.51.5",
     "react-hotkeys-hook": "^4.5.0",
-		"react-i18next": "^14.1.1",
+    "react-i18next": "^14.1.2",
     "react-string-replace": "^1.1.1",
     "slate": "^0.103.0",
-		"slate-react": "^0.102.0",
+    "slate-react": "^0.104.0",
     "sonner": "^1.4.41",
-		"use-debounce": "^10.0.0",
+    "use-debounce": "^10.0.1",
     "virtua": "^0.31.0"
   },
   "devDependencies": {
     "@lume/tailwindcss": "workspace:^",
     "@lume/tsconfig": "workspace:^",
     "@lume/types": "workspace:^",
-		"@tanstack/router-devtools": "^1.32.5",
+    "@tanstack/router-devtools": "^1.34.5",
-		"@tanstack/router-vite-plugin": "^1.32.2",
+    "@tanstack/router-vite-plugin": "^1.34.1",
-		"@types/react": "^18.3.2",
+    "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
-		"@vitejs/plugin-react-swc": "^3.6.0",
+    "@vitejs/plugin-react-swc": "^3.7.0",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.4.5",
-		"vite": "^5.2.11",
+    "vite": "^5.2.12",
     "vite-plugin-top-level-await": "^1.4.1",
     "vite-tsconfig-paths": "^4.3.2"
   }

apps/web/package.json

@@ -13,7 +13,7 @@
 		"@astrojs/check": "^0.5.10",
 		"@astrojs/tailwind": "^5.1.0",
 		"@fontsource/alice": "^5.0.13",
-		"astro": "^4.8.3",
+		"astro": "^4.9.2",
 		"astro-seo-meta": "^4.1.1",
 		"astro-seo-schema": "^4.0.2",
 		"schema-dts": "^1.1.2",

package.json

@@ -20,7 +20,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@tauri-apps/api": "^2.0.0-beta.7",
+    "@tauri-apps/api": "2.0.0-beta.13",
     "@tauri-apps/plugin-autostart": "2.0.0-beta.3",
     "@tauri-apps/plugin-clipboard-manager": "2.1.0-beta.1",
     "@tauri-apps/plugin-dialog": "2.0.0-beta.3",

packages/icons/package.json

@@ -8,7 +8,7 @@
 	},
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:*",
-		"@types/react": "^18.3.2",
+		"@types/react": "^18.3.3",
 		"typescript": "^5.4.5"
 	}
 }

packages/system/package.json

@@ -5,13 +5,13 @@
 	"main": "./src/index.ts",
 	"dependencies": {
 		"@lume/utils": "workspace:^",
-		"@tanstack/react-query": "^5.36.0",
+		"@tanstack/react-query": "^5.40.0",
 		"react": "^18.3.1"
 	},
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@types/react": "^18.3.2",
+		"@types/react": "^18.3.3",
 		"typescript": "^5.4.5"
 	}
 }

packages/system/src/commands.ts

@@ -11,10 +11,7 @@ export const commands = {
 },
 async connectRelay(relay: string) : Promise<Result<boolean, null>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("connect_relay", { relay }) };
-				status: "ok",
-				data: await TAURI_INVOKE("connect_relay", { relay }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -22,10 +19,7 @@ export const commands = {
 },
 async removeRelay(relay: string) : Promise<Result<boolean, null>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("remove_relay", { relay }) };
-				status: "ok",
-				data: await TAURI_INVOKE("remove_relay", { relay }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -47,43 +41,25 @@ export const commands = {
     else return { status: "error", error: e  as any };
 }
 },
-	async saveAccount(
+async saveAccount(nsec: string, password: string) : Promise<Result<string, string>> {
-		nsec: string,
-		password: string,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("save_account", { nsec, password }) };
-				status: "ok",
-				data: await TAURI_INVOKE("save_account", { nsec, password }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async getEncryptedKey(
+async getEncryptedKey(npub: string, password: string) : Promise<Result<string, string>> {
-		npub: string,
-		password: string,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_encrypted_key", { npub, password }) };
-				status: "ok",
-				data: await TAURI_INVOKE("get_encrypted_key", { npub, password }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async nostrConnect(
+async nostrConnect(npub: string, uri: string) : Promise<Result<string, string>> {
-		npub: string,
-		uri: string,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("nostr_connect", { npub, uri }) };
-				status: "ok",
-				data: await TAURI_INVOKE("nostr_connect", { npub, uri }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -91,38 +67,23 @@ export const commands = {
 },
 async loadAccount(npub: string) : Promise<Result<boolean, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("load_account", { npub }) };
-				status: "ok",
-				data: await TAURI_INVOKE("load_account", { npub }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async eventToBech32(
+async eventToBech32(id: string, relays: string[]) : Promise<Result<string, null>> {
-		id: string,
-		relays: string[],
-	): Promise<Result<string, null>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("event_to_bech32", { id, relays }) };
-				status: "ok",
-				data: await TAURI_INVOKE("event_to_bech32", { id, relays }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async userToBech32(
+async userToBech32(key: string, relays: string[]) : Promise<Result<string, null>> {
-		key: string,
-		relays: string[],
-	): Promise<Result<string, null>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("user_to_bech32", { key, relays }) };
-				status: "ok",
-				data: await TAURI_INVOKE("user_to_bech32", { key, relays }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -136,29 +97,17 @@ export const commands = {
     else return { status: "error", error: e  as any };
 }
 },
-	async verifyNip05(
+async verifyNip05(key: string, nip05: string) : Promise<Result<boolean, string>> {
-		key: string,
-		nip05: string,
-	): Promise<Result<boolean, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("verify_nip05", { key, nip05 }) };
-				status: "ok",
-				data: await TAURI_INVOKE("verify_nip05", { key, nip05 }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async getActivities(
+async getActivities(account: string, kind: string) : Promise<Result<string[], string>> {
-		account: string,
-		kind: string,
-	): Promise<Result<string[], string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_activities", { account, kind }) };
-				status: "ok",
-				data: await TAURI_INVOKE("get_activities", { account, kind }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -166,10 +115,7 @@ export const commands = {
 },
 async getCurrentUserProfile() : Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_current_user_profile") };
-				status: "ok",
-				data: await TAURI_INVOKE("get_current_user_profile"),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -193,53 +139,23 @@ export const commands = {
 },
 async setContactList(pubkeys: string[]) : Promise<Result<boolean, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("set_contact_list", { pubkeys }) };
-				status: "ok",
-				data: await TAURI_INVOKE("set_contact_list", { pubkeys }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async createProfile(
+async createProfile(name: string, displayName: string, about: string, picture: string, banner: string, nip05: string, lud16: string, website: string) : Promise<Result<string, string>> {
-		name: string,
-		displayName: string,
-		about: string,
-		picture: string,
-		banner: string,
-		nip05: string,
-		lud16: string,
-		website: string,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("create_profile", { name, displayName, about, picture, banner, nip05, lud16, website }) };
-				status: "ok",
-				data: await TAURI_INVOKE("create_profile", {
-					name,
-					displayName,
-					about,
-					picture,
-					banner,
-					nip05,
-					lud16,
-					website,
-				}),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async follow(
+async follow(id: string, alias: string | null) : Promise<Result<string, string>> {
-		id: string,
-		alias: string | null,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("follow", { id, alias }) };
-				status: "ok",
-				data: await TAURI_INVOKE("follow", { id, alias }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -261,15 +177,9 @@ export const commands = {
     else return { status: "error", error: e  as any };
 }
 },
-	async setNstore(
+async setNstore(key: string, content: string) : Promise<Result<string, string>> {
-		key: string,
-		content: string,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("set_nstore", { key, content }) };
-				status: "ok",
-				data: await TAURI_INVOKE("set_nstore", { key, content }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -299,31 +209,17 @@ export const commands = {
     else return { status: "error", error: e  as any };
 }
 },
-	async zapProfile(
+async zapProfile(id: string, amount: string, message: string) : Promise<Result<boolean, string>> {
-		id: string,
-		amount: string,
-		message: string,
-	): Promise<Result<boolean, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("zap_profile", { id, amount, message }) };
-				status: "ok",
-				data: await TAURI_INVOKE("zap_profile", { id, amount, message }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async zapEvent(
+async zapEvent(id: string, amount: string, message: string) : Promise<Result<boolean, string>> {
-		id: string,
-		amount: string,
-		message: string,
-	): Promise<Result<boolean, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("zap_event", { id, amount, message }) };
-				status: "ok",
-				data: await TAURI_INVOKE("zap_event", { id, amount, message }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -331,10 +227,7 @@ export const commands = {
 },
 async friendToFriend(npub: string) : Promise<Result<boolean, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("friend_to_friend", { npub }) };
-				status: "ok",
-				data: await TAURI_INVOKE("friend_to_friend", { npub }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -356,70 +249,41 @@ export const commands = {
     else return { status: "error", error: e  as any };
 }
 },
-	async getEventsBy(
+async getEventsBy(publicKey: string, asOf: string | null) : Promise<Result<string[], string>> {
-		publicKey: string,
-		asOf: string | null,
-	): Promise<Result<string[], string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_events_by", { publicKey, asOf }) };
-				status: "ok",
-				data: await TAURI_INVOKE("get_events_by", { publicKey, asOf }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async getLocalEvents(
+async getLocalEvents(pubkeys: string[], until: string | null) : Promise<Result<string[], string>> {
-		pubkeys: string[],
-		until: string | null,
-	): Promise<Result<string[], string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_local_events", { pubkeys, until }) };
-				status: "ok",
-				data: await TAURI_INVOKE("get_local_events", { pubkeys, until }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async getGlobalEvents(
+async getGlobalEvents(until: string | null) : Promise<Result<string[], string>> {
-		until: string | null,
-	): Promise<Result<string[], string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_global_events", { until }) };
-				status: "ok",
-				data: await TAURI_INVOKE("get_global_events", { until }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async getHashtagEvents(
+async getHashtagEvents(hashtags: string[], until: string | null) : Promise<Result<string[], string>> {
-		hashtags: string[],
-		until: string | null,
-	): Promise<Result<string[], string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("get_hashtag_events", { hashtags, until }) };
-				status: "ok",
-				data: await TAURI_INVOKE("get_hashtag_events", { hashtags, until }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async publish(
+async publish(content: string, tags: string[][]) : Promise<Result<string, string>> {
-		content: string,
-		tags: string[][],
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("publish", { content, tags }) };
-				status: "ok",
-				data: await TAURI_INVOKE("publish", { content, tags }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -436,26 +300,9 @@ export const commands = {
 async showInFolder(path: string) : Promise<void> {
 await TAURI_INVOKE("show_in_folder", { path });
 },
-	async createColumn(
+async createColumn(label: string, x: number, y: number, width: number, height: number, url: string) : Promise<Result<string, string>> {
-		label: string,
-		x: number,
-		y: number,
-		width: number,
-		height: number,
-		url: string,
-	): Promise<Result<string, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("create_column", { label, x, y, width, height, url }) };
-				status: "ok",
-				data: await TAURI_INVOKE("create_column", {
-					label,
-					x,
-					y,
-					width,
-					height,
-					url,
-				}),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -463,63 +310,31 @@ export const commands = {
 },
 async closeColumn(label: string) : Promise<Result<boolean, null>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("close_column", { label }) };
-				status: "ok",
-				data: await TAURI_INVOKE("close_column", { label }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async repositionColumn(
+async repositionColumn(label: string, x: number, y: number) : Promise<Result<null, string>> {
-		label: string,
-		x: number,
-		y: number,
-	): Promise<Result<null, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("reposition_column", { label, x, y }) };
-				status: "ok",
-				data: await TAURI_INVOKE("reposition_column", { label, x, y }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async resizeColumn(
+async resizeColumn(label: string, width: number, height: number) : Promise<Result<null, string>> {
-		label: string,
-		width: number,
-		height: number,
-	): Promise<Result<null, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("resize_column", { label, width, height }) };
-				status: "ok",
-				data: await TAURI_INVOKE("resize_column", { label, width, height }),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
 }
 },
-	async openWindow(
+async openWindow(label: string, title: string, url: string, width: number, height: number) : Promise<Result<null, string>> {
-		label: string,
-		title: string,
-		url: string,
-		width: number,
-		height: number,
-	): Promise<Result<null, string>> {
 try {
-			return {
+    return { status: "ok", data: await TAURI_INVOKE("open_window", { label, title, url, width, height }) };
-				status: "ok",
-				data: await TAURI_INVOKE("open_window", {
-					label,
-					title,
-					url,
-					width,
-					height,
-				}),
-			};
 } catch (e) {
     if(e instanceof Error) throw e;
     else return { status: "error", error: e  as any };
@@ -527,18 +342,15 @@ export const commands = {
 },
 async setBadge(count: number) : Promise<void> {
 await TAURI_INVOKE("set_badge", { count });
-	},
+}
-};
+}
+
+
 
 /** user-defined types **/
 
-export type Account = { npub: string; nsec: string };
+export type Account = { npub: string; nsec: string }
-export type Relays = {
+export type Relays = { connected: string[]; read: string[] | null; write: string[] | null; both: string[] | null }
-	connected: string[];
-	read: string[] | null;
-	write: string[] | null;
-	both: string[] | null;
-};
 
 /** tauri-specta globals **/
 
@@ -548,10 +360,10 @@ import { type WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webview
 
 type __EventObj__<T> = {
   listen: (
-		cb: TAURI_API_EVENT.EventCallback<T>,
+    cb: TAURI_API_EVENT.EventCallback<T>
   ) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
   once: (
-		cb: TAURI_API_EVENT.EventCallback<T>,
+    cb: TAURI_API_EVENT.EventCallback<T>
   ) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
   emit: T extends null
     ? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
@@ -563,7 +375,7 @@ export type Result<T, E> =
   | { status: "error"; error: E };
 
 function __makeEvents__<T extends Record<string, any>>(
-	mappings: Record<keyof T, string>,
+  mappings: Record<keyof T, string>
 ) {
   return new Proxy(
     {} as unknown as {
@@ -593,6 +405,8 @@ function __makeEvents__<T extends Record<string, any>>(
           },
         });
       },
-		},
+    }
   );
 }
+
+     

packages/ui/package.json

@@ -14,7 +14,7 @@
 		"@lume/tailwindcss": "workspace:^",
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@types/react": "^18.3.2",
+		"@types/react": "^18.3.3",
 		"tailwindcss": "^3.4.3",
 		"typescript": "^5.4.5"
 	}

packages/utils/package.json

@@ -8,21 +8,21 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@tanstack/react-query": "^5.36.0",
+		"@tanstack/react-query": "^5.40.0",
 		"bitcoin-units": "^1.0.0",
 		"clsx": "^2.1.1",
 		"dayjs": "^1.11.11",
 		"light-bolt11-decoder": "^3.1.1",
-		"nostr-tools": "^2.5.2",
+		"nostr-tools": "^2.6.0",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
 		"slate": "^0.103.0",
-		"slate-react": "^0.102.0"
+		"slate-react": "^0.104.0"
 	},
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@types/react": "^18.3.2",
+		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
 		"tailwind-merge": "^2.3.0",
 		"typescript": "^5.4.5"