chore: update and fix dependencies

lumehq · Jan 17, 2024 · c0305db · c0305db
1 parent 0b745cb
commit c0305db
Show file tree

Hide file tree

Showing 24 changed files with 149 additions and 152 deletions.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -20,7 +20,7 @@
 		"@lume/storage": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
+		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@radix-ui/react-accordion": "^1.1.2",
 		"@radix-ui/react-alert-dialog": "^1.0.5",
 		"@radix-ui/react-avatar": "^1.0.4",
@@ -32,7 +32,7 @@
 		"@radix-ui/react-select": "^2.0.0",
 		"@radix-ui/react-switch": "^1.0.3",
 		"@radix-ui/react-tooltip": "^1.0.7",
-		"@tanstack/react-query": "^5.17.12",
+		"@tanstack/react-query": "^5.17.15",
 		"@tauri-apps/api": "2.0.0-alpha.13",
 		"@tauri-apps/plugin-autostart": "2.0.0-alpha.5",
 		"@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.5",
@@ -46,7 +46,7 @@
 		"@tauri-apps/plugin-sql": "2.0.0-alpha.5",
 		"@tauri-apps/plugin-updater": "2.0.0-alpha.5",
 		"framer-motion": "^10.18.0",
-		"jotai": "^2.6.1",
+		"jotai": "^2.6.2",
 		"minidenticons": "^4.2.0",
 		"nanoid": "^5.0.4",
 		"nostr-fetch": "^0.15.0",
@@ -64,7 +64,7 @@
 		"@lume/tailwindcss": "workspace:^",
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@types/node": "^20.11.3",
+		"@types/node": "^20.11.4",
 		"@types/react": "^18.2.48",
 		"@types/react-dom": "^18.2.18",
 		"@vitejs/plugin-react-swc": "^3.5.0",
@@ -76,6 +76,6 @@
 		"typescript": "^5.3.3",
 		"vite": "^5.0.11",
 		"vite-plugin-top-level-await": "^1.4.1",
-		"vite-tsconfig-paths": "^4.2.3"
+		"vite-tsconfig-paths": "^4.3.1"
 	}
 }
diff --git a/apps/desktop/src/routes/settings/general.tsx b/apps/desktop/src/routes/settings/general.tsx
@@ -1,5 +1,6 @@
-import { CheckIcon, DarkIcon, LightIcon, SystemModeIcon } from "@lume/icons";
+import { DarkIcon, LightIcon, SystemModeIcon } from "@lume/icons";
 import { useStorage } from "@lume/storage";
+import { cn } from "@lume/utils";
 import * as Switch from "@radix-ui/react-switch";
 import { invoke } from "@tauri-apps/api/core";
 import { getCurrent } from "@tauri-apps/api/window";
@@ -9,7 +10,6 @@ import {
 	requestPermission,
 } from "@tauri-apps/plugin-notification";
 import { useEffect, useState } from "react";
