From d88c554a2d24b0f16c24062d9860a2447ba3d33c Mon Sep 17 00:00:00 2001 From: Alois Date: Mon, 31 Aug 2026 22:05:28 +0200 Subject: [PATCH] fix(storage): circual deps --- apps/web/src/components/navbar.tsx | 2 +- apps/web/src/features/conversation/list/body.tsx | 2 +- apps/web/src/routes/app/home.tsx | 2 +- apps/web/src/routes/app/shell.tsx | 2 +- packages/call/src/components/buttons/invite.tsx | 2 +- packages/call/src/store.tsx | 2 +- packages/chat/src/components/input.tsx | 2 +- packages/chat/src/context.tsx | 2 +- packages/identity/package.json | 1 + packages/identity/src/context.tsx | 2 +- packages/{storage => identity}/src/session.tsx | 4 ++-- packages/notifications/src/context.tsx | 2 +- packages/storage/package.json | 3 --- pnpm-lock.yaml | 6 ------ 14 files changed, 13 insertions(+), 21 deletions(-) rename packages/{storage => identity}/src/session.tsx (97%) diff --git a/apps/web/src/components/navbar.tsx b/apps/web/src/components/navbar.tsx index e8f574c..19c367f 100644 --- a/apps/web/src/components/navbar.tsx +++ b/apps/web/src/components/navbar.tsx @@ -27,7 +27,7 @@ import { displayCallId } from "@tensamin/call/utils"; import { useState } from "react"; import { SidebarTrigger, useSidebar } from "@methanium/ui"; import { WindowControls as Controls } from "@methanium/ui"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; import Profile from "./modals/profile"; export default function Navbar({ forMobile }: { forMobile: boolean }) { diff --git a/apps/web/src/features/conversation/list/body.tsx b/apps/web/src/features/conversation/list/body.tsx index cc3baaf..d413500 100644 --- a/apps/web/src/features/conversation/list/body.tsx +++ b/apps/web/src/features/conversation/list/body.tsx @@ -5,7 +5,7 @@ import Switch from "./switch"; import ConversationModal from "../modal/conversation"; import CommunityModal from "../modal/community"; import { Loader2 } from "lucide-react"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; export default function List() { const [category, setCategory] = useState<"conversations" | "communities">( diff --git a/apps/web/src/routes/app/home.tsx b/apps/web/src/routes/app/home.tsx index b46324f..e556fd7 100644 --- a/apps/web/src/routes/app/home.tsx +++ b/apps/web/src/routes/app/home.tsx @@ -17,7 +17,7 @@ import { log } from "@tensamin/shared/log"; import { useState } from "react"; import { Loader2 } from "lucide-react"; import { isTauri } from "@tauri-apps/api/core"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; import { useStorage } from "@tensamin/storage/context"; import { ShieldAlert } from "lucide-react"; import { useUser } from "@tensamin/identity/context"; diff --git a/apps/web/src/routes/app/shell.tsx b/apps/web/src/routes/app/shell.tsx index 8ec0348..6d0a66c 100644 --- a/apps/web/src/routes/app/shell.tsx +++ b/apps/web/src/routes/app/shell.tsx @@ -12,7 +12,7 @@ import { Provider as MTPProvider } from "@tensamin/mtp"; import NotificationsProvider from "@tensamin/notifications/context"; import OnboardingGate from "@tensamin/onboarding"; import DesktopMediaProvider from "@tensamin/shared/desktopMedia"; -import Session from "@tensamin/storage/session"; +import Session from "@tensamin/identity/session"; import { useDeeplinks } from "@tensamin/tauri/deeplinkHandler"; import TAuthWrapper from "@tensamin/tauth/context"; diff --git a/packages/call/src/components/buttons/invite.tsx b/packages/call/src/components/buttons/invite.tsx index 6ab4c1f..1e91c8e 100644 --- a/packages/call/src/components/buttons/invite.tsx +++ b/packages/call/src/components/buttons/invite.tsx @@ -12,7 +12,7 @@ import Wrapper from "@tensamin/identity/wrapper"; import { Mail } from "lucide-react"; import { sendCallInvite, useCall } from "../../store"; import { log, toast } from "@tensamin/shared/log"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; export default function InviteButton({ className, diff --git a/packages/call/src/store.tsx b/packages/call/src/store.tsx index eb19355..35ec92e 100644 --- a/packages/call/src/store.tsx +++ b/packages/call/src/store.tsx @@ -12,7 +12,7 @@ import { wrapCallSecret, } from "@tensamin/crypto/callSecret"; import { useStorage } from "@tensamin/storage/context"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; import { useUser } from "@tensamin/identity/context"; import { DeepFilterNoiseFilterProcessor } from "deepfilternet3-noise-filter"; import { diff --git a/packages/chat/src/components/input.tsx b/packages/chat/src/components/input.tsx index 014bdaa..a605af6 100644 --- a/packages/chat/src/components/input.tsx +++ b/packages/chat/src/components/input.tsx @@ -27,7 +27,7 @@ import { log, toast } from "@tensamin/shared/log"; import { cn, useIsMobile } from "@methanium/ui"; import { encryptChatText } from "@tensamin/crypto/chatSecret"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; import { useEmojiRanks, useRecordEmojiUse } from "./emoji/emojiRanks"; import ReplyBox from "./replyBox"; import { useHotkey } from "@tensamin/hotkeys"; diff --git a/packages/chat/src/context.tsx b/packages/chat/src/context.tsx index c4328db..f0c3065 100644 --- a/packages/chat/src/context.tsx +++ b/packages/chat/src/context.tsx @@ -25,7 +25,7 @@ import { import { useStorage } from "@tensamin/storage/context"; import { requireRelaySuccess, useMTP } from "@tensamin/mtp"; import { log, toast } from "@tensamin/shared/log"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; import { useUser } from "@tensamin/identity/context"; import { createCache, type ChatDraft } from "@tensamin/cache"; import { secureValueCodec } from "@tensamin/storage/secure"; diff --git a/packages/identity/package.json b/packages/identity/package.json index e5293e2..f70e4d8 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -5,6 +5,7 @@ "type": "module", "exports": { "./context": "./src/context.tsx", + "./session": "./src/session.tsx", "./wrapper": "./src/wrapper.tsx", "./values": "./src/values.ts" }, diff --git a/packages/identity/src/context.tsx b/packages/identity/src/context.tsx index de79a84..e6eb204 100644 --- a/packages/identity/src/context.tsx +++ b/packages/identity/src/context.tsx @@ -19,7 +19,7 @@ import { import type z from "zod"; import { createCache } from "@tensamin/cache"; import { useStorage } from "@tensamin/storage/context"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "./session"; import { getChangedUserFields, selectUserFields } from "./selection"; export { getChangedUserFields, selectUserFields } from "./selection"; diff --git a/packages/storage/src/session.tsx b/packages/identity/src/session.tsx similarity index 97% rename from packages/storage/src/session.tsx rename to packages/identity/src/session.tsx index 394718b..cb5b6ea 100644 --- a/packages/storage/src/session.tsx +++ b/packages/identity/src/session.tsx @@ -6,10 +6,10 @@ import { useContext, useEffect, } from "react"; -import { useStorage } from "./context"; +import { useStorage } from "@tensamin/storage/context"; import type { Contacts, Communities, Calls } from "@tensamin/shared/data"; import { createCache } from "@tensamin/cache"; -import { secureValueCodec } from "./secure"; +import { secureValueCodec } from "@tensamin/storage/secure"; interface SessionContextType { contacts: Contacts; diff --git a/packages/notifications/src/context.tsx b/packages/notifications/src/context.tsx index eef4e8b..2839706 100644 --- a/packages/notifications/src/context.tsx +++ b/packages/notifications/src/context.tsx @@ -11,7 +11,7 @@ import { requestPermission as requestTauriNotificationPermission, sendNotification as sendTauriNotification, } from "@tauri-apps/plugin-notification"; -import { useSession } from "@tensamin/storage/session"; +import { useSession } from "@tensamin/identity/session"; import { useLocation, useNavigate } from "@tanstack/react-router"; import { decryptChatText } from "@tensamin/crypto/chatSecret"; import { log } from "@tensamin/shared/log"; diff --git a/packages/storage/package.json b/packages/storage/package.json index dce1554..f610246 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -4,7 +4,6 @@ "version": "0.0.0", "type": "module", "exports": { - "./session": "./src/session.tsx", "./context": "./src/context.tsx", "./secure": "./src/secure.ts", "./browserSecure": "./src/browserSecure.ts", @@ -18,8 +17,6 @@ "dependencies": { "@methanium/ui": "*", "@tauri-apps/api": "^2.11.1", - "@tensamin/cache": "workspace:*", - "@tensamin/mtp": "workspace:*", "@tensamin/shared": "workspace:*", "react": "^19.2.8", "react-dom": "^19.2.8" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index de1413b..aa563a3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -697,12 +697,6 @@ importers: '@tauri-apps/api': specifier: ^2.11.1 version: 2.11.1 - '@tensamin/cache': - specifier: workspace:* - version: link:../cache - '@tensamin/mtp': - specifier: workspace:* - version: link:../mtp '@tensamin/shared': specifier: workspace:* version: link:../shared