fully support tauri v2
This commit is contained in:
@@ -38,6 +38,7 @@ const router = createBrowserRouter([
|
||||
{
|
||||
path: '/',
|
||||
element: (
|
||||
// @ts-expect-error, todo
|
||||
<Protected>
|
||||
<Root />
|
||||
</Protected>
|
||||
@@ -78,6 +79,7 @@ const router = createBrowserRouter([
|
||||
{
|
||||
path: '/app',
|
||||
element: (
|
||||
// @ts-expect-error, todo
|
||||
<Protected>
|
||||
<AppLayout />
|
||||
</Protected>
|
||||
@@ -94,6 +96,7 @@ const router = createBrowserRouter([
|
||||
{
|
||||
path: '/settings',
|
||||
element: (
|
||||
// @ts-expect-error, todo
|
||||
<Protected>
|
||||
<SettingsLayout />
|
||||
</Protected>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { useMutation, useQueryClient } from '@tanstack/react-query';
|
||||
import { BaseDirectory, writeTextFile } from '@tauri-apps/api/fs';
|
||||
import { BaseDirectory, writeTextFile } from '@tauri-apps/plugin-fs';
|
||||
import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Body, fetch } from '@tauri-apps/api/http';
|
||||
import { Body, fetch } from '@tauri-apps/plugin-http';
|
||||
import { useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ export function ChannelMetadata({ id }: { id: string }) {
|
||||
const noteID = id ? nip19.noteEncode(id) : null;
|
||||
|
||||
const copyNoteID = async () => {
|
||||
const { writeText } = await import('@tauri-apps/api/clipboard');
|
||||
const { writeText } = await import('@tauri-apps/plugin-clipboard-manager');
|
||||
if (noteID) {
|
||||
await writeText(noteID);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Switch } from '@headlessui/react';
|
||||
import { disable, enable, isEnabled } from '@tauri-apps/plugin-autostart';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { twMerge } from 'tailwind-merge';
|
||||
import { disable, enable, isEnabled } from 'tauri-plugin-autostart-api';
|
||||
|
||||
import { getSetting, updateSetting } from '@libs/storage';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { getVersion } from '@tauri-apps/api/app';
|
||||
import { getVersion } from '@tauri-apps/plugin-app';
|
||||
|
||||
import { RefreshIcon } from '@shared/icons';
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FetchOptions, ResponseType, fetch } from '@tauri-apps/api/http';
|
||||
import { FetchOptions, ResponseType, fetch } from '@tauri-apps/plugin-http';
|
||||
import * as cheerio from 'cheerio';
|
||||
|
||||
import { OPENGRAPH } from '@stores/constants';
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import Database from '@tauri-apps/plugin-sql';
|
||||
import destr from 'destr';
|
||||
import Database from 'tauri-plugin-sql-api';
|
||||
|
||||
import { parser } from '@utils/parser';
|
||||
import { getParentID } from '@utils/transform';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { platform } from '@tauri-apps/api/os';
|
||||
import { platform } from '@tauri-apps/plugin-os';
|
||||
import { Outlet, useNavigate } from 'react-router-dom';
|
||||
|
||||
import { ArrowLeftIcon, ArrowRightIcon } from '@shared/icons';
|
||||
@@ -29,7 +29,7 @@ export function AuthLayout() {
|
||||
>
|
||||
<div
|
||||
className={`flex h-full items-center gap-2 ${
|
||||
platformName === 'darwin' ? 'pl-[68px]' : ''
|
||||
platformName === 'macos' ? 'pl-[68px]' : ''
|
||||
}`}
|
||||
>
|
||||
<button
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { Dialog, Transition } from '@headlessui/react';
|
||||
import { NDKEvent } from '@nostr-dev-kit/ndk';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { fetch } from '@tauri-apps/api/http';
|
||||
import { fetch } from '@tauri-apps/plugin-http';
|
||||
import { Fragment, useEffect, useState } from 'react';
|
||||
import { useForm } from 'react-hook-form';
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { Dialog, Transition } from '@headlessui/react';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { relaunch } from '@tauri-apps/api/process';
|
||||
import { relaunch } from '@tauri-apps/plugin-process';
|
||||
import { Fragment, useState } from 'react';
|
||||
|
||||
import { removeAll } from '@libs/storage';
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import * as Tooltip from '@radix-ui/react-tooltip';
|
||||
import { open } from '@tauri-apps/api/dialog';
|
||||
import { useState } from 'react';
|
||||
|
||||
import { LoaderIcon, MediaIcon } from '@shared/icons';
|
||||
|
||||
@@ -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';
|
||||
import { Image } from '@shared/image';
|
||||
|
||||
@@ -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<Uint8Array> {
|
||||
const file = await readBinaryFile(path);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { removeFile } from '@tauri-apps/api/fs';
|
||||
import { removeFile } from '@tauri-apps/plugin-fs';
|
||||
import { BaseDirectory, appConfigDir } from '@tauri-apps/api/path';
|
||||
import { Stronghold } from 'tauri-plugin-stronghold-api';
|
||||
import { Stronghold } from '@tauri-apps/plugin-stronghold';
|
||||
|
||||
const dir = await appConfigDir();
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { open } from '@tauri-apps/api/dialog';
|
||||
import { Body, fetch } from '@tauri-apps/api/http';
|
||||
import { open } from '@tauri-apps/plugin-dialog';
|
||||
import { Body, fetch } from '@tauri-apps/plugin-http';
|
||||
|
||||
import { createBlobFromFile } from '@utils/createBlobFromFile';
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import {
|
||||
isPermissionGranted,
|
||||
requestPermission,
|
||||
sendNotification,
|
||||
} from '@tauri-apps/api/notification';
|
||||
} from '@tauri-apps/plugin-notification';
|
||||
|
||||
export async function sendNativeNotification(content: string) {
|
||||
let permissionGranted = await isPermissionGranted();
|
||||
|
||||
Reference in New Issue
Block a user