-import { twMerge } from "tailwind-merge";
 
 export function GeneralSettingScreen() {
 	const storage = useStorage();
@@ -293,7 +293,7 @@ export function GeneralSettingScreen() {
 							className="flex flex-col items-center justify-center gap-0.5"
 						>
 							<div
-								className={twMerge(
+								className={cn(
 									"inline-flex h-11 w-11 items-center justify-center rounded-lg",
 									settings.appearance === "light"
 										? "bg-blue-500 text-white"
@@ -312,7 +312,7 @@ export function GeneralSettingScreen() {
 							className="flex flex-col items-center justify-center gap-0.5"
 						>
 							<div
-								className={twMerge(
+								className={cn(
 									"inline-flex h-11 w-11 items-center justify-center rounded-lg",
 									settings.appearance === "dark"
 										? "bg-blue-500 text-white"
@@ -331,7 +331,7 @@ export function GeneralSettingScreen() {
 							className="flex flex-col items-center justify-center gap-0.5"
 						>
 							<div
-								className={twMerge(
+								className={cn(
 									"inline-flex h-11 w-11 items-center justify-center rounded-lg",
 									settings.appearance === "auto"
 										? "bg-blue-500 text-white"

diff --git a/package.json b/package.json
@@ -8,8 +8,8 @@
 		"tauri": "tauri"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "1.4.1",
-		"@tauri-apps/cli": "2.0.0-alpha.20",
+		"@biomejs/biome": "^1.4.1",
+		"@tauri-apps/cli": "^2.0.0-alpha.20",
 		"turbo": "^1.11.3"
 	},
 	"packageManager": "[email protected]",

diff --git a/packages/ark/package.json b/packages/ark/package.json
@@ -9,7 +9,7 @@
 		"@lume/ndk-cache-tauri": "workspace:^",
 		"@lume/storage": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
+		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@nostr-fetch/adapter-ndk": "^0.15.0",
 		"@radix-ui/react-avatar": "^1.0.4",
 		"@radix-ui/react-collapsible": "^1.0.3",
@@ -18,7 +18,7 @@
 		"@radix-ui/react-hover-card": "^1.0.7",
 		"@radix-ui/react-popover": "^1.0.7",
 		"@radix-ui/react-tooltip": "^1.0.7",
-		"@tanstack/react-query": "^5.17.12",
+		"@tanstack/react-query": "^5.17.15",
 		"@tauri-apps/api": "2.0.0-alpha.13",
 		"@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.5",
 		"@tauri-apps/plugin-dialog": "2.0.0-alpha.5",
@@ -30,7 +30,7 @@
 		"@tauri-apps/plugin-updater": "2.0.0-alpha.5",
 		"@tauri-apps/plugin-upload": "2.0.0-alpha.5",
 		"get-urls": "^12.1.0",
-		"jotai": "^2.6.1",
+		"jotai": "^2.6.2",
 		"linkify-react": "^4.1.3",
 		"linkifyjs": "^4.1.3",
 		"media-chrome": "^2.0.1",

diff --git a/packages/ark/src/components/column/root.tsx b/packages/ark/src/components/column/root.tsx
@@ -1,7 +1,7 @@
+import { cn } from "@lume/utils";
 import { Resizable } from "re-resizable";
 import { ReactNode, useState } from "react";
 import { MemoryRouter, UNSAFE_LocationContext } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
 
 export function ColumnRoot({
 	children,
@@ -22,7 +22,7 @@ export function ColumnRoot({
 				}}
 				minWidth={420}
 				maxWidth={600}
-				className={twMerge(
+				className={cn(
 					"relative flex flex-col border-r-2 border-neutral-50 hover:border-neutral-100 dark:border-neutral-950 dark:hover:border-neutral-900",
 					className,
 				)}

diff --git a/packages/ark/src/components/note/buttons/repost.tsx b/packages/ark/src/components/note/buttons/repost.tsx
@@ -1,12 +1,11 @@
 import { LoaderIcon, ReplyIcon, RepostIcon } from "@lume/icons";
-import { editorAtom, editorValueAtom } from "@lume/utils";
+import { cn, editorAtom, editorValueAtom } from "@lume/utils";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import * as Tooltip from "@radix-ui/react-tooltip";
 import { useSetAtom } from "jotai";
 import { nip19 } from "nostr-tools";
 import { useState } from "react";
 import { toast } from "sonner";
-import { twMerge } from "tailwind-merge";
 import { useNoteContext } from "../provider";
 
 export function NoteRepost() {
@@ -71,7 +70,7 @@ export function NoteRepost() {
 									<LoaderIcon className="size-4 animate-spin" />
 								) : (
 									<RepostIcon
-										className={twMerge(
+										className={cn(
 											"size-5 group-hover:text-blue-600",
 											isRepost ? "text-blue-500" : "",
 										)}

diff --git a/packages/ark/src/components/note/thread.tsx b/packages/ark/src/components/note/thread.tsx
@@ -1,7 +1,6 @@
 import { PinIcon } from "@lume/icons";
-import { COL_TYPES } from "@lume/utils";
+import { COL_TYPES, cn } from "@lume/utils";
 import { Link } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
 import { Note } from ".";
 import { useArk } from "../../hooks/useArk";
 import { useColumnContext } from "../column/provider";
@@ -24,7 +23,7 @@ export function NoteThread({
 	if (!thread) return null;
 
 	return (
-		<div className={twMerge("w-full px-3", className)}>
+		<div className={cn("w-full px-3", className)}>
 			<div className="flex flex-col w-full gap-3 p-3 rounded-lg h-min bg-neutral-100 dark:bg-neutral-900">
 				{thread.rootEventId ? (
 					<Note.Child eventId={thread.rootEventId} isRoot />

diff --git a/packages/lume-column-activity/package.json b/packages/lume-column-activity/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-antenas/package.json b/packages/lume-column-antenas/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-default/package.json b/packages/lume-column-default/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-group/package.json b/packages/lume-column-group/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-hashtag/package.json b/packages/lume-column-hashtag/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-thread/package.json b/packages/lume-column-thread/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-timeline/package.json b/packages/lume-column-timeline/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/lume-column-user/package.json b/packages/lume-column-user/package.json
@@ -8,8 +8,8 @@
 		"@lume/icons": "workspace:^",
 		"@lume/ui": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
-		"@tanstack/react-query": "^5.17.12",
+		"@nostr-dev-kit/ndk": "^2.3.3",
+		"@tanstack/react-query": "^5.17.15",
 		"react": "^18.2.0",
 		"react-router-dom": "^6.21.2",
 		"sonner": "^1.3.1",

diff --git a/packages/ndk-cache-tauri/package.json b/packages/ndk-cache-tauri/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@lume/storage": "workspace:*",
-    "@nostr-dev-kit/ndk": "^2.3.2",
+    "@nostr-dev-kit/ndk": "^2.3.3",
     "lru-cache": "^10.1.0",
     "nostr-fetch": "^0.15.0",
     "nostr-tools": "1.17.0",

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -11,6 +11,6 @@
 		"typescript": "^5.3.3"
 	},
 	"dependencies": {
-		"@nostr-dev-kit/ndk": "^2.3.2"
+		"@nostr-dev-kit/ndk": "^2.3.3"
 	}
 }
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -9,20 +9,20 @@
 		"@lume/icons": "workspace:^",
 		"@lume/storage": "workspace:^",
 		"@lume/utils": "workspace:^",
-		"@nostr-dev-kit/ndk": "^2.3.2",
+		"@nostr-dev-kit/ndk": "^2.3.3",
 		"@radix-ui/react-accordion": "^1.1.2",
 		"@radix-ui/react-alert-dialog": "^1.0.5",
 		"@radix-ui/react-avatar": "^1.0.4",
 		"@radix-ui/react-dialog": "^1.0.5",
 		"@radix-ui/react-dropdown-menu": "^2.0.6",
 		"@radix-ui/react-hover-card": "^1.0.7",
 		"@radix-ui/react-popover": "^1.0.7",
-		"@tanstack/react-query": "^5.17.12",
+		"@tanstack/react-query": "^5.17.15",
 		"@tauri-apps/api": "2.0.0-alpha.13",
 		"@tauri-apps/plugin-http": "2.0.0-alpha.6",
 		"@tauri-apps/plugin-os": "2.0.0-alpha.6",
 		"framer-motion": "^10.18.0",
-		"jotai": "^2.6.1",
+		"jotai": "^2.6.2",
 		"minidenticons": "^4.2.0",
 		"nostr-tools": "~1.17.0",
 		"react": "^18.2.0",

diff --git a/packages/ui/src/layouts/app.tsx b/packages/ui/src/layouts/app.tsx
@@ -1,14 +1,14 @@
+import { cn } from "@lume/utils";
 import { type Platform } from "@tauri-apps/plugin-os";
 import { Outlet } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
 import { Editor } from "../editor/column";
 import { Navigation } from "../navigation";
 import { WindowTitleBar } from "../titlebar";
 
 export function AppLayout({ platform }: { platform: Platform }) {
 	return (
 		<div
-			className={twMerge(
+			className={cn(
 				"flex h-screen w-screen flex-col",
 				platform !== "macos" ? "bg-blue-50 dark:bg-blue-950" : "",
 			)}

diff --git a/packages/ui/src/mentions.tsx b/packages/ui/src/mentions.tsx
@@ -7,9 +7,9 @@ import {
 	useImperativeHandle,
 	useState,
 } from "react";
-import { twMerge } from "tailwind-merge";
 
 import { NDKCacheUserProfile } from "@lume/types";
+import { cn } from "@lume/utils";
 
 type MentionListRef = {
 	onKeyDown: (props: { event: Event }) => boolean;
@@ -76,7 +76,7 @@ const List = (
 						type="button"
 						key={item.pubkey}
 						onClick={() => selectItem(index)}
-						className={twMerge(
+						className={cn(
 							"inline-flex h-11 items-center gap-2 rounded-md px-2",
 							index === selectedIndex
 								? "bg-neutral-100 dark:bg-neutral-900"

diff --git a/packages/ui/src/nip05.tsx b/packages/ui/src/nip05.tsx
@@ -1,8 +1,8 @@
 import { UnverifiedIcon, VerifiedIcon } from "@lume/icons";
+import { cn } from "@lume/utils";
 import { useQuery } from "@tanstack/react-query";
 import { fetch } from "@tauri-apps/plugin-http";
 import { memo } from "react";
-import { twMerge } from "tailwind-merge";
 
 interface NIP05 {
 	names: {
@@ -61,7 +61,7 @@ export const NIP05 = memo(function NIP05({
 
 	return (
 		<div className="inline-flex items-center gap-1">
-			<p className={twMerge("text-sm font-medium", className)}>
+			<p className={cn("text-sm font-medium", className)}>
 				{nip05.startsWith("_@") ? nip05.replace("_@", "") : nip05}
 			</p>
 			{data === true ? (

diff --git a/packages/ui/src/replyList.tsx b/packages/ui/src/replyList.tsx
@@ -4,7 +4,6 @@ import { NDKEventWithReplies } from "@lume/types";
 import { cn } from "@lume/utils";
 import { NDKKind, type NDKSubscription } from "@nostr-dev-kit/ndk";
 import { useEffect, useState } from "react";
-import { twMerge } from "tailwind-merge";
 import { ReplyForm } from "./editor/replyForm";
 
 export function ReplyList({

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -8,12 +8,12 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@tanstack/react-query": "^5.17.12",
+		"@tanstack/react-query": "^5.17.15",
 		"@tauri-apps/api": "2.0.0-alpha.13",
 		"@tauri-apps/plugin-notification": "2.0.0-alpha.5",
 		"clsx": "^2.1.0",
 		"dayjs": "^1.11.10",
-		"jotai": "^2.6.1",
+		"jotai": "^2.6.2",
 		"nostr-tools": "1.17.0",
 		"react": "^18.2.0",
 		"tailwind-merge": "^2.2.0"