-
+
{status === 'loading' ? (
diff --git a/src/index.css b/src/index.css
index ec134231..6d57156e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -50,15 +50,15 @@ input::-ms-clear {
}
.markdown {
- @apply prose prose-white max-w-none select-text whitespace-pre-line text-white prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-0 prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all 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;
+ @apply prose prose-white max-w-none select-text text-white prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:last:mb-0 prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all 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;
}
.markdown-article {
- @apply prose prose-white max-w-none select-text whitespace-pre-line text-white/80 prose-headings:mb-1 prose-headings:mt-3 prose-headings:text-white prose-p:mb-2 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-a:break-words prose-a:break-all prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all 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;
+ @apply prose prose-white max-w-none select-text text-white/80 prose-headings:mb-1 prose-headings:mt-3 prose-headings:text-white prose-p:mb-2 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-a:break-words prose-a:break-all prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all 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;
}
.markdown-simple {
- @apply prose prose-white max-w-none select-text hyphens-auto whitespace-pre-line text-white/70 prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-p:last:mb-0 prose-a:break-words prose-a:break-all prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all 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;
+ @apply prose prose-white max-w-none select-text hyphens-auto text-white/70 prose-headings:mb-1 prose-headings:mt-3 prose-p:mb-0 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-p:last:mb-0 prose-a:break-words prose-a:break-all prose-a:font-normal hover:prose-a:text-fuchsia-500 prose-blockquote:mb-1 prose-blockquote:mt-1 prose-blockquote:border-l-[2px] prose-blockquote:border-fuchsia-500 prose-blockquote:pl-2 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all 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;
}
.ProseMirror p.is-empty::before {
diff --git a/src/shared/notes/actions/zap.tsx b/src/shared/notes/actions/zap.tsx
index c4c219b7..76d52877 100644
--- a/src/shared/notes/actions/zap.tsx
+++ b/src/shared/notes/actions/zap.tsx
@@ -5,7 +5,6 @@ import { message } from '@tauri-apps/api/dialog';
import { QRCodeSVG } from 'qrcode.react';
import { useEffect, useRef, useState } from 'react';
import CurrencyInput from 'react-currency-input-field';
-import TextareaAutosize from 'react-textarea-autosize';
import { CancelIcon, ZapIcon } from '@shared/icons';
@@ -99,7 +98,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
-
+
@@ -171,7 +170,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
-
setZapMessage(e.target.value)}
diff --git a/src/shared/notes/kinds/file.tsx b/src/shared/notes/kinds/file.tsx
index 200fed88..866ae0cf 100644
--- a/src/shared/notes/kinds/file.tsx
+++ b/src/shared/notes/kinds/file.tsx
@@ -1,5 +1,10 @@
import { NDKEvent } from '@nostr-dev-kit/ndk';
-import { MediaPlayer, MediaProvider } from '@vidstack/react';
+import { MediaPlayer, MediaProvider, Poster } from '@vidstack/react';
+import {
+ DefaultAudioLayout,
+ DefaultVideoLayout,
+ defaultLayoutIcons,
+} from '@vidstack/react/player/layouts/default';
import { Link } from 'react-router-dom';
import { Image } from '@shared/image';
@@ -31,9 +36,27 @@ export function FileNote(props: { event?: NDKEvent }) {
poster={`https://thumbnail.video/api/get?url=${url}&seconds=1`}
load="visible"
aspectRatio="16/9"
+ muted={true}
crossorigin=""
+ className="player"
>
-
+
+
+
+
+
);
diff --git a/src/shared/notes/mentions/hashtag.tsx b/src/shared/notes/mentions/hashtag.tsx
index 5c95bd9e..29422466 100644
--- a/src/shared/notes/mentions/hashtag.tsx
+++ b/src/shared/notes/mentions/hashtag.tsx
@@ -7,7 +7,7 @@ export function Hashtag({ tag }: { tag: string }) {
const setWidget = useWidgets((state) => state.setWidget);
return (
-
@@ -24,9 +24,9 @@ export function Hashtag({ tag }: { tag: string }) {
content: tag.replace('#', ''),
})
}
- className="break-words text-fuchsia-400 hover:text-fuchsia-500"
+ className="break-all text-fuchsia-400 hover:text-fuchsia-500"
>
{tag}
-
+
);
}
diff --git a/src/shared/notes/preview/video.tsx b/src/shared/notes/preview/video.tsx
index 089820f7..c99ecf46 100644
--- a/src/shared/notes/preview/video.tsx
+++ b/src/shared/notes/preview/video.tsx
@@ -15,6 +15,7 @@ export function VideoPreview({ urls }: { urls: string[] }) {
load="visible"
aspectRatio="16/9"
crossorigin=""
+ muted={true}
className="player"
>
@@ -24,8 +25,16 @@ export function VideoPreview({ urls }: { urls: string[] }) {
alt={url}
/>
-
-
+
+
))}
From 508a7465789190def3db84cfb277c0ba2d10b4c6 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Thu, 5 Oct 2023 07:28:35 +0700
Subject: [PATCH 04/30] wip
---
src-tauri/tauri.conf.json | 3 +-
src-tauri/tauri.macos.conf.json | 1 -
.../{chaListItem.tsx => chatListItem.tsx} | 0
src/app/chats/components/modal.tsx | 77 -------------------
src/app/chats/index.tsx | 2 +-
5 files changed, 3 insertions(+), 80 deletions(-)
rename src/app/chats/components/{chaListItem.tsx => chatListItem.tsx} (100%)
delete mode 100644 src/app/chats/components/modal.tsx
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 9440a30c..5ff8ef92 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -134,6 +134,7 @@
"enableTauriAPI": true
}
]
- }
+ },
+ "macOSPrivateApi": true
}
}
diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json
index 1ca3cda6..fd56527b 100644
--- a/src-tauri/tauri.macos.conf.json
+++ b/src-tauri/tauri.macos.conf.json
@@ -1,7 +1,6 @@
{
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"tauri": {
- "macOSPrivateApi": true,
"windows": [
{
"width": 300,
diff --git a/src/app/chats/components/chaListItem.tsx b/src/app/chats/components/chatListItem.tsx
similarity index 100%
rename from src/app/chats/components/chaListItem.tsx
rename to src/app/chats/components/chatListItem.tsx
diff --git a/src/app/chats/components/modal.tsx b/src/app/chats/components/modal.tsx
deleted file mode 100644
index e8314656..00000000
--- a/src/app/chats/components/modal.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import * as Dialog from '@radix-ui/react-dialog';
-import { useState } from 'react';
-import { useNavigate } from 'react-router-dom';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { CancelIcon, PlusIcon } from '@shared/icons';
-import { User } from '@shared/user';
-
-export function NewMessageModal() {
- const navigate = useNavigate();
-
- const [open, setOpen] = useState(false);
- const { db } = useStorage();
-
- const openChat = (pubkey: string) => {
- setOpen(false);
- navigate(`/chats/${pubkey}`);
- };
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
- New chat
-
-
-
-
-
-
- All messages will be encrypted, but anyone can see who you chat
-
-
-
-
- {db.account?.follows?.map((pubkey) => (
-
-
-
-
-
-
- ))}
-
-
- );
-}
diff --git a/src/app/chats/index.tsx b/src/app/chats/index.tsx
index d2316e57..86a73ca8 100644
--- a/src/app/chats/index.tsx
+++ b/src/app/chats/index.tsx
@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query';
import { useCallback } from 'react';
import { Outlet } from 'react-router-dom';
-import { ChatListItem } from '@app/chats/components/chaListItem';
+import { ChatListItem } from '@app/chats/components/chatListItem';
import { LoaderIcon } from '@shared/icons';
From cef6b9aca90d12754289684c03e0334433ba12fb Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Thu, 5 Oct 2023 14:55:12 +0700
Subject: [PATCH 05/30] wip: new chat layout
---
src/app/chats/chat.tsx | 9 +++-
src/app/chats/components/chatListItem.tsx | 27 ++++++-----
src/app/chats/components/message.tsx | 55 +++++++++++------------
src/app/chats/index.tsx | 17 +++++--
src/app/space/components/widgetList.tsx | 8 ++--
src/shared/accounts/active.tsx | 4 +-
src/shared/icons/community.tsx | 19 ++++++++
src/shared/icons/index.ts | 1 +
src/shared/navigation.tsx | 18 ++++++++
src/shared/nip05.tsx | 6 ++-
src/shared/notes/kinds/article.tsx | 12 ++---
src/shared/notes/mentions/hashtag.tsx | 4 +-
src/shared/notes/preview/link.tsx | 8 ++--
src/shared/user.tsx | 38 ++++++++--------
14 files changed, 143 insertions(+), 83 deletions(-)
create mode 100644 src/shared/icons/community.tsx
diff --git a/src/app/chats/chat.tsx b/src/app/chats/chat.tsx
index f9d15696..5dfeb321 100644
--- a/src/app/chats/chat.tsx
+++ b/src/app/chats/chat.tsx
@@ -11,6 +11,7 @@ import { useNDK } from '@libs/ndk/provider';
import { useStorage } from '@libs/storage/provider';
import { LoaderIcon } from '@shared/icons';
+import { User } from '@shared/user';
import { useStronghold } from '@stores/stronghold';
@@ -35,6 +36,7 @@ export function ChatScreen() {
message={message}
userPubkey={db.account.pubkey}
userPrivkey={userPrivkey}
+ self={message.pubkey === db.account.pubkey}
/>
);
},
@@ -71,7 +73,10 @@ export function ChatScreen() {
-
+
+
+
+
{status === 'loading' ? (
@@ -92,7 +97,7 @@ export function ChatScreen() {
)}
-
+
-
-
+
);
}
@@ -55,24 +58,28 @@ export const ChatListItem = memo(function ChatListItem({ event }: { event: NDKEv
loading="lazy"
decoding="async"
style={{ contentVisibility: 'auto' }}
- className="h-9 w-9 rounded-lg"
+ className="h-10 w-10 rounded-lg"
/>
- 
+
-
+
{user?.name ||
user?.display_name ||
user?.displayName ||
displayNpub(event.pubkey, 16)}
-
+
-
+
{decryptedContent}
-
-
{createdAt}
+
+
{createdAt}
-
-
-
-
- {!richContent ? (
-
Decrypting...
- ) : (
-
-
- {richContent.parsed}
-
-
- {richContent.images.length > 0 && (
-
- )}
- {richContent.videos.length > 0 && (
-
- )}
- {richContent.links.length > 0 && }
- {richContent.notes.length > 0 &&
- richContent.notes.map((note: string) => (
-
- ))}
-
-
- )}
+
+ {!richContent ? (
+
Decrypting...
+ ) : (
+
+
+ {richContent.parsed}
+
+
+ {richContent.images.length > 0 && }
+ {richContent.videos.length > 0 && }
+ {richContent.links.length > 0 && }
+ {richContent.notes.length > 0 &&
+ richContent.notes.map((note: string) => (
+
+ ))}
+
-
+ )}
);
}
diff --git a/src/app/chats/index.tsx b/src/app/chats/index.tsx
index 86a73ca8..6d12c1d5 100644
--- a/src/app/chats/index.tsx
+++ b/src/app/chats/index.tsx
@@ -16,7 +16,12 @@ export function ChatsScreen() {
async () => {
return await getAllNIP04Chats();
},
- { refetchOnWindowFocus: false }
+ {
+ refetchOnWindowFocus: false,
+ refetchOnMount: false,
+ refetchOnReconnect: false,
+ staleTime: Infinity,
+ }
);
const renderItem = useCallback(
@@ -31,9 +36,13 @@ export function ChatsScreen() {
-
+ className="flex h-11 w-full shrink-0 items-center border-b border-white/5 px-3"
+ >
+
+ All chats
+
+
+
{status === 'loading' ? (
diff --git a/src/app/space/components/widgetList.tsx b/src/app/space/components/widgetList.tsx
index ec2c5851..3ceeb91e 100644
--- a/src/app/space/components/widgetList.tsx
+++ b/src/app/space/components/widgetList.tsx
@@ -57,9 +57,9 @@ export function WidgetList({ params }: { params: Widget }) {
);
const renderItem = useCallback(
- (row: WidgetGroup) => {
+ (row: WidgetGroup, index: number) => {
return (
-
+
{row.title}
{row.data.map((item, index) => (
@@ -101,7 +101,9 @@ export function WidgetList({ params }: { params: Widget }) {
- {DefaultWidgets.map((row: WidgetGroup) => renderItem(row))}
+ {DefaultWidgets.map((row: WidgetGroup, index: number) =>
+ renderItem(row, index)
+ )}
-
-
+
+
{user?.name || user?.display_name || user?.displayName}
diff --git a/src/shared/icons/community.tsx b/src/shared/icons/community.tsx
new file mode 100644
index 00000000..e1899bcc
--- /dev/null
+++ b/src/shared/icons/community.tsx
@@ -0,0 +1,19 @@
+import { SVGProps } from 'react';
+
+export function CommunityIcon(props: JSX.IntrinsicAttributes & SVGProps) {
+ return (
+
+ );
+}
diff --git a/src/shared/icons/index.ts b/src/shared/icons/index.ts
index 6bb149d5..3bc53bf2 100644
--- a/src/shared/icons/index.ts
+++ b/src/shared/icons/index.ts
@@ -72,3 +72,4 @@ export * from './explore';
export * from './explore2';
export * from './home';
export * from './chats';
+export * from './community';
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx
index 4c3e1922..195a9a01 100644
--- a/src/shared/navigation.tsx
+++ b/src/shared/navigation.tsx
@@ -10,6 +10,7 @@ import {
ArrowLeftIcon,
ArrowRightIcon,
ChatsIcon,
+ CommunityIcon,
ExploreIcon,
HomeIcon,
RelayIcon,
@@ -90,6 +91,23 @@ export function Navigation() {
Chats
+
+ twMerge(
+ 'flex h-10 items-center gap-2.5 rounded-r-lg border-l-2 px-3 font-medium',
+ isActive
+ ? 'border-fuchsia-500 bg-white/5 text-white'
+ : 'border-transparent text-white/70'
+ )
+ }
+ >
+
+
+
+ Communities
+
- {nip05}
+
+
{data === true ? (
diff --git a/src/shared/notes/kinds/article.tsx b/src/shared/notes/kinds/article.tsx
index 2f06b781..d720d587 100644
--- a/src/shared/notes/kinds/article.tsx
+++ b/src/shared/notes/kinds/article.tsx
@@ -38,13 +38,15 @@ export function ArticleNote(props: { event?: NDKEvent }) {
/>
)}
-
+
{metadata.title}
-
- {metadata.summary}
-
-
+ {metadata.summary ? (
+
+ {metadata.summary}
+
+ ) : null}
+
{metadata.publishedAt.toString()}
diff --git a/src/shared/notes/mentions/hashtag.tsx b/src/shared/notes/mentions/hashtag.tsx
index 29422466..2eb64726 100644
--- a/src/shared/notes/mentions/hashtag.tsx
+++ b/src/shared/notes/mentions/hashtag.tsx
@@ -7,7 +7,7 @@ export function Hashtag({ tag }: { tag: string }) {
const setWidget = useWidgets((state) => state.setWidget);
return (
-
@@ -27,6 +27,6 @@ export function Hashtag({ tag }: { tag: string }) {
className="break-all text-fuchsia-400 hover:text-fuchsia-500"
>
{tag}
-
+
);
}
diff --git a/src/shared/notes/preview/link.tsx b/src/shared/notes/preview/link.tsx
index b0b81e14..48183240 100644
--- a/src/shared/notes/preview/link.tsx
+++ b/src/shared/notes/preview/link.tsx
@@ -46,17 +46,15 @@ export function LinkPreview({ urls }: { urls: string[] }) {
/>
)}
-
+
{data.title}
{data.description && (
-
+
{data.description}
)}
-
- {domain.hostname}
-
+
{domain.hostname}
)}
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 8fab1c30..eda68ff2 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -80,14 +80,14 @@ export const User = memo(function User({
-
+
{user?.name ||
user?.display_name ||
user?.displayName ||
displayNpub(pubkey, 16)}
- ยท
- {createdAt}
+ ยท
+ {createdAt}
);
@@ -111,7 +111,7 @@ export const User = memo(function User({
-
+
{user?.name || user?.display_name || user?.displayName}
-
-
+
+
{user?.name || user?.display_name || user?.displayName}
-
+
{user?.nip05 || user?.username || displayNpub(pubkey, 16)}
-
+
{user?.name ||
user?.display_name ||
user?.displayName ||
@@ -260,13 +260,13 @@ export const User = memo(function User({
-
+
{user?.name || user?.display_name || user?.displayName || 'Anon'}
- {createdAt}
- ยท
- {displayNpub(pubkey, 16)}
+ {createdAt}
+ ยท
+ {displayNpub(pubkey, 16)}
-
+
+
{user?.name ||
user?.display_name ||
user?.displayName ||
displayNpub(pubkey, 16)}
- ยท
- {createdAt}
+ ยท
+ {createdAt}
-
+
{user?.name ||
user?.display_name ||
user?.displayName ||
@@ -341,10 +341,10 @@ export const User = memo(function User({
) : (
-
+
{displayNpub(pubkey, 16)}
)}
From 1240353e300026bb4c94b4b5f2af0e5b70416952 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Fri, 6 Oct 2023 07:40:50 +0700
Subject: [PATCH 06/30] wip
---
index.html | 4 ++--
package.json | 1 +
pnpm-lock.yaml | 7 +++++++
src-tauri/Cargo.lock | 12 ++++++++++++
src-tauri/Cargo.toml | 1 +
src-tauri/src/main.rs | 11 ++++++++---
src-tauri/tauri.windows.conf.json | 1 +
src/{index.css => app.css} | 0
src/app.tsx | 8 ++++----
src/app/error.tsx | 6 ++----
src/{main.tsx => main.jsx} | 0
src/shared/accounts/active.tsx | 8 ++++----
src/shared/frame.tsx | 28 ----------------------------
src/shared/layouts/app.tsx | 5 ++---
src/shared/layouts/auth.tsx | 6 ++----
src/shared/layouts/note.tsx | 6 ++----
src/shared/layouts/settings.tsx | 5 ++---
src/shared/navigation.tsx | 8 ++------
tailwind.config.js | 5 +++++
tsconfig.json | 2 +-
20 files changed, 58 insertions(+), 66 deletions(-)
rename src/{index.css => app.css} (100%)
rename src/{main.tsx => main.jsx} (100%)
delete mode 100644 src/shared/frame.tsx
diff --git a/index.html b/index.html
index 05fab479..c9a5cef7 100644
--- a/index.html
+++ b/index.html
@@ -4,8 +4,8 @@
Lume
-
+
-
+
diff --git a/package.json b/package.json
index 80ee335a..882fedd4 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
},
"dependencies": {
"@dnd-kit/core": "^6.0.8",
+ "@fontsource-variable/inter": "^5.0.12",
"@getalby/sdk": "^2.4.0",
"@nostr-dev-kit/ndk": "^1.3.1",
"@nostr-dev-kit/ndk-cache-dexie": "^1.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f904528b..233f1077 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,6 +8,9 @@ dependencies:
'@dnd-kit/core':
specifier: ^6.0.8
version: 6.0.8(react-dom@18.2.0)(react@18.2.0)
+ '@fontsource-variable/inter':
+ specifier: ^5.0.12
+ version: 5.0.12
'@getalby/sdk':
specifier: ^2.4.0
version: 2.4.0
@@ -675,6 +678,10 @@ packages:
resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
dev: false
+ /@fontsource-variable/inter@5.0.12:
+ resolution: {integrity: sha512-BuYkYLsvqLnWlXeyUvo6HpcAAgiOpIeQeVXWuxTNrJWr3NpuY5mWzizCxHnHD2gWLZOSOx0GkBqhQl7Oh6zTUQ==}
+ dev: false
+
/@getalby/sdk@2.4.0:
resolution: {integrity: sha512-aIGNwLRF9coj6koxfq7P4GtFZbFjQbnIheix39x9176PwFw4dXOdGXHPXnqioJTmeq80y+vX1yd+u/f03YGoeg==}
engines: {node: '>=14'}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 202bc54f..6edb5a0c 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2626,6 +2626,7 @@ dependencies = [
"tauri-plugin-stronghold",
"tauri-plugin-upload",
"webpage",
+ "window-shadows",
"window-vibrancy",
]
@@ -5949,6 +5950,17 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+[[package]]
+name = "window-shadows"
+version = "0.2.1"
+source = "git+https://github.com/tauri-apps/window-shadows?branch=dev#a9f5f1f7725609c71404539befca1f1a98095cd2"
+dependencies = [
+ "cocoa 0.25.0",
+ "objc",
+ "raw-window-handle",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "window-vibrancy"
version = "0.4.1"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index b4ae74bf..ec495687 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -49,6 +49,7 @@ tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspa
tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" }
+window-shadows = { git = "https://github.com/tauri-apps/window-shadows", branch = "dev" }
sqlx-cli = { version = "0.7.0", default-features = false, features = [
"sqlite",
] }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 87952bb2..f0e3e113 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -12,9 +12,8 @@ use tauri::{Manager, WindowEvent};
use tauri_plugin_autostart::MacosLauncher;
use tauri_plugin_sql::{Migration, MigrationKind};
use webpage::{Webpage, WebpageOptions};
-
-#[cfg(target_os = "macos")]
-use window_vibrancy::{apply_vibrancy, NSVisualEffectMaterial};
+use window_vibrancy::{apply_mica, apply_vibrancy, NSVisualEffectMaterial};
+use window_shadows::set_shadow;
#[cfg(target_os = "macos")]
use traffic_light::TrafficLight;
@@ -107,6 +106,12 @@ fn main() {
tauri::Builder::default()
.setup(|app| {
let window = app.get_window("main").unwrap();
+ let splashscreen = app.get_window("splashscreen").unwrap();
+
+ #[cfg(target_os = "windows")]
+ set_shadow(&window, true).expect("Unsupported platform!");
+ #[cfg(target_os = "windows")]
+ set_shadow(&splashscreen, true).expect("Unsupported platform!");
#[cfg(target_os = "macos")]
apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None)
diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json
index 41eb03d0..19bd3611 100644
--- a/src-tauri/tauri.windows.conf.json
+++ b/src-tauri/tauri.windows.conf.json
@@ -17,6 +17,7 @@
"height": 800,
"minWidth": 1080,
"minHeight": 800,
+ "decorations": false,
"resizable": true,
"theme": "Dark",
"title": "Lume",
diff --git a/src/index.css b/src/app.css
similarity index 100%
rename from src/index.css
rename to src/app.css
diff --git a/src/app.tsx b/src/app.tsx
index a312965f..1f6544d4 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,3 +1,4 @@
+import '@fontsource-variable/inter/slnt.css';
import { message } from '@tauri-apps/api/dialog';
import { fetch } from '@tauri-apps/api/http';
import { RouterProvider, createBrowserRouter, defer, redirect } from 'react-router-dom';
@@ -12,14 +13,13 @@ import { ExploreScreen } from '@app/explore';
import { useStorage } from '@libs/storage/provider';
-import { Frame } from '@shared/frame';
import { LoaderIcon } from '@shared/icons';
import { AppLayout } from '@shared/layouts/app';
import { AuthLayout } from '@shared/layouts/auth';
import { NoteLayout } from '@shared/layouts/note';
import { SettingsLayout } from '@shared/layouts/settings';
-import './index.css';
+import './app.css';
export default function App() {
const { db } = useStorage();
@@ -331,9 +331,9 @@ export default function App() {
+
-
+
}
future={{ v7_startTransition: true }}
/>
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 074399b7..1d6bbbaa 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -1,8 +1,6 @@
import { useEffect, useState } from 'react';
import { useLocation, useRouteError } from 'react-router-dom';
-import { Frame } from '@shared/frame';
-
interface RouteError {
statusText: string;
message: string;
@@ -46,7 +44,7 @@ export function ErrorScreen() {
}, []);
return (
-
+
@@ -88,6 +86,6 @@ export function ErrorScreen() {
-
+
);
}
diff --git a/src/main.tsx b/src/main.jsx
similarity index 100%
rename from src/main.tsx
rename to src/main.jsx
diff --git a/src/shared/accounts/active.tsx b/src/shared/accounts/active.tsx
index f4e80848..89fa8294 100644
--- a/src/shared/accounts/active.tsx
+++ b/src/shared/accounts/active.tsx
@@ -68,12 +68,12 @@ export function ActiveAccount() {
className="h-9 w-9 shrink-0 rounded-lg object-cover"
/>
-
+
{user?.name || user?.display_name || user?.displayName}
-
-
+
+
{user?.nip05 || displayNpub(db.account.pubkey, 12)}
-
+
diff --git a/src/shared/frame.tsx b/src/shared/frame.tsx
deleted file mode 100644
index cfa254ca..00000000
--- a/src/shared/frame.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { HTMLProps, ReactNode, useCallback } from 'react';
-import { twMerge } from 'tailwind-merge';
-
-import { useStorage } from '@libs/storage/provider';
-
-export function Frame({
- children,
- className,
- lighter,
-}: {
- children: ReactNode;
- className: HTMLProps
['className'];
- lighter?: boolean;
-}) {
- const { db } = useStorage();
-
- const platformStyles = useCallback(() => {
- switch (db.platform) {
- case 'darwin':
- if (lighter) return 'bg-black/80';
- return 'bg-black/90';
- default:
- return 'bg-black';
- }
- }, []);
-
- return {children}
;
-}
diff --git a/src/shared/layouts/app.tsx b/src/shared/layouts/app.tsx
index bb0bff26..32db40e9 100644
--- a/src/shared/layouts/app.tsx
+++ b/src/shared/layouts/app.tsx
@@ -1,6 +1,5 @@
import { Outlet, ScrollRestoration } from 'react-router-dom';
-import { Frame } from '@shared/frame';
import { Navigation } from '@shared/navigation';
export function AppLayout() {
@@ -9,14 +8,14 @@ export function AppLayout() {
-
+
{
return location.pathname;
}}
/>
-
+
-
+
@@ -56,7 +55,7 @@ export function SettingsLayout() {
-
+
+
);
}
diff --git a/tailwind.config.js b/tailwind.config.js
index 8110e056..e9afbd89 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,10 +1,15 @@
/** @type {import('tailwindcss').Config} */
+const defaultTheme = require('tailwindcss/defaultTheme')
+
module.exports = {
content: ['./src/**/*.{js,ts,jsx,tsx}', 'index.html'],
darkMode: 'class',
theme: {
extend: {
+ fontFamily: {
+ sans: ['Inter Variable', ...defaultTheme.fontFamily.sans],
+ },
typography: ({ theme }) => ({
white: {
css: {
diff --git a/tsconfig.json b/tsconfig.json
index 2f86f511..d37c8f01 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,6 +24,6 @@
"jsx": "preserve",
"strictNullChecks": false
},
- "include": ["**/*.ts", "**/*.tsx"],
+ "include": ["**/*.ts", "**/*.tsx", "src/main.jsx"],
"exclude": ["node_modules", "dist", "src-tauri"]
}
From 9627c40d7546b2c6c9b4e591d1d11604c0c1e097 Mon Sep 17 00:00:00 2001
From: reya
Date: Fri, 6 Oct 2023 08:30:59 +0700
Subject: [PATCH 07/30] wip: tauri v2
---
package.json | 14 +-
pnpm-lock.yaml | 181 +++-
src-tauri/Cargo.lock | 1222 +++++++++++++++--------
src-tauri/Cargo.toml | 52 +-
src-tauri/src/main.rs | 22 +-
src-tauri/tauri.conf.json | 126 +--
src/app.tsx | 4 +-
src/app/auth/create/step-1.tsx | 6 +-
src/app/auth/onboarding/step-2.tsx | 2 +-
src/app/error.tsx | 4 +-
src/app/notes/article.tsx | 2 +-
src/app/notes/text.tsx | 2 +-
src/app/nwc/components/alby.tsx | 4 +-
src/app/relays/components/relayList.tsx | 2 +-
src/app/settings/components/version.tsx | 2 +-
src/app/splash.tsx | 2 +-
src/app/users/components/modal.tsx | 2 +-
src/libs/ndk/instance.ts | 4 +-
src/libs/storage/instance.ts | 4 +-
src/libs/storage/provider.tsx | 4 +-
src/shared/composer/composer.tsx | 2 +-
src/shared/composer/mediaUploader.tsx | 2 +-
src/shared/nip05.tsx | 2 +-
src/shared/notes/actions/more.tsx | 2 +-
src/shared/notes/actions/repost.tsx | 2 +-
src/shared/notes/actions/zap.tsx | 2 +-
src/utils/createBlobFromFile.ts | 2 +-
src/utils/hooks/useNostr.ts | 4 +-
src/utils/notification.ts | 2 +-
src/utils/types.d.ts | 2 +-
30 files changed, 1056 insertions(+), 627 deletions(-)
diff --git a/package.json b/package.json
index 882fedd4..a05352dd 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,18 @@
"@radix-ui/react-tooltip": "^1.0.7",
"@tanstack/react-query": "^4.35.7",
"@tauri-apps/api": "^1.5.0",
+ "@tauri-apps/plugin-app": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-cli": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-dialog": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-fs": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-http": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-notification": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-os": "2.0.0-alpha.2",
+ "@tauri-apps/plugin-process": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-shell": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-updater": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-window": "2.0.0-alpha.1",
"@tiptap/extension-image": "^2.1.11",
"@tiptap/extension-mention": "^2.1.11",
"@tiptap/extension-placeholder": "^2.1.11",
@@ -70,7 +82,7 @@
},
"devDependencies": {
"@tailwindcss/typography": "^0.5.10",
- "@tauri-apps/cli": "^1.5.1",
+ "@tauri-apps/cli": "2.0.0-alpha.14",
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
"@types/html-to-text": "^9.0.2",
"@types/node": "^20.8.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 233f1077..839f1b91 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -53,6 +53,42 @@ dependencies:
'@tauri-apps/api':
specifier: ^1.5.0
version: 1.5.0
+ '@tauri-apps/plugin-app':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-cli':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-clipboard-manager':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-dialog':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-fs':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-http':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-notification':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-os':
+ specifier: 2.0.0-alpha.2
+ version: 2.0.0-alpha.2
+ '@tauri-apps/plugin-process':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-shell':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-updater':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-window':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
'@tiptap/extension-image':
specifier: ^2.1.11
version: 2.1.11(@tiptap/core@2.1.11)
@@ -158,8 +194,8 @@ devDependencies:
specifier: ^0.5.10
version: 0.5.10(tailwindcss@3.3.3)
'@tauri-apps/cli':
- specifier: ^1.5.1
- version: 1.5.1
+ specifier: 2.0.0-alpha.14
+ version: 2.0.0-alpha.14
'@trivago/prettier-plugin-sort-imports':
specifier: ^4.2.0
version: 4.2.0(prettier@3.0.3)
@@ -1901,8 +1937,13 @@ packages:
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
- /@tauri-apps/cli-darwin-arm64@1.5.1:
- resolution: {integrity: sha512-o2FSGj72gqJjlVtuScXQZUgiRs90PS9gG7YAz0Hgr4nV1MfIn9U6JVj6R+mnAEZBCK8qdy5jdemhmNKDDoiYQg==}
+ /@tauri-apps/api@2.0.0-alpha.6:
+ resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==}
+ engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
+ dev: false
+
+ /@tauri-apps/cli-darwin-arm64@2.0.0-alpha.14:
+ resolution: {integrity: sha512-3K416rvSUt8el/fdPnSnHJOI2j5Os9Kyy17XZp+z3PKRRuo/iJPp9L3w0zFGYsh7C+ylzV4OBUSVTi+e+gO5qA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [darwin]
@@ -1910,8 +1951,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-darwin-x64@1.5.1:
- resolution: {integrity: sha512-G1/v6AJPP5oIcjsOxZshag28wdmDx1Fis2yz545aUk7oKU86A3ZJpz0b8BaXkr93w04xGcmGAaspZeXMmTvrbw==}
+ /@tauri-apps/cli-darwin-x64@2.0.0-alpha.14:
+ resolution: {integrity: sha512-aLEUGG8Z0UpTENe4/UG6DU8bnB2e1uxyxYvcmFKrHv+EAtR9nLH14alBxPl2K54YXy3JLR4bKROW15a/sFrX9g==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
@@ -1919,8 +1960,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-linux-arm-gnueabihf@1.5.1:
- resolution: {integrity: sha512-hPDOUMviffyX5BySk6RuD7IZZeMuNUJzKWHxVWa0NHJPfxQOIPWwYWbk6TascrVk9GZYAImcB0yKfrll8I0VTg==}
+ /@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-alpha.14:
+ resolution: {integrity: sha512-Lu7unNvurBccxfHIaUQ0gPgUioTkQBMtWGrqO/auZ/JbjPR1W2eBlRwVNXf+nBWX9HwomPR3YD5yZuZmzxRV2g==}
engines: {node: '>= 10'}
cpu: [arm]
os: [linux]
@@ -1928,8 +1969,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-linux-arm64-gnu@1.5.1:
- resolution: {integrity: sha512-EJjTXqZchFLVrFgfxwstrQj7NwVDirffLhw5hRWS3L3Iys3IvqzIMVIA+GrY7KsaPwq7qaSqE1CDtP1wejE/9g==}
+ /@tauri-apps/cli-linux-arm64-gnu@2.0.0-alpha.14:
+ resolution: {integrity: sha512-g8HkwKvAsWLLMJzPup7B1BCilYmXKwXdee7sf8QFbaIUSccR8i5pXLK5N/quKw5lmldYgFveEyuW9Qs8RgTYnQ==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
@@ -1937,8 +1978,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-linux-arm64-musl@1.5.1:
- resolution: {integrity: sha512-XgJIk0AcxRL4pWVjfj0wiC9WnIZoUIVLPcQs86dNxoqzwAvADdNYp+McXf3/MDxX8uGEzpgdvlqr4T+50c8f6w==}
+ /@tauri-apps/cli-linux-arm64-musl@2.0.0-alpha.14:
+ resolution: {integrity: sha512-ag4UuX6zg7vmBFWmg9ChyiJI7GTMkc8tjr/qobd3Lg9ddmjnVWwLUHt6v1kYhXiU7iLPD5DYDIjU8x/POc3hSA==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
@@ -1946,8 +1987,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-linux-x64-gnu@1.5.1:
- resolution: {integrity: sha512-VoVrIn7b+F2n0LJoDkLGXQJsPV/U1h3QnjRNE+Tcju6xVPBx64H0vfb7lC3S4QfVpiQ4Uc+1UD3Slvn4jGpL/A==}
+ /@tauri-apps/cli-linux-x64-gnu@2.0.0-alpha.14:
+ resolution: {integrity: sha512-+CviROc4fzrGqqyHQXh3uc2dGr/oYr19I8r2k+LJ2CDfmtj7CbNd/oC5oehHbHdw1oGFKuDPudrTGvzdRNygYA==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
@@ -1955,8 +1996,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-linux-x64-musl@1.5.1:
- resolution: {integrity: sha512-tQi2K0LYW80BLud7ZFOy3WxCM2VjDRxuhxOYhtcLG39cIeGqsSz07LwiCFNBn4vy2J47TnZ+8XDRAOtxSFe25w==}
+ /@tauri-apps/cli-linux-x64-musl@2.0.0-alpha.14:
+ resolution: {integrity: sha512-aCP51HOAQXgVhyPHXKy627bYVRkNnpCvSU3L03pYV8YDoGo+veeuek5UiW7PlNdwx52B/yC3Jz7Dr3gEbFimfQ==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
@@ -1964,8 +2005,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-win32-arm64-msvc@1.5.1:
- resolution: {integrity: sha512-BdVwzVXY2JWBtWEO/G0//jIWXeWR52+KG0+kyoHO6QTxkncLrN5q2RldvXOe7CvhKe/qmgbkNosj5jWi7t49kQ==}
+ /@tauri-apps/cli-win32-arm64-msvc@2.0.0-alpha.14:
+ resolution: {integrity: sha512-b6Ei5ERUF0KS1bttM7i6U62GmjIvlgK03XZqvL/KLNvUfqRMu8F7JA1ejSExgTxhEhKSWA768HiTXpXk2GjFFw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
@@ -1973,8 +2014,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-win32-ia32-msvc@1.5.1:
- resolution: {integrity: sha512-Q0ei4ZUHlGu/b4DP4Cm6WnI5zxpLxnf/vSwR2BYO3XO65TdLee1gTyuwYuSZJYu5jxqSoSusmLyL4F43jHhf9Q==}
+ /@tauri-apps/cli-win32-ia32-msvc@2.0.0-alpha.14:
+ resolution: {integrity: sha512-TDkvu5pd37bKxZ6N+BqngCNGcefY7aHxyJ3BdBGxF+wRMjEMh70mgEXk8i0uM/aUi/Kl1GQoO6xJfUDlIMPXOA==}
engines: {node: '>= 10'}
cpu: [ia32]
os: [win32]
@@ -1982,8 +2023,8 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli-win32-x64-msvc@1.5.1:
- resolution: {integrity: sha512-chpsJ5PIwMOdn1IIJ6bj2G7jv9jQryVvhujU0k3kt/5kE7OuLRDYbI5BAIzMOaLoOTgoo8oxcFXQ+enELSxlMQ==}
+ /@tauri-apps/cli-win32-x64-msvc@2.0.0-alpha.14:
+ resolution: {integrity: sha512-9yfoEe2RSykKr5hCifVAL5o0gHXgRCS+Wo+RJjQ9L2+QHY7XPLZYAhj/h8jdcAdRveyIQwat3k7wl+SW87v1eg==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
@@ -1991,23 +2032,95 @@ packages:
dev: true
optional: true
- /@tauri-apps/cli@1.5.1:
- resolution: {integrity: sha512-Ssj30axil5vPBV3W5ScHXk4umTKu6BhfmMdljfKDOG9K55gAqzBAE2VBC5e/ouclSxZfN+6YNL9VhDXFu/UyeA==}
+ /@tauri-apps/cli@2.0.0-alpha.14:
+ resolution: {integrity: sha512-4/IQwN5S94D6LTXQrDWbSea0pGb9TTC4BwxHUFmhep4NjFxms161v1zadAUIsq/N2x6WwCBGrsdq9SIkgKv49Q==}
engines: {node: '>= 10'}
hasBin: true
optionalDependencies:
- '@tauri-apps/cli-darwin-arm64': 1.5.1
- '@tauri-apps/cli-darwin-x64': 1.5.1
- '@tauri-apps/cli-linux-arm-gnueabihf': 1.5.1
- '@tauri-apps/cli-linux-arm64-gnu': 1.5.1
- '@tauri-apps/cli-linux-arm64-musl': 1.5.1
- '@tauri-apps/cli-linux-x64-gnu': 1.5.1
- '@tauri-apps/cli-linux-x64-musl': 1.5.1
- '@tauri-apps/cli-win32-arm64-msvc': 1.5.1
- '@tauri-apps/cli-win32-ia32-msvc': 1.5.1
- '@tauri-apps/cli-win32-x64-msvc': 1.5.1
+ '@tauri-apps/cli-darwin-arm64': 2.0.0-alpha.14
+ '@tauri-apps/cli-darwin-x64': 2.0.0-alpha.14
+ '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-alpha.14
+ '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-alpha.14
+ '@tauri-apps/cli-linux-arm64-musl': 2.0.0-alpha.14
+ '@tauri-apps/cli-linux-x64-gnu': 2.0.0-alpha.14
+ '@tauri-apps/cli-linux-x64-musl': 2.0.0-alpha.14
+ '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-alpha.14
+ '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-alpha.14
+ '@tauri-apps/cli-win32-x64-msvc': 2.0.0-alpha.14
dev: true
+ /@tauri-apps/plugin-app@2.0.0-alpha.1:
+ resolution: {integrity: sha512-DKlbG4ymoa8xDKdK36adPlZYeY8wcDQfi/XJG4qxhK6YC4GLrM1sG5eQgjVKheDI6wDQC5CiUjhnvddXVFUPTg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-cli@2.0.0-alpha.1:
+ resolution: {integrity: sha512-CsEGByU9btlLWgo2WGsWnvMFHY7za+K5tAcCo5c6xgyOGplx+PrN63ZDxVvF686ZpjxtItoRra8lesqXHToGMg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-clipboard-manager@2.0.0-alpha.1:
+ resolution: {integrity: sha512-zXybHu31RCx58ZGU7/kUHcvoXW2AX6kBXBZsKHv4rYe7Z869WmDLDC7iU23/dAJLu7xAPTJzJ/HbeMfbrfJ4hg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-dialog@2.0.0-alpha.1:
+ resolution: {integrity: sha512-Fqv7zB7qvR6DkcH1dafHcRRNWRSFwj637/G2MQ+kKrmk1ErfV95lcYjpIhmUaETQSPKeogSI6A78kSnO89cvHQ==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-fs@2.0.0-alpha.1:
+ resolution: {integrity: sha512-snIDRAFgg3vi73TwiDQkM3+zBTDRvBXgGd7BAsSW7MQ+/3cJM4XcyPcYkv9X6jpgIiQrbWsDGs/KM4ob247K7A==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-http@2.0.0-alpha.1:
+ resolution: {integrity: sha512-Ss9tR7JWmOcQEbHRdXXjjd+3nIPurqvuJwduIFrU3z0DQ0A+gtWVgyNMrQm+PAtJvw7FZlZDt8YMNIi7eEkJHg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-notification@2.0.0-alpha.1:
+ resolution: {integrity: sha512-/U046gKo0RsPsi7OTQEuu2ezWrhBNheTMA+iyMWb65N9mMSORul66Y1oKXzJOqeMsSQcL4V+WPz+6wzMGHY7lQ==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-os@2.0.0-alpha.2:
+ resolution: {integrity: sha512-5N20UFcgx+d415xupGfxb4vS7L/cx0X+I6DlJJ+xuO1y123+NLthFpnXxU3XH2TZXIZ36Rkfqz5uZO+xf+9JUQ==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-process@2.0.0-alpha.1:
+ resolution: {integrity: sha512-ljTtJmuuURR1Q+H8zvbMX9pmMZdJQWMXGsUEK2aBNlUo4qE2AniXLjoaE1jJQ1NF2LKptJRSY1bSUi+OyEkjGg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-shell@2.0.0-alpha.1:
+ resolution: {integrity: sha512-vH4ODw/7pmMHackh1F+/uGmBXNGArVJ8FRO0xyL0xjPsMxbba4o90FJ7eiITENznBZRKn3JFaTedh8KhAZqU/g==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-updater@2.0.0-alpha.1:
+ resolution: {integrity: sha512-rJoVc/N8gg1MkUOFZdx5h39V47elddwnOjs0sAPhaGfwct7okmFMRnXpN/MwHoprTkK2+6EDLOvhf0jFMiy4JA==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-window@2.0.0-alpha.1:
+ resolution: {integrity: sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
/@tiptap/core@2.1.11(@tiptap/pm@2.1.11):
resolution: {integrity: sha512-1W2DdjpPwfphHgQ3Qm4s5wzCnEjiXm1TeZ+6/zBl89yKURXgv8Mw1JGdj/NcImQjtDcsNn97MscACK3GKbEJBA==}
peerDependencies:
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 6edb5a0c..c467216c 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -33,11 +33,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
dependencies = [
"cfg-if",
- "cipher",
+ "cipher 0.3.0",
"cpufeatures",
"opaque-debug",
]
+[[package]]
+name = "aes"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
+dependencies = [
+ "cfg-if",
+ "cipher 0.4.4",
+ "cpufeatures",
+]
+
[[package]]
name = "aes-gcm"
version = "0.9.4"
@@ -45,8 +56,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6"
dependencies = [
"aead",
- "aes",
- "cipher",
+ "aes 0.7.5",
+ "cipher 0.3.0",
"ctr",
"ghash",
"subtle",
@@ -174,6 +185,25 @@ version = "1.0.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+[[package]]
+name = "arboard"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc"
+dependencies = [
+ "clipboard-win",
+ "core-graphics 0.22.3",
+ "image",
+ "log",
+ "objc",
+ "objc-foundation",
+ "objc_id",
+ "parking_lot",
+ "thiserror",
+ "winapi",
+ "x11rb",
+]
+
[[package]]
name = "arrayref"
version = "0.3.7"
@@ -310,9 +340,9 @@ dependencies = [
[[package]]
name = "atk"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd"
+checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf"
dependencies = [
"atk-sys",
"bitflags 1.3.2",
@@ -322,14 +352,14 @@ dependencies = [
[[package]]
name = "atk-sys"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
+checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
@@ -349,9 +379,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "auto-launch"
-version = "0.5.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471"
+checksum = "5904a4d734f0235edf29aab320a14899f3e090446e594ff96508a6215f76f89c"
dependencies = [
"dirs",
"thiserror",
@@ -516,16 +546,6 @@ dependencies = [
"alloc-stdlib",
]
-[[package]]
-name = "bstr"
-version = "1.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
-dependencies = [
- "memchr",
- "serde",
-]
-
[[package]]
name = "bumpalo"
version = "3.14.0"
@@ -554,27 +574,49 @@ dependencies = [
]
[[package]]
-name = "cairo-rs"
-version = "0.15.12"
+name = "bzip2"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.11+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
+[[package]]
+name = "cairo-rs"
+version = "0.16.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d"
dependencies = [
"bitflags 1.3.2",
"cairo-sys-rs",
"glib",
"libc",
+ "once_cell",
"thiserror",
]
[[package]]
name = "cairo-sys-rs"
-version = "0.15.1"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
+checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
@@ -624,6 +666,7 @@ version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
dependencies = [
+ "jobserver",
"libc",
]
@@ -644,15 +687,6 @@ dependencies = [
"uuid",
]
-[[package]]
-name = "cfg-expr"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
-dependencies = [
- "smallvec",
-]
-
[[package]]
name = "cfg-expr"
version = "0.15.5"
@@ -676,7 +710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
dependencies = [
"cfg-if",
- "cipher",
+ "cipher 0.3.0",
"cpufeatures",
"zeroize",
]
@@ -689,7 +723,7 @@ checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
dependencies = [
"aead",
"chacha20",
- "cipher",
+ "cipher 0.3.0",
"poly1305",
"zeroize",
]
@@ -716,6 +750,16 @@ dependencies = [
"generic-array",
]
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
[[package]]
name = "clap"
version = "4.4.6"
@@ -744,7 +788,7 @@ version = "4.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
dependencies = [
- "heck 0.4.1",
+ "heck",
"proc-macro2",
"quote",
"syn 2.0.37",
@@ -1049,7 +1093,7 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea"
dependencies = [
- "cipher",
+ "cipher 0.3.0",
]
[[package]]
@@ -1130,6 +1174,12 @@ dependencies = [
"syn 2.0.37",
]
+[[package]]
+name = "data-url"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f"
+
[[package]]
name = "der"
version = "0.7.8"
@@ -1684,9 +1734,9 @@ dependencies = [
[[package]]
name = "gdk"
-version = "0.15.4"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8"
+checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1"
dependencies = [
"bitflags 1.3.2",
"cairo-rs",
@@ -1700,9 +1750,9 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
-version = "0.15.11"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a"
+checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05"
dependencies = [
"bitflags 1.3.2",
"gdk-pixbuf-sys",
@@ -1713,22 +1763,22 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7"
+checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016"
dependencies = [
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
name = "gdk-sys"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
+checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@@ -1738,33 +1788,33 @@ dependencies = [
"libc",
"pango-sys",
"pkg-config",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
name = "gdkwayland-sys"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2"
+checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba"
dependencies = [
"gdk-sys",
"glib-sys",
"gobject-sys",
"libc",
"pkg-config",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
name = "gdkx11-sys"
-version = "0.15.1"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178"
+checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af"
dependencies = [
"gdk-sys",
"glib-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
"x11",
]
@@ -1791,6 +1841,26 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "gethostname"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "gethostname"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818"
+dependencies = [
+ "libc",
+ "windows-targets 0.48.5",
+]
+
[[package]]
name = "getrandom"
version = "0.1.16"
@@ -1833,45 +1903,50 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "gio"
-version = "0.15.12"
+version = "0.16.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b"
+checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092"
dependencies = [
"bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-io",
+ "futures-util",
"gio-sys",
"glib",
"libc",
"once_cell",
+ "pin-project-lite",
+ "smallvec",
"thiserror",
]
[[package]]
name = "gio-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d"
+checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
"winapi",
]
[[package]]
name = "glib"
-version = "0.15.12"
+version = "0.16.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d"
+checksum = "16aa2475c9debed5a32832cb5ff2af5a3f9e1ab9e69df58eaadc1ab2004d6eba"
dependencies = [
"bitflags 1.3.2",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
+ "futures-util",
+ "gio-sys",
"glib-macros",
"glib-sys",
"gobject-sys",
@@ -1883,12 +1958,12 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.15.13"
+version = "0.16.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a"
+checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b"
dependencies = [
"anyhow",
- "heck 0.4.1",
+ "heck",
"proc-macro-crate",
"proc-macro-error",
"proc-macro2",
@@ -1898,12 +1973,12 @@ dependencies = [
[[package]]
name = "glib-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4"
+checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65"
dependencies = [
"libc",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
@@ -1912,35 +1987,22 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-[[package]]
-name = "globset"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
[[package]]
name = "gobject-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a"
+checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1"
dependencies = [
"glib-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
name = "gtk"
-version = "0.15.5"
+version = "0.16.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0"
+checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6"
dependencies = [
"atk",
"bitflags 1.3.2",
@@ -1961,9 +2023,9 @@ dependencies = [
[[package]]
name = "gtk-sys"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
+checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3"
dependencies = [
"atk-sys",
"cairo-sys-rs",
@@ -1974,14 +2036,14 @@ dependencies = [
"gobject-sys",
"libc",
"pango-sys",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
name = "gtk3-macros"
-version = "0.15.6"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d"
+checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8"
dependencies = [
"anyhow",
"proc-macro-crate",
@@ -2038,15 +2100,6 @@ dependencies = [
"hashbrown 0.14.1",
]
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
[[package]]
name = "heck"
version = "0.4.1"
@@ -2095,20 +2148,6 @@ dependencies = [
"windows-sys 0.48.0",
]
-[[package]]
-name = "html5ever"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148"
-dependencies = [
- "log",
- "mac",
- "markup5ever 0.10.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
[[package]]
name = "html5ever"
version = "0.26.0"
@@ -2117,7 +2156,7 @@ checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7"
dependencies = [
"log",
"mac",
- "markup5ever 0.11.0",
+ "markup5ever",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -2145,12 +2184,6 @@ dependencies = [
"pin-project-lite",
]
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
[[package]]
name = "httparse"
version = "1.8.0"
@@ -2249,23 +2282,6 @@ dependencies = [
"unicode-normalization",
]
-[[package]]
-name = "ignore"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492"
-dependencies = [
- "globset",
- "lazy_static",
- "log",
- "memchr",
- "regex",
- "same-file",
- "thread_local",
- "walkdir",
- "winapi-util",
-]
-
[[package]]
name = "image"
version = "0.24.7"
@@ -2277,6 +2293,8 @@ dependencies = [
"color_quant",
"num-rational",
"num-traits",
+ "png",
+ "tiff",
]
[[package]]
@@ -2310,6 +2328,15 @@ dependencies = [
"cfb",
]
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
[[package]]
name = "instant"
version = "0.1.12"
@@ -2337,7 +2364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e04d492224bff6e97142f033d0a4383bcbc05918be1ff7b3abd2c1cc85205a2"
dependencies = [
"aead",
- "aes",
+ "aes 0.7.5",
"aes-gcm",
"autocfg",
"blake2",
@@ -2389,6 +2416,25 @@ version = "2.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+[[package]]
+name = "is-docker"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "is-wsl"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5"
+dependencies = [
+ "is-docker",
+ "once_cell",
+]
+
[[package]]
name = "itertools"
version = "0.11.0"
@@ -2412,9 +2458,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "javascriptcore-rs"
-version = "0.16.0"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c"
+checksum = "4cfcc681b896b083864a4a3c3b3ea196f14ff66b8641a68fde209c6d84434056"
dependencies = [
"bitflags 1.3.2",
"glib",
@@ -2423,28 +2469,30 @@ dependencies = [
[[package]]
name = "javascriptcore-rs-sys"
-version = "0.4.0"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c"
+checksum = "b0983ba5b3ab9a0c0918de02c42dc71f795d6de08092f88a98ce9fdfdee4ba91"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 5.0.0",
+ "system-deps",
]
[[package]]
name = "jni"
-version = "0.20.0"
+version = "0.21.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
dependencies = [
"cesu8",
+ "cfg-if",
"combine",
"jni-sys",
"log",
"thiserror",
"walkdir",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -2453,6 +2501,21 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "jpeg-decoder"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+
[[package]]
name = "js-sys"
version = "0.3.64"
@@ -2475,15 +2538,14 @@ dependencies = [
]
[[package]]
-name = "kuchiki"
-version = "0.8.1"
+name = "keyboard-types"
+version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358"
+checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68"
dependencies = [
- "cssparser",
- "html5ever 0.25.2",
- "matches",
- "selectors",
+ "bitflags 1.3.2",
+ "serde",
+ "unicode-segmentation",
]
[[package]]
@@ -2493,7 +2555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8"
dependencies = [
"cssparser",
- "html5ever 0.26.0",
+ "html5ever",
"indexmap 1.9.3",
"matches",
"selectors",
@@ -2508,12 +2570,46 @@ dependencies = [
"spin 0.5.2",
]
+[[package]]
+name = "libappindicator"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f"
+dependencies = [
+ "glib",
+ "gtk",
+ "gtk-sys",
+ "libappindicator-sys",
+ "log",
+]
+
+[[package]]
+name = "libappindicator-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918"
+dependencies = [
+ "gtk-sys",
+ "libloading",
+ "once_cell",
+]
+
[[package]]
name = "libc"
version = "0.2.148"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
[[package]]
name = "libm"
version = "0.2.7"
@@ -2619,15 +2715,25 @@ dependencies = [
"sqlx-cli",
"tauri",
"tauri-build",
+ "tauri-plugin-app",
"tauri-plugin-autostart",
+ "tauri-plugin-cli",
+ "tauri-plugin-clipboard-manager",
+ "tauri-plugin-dialog",
+ "tauri-plugin-fs",
+ "tauri-plugin-http",
+ "tauri-plugin-notification",
+ "tauri-plugin-os",
+ "tauri-plugin-process",
+ "tauri-plugin-shell",
"tauri-plugin-single-instance",
"tauri-plugin-sql",
"tauri-plugin-store",
"tauri-plugin-stronghold",
+ "tauri-plugin-updater",
"tauri-plugin-upload",
+ "tauri-plugin-window",
"webpage",
- "window-shadows",
- "window-vibrancy",
]
[[package]]
@@ -2658,20 +2764,6 @@ dependencies = [
"libc",
]
-[[package]]
-name = "markup5ever"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd"
-dependencies = [
- "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
- "string_cache",
- "string_cache_codegen",
- "tendril",
-]
-
[[package]]
name = "markup5ever"
version = "0.11.0"
@@ -2692,8 +2784,8 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9521dd6750f8e80ee6c53d65e2e4656d7de37064f3a7a5d2d11d05df93839c2"
dependencies = [
- "html5ever 0.26.0",
- "markup5ever 0.11.0",
+ "html5ever",
+ "markup5ever",
"tendril",
"xml5ever",
]
@@ -2762,22 +2854,18 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
[[package]]
name = "minimal-lexical"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+[[package]]
+name = "minisign-verify"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881"
+
[[package]]
name = "miniz_oxide"
version = "0.7.1"
@@ -2799,6 +2887,25 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "muda"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe753ec4d3e8137a1d3ecb1aee1192b8f7661fe1247641968f5bf5f2e6ebbe"
+dependencies = [
+ "cocoa 0.25.0",
+ "crossbeam-channel",
+ "gdk",
+ "gdk-pixbuf",
+ "gtk",
+ "keyboard-types",
+ "objc",
+ "once_cell",
+ "png",
+ "thiserror",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "native-tls"
version = "0.2.11"
@@ -2819,14 +2926,15 @@ dependencies = [
[[package]]
name = "ndk"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4"
+checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0"
dependencies = [
"bitflags 1.3.2",
"jni-sys",
"ndk-sys",
"num_enum",
+ "raw-window-handle",
"thiserror",
]
@@ -2838,9 +2946,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b"
[[package]]
name = "ndk-sys"
-version = "0.3.0"
+version = "0.4.1+23.1.7779620"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97"
+checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3"
dependencies = [
"jni-sys",
]
@@ -3088,12 +3196,13 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "open"
-version = "3.2.0"
+version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8"
+checksum = "3a083c0c7e5e4a8ec4176346cf61f67ac674e8bfb059d9226e1c54a96b377c12"
dependencies = [
+ "is-wsl",
+ "libc",
"pathdiff",
- "windows-sys 0.42.0",
]
[[package]]
@@ -3128,6 +3237,15 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+[[package]]
+name = "openssl-src"
+version = "300.1.5+3.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491"
+dependencies = [
+ "cc",
+]
+
[[package]]
name = "openssl-sys"
version = "0.9.93"
@@ -3136,6 +3254,7 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
dependencies = [
"cc",
"libc",
+ "openssl-src",
"pkg-config",
"vcpkg",
]
@@ -3161,6 +3280,16 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "os_pipe"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "overload"
version = "0.1.1"
@@ -3169,11 +3298,12 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "pango"
-version = "0.15.10"
+version = "0.16.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f"
+checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94"
dependencies = [
"bitflags 1.3.2",
+ "gio",
"glib",
"libc",
"once_cell",
@@ -3182,14 +3312,14 @@ dependencies = [
[[package]]
name = "pango-sys"
-version = "0.15.10"
+version = "0.16.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa"
+checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f"
dependencies = [
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 6.1.2",
+ "system-deps",
]
[[package]]
@@ -3221,6 +3351,17 @@ dependencies = [
"windows-targets 0.48.5",
]
+[[package]]
+name = "password-hash"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
[[package]]
name = "paste"
version = "1.0.14"
@@ -3240,6 +3381,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
dependencies = [
"digest 0.10.7",
+ "hmac",
+ "password-hash",
+ "sha2 0.10.8",
]
[[package]]
@@ -3779,7 +3923,6 @@ dependencies = [
"js-sys",
"log",
"mime",
- "mime_guess",
"native-tls",
"once_cell",
"percent-encoding",
@@ -3802,17 +3945,18 @@ dependencies = [
[[package]]
name = "rfd"
-version = "0.10.0"
+version = "0.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea"
+checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f"
dependencies = [
+ "async-io",
"block",
"dispatch",
+ "futures-util",
"glib-sys",
"gobject-sys",
"gtk-sys",
"js-sys",
- "lazy_static",
"log",
"objc",
"objc-foundation",
@@ -3821,7 +3965,7 @@ dependencies = [
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
- "windows 0.37.0",
+ "windows 0.44.0",
]
[[package]]
@@ -4247,6 +4391,16 @@ dependencies = [
"lazy_static",
]
+[[package]]
+name = "shared_child"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
[[package]]
name = "signal-hook"
version = "0.3.17"
@@ -4324,31 +4478,31 @@ dependencies = [
]
[[package]]
-name = "soup2"
-version = "0.2.1"
+name = "soup3"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0"
+checksum = "82bc46048125fefd69d30b32b9d263d6556c9ffe82a7a7df181a86d912da5616"
dependencies = [
"bitflags 1.3.2",
+ "futures-channel",
"gio",
"glib",
"libc",
"once_cell",
- "soup2-sys",
+ "soup3-sys",
]
[[package]]
-name = "soup2-sys"
-version = "0.2.0"
+name = "soup3-sys"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf"
+checksum = "014bbeb1c4cdb30739dc181e8d98b7908f124d9555843afa89b5570aaf4ec62b"
dependencies = [
- "bitflags 1.3.2",
"gio-sys",
"glib-sys",
"gobject-sys",
"libc",
- "system-deps 5.0.0",
+ "system-deps",
]
[[package]]
@@ -4490,7 +4644,7 @@ checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
dependencies = [
"dotenvy",
"either",
- "heck 0.4.1",
+ "heck",
"hex",
"once_cell",
"proc-macro2",
@@ -4622,9 +4776,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "state"
-version = "0.5.3"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b"
+checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8"
dependencies = [
"loom",
]
@@ -4748,6 +4902,17 @@ version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+[[package]]
+name = "swift-rs"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bbdb58577b6301f8d17ae2561f32002a5bae056d444e0f69e611e504a276204"
+dependencies = [
+ "base64 0.21.4",
+ "serde",
+ "serde_json",
+]
+
[[package]]
name = "syn"
version = "1.0.109"
@@ -4772,15 +4937,11 @@ dependencies = [
[[package]]
name = "sys-locale"
-version = "0.2.4"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee"
+checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0"
dependencies = [
- "js-sys",
"libc",
- "wasm-bindgen",
- "web-sys",
- "windows-sys 0.45.0",
]
[[package]]
@@ -4804,37 +4965,24 @@ dependencies = [
"libc",
]
-[[package]]
-name = "system-deps"
-version = "5.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
-dependencies = [
- "cfg-expr 0.9.1",
- "heck 0.3.3",
- "pkg-config",
- "toml 0.5.11",
- "version-compare 0.0.11",
-]
-
[[package]]
name = "system-deps"
version = "6.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6"
dependencies = [
- "cfg-expr 0.15.5",
- "heck 0.4.1",
+ "cfg-expr",
+ "heck",
"pkg-config",
"toml 0.8.2",
- "version-compare 0.1.1",
+ "version-compare",
]
[[package]]
name = "tao"
-version = "0.16.4"
+version = "0.22.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b768eb5cf657b045d03304b1f60ecb54eac8b520f393c4f4240a94111a1caa17"
+checksum = "9f76221bce9db3af6b2b9cca4e92d8ea46c4cc88d785bc4b1a5cbcaab06f0b56"
dependencies = [
"bitflags 1.3.2",
"cairo-rs",
@@ -4871,10 +5019,12 @@ dependencies = [
"serde",
"tao-macros",
"unicode-segmentation",
+ "url",
"uuid",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-implement",
"x11-dl",
+ "zbus",
]
[[package]]
@@ -4907,71 +5057,68 @@ checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
[[package]]
name = "tauri"
-version = "1.5.1"
+version = "2.0.0-alpha.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0238c5063bf9613054149a1b6bce4935922e532b7d8211f36989a490a79806be"
+checksum = "46acc0b6d20fe3a7c27e6036d9ef52d2c28afd1b6178ffc2dd4881f9994fecd7"
dependencies = [
"anyhow",
"bytes",
- "cocoa 0.24.1",
+ "cocoa 0.25.0",
"dirs-next",
"embed_plist",
- "encoding_rs",
- "flate2",
"futures-util",
"glib",
"glob",
"gtk",
- "heck 0.4.1",
+ "heck",
"http",
- "ignore",
- "notify-rust",
+ "jni",
+ "libc",
+ "log",
+ "mime",
+ "muda",
"objc",
"once_cell",
- "open",
- "os_info",
"percent-encoding",
"rand 0.8.5",
"raw-window-handle",
- "regex",
"reqwest",
- "rfd",
- "semver",
"serde",
"serde_json",
"serde_repr",
"serialize-to-javascript",
"state",
- "sys-locale",
- "tar",
+ "swift-rs",
+ "tauri-build",
"tauri-macros",
"tauri-runtime",
"tauri-runtime-wry",
"tauri-utils",
- "tempfile",
"thiserror",
"tokio",
+ "tray-icon",
"url",
"uuid",
"webkit2gtk",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
]
[[package]]
name = "tauri-build"
-version = "1.5.0"
+version = "2.0.0-alpha.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c"
+checksum = "dc47d3c84f4aeac397cd956267f3b8060c5a2dba78288a5ccf9a8b7a8c1e7025"
dependencies = [
"anyhow",
"cargo_toml",
- "dirs-next",
- "heck 0.4.1",
+ "heck",
"json-patch",
+ "plist",
"semver",
"serde",
"serde_json",
+ "swift-rs",
"tauri-utils",
"tauri-winres",
"walkdir",
@@ -4979,9 +5126,9 @@ dependencies = [
[[package]]
name = "tauri-codegen"
-version = "1.4.1"
+version = "2.0.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb"
+checksum = "7f98a67c7ef3cb3c25de91fe1fa16cc3681997f6ec99da0a7496d6feae2ea91e"
dependencies = [
"base64 0.21.4",
"brotli",
@@ -4991,7 +5138,6 @@ dependencies = [
"png",
"proc-macro2",
"quote",
- "regex",
"semver",
"serde",
"serde_json",
@@ -4999,17 +5145,18 @@ dependencies = [
"tauri-utils",
"thiserror",
"time",
+ "url",
"uuid",
"walkdir",
]
[[package]]
name = "tauri-macros"
-version = "1.4.1"
+version = "2.0.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613740228de92d9196b795ac455091d3a5fbdac2654abb8bb07d010b62ab43af"
+checksum = "b01cb5f945c71e040c5d191c32598565ae26cc266a9d5d4f7dd2dc324c5cfdd0"
dependencies = [
- "heck 0.4.1",
+ "heck",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -5017,10 +5164,18 @@ dependencies = [
"tauri-utils",
]
+[[package]]
+name = "tauri-plugin-app"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "tauri",
+]
+
[[package]]
name = "tauri-plugin-autostart"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
dependencies = [
"auto-launch",
"log",
@@ -5030,10 +5185,143 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "tauri-plugin-cli"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "clap",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-clipboard-manager"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "arboard",
+ "log",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-dialog"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "glib",
+ "log",
+ "raw-window-handle",
+ "rfd",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-fs",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-fs"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "anyhow",
+ "glob",
+ "serde",
+ "tauri",
+ "thiserror",
+ "uuid",
+]
+
+[[package]]
+name = "tauri-plugin-http"
+version = "2.0.0-alpha.3"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "data-url",
+ "glob",
+ "http",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "tauri",
+ "tauri-plugin-fs",
+ "thiserror",
+ "url",
+]
+
+[[package]]
+name = "tauri-plugin-notification"
+version = "2.0.0-alpha.3"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "log",
+ "notify-rust",
+ "rand 0.8.5",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "tauri",
+ "tauri-build",
+ "thiserror",
+ "time",
+ "url",
+]
+
+[[package]]
+name = "tauri-plugin-os"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "gethostname 0.4.3",
+ "log",
+ "os_info",
+ "serde",
+ "serde_json",
+ "serialize-to-javascript",
+ "sys-locale",
+ "tauri",
+ "thiserror",
+]
+
+[[package]]
+name = "tauri-plugin-process"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "tauri",
+]
+
+[[package]]
+name = "tauri-plugin-shell"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "encoding_rs",
+ "log",
+ "open",
+ "os_pipe",
+ "regex",
+ "serde",
+ "serde_json",
+ "shared_child",
+ "tauri",
+ "thiserror",
+]
+
[[package]]
name = "tauri-plugin-single-instance"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
dependencies = [
"log",
"serde",
@@ -5046,8 +5334,8 @@ dependencies = [
[[package]]
name = "tauri-plugin-sql"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
dependencies = [
"futures-core",
"log",
@@ -5062,8 +5350,8 @@ dependencies = [
[[package]]
name = "tauri-plugin-store"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
dependencies = [
"log",
"serde",
@@ -5074,16 +5362,13 @@ dependencies = [
[[package]]
name = "tauri-plugin-stronghold"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
dependencies = [
"hex",
"iota-crypto 0.23.0",
"iota_stronghold",
"log",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
- "rust-argon2",
"serde",
"serde_json",
"tauri",
@@ -5091,10 +5376,35 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "tauri-plugin-updater"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "base64 0.21.4",
+ "dirs-next",
+ "futures-util",
+ "http",
+ "minisign-verify",
+ "percent-encoding",
+ "reqwest",
+ "semver",
+ "serde",
+ "serde_json",
+ "tar",
+ "tauri",
+ "tempfile",
+ "thiserror",
+ "time",
+ "tokio",
+ "url",
+ "zip",
+]
+
[[package]]
name = "tauri-plugin-upload"
-version = "0.0.0"
-source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#fa32d1afa97f52f74d814c5619b8d95da3268e3e"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
dependencies = [
"futures-util",
"log",
@@ -5108,15 +5418,25 @@ dependencies = [
"tokio-util",
]
+[[package]]
+name = "tauri-plugin-window"
+version = "2.0.0-alpha.2"
+source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v2#8902fe9adf256c52e7e6a14370f56d0b4780a3a2"
+dependencies = [
+ "serde",
+ "tauri",
+ "thiserror",
+]
+
[[package]]
name = "tauri-runtime"
-version = "0.14.1"
+version = "1.0.0-alpha.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43"
+checksum = "525c4dea52547a13e58816c655bd0928f6c30026515e7b2a77166bcd984da6d0"
dependencies = [
"gtk",
"http",
- "http-range",
+ "jni",
"rand 0.8.5",
"raw-window-handle",
"serde",
@@ -5125,18 +5445,19 @@ dependencies = [
"thiserror",
"url",
"uuid",
- "webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
]
[[package]]
name = "tauri-runtime-wry"
-version = "0.14.1"
+version = "1.0.0-alpha.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8141d72b6b65f2008911e9ef5b98a68d1e3413b7a1464e8f85eb3673bb19a895"
+checksum = "fce46e920b62699045e02db3006017d24324119189dfab2b12261aeebf98f4be"
dependencies = [
"cocoa 0.24.1",
"gtk",
+ "http",
+ "jni",
"percent-encoding",
"rand 0.8.5",
"raw-window-handle",
@@ -5145,26 +5466,25 @@ dependencies = [
"uuid",
"webkit2gtk",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
"wry",
]
[[package]]
name = "tauri-utils"
-version = "1.5.0"
+version = "2.0.0-alpha.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d55e185904a84a419308d523c2c6891d5e2dbcee740c4997eb42e75a7b0f46"
+checksum = "06bcd7c6f67fd6371dcc22da7d7f26ec12c4eae26ad7bc54943bb9f35b5db302"
dependencies = [
"brotli",
"ctor",
"dunce",
"glob",
- "heck 0.4.1",
- "html5ever 0.26.0",
+ "heck",
+ "html5ever",
"infer",
"json-patch",
"kuchikiki",
- "log",
"memchr",
"phf 0.10.1",
"proc-macro2",
@@ -5176,7 +5496,7 @@ dependencies = [
"thiserror",
"url",
"walkdir",
- "windows 0.39.0",
+ "windows 0.48.0",
]
[[package]]
@@ -5259,6 +5579,17 @@ dependencies = [
"once_cell",
]
+[[package]]
+name = "tiff"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
[[package]]
name = "time"
version = "0.3.29"
@@ -5365,15 +5696,6 @@ dependencies = [
"tracing",
]
-[[package]]
-name = "toml"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "toml"
version = "0.7.8"
@@ -5502,6 +5824,25 @@ dependencies = [
"tracing-log",
]
+[[package]]
+name = "tray-icon"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b164327e17101c78ba3dfdf879b977027ef1bd7855668ac30063de21fc02447"
+dependencies = [
+ "cocoa 0.25.0",
+ "core-graphics 0.23.1",
+ "crossbeam-channel",
+ "dirs-next",
+ "libappindicator",
+ "muda",
+ "objc",
+ "once_cell",
+ "png",
+ "thiserror",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "treediff"
version = "4.0.2"
@@ -5533,15 +5874,6 @@ dependencies = [
"winapi",
]
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
[[package]]
name = "unicode-bidi"
version = "0.3.13"
@@ -5642,12 +5974,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
[[package]]
name = "version-compare"
version = "0.1.1"
@@ -5808,9 +6134,9 @@ dependencies = [
[[package]]
name = "webkit2gtk"
-version = "0.18.2"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370"
+checksum = "6f8db2963d7f1bd4ac2a208ab925881b4779dd20fee853b09a0bbf69289827c2"
dependencies = [
"bitflags 1.3.2",
"cairo-rs",
@@ -5826,20 +6152,18 @@ dependencies = [
"javascriptcore-rs",
"libc",
"once_cell",
- "soup2",
+ "soup3",
"webkit2gtk-sys",
]
[[package]]
name = "webkit2gtk-sys"
-version = "0.18.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3"
+checksum = "864ebc9a39649baf49e46c713cd8b741cca14dd59d24cd77bc611ba9419fa18d"
dependencies = [
- "atk-sys",
"bitflags 1.3.2",
"cairo-sys-rs",
- "gdk-pixbuf-sys",
"gdk-sys",
"gio-sys",
"glib-sys",
@@ -5847,10 +6171,9 @@ dependencies = [
"gtk-sys",
"javascriptcore-rs-sys",
"libc",
- "pango-sys",
"pkg-config",
- "soup2-sys",
- "system-deps 6.1.2",
+ "soup3-sys",
+ "system-deps",
]
[[package]]
@@ -5860,7 +6183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8598785beeb5af95abe95e7bb20c7e747d1188347080d6811d5a56d2b9a5f368"
dependencies = [
"curl",
- "html5ever 0.26.0",
+ "html5ever",
"markup5ever_rcdom",
"serde",
"serde_json",
@@ -5877,42 +6200,49 @@ dependencies = [
[[package]]
name = "webview2-com"
-version = "0.19.1"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178"
+checksum = "79e563ffe8e84d42e43ffacbace8780c0244fc8910346f334613559d92e203ad"
dependencies = [
"webview2-com-macros",
"webview2-com-sys",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-implement",
+ "windows-interface",
]
[[package]]
name = "webview2-com-macros"
-version = "0.6.0"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac"
+checksum = "ac1345798ecd8122468840bcdf1b95e5dc6d2206c5e4b0eafa078d061f59c9bc"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.37",
]
[[package]]
name = "webview2-com-sys"
-version = "0.19.0"
+version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7"
+checksum = "19d39576804304cf9ead192467ef47f7859a1a12fec3bd459d5ba34b8cd65ed5"
dependencies = [
"regex",
"serde",
"serde_json",
"thiserror",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-bindgen",
"windows-metadata",
]
+[[package]]
+name = "weezl"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+
[[package]]
name = "whoami"
version = "1.4.1"
@@ -5944,34 +6274,21 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "winapi-wsapoll"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e"
+dependencies = [
+ "winapi",
+]
+
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "window-shadows"
-version = "0.2.1"
-source = "git+https://github.com/tauri-apps/window-shadows?branch=dev#a9f5f1f7725609c71404539befca1f1a98095cd2"
-dependencies = [
- "cocoa 0.25.0",
- "objc",
- "raw-window-handle",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "window-vibrancy"
-version = "0.4.1"
-source = "git+https://github.com/tauri-apps/window-vibrancy?branch=dev#ce6e299a3bc98bd1d0f322c3b922fe8634f09e8e"
-dependencies = [
- "cocoa 0.25.0",
- "objc",
- "raw-window-handle",
- "windows-sys 0.48.0",
-]
-
[[package]]
name = "windows"
version = "0.36.1"
@@ -5985,26 +6302,12 @@ dependencies = [
"windows_x86_64_msvc 0.36.1",
]
-[[package]]
-name = "windows"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647"
-dependencies = [
- "windows_aarch64_msvc 0.37.0",
- "windows_i686_gnu 0.37.0",
- "windows_i686_msvc 0.37.0",
- "windows_x86_64_gnu 0.37.0",
- "windows_x86_64_msvc 0.37.0",
-]
-
[[package]]
name = "windows"
version = "0.39.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a"
dependencies = [
- "windows-implement",
"windows_aarch64_msvc 0.39.0",
"windows_i686_gnu 0.39.0",
"windows_i686_msvc 0.39.0",
@@ -6012,20 +6315,31 @@ dependencies = [
"windows_x86_64_msvc 0.39.0",
]
+[[package]]
+name = "windows"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
[[package]]
name = "windows"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
dependencies = [
+ "windows-implement",
+ "windows-interface",
"windows-targets 0.48.5",
]
[[package]]
name = "windows-bindgen"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41"
+checksum = "1fe21a77bc54b7312dbd66f041605e098990c98be48cd52967b85b5e60e75ae6"
dependencies = [
"windows-metadata",
"windows-tokens",
@@ -6033,34 +6347,31 @@ dependencies = [
[[package]]
name = "windows-implement"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7"
+checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c"
dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7"
+dependencies = [
+ "proc-macro2",
+ "quote",
"syn 1.0.109",
- "windows-tokens",
]
[[package]]
name = "windows-metadata"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278"
-
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
+checksum = "422ee0e5f0e2cc372bb6addbfff9a8add712155cd743df9c15f6ab000f31432d"
[[package]]
name = "windows-sys"
@@ -6112,9 +6423,9 @@ dependencies = [
[[package]]
name = "windows-tokens"
-version = "0.39.0"
+version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
+checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4"
[[package]]
name = "windows_aarch64_gnullvm"
@@ -6134,12 +6445,6 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.39.0"
@@ -6164,12 +6469,6 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1"
-
[[package]]
name = "windows_i686_gnu"
version = "0.39.0"
@@ -6194,12 +6493,6 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c"
-
[[package]]
name = "windows_i686_msvc"
version = "0.39.0"
@@ -6224,12 +6517,6 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.39.0"
@@ -6266,12 +6553,6 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.37.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.39.0"
@@ -6330,11 +6611,11 @@ dependencies = [
[[package]]
name = "wry"
-version = "0.24.4"
+version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ef04bdad49eba2e01f06e53688c8413bd6a87b0bc14b72284465cf96e3578e"
+checksum = "bf906b43b8042615c85a978dceb4d4b72214d27b850b54abc3edeb7c5a67abab"
dependencies = [
- "base64 0.13.1",
+ "base64 0.21.4",
"block",
"cocoa 0.24.1",
"core-graphics 0.22.3",
@@ -6344,9 +6625,10 @@ dependencies = [
"gio",
"glib",
"gtk",
- "html5ever 0.25.2",
+ "html5ever",
"http",
- "kuchiki",
+ "javascriptcore-rs",
+ "kuchikiki",
"libc",
"log",
"objc",
@@ -6355,14 +6637,14 @@ dependencies = [
"serde",
"serde_json",
"sha2 0.10.8",
- "soup2",
+ "soup3",
"tao",
"thiserror",
"url",
"webkit2gtk",
"webkit2gtk-sys",
"webview2-com",
- "windows 0.39.0",
+ "windows 0.48.0",
"windows-implement",
]
@@ -6387,6 +6669,28 @@ dependencies = [
"pkg-config",
]
+[[package]]
+name = "x11rb"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507"
+dependencies = [
+ "gethostname 0.2.3",
+ "nix 0.24.3",
+ "winapi",
+ "winapi-wsapoll",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67"
+dependencies = [
+ "nix 0.24.3",
+]
+
[[package]]
name = "x25519-dalek"
version = "1.1.1"
@@ -6425,7 +6729,7 @@ checksum = "4034e1d05af98b51ad7214527730626f019682d797ba38b51689212118d8e650"
dependencies = [
"log",
"mac",
- "markup5ever 0.11.0",
+ "markup5ever",
]
[[package]]
@@ -6514,6 +6818,56 @@ dependencies = [
"syn 2.0.37",
]
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "aes 0.8.3",
+ "byteorder",
+ "bzip2",
+ "constant_time_eq 0.1.5",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "hmac",
+ "pbkdf2",
+ "sha1",
+ "time",
+ "zstd",
+]
+
+[[package]]
+name = "zstd"
+version = "0.11.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "5.0.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.8+zstd.1.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
[[package]]
name = "zvariant"
version = "3.15.0"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index ec495687..e5a867b0 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -11,45 +11,35 @@ rust-version = "1.66"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
-tauri-build = { version = "1.5", features = [] }
+tauri-build = { version = "2.0.0-alpha.8", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.5", features = [
+tauri = { version = "2.0.0-alpha", features = [
"macos-private-api",
- "window-close",
- "window-print",
- "window-create",
- "fs-read-dir",
- "fs-read-file",
- "window-start-dragging",
- "path-all",
- "http-all",
- "clipboard-write-text",
- "os-all",
- "notification-all",
- "clipboard-read-text",
- "window-set-resizable",
- "window-set-size",
- "shell-open",
- "fs-write-file",
- "app-all",
- "fs-remove-file",
- "window-center",
- "dialog-all",
- "http-multipart",
+ "native-tls-vendored",
] }
-tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v1", features = [
+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" }
+tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+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-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
"sqlite",
] }
-tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy", branch = "dev" }
-window-shadows = { git = "https://github.com/tauri-apps/window-shadows", branch = "dev" }
+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-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
sqlx-cli = { version = "0.7.0", default-features = false, features = [
"sqlite",
] }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index f0e3e113..46b02ea8 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -106,16 +106,6 @@ fn main() {
tauri::Builder::default()
.setup(|app| {
let window = app.get_window("main").unwrap();
- let splashscreen = app.get_window("splashscreen").unwrap();
-
- #[cfg(target_os = "windows")]
- set_shadow(&window, true).expect("Unsupported platform!");
- #[cfg(target_os = "windows")]
- set_shadow(&splashscreen, true).expect("Unsupported platform!");
-
- #[cfg(target_os = "macos")]
- apply_vibrancy(&window, NSVisualEffectMaterial::HudWindow, None, None)
- .expect("Unsupported platform! 'apply_vibrancy' is only supported on macOS");
#[cfg(target_os = "macos")]
window.position_traffic_lights(16.0, 25.0);
@@ -129,6 +119,18 @@ fn main() {
window.position_traffic_lights(16.0, 25.0);
}
})
+ .plugin(tauri_plugin_app::init())
+ .plugin(tauri_plugin_cli::init())
+ .plugin(tauri_plugin_clipboard_manager::init())
+ .plugin(tauri_plugin_dialog::init())
+ .plugin(tauri_plugin_fs::init())
+ .plugin(tauri_plugin_http::init())
+ .plugin(tauri_plugin_notification::init())
+ .plugin(tauri_plugin_os::init())
+ .plugin(tauri_plugin_process::init())
+ .plugin(tauri_plugin_shell::init())
+ .plugin(tauri_plugin_updater::Builder::new().build())
+ .plugin(tauri_plugin_window::init())
.plugin(
tauri_plugin_sql::Builder::default()
.add_migrations(
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 5ff8ef92..18531cad 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -11,76 +11,38 @@
"productName": "Lume",
"version": "1.2.6"
},
- "tauri": {
- "allowlist": {
- "app": {
- "all": true,
- "show": true,
- "hide": true
- },
- "path": {
- "all": true
- },
- "dialog": {
- "all": true,
- "ask": true,
- "confirm": true,
- "message": true,
- "open": true,
- "save": true
- },
- "fs": {
- "all": false,
- "removeFile": true,
- "writeFile": true,
- "readDir": true,
- "readFile": true,
- "scope": [
- "$APPDATA/*",
- "$DATA/*",
- "$LOCALDATA/*",
- "$DESKTOP/*",
- "$DOCUMENT/*",
- "$DOWNLOAD/*",
- "$HOME/*",
- "$PICTURE/*",
- "$PUBLIC/*",
- "$VIDEO/*"
- ]
- },
- "http": {
- "all": true,
- "scope": [
- "http://**",
- "https://**"
- ]
- },
- "shell": {
- "all": false,
- "open": true
- },
- "os": {
- "all": true
- },
- "window": {
- "all": false,
- "center": true,
- "setResizable": true,
- "setSize": true,
- "startDragging": true,
- "create": true,
- "close": true,
- "print": true
- },
- "clipboard": {
- "all": false,
- "writeText": true,
- "readText": true
- },
- "notification": {
- "all": true
- }
+ "plugins": {
+ "fs": {
+ "scope": [
+ "$APPDATA/*",
+ "$DATA/*",
+ "$LOCALDATA/*",
+ "$DESKTOP/*",
+ "$DOCUMENT/*",
+ "$DOWNLOAD/*",
+ "$HOME/*",
+ "$PICTURE/*",
+ "$PUBLIC/*",
+ "$VIDEO/*"
+ ]
},
+ "http": {
+ "scope": [
+ "http://**/",
+ "https://**/"
+ ]
+ },
+ "shell": {
+ "open": true
+ },
+ "updater": {
+ "endpoints": [
+ "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
+ "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
+ ]
+ }
+ },
+ "tauri": {
"bundle": {
"active": true,
"appimage": {
@@ -105,36 +67,32 @@
"entitlements": null,
"exceptionDomain": "",
"frameworks": [],
- "providerShortName": null,
- "signingIdentity": null,
+ "license": "../LICENSE",
"minimumSystemVersion": "10.15.0",
- "license": "../LICENSE"
+ "providerShortName": null,
+ "signingIdentity": null
},
"resources": [],
"shortDescription": "",
"targets": "all",
+ "updater": {},
"windows": {
"certificateThumbprint": null,
"digestAlgorithm": "sha256",
"timestampUrl": ""
}
},
- "updater": {
- "endpoints": [
- "https://lus.reya3772.workers.dev/v1/{{target}}/{{arch}}/{{current_version}}",
- "https://lus.reya3772.workers.dev/{{target}}/{{current_version}}"
- ]
- },
+ "macOSPrivateApi": true,
"security": {
"dangerousRemoteDomainIpcAccess": [
{
- "scheme": "https",
"domain": "nwc.getalby.com",
- "windows": ["alby"],
- "enableTauriAPI": true
+ "scheme": "https",
+ "windows": [
+ "alby"
+ ]
}
]
- },
- "macOSPrivateApi": true
+ }
}
-}
+}
\ No newline at end of file
diff --git a/src/app.tsx b/src/app.tsx
index 1f6544d4..e9a00163 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -1,6 +1,6 @@
import '@fontsource-variable/inter/slnt.css';
-import { message } from '@tauri-apps/api/dialog';
-import { fetch } from '@tauri-apps/api/http';
+import { message } from '@tauri-apps/plugin-dialog';
+import { fetch } from '@tauri-apps/plugin-http';
import { RouterProvider, createBrowserRouter, defer, redirect } from 'react-router-dom';
import { ReactFlowProvider } from 'reactflow';
diff --git a/src/app/auth/create/step-1.tsx b/src/app/auth/create/step-1.tsx
index 48c39bef..8059a6bb 100644
--- a/src/app/auth/create/step-1.tsx
+++ b/src/app/auth/create/step-1.tsx
@@ -1,6 +1,6 @@
-import { writeText } from '@tauri-apps/api/clipboard';
-import { message, save } from '@tauri-apps/api/dialog';
-import { writeTextFile } from '@tauri-apps/api/fs';
+import { writeText } from '@tauri-apps/plugin-clipboard-manager';
+import { message, save } from '@tauri-apps/plugin-dialog';
+import { writeTextFile } from '@tauri-apps/plugin-fs';
import { downloadDir } from '@tauri-apps/api/path';
import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
import { useEffect, useMemo, useState } from 'react';
diff --git a/src/app/auth/onboarding/step-2.tsx b/src/app/auth/onboarding/step-2.tsx
index 0fd99a89..f465d5e2 100644
--- a/src/app/auth/onboarding/step-2.tsx
+++ b/src/app/auth/onboarding/step-2.tsx
@@ -1,4 +1,4 @@
-import { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 1d6bbbaa..7a9b74a6 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -24,8 +24,8 @@ export function ErrorScreen() {
useEffect(() => {
async function getInformation() {
- const { platform, version } = await import('@tauri-apps/api/os');
- const { getVersion } = await import('@tauri-apps/api/app');
+ const { platform, version } = await import('@tauri-apps/plugin-os');
+ const { getVersion } = await import('@tauri-apps/plugin-app');
const { appConfigDir } = await import('@tauri-apps/api/path');
const platformName = await platform();
diff --git a/src/app/notes/article.tsx b/src/app/notes/article.tsx
index 9e12e4c6..e20caa35 100644
--- a/src/app/notes/article.tsx
+++ b/src/app/notes/article.tsx
@@ -1,5 +1,5 @@
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
-import { writeText } from '@tauri-apps/api/clipboard';
+import { writeText } from '@tauri-apps/plugin-clipboard-manager';
import { nip19 } from 'nostr-tools';
import { AddressPointer, EventPointer } from 'nostr-tools/lib/nip19';
import { useRef, useState } from 'react';
diff --git a/src/app/notes/text.tsx b/src/app/notes/text.tsx
index c3a36f46..752e9792 100644
--- a/src/app/notes/text.tsx
+++ b/src/app/notes/text.tsx
@@ -1,5 +1,5 @@
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
-import { writeText } from '@tauri-apps/api/clipboard';
+import { writeText } from '@tauri-apps/plugin-clipboard-manager';
import { nip19 } from 'nostr-tools';
import { EventPointer } from 'nostr-tools/lib/nip19';
import { useRef, useState } from 'react';
diff --git a/src/app/nwc/components/alby.tsx b/src/app/nwc/components/alby.tsx
index 520ff8cb..afc44eef 100644
--- a/src/app/nwc/components/alby.tsx
+++ b/src/app/nwc/components/alby.tsx
@@ -1,7 +1,7 @@
import { webln } from '@getalby/sdk';
import * as Dialog from '@radix-ui/react-dialog';
-import { message } from '@tauri-apps/api/dialog';
-import { WebviewWindow } from '@tauri-apps/api/window';
+import { message } from '@tauri-apps/plugin-dialog';
+import { WebviewWindow } from '@tauri-apps/plugin-window';
import { useState } from 'react';
import { useStorage } from '@libs/storage/provider';
diff --git a/src/app/relays/components/relayList.tsx b/src/app/relays/components/relayList.tsx
index 0281ab4a..aef6d706 100644
--- a/src/app/relays/components/relayList.tsx
+++ b/src/app/relays/components/relayList.tsx
@@ -1,5 +1,5 @@
import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import { normalizeRelayUrl } from 'nostr-fetch';
import { useNavigate } from 'react-router-dom';
import { VList } from 'virtua';
diff --git a/src/app/settings/components/version.tsx b/src/app/settings/components/version.tsx
index ad15d1de..3a6cddbd 100644
--- a/src/app/settings/components/version.tsx
+++ b/src/app/settings/components/version.tsx
@@ -1,4 +1,4 @@
-import { getVersion } from '@tauri-apps/api/app';
+import { getVersion } from '@tauri-apps/plugin-app';
import { useEffect, useState } from 'react';
export function VersionSetting() {
diff --git a/src/app/splash.tsx b/src/app/splash.tsx
index 6fe40963..3ce34a56 100644
--- a/src/app/splash.tsx
+++ b/src/app/splash.tsx
@@ -1,4 +1,4 @@
-import { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import { invoke } from '@tauri-apps/api/tauri';
import { useEffect } from 'react';
diff --git a/src/app/users/components/modal.tsx b/src/app/users/components/modal.tsx
index 8ba979e6..cb17d6ed 100644
--- a/src/app/users/components/modal.tsx
+++ b/src/app/users/components/modal.tsx
@@ -1,7 +1,7 @@
import { NDKEvent, NDKUserProfile } from '@nostr-dev-kit/ndk';
import * as Dialog from '@radix-ui/react-dialog';
import { useQueryClient } from '@tanstack/react-query';
-import { fetch } from '@tauri-apps/api/http';
+import { fetch } from '@tauri-apps/plugin-http';
import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form';
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index 5fb58aff..0a1a605a 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -1,8 +1,8 @@
import NDK from '@nostr-dev-kit/ndk';
import NDKCacheAdapterDexie from '@nostr-dev-kit/ndk-cache-dexie';
import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
-import { message } from '@tauri-apps/api/dialog';
-import { fetch } from '@tauri-apps/api/http';
+import { message } from '@tauri-apps/plugin-dialog';
+import { fetch } from '@tauri-apps/plugin-http';
import { NostrFetcher } from 'nostr-fetch';
import { useEffect, useMemo, useState } from 'react';
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index f6071ec0..deec5ff1 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -1,6 +1,6 @@
import { NDKEvent } from '@nostr-dev-kit/ndk';
-import { BaseDirectory, removeFile } from '@tauri-apps/api/fs';
-import { Platform } from '@tauri-apps/api/os';
+import { BaseDirectory, removeFile } from '@tauri-apps/plugin-fs';
+import { Platform } from '@tauri-apps/plugin-os';
import Database from 'tauri-plugin-sql-api';
import { Stronghold } from 'tauri-plugin-stronghold-api';
diff --git a/src/libs/storage/provider.tsx b/src/libs/storage/provider.tsx
index 718a1a9f..aa2d961e 100644
--- a/src/libs/storage/provider.tsx
+++ b/src/libs/storage/provider.tsx
@@ -1,5 +1,5 @@
-import { message } from '@tauri-apps/api/dialog';
-import { platform } from '@tauri-apps/api/os';
+import { message } from '@tauri-apps/plugin-dialog';
+import { platform } from '@tauri-apps/plugin-os';
import { PropsWithChildren, createContext, useContext, useEffect, useState } from 'react';
import Database from 'tauri-plugin-sql-api';
diff --git a/src/shared/composer/composer.tsx b/src/shared/composer/composer.tsx
index c23ca261..dee24f51 100644
--- a/src/shared/composer/composer.tsx
+++ b/src/shared/composer/composer.tsx
@@ -1,4 +1,4 @@
-import { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import Image from '@tiptap/extension-image';
import Placeholder from '@tiptap/extension-placeholder';
import { EditorContent, useEditor } from '@tiptap/react';
diff --git a/src/shared/composer/mediaUploader.tsx b/src/shared/composer/mediaUploader.tsx
index ef9f0fce..9622c3bc 100644
--- a/src/shared/composer/mediaUploader.tsx
+++ b/src/shared/composer/mediaUploader.tsx
@@ -1,4 +1,4 @@
-import { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import { UnlistenFn, listen } from '@tauri-apps/api/event';
import { Editor } from '@tiptap/react';
import { useEffect, useState } from 'react';
diff --git a/src/shared/nip05.tsx b/src/shared/nip05.tsx
index dcb2d92b..da845d6d 100644
--- a/src/shared/nip05.tsx
+++ b/src/shared/nip05.tsx
@@ -1,5 +1,5 @@
import { useQuery } from '@tanstack/react-query';
-import { fetch } from '@tauri-apps/api/http';
+import { fetch } from '@tauri-apps/plugin-http';
import { memo } from 'react';
import { twMerge } from 'tailwind-merge';
diff --git a/src/shared/notes/actions/more.tsx b/src/shared/notes/actions/more.tsx
index d636c49e..ad929b4d 100644
--- a/src/shared/notes/actions/more.tsx
+++ b/src/shared/notes/actions/more.tsx
@@ -1,6 +1,6 @@
import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
import * as Tooltip from '@radix-ui/react-tooltip';
-import { writeText } from '@tauri-apps/api/clipboard';
+import { writeText } from '@tauri-apps/plugin-clipboard-manager';
import { nip19 } from 'nostr-tools';
import { EventPointer } from 'nostr-tools/lib/nip19';
import { useState } from 'react';
diff --git a/src/shared/notes/actions/repost.tsx b/src/shared/notes/actions/repost.tsx
index 2fd29237..6c85b1c1 100644
--- a/src/shared/notes/actions/repost.tsx
+++ b/src/shared/notes/actions/repost.tsx
@@ -1,7 +1,7 @@
import { NDKKind } from '@nostr-dev-kit/ndk';
import * as AlertDialog from '@radix-ui/react-alert-dialog';
import * as Tooltip from '@radix-ui/react-tooltip';
-import { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import { useState } from 'react';
import { twMerge } from 'tailwind-merge';
diff --git a/src/shared/notes/actions/zap.tsx b/src/shared/notes/actions/zap.tsx
index 76d52877..0d54a095 100644
--- a/src/shared/notes/actions/zap.tsx
+++ b/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 { message } from '@tauri-apps/api/dialog';
+import { message } from '@tauri-apps/plugin-dialog';
import { QRCodeSVG } from 'qrcode.react';
import { useEffect, useRef, useState } from 'react';
import CurrencyInput from 'react-currency-input-field';
diff --git a/src/utils/createBlobFromFile.ts b/src/utils/createBlobFromFile.ts
index 2f508776..0825c099 100644
--- a/src/utils/createBlobFromFile.ts
+++ b/src/utils/createBlobFromFile.ts
@@ -1,4 +1,4 @@
-import { readBinaryFile } from '@tauri-apps/api/fs';
+import { readBinaryFile } from '@tauri-apps/plugin-fs';
export async function createBlobFromFile(path: string): Promise {
const file = await readBinaryFile(path);
diff --git a/src/utils/hooks/useNostr.ts b/src/utils/hooks/useNostr.ts
index 9d24d449..a9012583 100644
--- a/src/utils/hooks/useNostr.ts
+++ b/src/utils/hooks/useNostr.ts
@@ -6,8 +6,8 @@ import {
NDKSubscription,
NDKUser,
} from '@nostr-dev-kit/ndk';
-import { message, open } from '@tauri-apps/api/dialog';
-import { Body, fetch } from '@tauri-apps/api/http';
+import { message, open } from '@tauri-apps/plugin-dialog';
+import { Body, fetch } from '@tauri-apps/plugin-http';
import { LRUCache } from 'lru-cache';
import { NostrEventExt } from 'nostr-fetch';
import { nip19 } from 'nostr-tools';
diff --git a/src/utils/notification.ts b/src/utils/notification.ts
index 5fb9f0a4..795783f4 100644
--- a/src/utils/notification.ts
+++ b/src/utils/notification.ts
@@ -2,7 +2,7 @@ import {
isPermissionGranted,
requestPermission,
sendNotification,
-} from '@tauri-apps/api/notification';
+} from '@tauri-apps/plugin-notification';
export async function sendNativeNotification(content: string, title?: string) {
let permissionGranted = await isPermissionGranted();
diff --git a/src/utils/types.d.ts b/src/utils/types.d.ts
index 0bd2ff84..e5262620 100644
--- a/src/utils/types.d.ts
+++ b/src/utils/types.d.ts
@@ -1,5 +1,5 @@
import { NDKEvent, NDKUserProfile } from '@nostr-dev-kit/ndk';
-import { Response } from '@tauri-apps/api/http';
+import { Response } from '@tauri-apps/plugin-http';
export interface RichContent {
parsed: string;
From c71bfb3f6dc2011b28140761223f7ae6977c0d6e Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Fri, 6 Oct 2023 09:08:37 +0700
Subject: [PATCH 08/30] wip: fully migrate to tauri v2
---
package.json | 11 +--
pnpm-lock.yaml | 126 ++++++++---------------------
src-tauri/Cargo.toml | 6 +-
src-tauri/src/main.rs | 4 +-
src/app.tsx | 2 +-
src/app/auth/create/step-2.tsx | 2 +-
src/app/auth/import/step-2.tsx | 2 +-
src/app/auth/migrate.tsx | 2 +-
src/app/auth/reset.tsx | 2 +-
src/app/auth/unlock.tsx | 2 +-
src/app/splash.tsx | 2 +-
src/app/users/components/modal.tsx | 5 +-
src/libs/ndk/cache.ts | 54 -------------
src/libs/ndk/instance.ts | 1 -
src/libs/storage/instance.ts | 4 +-
src/libs/storage/provider.tsx | 2 +-
src/shared/nip05.tsx | 3 +-
src/shared/notes/preview/image.tsx | 2 +-
src/utils/hooks/useNostr.ts | 19 ++---
src/utils/hooks/useOpenGraph.ts | 2 +-
src/utils/types.d.ts | 2 +-
21 files changed, 62 insertions(+), 193 deletions(-)
delete mode 100644 src/libs/ndk/cache.ts
diff --git a/package.json b/package.json
index a05352dd..c91e5a98 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,6 @@
"**/*.{ts, tsx, css, md, html, json}": "prettier --cache --write"
},
"dependencies": {
- "@dnd-kit/core": "^6.0.8",
"@fontsource-variable/inter": "^5.0.12",
"@getalby/sdk": "^2.4.0",
"@nostr-dev-kit/ndk": "^1.3.1",
@@ -33,9 +32,8 @@
"@radix-ui/react-popover": "^1.0.7",
"@radix-ui/react-tooltip": "^1.0.7",
"@tanstack/react-query": "^4.35.7",
- "@tauri-apps/api": "^1.5.0",
+ "@tauri-apps/api": "2.0.0-alpha.8",
"@tauri-apps/plugin-app": "2.0.0-alpha.1",
- "@tauri-apps/plugin-cli": "2.0.0-alpha.1",
"@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1",
"@tauri-apps/plugin-dialog": "2.0.0-alpha.1",
"@tauri-apps/plugin-fs": "2.0.0-alpha.1",
@@ -44,7 +42,10 @@
"@tauri-apps/plugin-os": "2.0.0-alpha.2",
"@tauri-apps/plugin-process": "2.0.0-alpha.1",
"@tauri-apps/plugin-shell": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-sql": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-stronghold": "2.0.0-alpha.2",
"@tauri-apps/plugin-updater": "2.0.0-alpha.1",
+ "@tauri-apps/plugin-upload": "2.0.0-alpha.1",
"@tauri-apps/plugin-window": "2.0.0-alpha.1",
"@tiptap/extension-image": "^2.1.11",
"@tiptap/extension-mention": "^2.1.11",
@@ -72,10 +73,6 @@
"react-router-dom": "^6.16.0",
"reactflow": "^11.9.2",
"remark-gfm": "^3.0.1",
- "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql#v1",
- "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
- "tauri-plugin-stronghold-api": "github:tauri-apps/tauri-plugin-stronghold#v1",
- "tauri-plugin-upload-api": "github:tauri-apps/tauri-plugin-upload#v1",
"tippy.js": "^6.3.7",
"virtua": "^0.9.1",
"zustand": "^4.4.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 839f1b91..f45141d3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,9 +5,6 @@ settings:
excludeLinksFromLockfile: false
dependencies:
- '@dnd-kit/core':
- specifier: ^6.0.8
- version: 6.0.8(react-dom@18.2.0)(react@18.2.0)
'@fontsource-variable/inter':
specifier: ^5.0.12
version: 5.0.12
@@ -51,14 +48,11 @@ dependencies:
specifier: ^4.35.7
version: 4.35.7(react-dom@18.2.0)(react@18.2.0)
'@tauri-apps/api':
- specifier: ^1.5.0
- version: 1.5.0
+ specifier: 2.0.0-alpha.8
+ version: 2.0.0-alpha.8
'@tauri-apps/plugin-app':
specifier: 2.0.0-alpha.1
version: 2.0.0-alpha.1
- '@tauri-apps/plugin-cli':
- specifier: 2.0.0-alpha.1
- version: 2.0.0-alpha.1
'@tauri-apps/plugin-clipboard-manager':
specifier: 2.0.0-alpha.1
version: 2.0.0-alpha.1
@@ -83,9 +77,18 @@ dependencies:
'@tauri-apps/plugin-shell':
specifier: 2.0.0-alpha.1
version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-sql':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-stronghold':
+ specifier: 2.0.0-alpha.2
+ version: 2.0.0-alpha.2
'@tauri-apps/plugin-updater':
specifier: 2.0.0-alpha.1
version: 2.0.0-alpha.1
+ '@tauri-apps/plugin-upload':
+ specifier: 2.0.0-alpha.1
+ version: 2.0.0-alpha.1
'@tauri-apps/plugin-window':
specifier: 2.0.0-alpha.1
version: 2.0.0-alpha.1
@@ -167,18 +170,6 @@ dependencies:
remark-gfm:
specifier: ^3.0.1
version: 3.0.1
- tauri-plugin-sql-api:
- specifier: github:tauri-apps/tauri-plugin-sql#v1
- version: github.com/tauri-apps/tauri-plugin-sql/1c79471feb06366fe1c11cb1cb6c67bcdb80c215
- tauri-plugin-store-api:
- specifier: github:tauri-apps/tauri-plugin-store#v1
- version: github.com/tauri-apps/tauri-plugin-store/1a741b721ed1eae0de0d811ecfe86fc6ad54fb73
- tauri-plugin-stronghold-api:
- specifier: github:tauri-apps/tauri-plugin-stronghold#v1
- version: github.com/tauri-apps/tauri-plugin-stronghold/d87b778f48ee12435efcf3f82d2e5efbb9541759
- tauri-plugin-upload-api:
- specifier: github:tauri-apps/tauri-plugin-upload#v1
- version: github.com/tauri-apps/tauri-plugin-upload/5348082f7436b01f0b5c08d6ddfc4f760abbac7e
tippy.js:
specifier: ^6.3.7
version: 6.3.7
@@ -420,37 +411,6 @@ packages:
to-fast-properties: 2.0.0
dev: true
- /@dnd-kit/accessibility@3.0.1(react@18.2.0):
- resolution: {integrity: sha512-HXRrwS9YUYQO9lFRc/49uO/VICbM+O+ZRpFDe9Pd1rwVv2PCNkRiTZRdxrDgng/UkvdC3Re9r2vwPpXXrWeFzg==}
- peerDependencies:
- react: '>=16.8.0'
- dependencies:
- react: 18.2.0
- tslib: 2.6.2
- dev: false
-
- /@dnd-kit/core@6.0.8(react-dom@18.2.0)(react@18.2.0):
- resolution: {integrity: sha512-lYaoP8yHTQSLlZe6Rr9qogouGUz9oRUj4AHhDQGQzq/hqaJRpFo65X+JKsdHf8oUFBzx5A+SJPUvxAwTF2OabA==}
- peerDependencies:
- react: '>=16.8.0'
- react-dom: '>=16.8.0'
- dependencies:
- '@dnd-kit/accessibility': 3.0.1(react@18.2.0)
- '@dnd-kit/utilities': 3.2.1(react@18.2.0)
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
- tslib: 2.6.2
- dev: false
-
- /@dnd-kit/utilities@3.2.1(react@18.2.0):
- resolution: {integrity: sha512-OOXqISfvBw/1REtkSK2N3Fi2EQiLMlWUlqnOK/UpOISqBZPWpE6TqL+jcPtMOkE8TqYGiURvRdPSI9hltNUjEA==}
- peerDependencies:
- react: '>=16.8.0'
- dependencies:
- react: 18.2.0
- tslib: 2.6.2
- dev: false
-
/@esbuild/android-arm64@0.18.20:
resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
engines: {node: '>=12'}
@@ -1932,13 +1892,13 @@ packages:
use-sync-external-store: 1.2.0(react@18.2.0)
dev: false
- /@tauri-apps/api@1.5.0:
- resolution: {integrity: sha512-yQY9wpVNuiYhLLuyDlu1nBpqJELT1fGp7OctN4rW9I2W1T2p7A3tqPxsEzQprEwneQRBAlPM9vC8NsnMbct+pg==}
+ /@tauri-apps/api@2.0.0-alpha.6:
+ resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
- /@tauri-apps/api@2.0.0-alpha.6:
- resolution: {integrity: sha512-ZMOc3eu9amwvkC6M69h3hWt4/EsFaAXmtkiw4xd2LN59/lTb4ZQiVfq2QKlRcu1rj3n/Tcr7U30ZopvHwXBGIg==}
+ /@tauri-apps/api@2.0.0-alpha.8:
+ resolution: {integrity: sha512-3hZ+7EzUA11KN+O/Y4KgmjR+ldhXLdNllkw//hv/AaNsktEopCRBuKfVRLzVK3yov+Z+GzgxqFlwgJ1v6g1iKw==}
engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
dev: false
@@ -2055,12 +2015,6 @@ packages:
'@tauri-apps/api': 2.0.0-alpha.6
dev: false
- /@tauri-apps/plugin-cli@2.0.0-alpha.1:
- resolution: {integrity: sha512-CsEGByU9btlLWgo2WGsWnvMFHY7za+K5tAcCo5c6xgyOGplx+PrN63ZDxVvF686ZpjxtItoRra8lesqXHToGMg==}
- dependencies:
- '@tauri-apps/api': 2.0.0-alpha.6
- dev: false
-
/@tauri-apps/plugin-clipboard-manager@2.0.0-alpha.1:
resolution: {integrity: sha512-zXybHu31RCx58ZGU7/kUHcvoXW2AX6kBXBZsKHv4rYe7Z869WmDLDC7iU23/dAJLu7xAPTJzJ/HbeMfbrfJ4hg==}
dependencies:
@@ -2109,12 +2063,30 @@ packages:
'@tauri-apps/api': 2.0.0-alpha.6
dev: false
+ /@tauri-apps/plugin-sql@2.0.0-alpha.1:
+ resolution: {integrity: sha512-HzFjcISMnkYR4lSOEAvtOUUT/YIMU2mz+oVGdVzVYAM5gzt8Xmooapp66UCJ/ugTlpd0angSkqfRgU3eQVS7Mg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
+ /@tauri-apps/plugin-stronghold@2.0.0-alpha.2:
+ resolution: {integrity: sha512-G01gRHjD1QCNn2EK/hgHJYy0tFEfjuKpU104JOgeYVEbkJX7G92hjxfyLqe++LoihPF/sUa6VHEUVVXBsRa71Q==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
/@tauri-apps/plugin-updater@2.0.0-alpha.1:
resolution: {integrity: sha512-rJoVc/N8gg1MkUOFZdx5h39V47elddwnOjs0sAPhaGfwct7okmFMRnXpN/MwHoprTkK2+6EDLOvhf0jFMiy4JA==}
dependencies:
'@tauri-apps/api': 2.0.0-alpha.6
dev: false
+ /@tauri-apps/plugin-upload@2.0.0-alpha.1:
+ resolution: {integrity: sha512-MSQesuCrQqPJtn1kbO428sz2M2q+G/jrOV2J3nxVrxUkISQvn2vK/vmMZ8e3p/dT5hdzs10Xz6KC9GZ67BCMVg==}
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.6
+ dev: false
+
/@tauri-apps/plugin-window@2.0.0-alpha.1:
resolution: {integrity: sha512-dFOAgal/3Txz3SQ+LNQq0AK1EPC+acdaFlwPVB/6KXUZYmaFleIlzgxDVoJCQ+/xOhxvYrdQaFLefh0I/Kldbg==}
dependencies:
@@ -6810,35 +6782,3 @@ packages:
/zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
dev: false
-
- github.com/tauri-apps/tauri-plugin-sql/1c79471feb06366fe1c11cb1cb6c67bcdb80c215:
- resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-sql/tar.gz/1c79471feb06366fe1c11cb1cb6c67bcdb80c215}
- name: tauri-plugin-sql-api
- version: 0.0.0
- dependencies:
- '@tauri-apps/api': 1.5.0
- dev: false
-
- github.com/tauri-apps/tauri-plugin-store/1a741b721ed1eae0de0d811ecfe86fc6ad54fb73:
- resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-store/tar.gz/1a741b721ed1eae0de0d811ecfe86fc6ad54fb73}
- name: tauri-plugin-store-api
- version: 0.0.0
- dependencies:
- '@tauri-apps/api': 1.5.0
- dev: false
-
- github.com/tauri-apps/tauri-plugin-stronghold/d87b778f48ee12435efcf3f82d2e5efbb9541759:
- resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-stronghold/tar.gz/d87b778f48ee12435efcf3f82d2e5efbb9541759}
- name: tauri-plugin-stronghold-api
- version: 0.0.0
- dependencies:
- '@tauri-apps/api': 1.5.0
- dev: false
-
- github.com/tauri-apps/tauri-plugin-upload/5348082f7436b01f0b5c08d6ddfc4f760abbac7e:
- resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-upload/tar.gz/5348082f7436b01f0b5c08d6ddfc4f760abbac7e}
- name: tauri-plugin-upload-api
- version: 0.0.0
- dependencies:
- '@tauri-apps/api': 1.5.0
- dev: false
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e5a867b0..b4798f9e 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -32,14 +32,14 @@ tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace"
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-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
- "sqlite",
-] }
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-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-sql = { git = "hhttps://github.com/tauri-apps/plugins-workspace", branch = "v2", features = [
+ "sqlite",
+] }
sqlx-cli = { version = "0.7.0", default-features = false, features = [
"sqlite",
] }
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 46b02ea8..47a98ee7 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -12,8 +12,6 @@ use tauri::{Manager, WindowEvent};
use tauri_plugin_autostart::MacosLauncher;
use tauri_plugin_sql::{Migration, MigrationKind};
use webpage::{Webpage, WebpageOptions};
-use window_vibrancy::{apply_mica, apply_vibrancy, NSVisualEffectMaterial};
-use window_shadows::set_shadow;
#[cfg(target_os = "macos")]
use traffic_light::TrafficLight;
@@ -120,7 +118,6 @@ fn main() {
}
})
.plugin(tauri_plugin_app::init())
- .plugin(tauri_plugin_cli::init())
.plugin(tauri_plugin_clipboard_manager::init())
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_fs::init())
@@ -129,6 +126,7 @@ fn main() {
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_process::init())
.plugin(tauri_plugin_shell::init())
+ .plugin(tauri_plugin_upload::init())
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_window::init())
.plugin(
diff --git a/src/app.tsx b/src/app.tsx
index e9a00163..023242a9 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -59,7 +59,7 @@ export default function App() {
headers: {
Accept: 'application/nostr+json',
},
- }).then((res) => res.data),
+ }).then((res) => res.json()),
});
};
diff --git a/src/app/auth/create/step-2.tsx b/src/app/auth/create/step-2.tsx
index 84e5dfab..18b767f9 100644
--- a/src/app/auth/create/step-2.tsx
+++ b/src/app/auth/create/step-2.tsx
@@ -1,8 +1,8 @@
import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useEffect, useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
-import { Stronghold } from 'tauri-plugin-stronghold-api';
import { useStorage } from '@libs/storage/provider';
diff --git a/src/app/auth/import/step-2.tsx b/src/app/auth/import/step-2.tsx
index 42da6e81..e93f1f5b 100644
--- a/src/app/auth/import/step-2.tsx
+++ b/src/app/auth/import/step-2.tsx
@@ -1,8 +1,8 @@
import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useEffect, useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
-import { Stronghold } from 'tauri-plugin-stronghold-api';
import { useStorage } from '@libs/storage/provider';
diff --git a/src/app/auth/migrate.tsx b/src/app/auth/migrate.tsx
index dd9b6c77..17378247 100644
--- a/src/app/auth/migrate.tsx
+++ b/src/app/auth/migrate.tsx
@@ -1,9 +1,9 @@
import { useQueryClient } from '@tanstack/react-query';
import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
-import { Stronghold } from 'tauri-plugin-stronghold-api';
import { useStorage } from '@libs/storage/provider';
diff --git a/src/app/auth/reset.tsx b/src/app/auth/reset.tsx
index 63bef717..ecef82fb 100644
--- a/src/app/auth/reset.tsx
+++ b/src/app/auth/reset.tsx
@@ -1,9 +1,9 @@
import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { getPublicKey, nip19 } from 'nostr-tools';
import { useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { Link, useNavigate } from 'react-router-dom';
-import { Stronghold } from 'tauri-plugin-stronghold-api';
import { useStorage } from '@libs/storage/provider';
diff --git a/src/app/auth/unlock.tsx b/src/app/auth/unlock.tsx
index e4aa8d7d..616a3e2d 100644
--- a/src/app/auth/unlock.tsx
+++ b/src/app/auth/unlock.tsx
@@ -1,8 +1,8 @@
import { appConfigDir } from '@tauri-apps/api/path';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { useState } from 'react';
import { Resolver, useForm } from 'react-hook-form';
import { Link, useNavigate } from 'react-router-dom';
-import { Stronghold } from 'tauri-plugin-stronghold-api';
import { useStorage } from '@libs/storage/provider';
diff --git a/src/app/splash.tsx b/src/app/splash.tsx
index 3ce34a56..7909d697 100644
--- a/src/app/splash.tsx
+++ b/src/app/splash.tsx
@@ -1,5 +1,5 @@
+import { invoke } from '@tauri-apps/api';
import { message } from '@tauri-apps/plugin-dialog';
-import { invoke } from '@tauri-apps/api/tauri';
import { useEffect } from 'react';
import { useNDK } from '@libs/ndk/provider';
diff --git a/src/app/users/components/modal.tsx b/src/app/users/components/modal.tsx
index cb17d6ed..1f5ce126 100644
--- a/src/app/users/components/modal.tsx
+++ b/src/app/users/components/modal.tsx
@@ -60,7 +60,6 @@ export function EditProfileModal() {
const res = await fetch(verifyURL, {
method: 'GET',
- timeout: 10,
headers: {
'Content-Type': 'application/json; charset=utf-8',
},
@@ -68,7 +67,7 @@ export function EditProfileModal() {
if (!res.ok) throw new Error(`Failed to fetch NIP-05 service: ${nip05}`);
- const data = res.data as NIP05;
+ const data: NIP05 = await res.json();
if (data.names) {
if (data.names[localPath] !== db.account.pubkey) return false;
return true;
@@ -144,7 +143,7 @@ export function EditProfileModal() {
Edit profile
-
+
diff --git a/src/libs/ndk/cache.ts b/src/libs/ndk/cache.ts
deleted file mode 100644
index beb5df39..00000000
--- a/src/libs/ndk/cache.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { NDKCacheAdapter } from '@nostr-dev-kit/ndk';
-import { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk';
-import { Store } from 'tauri-plugin-store-api';
-
-export default class TauriAdapter implements NDKCacheAdapter {
- public store: Store;
- readonly locking: boolean;
-
- constructor() {
- this.store = new Store('.ndk_cache.dat');
- this.locking = true;
- }
-
- public async query(subscription: NDKSubscription): Promise
{
- const { filter } = subscription;
-
- if (filter.authors && filter.kinds) {
- const promises = [];
-
- for (const author of filter.authors) {
- for (const kind of filter.kinds) {
- const key = `${author}:${kind}`;
- promises.push(this.store.get(key));
- }
- }
-
- const results = await Promise.all(promises);
-
- for (const result of results) {
- if (result) {
- const ndkEvent = new NDKEvent(subscription.ndk, JSON.parse(result as string));
- subscription.eventReceived(ndkEvent, undefined, true);
- }
- }
- }
- }
-
- public async setEvent(event: NDKEvent): Promise {
- const nostrEvent = await event.toNostrEvent();
- if (event.kind !== 3) {
- const key = `${nostrEvent.pubkey}:${nostrEvent.kind}`;
-
- return new Promise((resolve) => {
- Promise.all([this.store.set(key, JSON.stringify(nostrEvent))]).then(() =>
- resolve()
- );
- });
- }
- }
-
- public async saveCache(): Promise {
- return await this.store.save();
- }
-}
diff --git a/src/libs/ndk/instance.ts b/src/libs/ndk/instance.ts
index 0a1a605a..03382a52 100644
--- a/src/libs/ndk/instance.ts
+++ b/src/libs/ndk/instance.ts
@@ -30,7 +30,6 @@ export const NDKInstance = () => {
try {
const res = await fetch(`https://${url.hostname}`, {
method: 'GET',
- timeout: { secs: 5, nanos: 0 },
headers: {
Accept: 'application/nostr+json',
},
diff --git a/src/libs/storage/instance.ts b/src/libs/storage/instance.ts
index deec5ff1..572fa0ae 100644
--- a/src/libs/storage/instance.ts
+++ b/src/libs/storage/instance.ts
@@ -1,8 +1,8 @@
import { NDKEvent } from '@nostr-dev-kit/ndk';
import { BaseDirectory, removeFile } from '@tauri-apps/plugin-fs';
import { Platform } from '@tauri-apps/plugin-os';
-import Database from 'tauri-plugin-sql-api';
-import { Stronghold } from 'tauri-plugin-stronghold-api';
+import Database from '@tauri-apps/plugin-sql';
+import { Stronghold } from '@tauri-apps/plugin-stronghold';
import { FULL_RELAYS } from '@stores/constants';
diff --git a/src/libs/storage/provider.tsx b/src/libs/storage/provider.tsx
index aa2d961e..c4614089 100644
--- a/src/libs/storage/provider.tsx
+++ b/src/libs/storage/provider.tsx
@@ -1,7 +1,7 @@
import { message } from '@tauri-apps/plugin-dialog';
import { platform } from '@tauri-apps/plugin-os';
+import Database from '@tauri-apps/plugin-sql';
import { PropsWithChildren, createContext, useContext, useEffect, useState } from 'react';
-import Database from 'tauri-plugin-sql-api';
import { LumeStorage } from '@libs/storage/instance';
diff --git a/src/shared/nip05.tsx b/src/shared/nip05.tsx
index da845d6d..9c664384 100644
--- a/src/shared/nip05.tsx
+++ b/src/shared/nip05.tsx
@@ -30,7 +30,6 @@ export const NIP05 = memo(function NIP05({
const res = await fetch(verifyURL, {
method: 'GET',
- timeout: 10,
headers: {
'Content-Type': 'application/json; charset=utf-8',
},
@@ -38,7 +37,7 @@ export const NIP05 = memo(function NIP05({
if (!res.ok) throw new Error(`Failed to fetch NIP-05 service: ${nip05}`);
- const data = res.data as NIP05;
+ const data: NIP05 = await res.json();
if (data.names) {
if (data.names[localPath] !== pubkey) return false;
return true;
diff --git a/src/shared/notes/preview/image.tsx b/src/shared/notes/preview/image.tsx
index 31c1be25..9d9088ef 100644
--- a/src/shared/notes/preview/image.tsx
+++ b/src/shared/notes/preview/image.tsx
@@ -1,5 +1,5 @@
import { downloadDir } from '@tauri-apps/api/path';
-import { download } from 'tauri-plugin-upload-api';
+import { download } from '@tauri-apps/plugin-upload';
import { DownloadIcon } from '@shared/icons';
diff --git a/src/utils/hooks/useNostr.ts b/src/utils/hooks/useNostr.ts
index a9012583..57602d24 100644
--- a/src/utils/hooks/useNostr.ts
+++ b/src/utils/hooks/useNostr.ts
@@ -7,7 +7,7 @@ import {
NDKUser,
} from '@nostr-dev-kit/ndk';
import { message, open } from '@tauri-apps/plugin-dialog';
-import { Body, fetch } from '@tauri-apps/plugin-http';
+import { fetch } from '@tauri-apps/plugin-http';
import { LRUCache } from 'lru-cache';
import { NostrEventExt } from 'nostr-fetch';
import { nip19 } from 'nostr-tools';
@@ -18,7 +18,6 @@ import { useStorage } from '@libs/storage/provider';
import { useStronghold } from '@stores/stronghold';
-import { createBlobFromFile } from '@utils/createBlobFromFile';
import { nHoursAgo } from '@utils/date';
import { getMultipleRandom } from '@utils/transform';
import { NDKEventWithReplies, NostrBuildResponse } from '@utils/types';
@@ -413,27 +412,19 @@ export function useNostr() {
error: 'Cancelled',
};
} else {
- filepath = selected;
+ filepath = selected.path;
}
}
- const filename = filepath.split('/').pop();
- const filetype = filename.split('.').pop();
+ const formData = new FormData();
+ formData.append('file', filepath);
- const fileData = await createBlobFromFile(filepath);
const res: NostrBuildResponse = await fetch(
'https://nostr.build/api/v2/upload/files',
{
method: 'POST',
- timeout: 30,
headers: { 'Content-Type': 'multipart/form-data' },
- body: Body.form({
- fileData: {
- file: fileData,
- mime: `image/${filetype}`,
- fileName: filename,
- },
- }),
+ body: formData,
}
);
diff --git a/src/utils/hooks/useOpenGraph.ts b/src/utils/hooks/useOpenGraph.ts
index 9759ec80..320b94f4 100644
--- a/src/utils/hooks/useOpenGraph.ts
+++ b/src/utils/hooks/useOpenGraph.ts
@@ -1,5 +1,5 @@
import { useQuery } from '@tanstack/react-query';
-import { invoke } from '@tauri-apps/api/tauri';
+import { invoke } from '@tauri-apps/api';
import { Opengraph } from '@utils/types';
diff --git a/src/utils/types.d.ts b/src/utils/types.d.ts
index e5262620..511aa6d8 100644
--- a/src/utils/types.d.ts
+++ b/src/utils/types.d.ts
@@ -94,7 +94,7 @@ export interface NDKEventWithReplies extends NDKEvent {
export interface NostrBuildResponse extends Response {
ok: boolean;
- data: {
+ data?: {
message: string;
status: string;
data: Array<{
From cb91373d331724a7692fcf4c94708867ac5213e1 Mon Sep 17 00:00:00 2001
From: Ren Amamiya <123083837+reyamir@users.noreply.github.com>
Date: Sat, 7 Oct 2023 09:06:33 +0700
Subject: [PATCH 09/30] wip: dark mode - light mode
---
package.json | 2 +
pnpm-lock.yaml | 32 +++++++++-
public/lockscreen/1.png | Bin 0 -> 6961714 bytes
src-tauri/tauri.linux.conf.json | 1 +
src/app/auth/unlock.tsx | 83 ++++++++------------------
src/app/space/index.tsx | 2 +-
src/app/splash.tsx | 8 +--
src/shared/composer/modal.tsx | 4 +-
src/shared/layouts/app.tsx | 26 ++++----
src/shared/layouts/auth.tsx | 9 ++-
src/shared/navigation.tsx | 33 +++++-----
src/shared/notes/child.tsx | 2 +-
src/shared/notes/kinds/repost.tsx | 12 ++--
src/shared/notes/kinds/text.tsx | 4 +-
src/shared/notes/mentions/hashtag.tsx | 2 +-
src/shared/notes/mentions/user.tsx | 2 +-
src/shared/notes/preview/image.tsx | 2 +-
src/shared/notes/preview/video.tsx | 2 +-
src/shared/notes/wrapper.tsx | 4 +-
src/shared/titleBar.tsx | 6 +-
src/utils/parser.ts | 13 +++-
tailwind.config.js | 18 +++++-
22 files changed, 147 insertions(+), 120 deletions(-)
create mode 100644 public/lockscreen/1.png
diff --git a/package.json b/package.json
index c91e5a98..4bb31a7f 100644
--- a/package.json
+++ b/package.json
@@ -71,8 +71,10 @@
"react-hook-form": "^7.47.0",
"react-markdown": "^8.0.7",
"react-router-dom": "^6.16.0",
+ "react-string-replace": "^1.1.1",
"reactflow": "^11.9.2",
"remark-gfm": "^3.0.1",
+ "tauri-controls": "^0.2.0",
"tippy.js": "^6.3.7",
"virtua": "^0.9.1",
"zustand": "^4.4.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f45141d3..46e8b929 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -164,12 +164,18 @@ dependencies:
react-router-dom:
specifier: ^6.16.0
version: 6.16.0(react-dom@18.2.0)(react@18.2.0)
+ react-string-replace:
+ specifier: ^1.1.1
+ version: 1.1.1
reactflow:
specifier: ^11.9.2
version: 11.9.2(@types/react@18.2.24)(react-dom@18.2.0)(react@18.2.0)
remark-gfm:
specifier: ^3.0.1
version: 3.0.1
+ tauri-controls:
+ specifier: ^0.2.0
+ version: 0.2.0(@tauri-apps/plugin-os@2.0.0-alpha.2)(@tauri-apps/plugin-window@2.0.0-alpha.1)(clsx@2.0.0)(react-dom@18.2.0)(react@18.2.0)(tailwind-merge@1.14.0)
tippy.js:
specifier: ^6.3.7
version: 6.3.7
@@ -3153,7 +3159,6 @@ packages:
/clsx@2.0.0:
resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==}
engines: {node: '>=6'}
- dev: true
/color-convert@1.9.3:
resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
@@ -5804,6 +5809,11 @@ packages:
react: 18.2.0
dev: false
+ /react-string-replace@1.1.1:
+ resolution: {integrity: sha512-26TUbLzLfHQ5jO5N7y3Mx88eeKo0Ml0UjCQuX4BMfOd/JX+enQqlKpL1CZnmjeBRvQE8TR+ds9j1rqx9CxhKHQ==}
+ engines: {node: '>=0.12.0'}
+ dev: false
+
/react-style-singleton@2.2.1(@types/react@18.2.24)(react@18.2.0):
resolution: {integrity: sha512-ZWj0fHEMyWkHzKYUr2Bs/4zU6XLmq9HsgBURm7g5pAVfyn49DgUiNgY2d4lXRlYSiCif9YBGpQleewkcqddc7g==}
engines: {node: '>=10'}
@@ -6211,7 +6221,6 @@ packages:
/tailwind-merge@1.14.0:
resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
- dev: true
/tailwindcss@3.3.3:
resolution: {integrity: sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==}
@@ -6244,6 +6253,25 @@ packages:
- ts-node
dev: true
+ /tauri-controls@0.2.0(@tauri-apps/plugin-os@2.0.0-alpha.2)(@tauri-apps/plugin-window@2.0.0-alpha.1)(clsx@2.0.0)(react-dom@18.2.0)(react@18.2.0)(tailwind-merge@1.14.0):
+ resolution: {integrity: sha512-/IDXLhcqGRjNN7QKfzgyr2y4QfnWT9MSIdqxrjH2oElXyngSo/cQltTb8LT6h/sH/7gRiSQMvQBEmavfn9Hk0w==}
+ peerDependencies:
+ '@tauri-apps/plugin-os': 2.0.0-alpha.2
+ '@tauri-apps/plugin-window': 2.0.0-alpha.1
+ clsx: ^2.0.0
+ react: ^18.2.0
+ react-dom: ^18.2.0
+ tailwind-merge: ^1.14.0
+ dependencies:
+ '@tauri-apps/api': 2.0.0-alpha.8
+ '@tauri-apps/plugin-os': 2.0.0-alpha.2
+ '@tauri-apps/plugin-window': 2.0.0-alpha.1
+ clsx: 2.0.0
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
+ tailwind-merge: 1.14.0
+ dev: false
+
/text-table@0.2.0:
resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
dev: true
diff --git a/public/lockscreen/1.png b/public/lockscreen/1.png
new file mode 100644
index 0000000000000000000000000000000000000000..30dd8f4bae6e4aff2a6c2e1c1d90e30ce00986a4
GIT binary patch
literal 6961714
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