update dependencies

package.json

@@ -32,22 +32,20 @@
     "@radix-ui/react-popover": "^1.0.7",
     "@radix-ui/react-toolbar": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.7",
-    "@tanstack/react-query": "4.36.1",
+    "@tanstack/react-query": "^5.0.5",
-    "@tauri-apps/api": "2.0.0-alpha.8",
+    "@tauri-apps/api": "^2.0.0-alpha.9",
-    "@tauri-apps/cli": "2.0.0-alpha.15",
+    "@tauri-apps/cli": "^2.0.0-alpha.16",
-    "@tauri-apps/plugin-app": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-clipboard-manager": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-dialog": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-dialog": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-fs": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-fs": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-http": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-http": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-notification": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-notification": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-os": "^2.0.0-alpha.3",
-    "@tauri-apps/plugin-os": "2.0.0-alpha.2",
+    "@tauri-apps/plugin-process": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-process": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-shell": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-shell": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-sql": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-sql": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-updater": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-updater": "2.0.0-alpha.1",
+    "@tauri-apps/plugin-upload": "^2.0.0-alpha.2",
-    "@tauri-apps/plugin-upload": "2.0.0-alpha.1",
-    "@tauri-apps/plugin-window": "2.0.0-alpha.1",
     "@tiptap/extension-character-count": "^2.1.12",
     "@tiptap/extension-document": "^2.1.12",
     "@tiptap/extension-image": "^2.1.12",
@@ -60,7 +58,7 @@
     "@tiptap/starter-kit": "^2.1.12",
     "@tiptap/suggestion": "^2.1.12",
     "dayjs": "^1.11.10",
-    "destr": "^2.0.1",
+    "destr": "^2.0.2",
     "framer-motion": "^10.16.4",
     "html-to-text": "^9.0.5",
     "light-bolt11-decoder": "^3.0.0",
@@ -77,48 +75,49 @@
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.47.0",
     "react-hotkeys-hook": "^4.4.1",
-    "react-markdown": "^8.0.7",
+    "react-markdown": "^9.0.0",
     "react-router-dom": "^6.17.0",
     "react-string-replace": "^1.1.1",
     "reactflow": "^11.9.4",
-    "remark-gfm": "^3.0.1",
+    "rehype-external-links": "^3.0.0",
+    "remark-gfm": "^4.0.0",
     "sonner": "^1.0.3",
     "tailwind-scrollbar": "^3.0.5",
     "tauri-controls": "^0.2.0",
     "tippy.js": "^6.3.7",
     "tiptap-markdown": "^0.8.2",
-    "virtua": "^0.15.0",
+    "virtua": "^0.15.4",
-    "zustand": "^4.4.3"
+    "zustand": "^4.4.4"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.10",
-    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.2.1",
     "@types/html-to-text": "^9.0.3",
-    "@types/node": "^20.8.7",
+    "@types/node": "^20.8.9",
-    "@types/react": "^18.2.29",
+    "@types/react": "^18.2.33",
     "@types/react-dom": "^18.2.14",
     "@types/youtube-player": "^5.5.9",
-    "@typescript-eslint/eslint-plugin": "^6.8.0",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.8.0",
+    "@typescript-eslint/parser": "^6.9.0",
     "@vitejs/plugin-react-swc": "^3.4.0",
     "autoprefixer": "^10.4.16",
     "clsx": "^2.0.0",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.2",
     "encoding": "^0.1.13",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.0.2",
     "postcss": "^8.4.31",
     "prettier": "^3.0.3",
     "prettier-plugin-tailwindcss": "^0.5.6",
     "prop-types": "^15.8.1",
     "tailwind-merge": "^1.14.0",
-    "tailwindcss": "^3.3.3",
+    "tailwindcss": "^3.3.5",
     "typescript": "^5.2.2",
     "vite": "^4.5.0",
     "vite-tsconfig-paths": "^4.2.1"

src-tauri/Cargo.toml

@@ -18,7 +18,6 @@ tauri = { version = "2.0.0-alpha", features = [
   "macos-private-api",
   "native-tls-vendored",
 ] }
-tauri-plugin-app = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-cli = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
@@ -29,7 +28,6 @@ tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", bra
 tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
-tauri-plugin-window = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }

src-tauri/src/main.rs

@@ -114,7 +114,6 @@ fn main() {
         .plugin(tauri_plugin_updater::Builder::new().build())?;
       Ok(())
     })
-    .plugin(tauri_plugin_app::init())
     .plugin(tauri_plugin_clipboard_manager::init())
     .plugin(tauri_plugin_dialog::init())
     .plugin(tauri_plugin_fs::init())
