0.2.1 onlyoffice修复

2026-01-17 10:12:53 +08:00
parent 94957dc361
commit 19907bccdc
102 changed files with 7188 additions and 186 deletions
@@ -5,6 +5,7 @@ import { SupabaseProvider } from "@/components/providers/supabase-provider";
 import { QueryProvider } from "@/components/providers/query-provider";
 import { createSupabaseServerClient } from "@/lib/supabase/server";
 import { getMnoteRuntimeConfig } from "@/lib/runtime-config";
+import { isConvexEnabled } from "@/lib/convex/enabled";

 const inter = Inter({
  subsets: ["latin"],
@@ -22,16 +23,19 @@ export default async function RootLayout({
  children: React.ReactNode;
 }>) {
  const isDesktop = process.env.MNOTE_DESKTOP === "1";
+  const useConvex = isConvexEnabled();

  let session = null;
-  try {
-    session = (await (await createSupabaseServerClient()).auth.getSession()).data.session;
-  } catch {
-    // 说明：不阻塞页面渲染，交由客户端登录页处理（例如网络暂不可达）。
-    session = null;
+  if (!useConvex) {
+    try {
+      session = (await (await createSupabaseServerClient()).auth.getSession()).data.session;
+    } catch {
+      // 说明：不阻塞页面渲染，交由客户端登录页处理（例如网络暂不可达）。
+      session = null;
+    }
  }

-  const runtimeConfig = { ...getMnoteRuntimeConfig(), isDesktop };
+  const runtimeConfig = { ...getMnoteRuntimeConfig(), isDesktop, useConvex };
  const runtimeConfigJson = JSON.stringify(runtimeConfig).replace(/</g, "\\u003cc");

  return (
@@ -46,9 +50,13 @@ export default async function RootLayout({
        />
      </head>
      <body className={`${inter.variable} antialiased`}>
-        <SupabaseProvider session={session}>
+        {useConvex ? (
          <QueryProvider>{children}</QueryProvider>
-        </SupabaseProvider>
+        ) : (
+          <SupabaseProvider session={session}>
+            <QueryProvider>{children}</QueryProvider>
+          </SupabaseProvider>
+        )}
      </body>
    </html>
  );