From b1dee1727e0267dc47ab62c675ae1799ac63e006 Mon Sep 17 00:00:00 2001 From: Lotus Bot Date: Fri, 22 May 2026 00:36:30 -0400 Subject: [PATCH] fix: prettier formatting, viteStaticCopy paths, HydrateFallback warning - Fix prettier formatting in useCall.ts and initMatrix.ts (unblocks CI) - Fix viteStaticCopy stripBase so manifest.json and public/locales/ land at correct output paths (was getting extra 'public/' prefix from v4 path preservation behavior) - Silence react-router v7 HydrateFallback warning on root route (SPA has no SSR hydration, null is intentional) --- src/app/hooks/useCall.ts | 4 +--- src/app/pages/Router.tsx | 2 +- src/client/initMatrix.ts | 1 - vite.config.js | 3 +++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/hooks/useCall.ts b/src/app/hooks/useCall.ts index 3eb2d66ab..34cc61a5c 100644 --- a/src/app/hooks/useCall.ts +++ b/src/app/hooks/useCall.ts @@ -34,9 +34,7 @@ export const useCallSession = (room: Room): MatrixRTCSession => { }; export const useCallMembers = (room: Room, session: MatrixRTCSession): CallMembership[] => { - const [memberships, setMemberships] = useState( - session.memberships, - ); + const [memberships, setMemberships] = useState(session.memberships); useEffect(() => { const updateMemberships = () => { diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx index 95d695f9b..c0724685b 100644 --- a/src/app/pages/Router.tsx +++ b/src/app/pages/Router.tsx @@ -104,7 +104,7 @@ export const createRouter = (clientConfig: ClientConfig, screenSize: ScreenSize) const mobile = screenSize === ScreenSize.Mobile; const routes = createRoutesFromElements( - + { diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index bd58d7b21..78f204c99 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -99,4 +99,3 @@ export const clearLoginData = async () => { window.localStorage.clear(); window.location.reload(); }; - diff --git a/vite.config.js b/vite.config.js index e14c97086..62882f9ee 100644 --- a/vite.config.js +++ b/vite.config.js @@ -24,14 +24,17 @@ const copyFiles = { { src: 'public/manifest.json', dest: '', + rename: { stripBase: true }, }, { src: 'public/res/android', dest: 'public/', + rename: { stripBase: 2 }, }, { src: 'public/locales', dest: 'public/', + rename: { stripBase: 1 }, }, ], };