@@ -125,7 +124,6 @@ fn main() {
     .plugin(tauri_plugin_shell::init())
     .plugin(tauri_plugin_upload::init())
     .plugin(tauri_plugin_updater::Builder::new().build())
-    .plugin(tauri_plugin_window::init())
     .plugin(
       tauri_plugin_sql::Builder::default()
         .add_migrations(

src/libs/storage/instance.ts

@@ -1,5 +1,5 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/primitives';
 import { Platform } from '@tauri-apps/plugin-os';
 import Database from '@tauri-apps/plugin-sql';
 

src/shared/avatarUploader.tsx

@@ -1,5 +1,6 @@
 import { message, open } from '@tauri-apps/plugin-dialog';
 import { readBinaryFile } from '@tauri-apps/plugin-fs';
+import { fetch } from '@tauri-apps/plugin-http';
 import { Dispatch, SetStateAction, useState } from 'react';
 
 import { LoaderIcon, PlusIcon } from '@shared/icons';

src/shared/bannerUploader.tsx

@@ -1,5 +1,6 @@
 import { message, open } from '@tauri-apps/plugin-dialog';
 import { readBinaryFile } from '@tauri-apps/plugin-fs';
+import { fetch } from '@tauri-apps/plugin-http';
 import { Dispatch, SetStateAction, useState } from 'react';
 
 import { LoaderIcon, PlusIcon } from '@shared/icons';

src/shared/notes/actions/zap.tsx

@@ -1,7 +1,7 @@
 import { webln } from '@getalby/sdk';
 import { SendPaymentResponse } from '@getalby/sdk/dist/types';
 import * as Dialog from '@radix-ui/react-dialog';
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/primitives';
 import { message } from '@tauri-apps/plugin-dialog';
 import { QRCodeSVG } from 'qrcode.react';
 import { useEffect, useRef, useState } from 'react';

src/shared/notes/kinds/articleDetail.tsx

@@ -1,6 +1,7 @@
 import { NDKEvent } from '@nostr-dev-kit/ndk';
 import ReactMarkdown from 'react-markdown';
 import { Link } from 'react-router-dom';
+import rehypeExternalLinks from 'rehype-external-links';
 import remarkGfm from 'remark-gfm';
 
 import { Boost, Hashtag, Invoice, MentionUser } from '@shared/notes';
@@ -32,6 +33,7 @@ export function ArticleDetailNote({ event }: { event: NDKEvent }) {
     <ReactMarkdown
       className="break-p prose prose-neutral max-w-none select-text whitespace-pre-line leading-normal dark:prose-invert prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-1 prose-a:font-normal prose-a:text-blue-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-blue-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2 hover:prose-a:text-blue-500"
       remarkPlugins={[remarkGfm]}
+      rehypePlugins={[rehypeExternalLinks({ target: '_blank' })]}
       components={{
         a: ({ href }) => {
           const cleanURL = new URL(href);
@@ -59,7 +61,6 @@ export function ArticleDetailNote({ event }: { event: NDKEvent }) {
           }
         },
       }}
-      linkTarget={'_blank'}
     >
       {event.content}
     </ReactMarkdown>

src/shared/notes/kinds/text.tsx

@@ -1,6 +1,7 @@
 import { memo } from 'react';
 import ReactMarkdown from 'react-markdown';
 import { Link } from 'react-router-dom';
+import rehypeExternalLinks from 'rehype-external-links';
 import remarkGfm from 'remark-gfm';
 
 import {
@@ -25,9 +26,9 @@ export function TextNote(props: { content?: string }) {
         <ReactMarkdown
           className="break-p prose prose-neutral max-w-none select-text whitespace-pre-line leading-normal dark:prose-invert prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-1 prose-a:font-normal prose-a:text-blue-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-blue-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2 hover:prose-a:text-blue-500"
           remarkPlugins={[remarkGfm]}
+          rehypePlugins={[rehypeExternalLinks({ target: '_blank' })]}
           disallowedElements={['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'code']}
           unwrapDisallowed={true}
-          linkTarget={'_blank'}
         >
           {props.content}
         </ReactMarkdown>
@@ -40,6 +41,7 @@ export function TextNote(props: { content?: string }) {
       <ReactMarkdown
         className="break-p prose prose-neutral max-w-none select-text whitespace-pre-line leading-normal dark:prose-invert prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-1 prose-a:font-normal prose-a:text-blue-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-blue-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:bg-white/10 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-ul:mt-1 prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2 hover:prose-a:text-blue-500"
         remarkPlugins={[remarkGfm]}
+        rehypePlugins={[rehypeExternalLinks({ target: '_blank' })]}
         components={{
           a: ({ href }) => {
             const cleanURL = new URL(href);
@@ -69,7 +71,6 @@ export function TextNote(props: { content?: string }) {
         }}
         disallowedElements={['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre', 'code']}
         unwrapDisallowed={true}
-        linkTarget={'_blank'}
       >
         {richContent.parsed}
       </ReactMarkdown>

src/shared/user.tsx

@@ -4,6 +4,7 @@ import { minidenticon } from 'minidenticons';
 import { memo } from 'react';
 import ReactMarkdown from 'react-markdown';
 import { Link } from 'react-router-dom';
+import rehypeExternalLinks from 'rehype-external-links';
 import remarkGfm from 'remark-gfm';
 
 import { RepostIcon, WorldIcon } from '@shared/icons';
@@ -168,10 +169,10 @@ export const User = memo(function User({
             </p>
             <ReactMarkdown
               remarkPlugins={[remarkGfm]}
+              rehypePlugins={[rehypeExternalLinks({ target: '_blank' })]}
               className="markdown-simple line-clamp-6 whitespace-pre-line break-all"
               disallowedElements={['h1', 'h2', 'h3', 'h4', 'h5', 'h6']}
               unwrapDisallowed={true}
-              linkTarget={'_blank'}
             >
               {user?.about || user?.bio || 'No bio'}
             </ReactMarkdown>

src/utils/hooks/useOpenGraph.ts

@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { invoke } from '@tauri-apps/api';
+import { invoke } from '@tauri-apps/api/primitives';
 
 import { Opengraph } from '@utils/types';