From 60ac19651a727aee77914677df6d3dd3401dc755 Mon Sep 17 00:00:00 2001 From: Nikita Date: Thu, 5 Sep 2024 11:56:44 +0300 Subject: [PATCH] remove fs watch v1 incorrect api use --- web/components/routes/tauri/TauriRoute.tsx | 10 +- web/lib/providers/deep-link-provider.tsx | 50 +++-- web/package.json | 222 ++++++++++----------- 3 files changed, 139 insertions(+), 143 deletions(-) diff --git a/web/components/routes/tauri/TauriRoute.tsx b/web/components/routes/tauri/TauriRoute.tsx index e35f3ad9..20a61997 100644 --- a/web/components/routes/tauri/TauriRoute.tsx +++ b/web/components/routes/tauri/TauriRoute.tsx @@ -1,7 +1,7 @@ "use client" import { useAccount } from "@/lib/providers/jazz-provider" -import { open } from "@tauri-apps/plugin-dialog" +// import { open } from "@tauri-apps/plugin-dialog" export default function TauriRoute() { const { me } = useAccount({ @@ -12,7 +12,7 @@ export default function TauriRoute() { // TODO: ugly code, just to get folder connecting working return (
- {me?.root?.connectedFolderPath && ( + {/* {me?.root?.connectedFolderPath && (
Connected folder: {me.root.connectedFolderPath}
- )} - {!me?.root?.connectedFolderPath && ( + )} */} + {/* {!me?.root?.connectedFolderPath && ( - )} + )} */} {/* TODO: loads a lot more data than expected */} {/* {JSON.stringify(me?.root?.personalPages)} */}
diff --git a/web/lib/providers/deep-link-provider.tsx b/web/lib/providers/deep-link-provider.tsx index de7707ad..cdcb9a12 100644 --- a/web/lib/providers/deep-link-provider.tsx +++ b/web/lib/providers/deep-link-provider.tsx @@ -1,7 +1,6 @@ "use client" import React, { useEffect, ReactNode } from "react" -import { watch, watchImmediate } from "tauri-plugin-fs-watch-api" interface DeepLinkProviderProps { children: ReactNode @@ -29,32 +28,31 @@ export function DeepLinkProvider({ children }: DeepLinkProviderProps) { let stopWatching: (() => void) | undefined let stopRawWatcher: (() => void) | undefined - const setupFileWatchers = async () => { - try { - stopWatching = await watch( - // TODO: should not hard code this, should get it from jazz - "~/src/org/learn-anything/learn-anything.xyz/private/vaults/nikiv", - event => { - const { kind, path } = event - console.log("File watch event:", { kind, path }) - }, - { recursive: true } - ) + // const setupFileWatchers = async () => { + // try { + // stopWatching = await watch( + // // TODO: should not hard code this, should get it from jazz + // "~/src/org/learn-anything/learn-anything.xyz/private/vaults/nikiv", + // event => { + // const { kind, path } = event + // console.log("File watch event:", { kind, path }) + // }, + // { recursive: true } + // ) - stopRawWatcher = await watchImmediate( - ["/path/a", "/path/b"], - event => { - const { type, paths, attrs } = event - console.log("Raw file watch event:", { type, paths, attrs }) - }, - {} - ) - } catch (error) { - console.error("Error setting up file watchers:", error) - } - } - - setupFileWatchers() + // stopRawWatcher = await watchImmediate( + // ["/path/a", "/path/b"], + // event => { + // const { type, paths, attrs } = event + // console.log("Raw file watch event:", { type, paths, attrs }) + // }, + // {} + // ) + // } catch (error) { + // console.error("Error setting up file watchers:", error) + // } + // } + // setupFileWatchers() // Cleanup function return () => { diff --git a/web/package.json b/web/package.json index acf797dd..832c5906 100644 --- a/web/package.json +++ b/web/package.json @@ -1,114 +1,112 @@ { - "name": "web", - "version": "0.1.0", - "scripts": { - "dev": "next dev", - "build": "next build", - "start": "next start", - "lint": "next lint", - "test": "jest" - }, - "dependencies": { - "@clerk/nextjs": "^5.4.1", - "@dnd-kit/core": "^6.1.0", - "@dnd-kit/sortable": "^8.0.0", - "@hookform/resolvers": "^3.9.0", - "@nothing-but/force-graph": "^0.8.3", - "@omit/react-confirm-dialog": "^1.1.5", - "@omit/react-fancy-switch": "^0.1.1", - "@radix-ui/react-avatar": "^1.1.0", - "@radix-ui/react-checkbox": "^1.1.1", - "@radix-ui/react-context-menu": "^2.2.1", - "@radix-ui/react-dialog": "^1.1.1", - "@radix-ui/react-dismissable-layer": "^1.1.0", - "@radix-ui/react-dropdown-menu": "^2.1.1", - "@radix-ui/react-focus-scope": "^1.1.0", - "@radix-ui/react-icons": "^1.3.0", - "@radix-ui/react-label": "^2.1.0", - "@radix-ui/react-popover": "^1.1.1", - "@radix-ui/react-scroll-area": "^1.1.0", - "@radix-ui/react-select": "^2.1.1", - "@radix-ui/react-separator": "^1.1.0", - "@radix-ui/react-slot": "^1.1.0", - "@radix-ui/react-toggle": "^1.1.0", - "@radix-ui/react-tooltip": "^1.1.2", - "@tanstack/react-virtual": "^3.10.7", - "@tauri-apps/plugin-fs-watch": "https://github.com/tauri-apps/tauri-plugin-fs-watch#v2", - "@tiptap/core": "^2.6.6", - "@tiptap/extension-blockquote": "^2.6.6", - "@tiptap/extension-bold": "^2.6.6", - "@tiptap/extension-bullet-list": "^2.6.6", - "@tiptap/extension-code": "^2.6.6", - "@tiptap/extension-code-block-lowlight": "^2.6.6", - "@tiptap/extension-document": "^2.6.6", - "@tiptap/extension-dropcursor": "^2.6.6", - "@tiptap/extension-focus": "^2.6.6", - "@tiptap/extension-gapcursor": "^2.6.6", - "@tiptap/extension-hard-break": "^2.6.6", - "@tiptap/extension-heading": "^2.6.6", - "@tiptap/extension-history": "^2.6.6", - "@tiptap/extension-horizontal-rule": "^2.6.6", - "@tiptap/extension-italic": "^2.6.6", - "@tiptap/extension-link": "^2.6.6", - "@tiptap/extension-list-item": "^2.6.6", - "@tiptap/extension-ordered-list": "^2.6.6", - "@tiptap/extension-paragraph": "^2.6.6", - "@tiptap/extension-placeholder": "^2.6.6", - "@tiptap/extension-strike": "^2.6.6", - "@tiptap/extension-task-item": "^2.6.6", - "@tiptap/extension-task-list": "^2.6.6", - "@tiptap/extension-text": "^2.6.6", - "@tiptap/extension-typography": "^2.6.6", - "@tiptap/pm": "^2.6.6", - "@tiptap/react": "^2.6.6", - "@tiptap/suggestion": "^2.6.6", - "axios": "^1.7.7", - "cheerio": "1.0.0", - "class-variance-authority": "^0.7.0", - "clsx": "^2.1.1", - "cmdk": "^1.0.0", - "date-fns": "^3.6.0", - "framer-motion": "^11.5.2", - "jazz-react": "0.7.35-unique.2", - "jazz-react-auth-clerk": "0.7.33-new-auth.1", - "jazz-tools": "0.7.35-unique.2", - "jotai": "^2.9.3", - "lowlight": "^3.1.0", - "lucide-react": "^0.429.0", - "next": "14.2.5", - "next-themes": "^0.3.0", - "nuqs": "^1.19.0", - "react": "^18.3.1", - "react-day-picker": "^8.10.1", - "react-dom": "^18.3.1", - "react-hook-form": "^7.53.0", - "react-textarea-autosize": "^8.5.3", - "react-use": "^17.5.1", - "slugify": "^1.6.6", - "sonner": "^1.5.0", - "streaming-markdown": "^0.0.14", - "tailwind-merge": "^2.5.2", - "tailwindcss-animate": "^1.0.7", - "tauri-plugin-fs-watch-api": "https://github.com/tauri-apps/tauri-plugin-fs-watch#v1", - "ts-node": "^10.9.2", - "zod": "^3.23.8", - "zsa": "^0.6.0" - }, - "devDependencies": { - "@testing-library/jest-dom": "^6.5.0", - "@testing-library/react": "^16.0.1", - "@types/jest": "^29.5.12", - "@types/node": "^22.5.3", - "@types/react": "^18.3.5", - "@types/react-dom": "^18.3.0", - "eslint": "^8.57.0", - "eslint-config-next": "14.2.5", - "jest": "^29.7.0", - "jest-environment-jsdom": "^29.7.0", - "postcss": "^8.4.45", - "prettier-plugin-tailwindcss": "^0.6.6", - "tailwindcss": "^3.4.10", - "ts-jest": "^29.2.5", - "typescript": "^5.5.4" - } + "name": "web", + "version": "0.1.0", + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint", + "test": "jest" + }, + "dependencies": { + "@clerk/nextjs": "^5.4.1", + "@dnd-kit/core": "^6.1.0", + "@dnd-kit/sortable": "^8.0.0", + "@hookform/resolvers": "^3.9.0", + "@nothing-but/force-graph": "^0.8.3", + "@omit/react-confirm-dialog": "^1.1.5", + "@omit/react-fancy-switch": "^0.1.1", + "@radix-ui/react-avatar": "^1.1.0", + "@radix-ui/react-checkbox": "^1.1.1", + "@radix-ui/react-context-menu": "^2.2.1", + "@radix-ui/react-dialog": "^1.1.1", + "@radix-ui/react-dismissable-layer": "^1.1.0", + "@radix-ui/react-dropdown-menu": "^2.1.1", + "@radix-ui/react-focus-scope": "^1.1.0", + "@radix-ui/react-icons": "^1.3.0", + "@radix-ui/react-label": "^2.1.0", + "@radix-ui/react-popover": "^1.1.1", + "@radix-ui/react-scroll-area": "^1.1.0", + "@radix-ui/react-select": "^2.1.1", + "@radix-ui/react-separator": "^1.1.0", + "@radix-ui/react-slot": "^1.1.0", + "@radix-ui/react-toggle": "^1.1.0", + "@radix-ui/react-tooltip": "^1.1.2", + "@tanstack/react-virtual": "^3.10.7", + "@tiptap/core": "^2.6.6", + "@tiptap/extension-blockquote": "^2.6.6", + "@tiptap/extension-bold": "^2.6.6", + "@tiptap/extension-bullet-list": "^2.6.6", + "@tiptap/extension-code": "^2.6.6", + "@tiptap/extension-code-block-lowlight": "^2.6.6", + "@tiptap/extension-document": "^2.6.6", + "@tiptap/extension-dropcursor": "^2.6.6", + "@tiptap/extension-focus": "^2.6.6", + "@tiptap/extension-gapcursor": "^2.6.6", + "@tiptap/extension-hard-break": "^2.6.6", + "@tiptap/extension-heading": "^2.6.6", + "@tiptap/extension-history": "^2.6.6", + "@tiptap/extension-horizontal-rule": "^2.6.6", + "@tiptap/extension-italic": "^2.6.6", + "@tiptap/extension-link": "^2.6.6", + "@tiptap/extension-list-item": "^2.6.6", + "@tiptap/extension-ordered-list": "^2.6.6", + "@tiptap/extension-paragraph": "^2.6.6", + "@tiptap/extension-placeholder": "^2.6.6", + "@tiptap/extension-strike": "^2.6.6", + "@tiptap/extension-task-item": "^2.6.6", + "@tiptap/extension-task-list": "^2.6.6", + "@tiptap/extension-text": "^2.6.6", + "@tiptap/extension-typography": "^2.6.6", + "@tiptap/pm": "^2.6.6", + "@tiptap/react": "^2.6.6", + "@tiptap/suggestion": "^2.6.6", + "axios": "^1.7.7", + "cheerio": "1.0.0", + "class-variance-authority": "^0.7.0", + "clsx": "^2.1.1", + "cmdk": "^1.0.0", + "date-fns": "^3.6.0", + "framer-motion": "^11.5.2", + "jazz-react": "0.7.35-unique.2", + "jazz-react-auth-clerk": "0.7.33-new-auth.1", + "jazz-tools": "0.7.35-unique.2", + "jotai": "^2.9.3", + "lowlight": "^3.1.0", + "lucide-react": "^0.429.0", + "next": "14.2.5", + "next-themes": "^0.3.0", + "nuqs": "^1.19.0", + "react": "^18.3.1", + "react-day-picker": "^8.10.1", + "react-dom": "^18.3.1", + "react-hook-form": "^7.53.0", + "react-textarea-autosize": "^8.5.3", + "react-use": "^17.5.1", + "slugify": "^1.6.6", + "sonner": "^1.5.0", + "streaming-markdown": "^0.0.14", + "tailwind-merge": "^2.5.2", + "tailwindcss-animate": "^1.0.7", + "ts-node": "^10.9.2", + "zod": "^3.23.8", + "zsa": "^0.6.0" + }, + "devDependencies": { + "@testing-library/jest-dom": "^6.5.0", + "@testing-library/react": "^16.0.1", + "@types/jest": "^29.5.12", + "@types/node": "^22.5.3", + "@types/react": "^18.3.5", + "@types/react-dom": "^18.3.0", + "eslint": "^8.57.0", + "eslint-config-next": "14.2.5", + "jest": "^29.7.0", + "jest-environment-jsdom": "^29.7.0", + "postcss": "^8.4.45", + "prettier-plugin-tailwindcss": "^0.6.6", + "tailwindcss": "^3.4.10", + "ts-jest": "^29.2.5", + "typescript": "^5.5.4" + } }