@lobehub/lobehub 2.0.0-next.72 → 2.0.0-next.74

package/src/app/[variants]/(main)/(mobile)/me/(home)/features/useCategory.tsx

@@ -8,8 +8,8 @@ import {
   FileClockIcon,
   Settings2,
 } from 'lucide-react';
-import { useRouter } from 'next/navigation';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 import { CellProps } from '@/components/Cell';
 import { usePWAInstall } from '@/hooks/usePWAInstall';
@@ -18,7 +18,7 @@ import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
 export const useCategory = () => {
-  const router = useRouter();
+  const navigate = useNavigate();
   const { canInstall, install } = usePWAInstall();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
@@ -29,7 +29,7 @@ export const useCategory = () => {
       icon: CircleUserRound,
       key: 'profile',
       label: t('userPanel.profile'),
-      onClick: () => router.push('/me/profile'),
+      onClick: () => navigate('/me/profile'),
     },
   ];
 
@@ -38,7 +38,7 @@ export const useCategory = () => {
       icon: Settings2,
       key: 'setting',
       label: t('userPanel.setting'),
-      onClick: () => router.push('/me/settings'),
+      onClick: () => navigate('/me/settings'),
     },
     {
       type: 'divider',
@@ -58,9 +58,6 @@ export const useCategory = () => {
   ];
 
   /* ↓ cloud slot ↓ */
-
-  /* ↑ cloud slot ↑ */
-
   const helps: CellProps[] = [
     showCloudPromotion && {
       icon: Cloudy,
@@ -84,7 +81,7 @@ export const useCategory = () => {
       icon: FileClockIcon,
       key: 'changelog',
       label: t('changelog'),
-      onClick: () => router.push('/changelog'),
+      onClick: () => navigate('/changelog'),
     },
   ].filter(Boolean) as CellProps[];
 

package/src/app/[variants]/(main)/(mobile)/me/(home)/index.tsx

@@ -0,0 +1,25 @@
+'use client';
+
+import { memo } from 'react';
+import { Center } from 'react-layout-kit';
+
+import BrandWatermark from '@/components/BrandWatermark';
+
+import Category from './features/Category';
+import UserBanner from './features/UserBanner';
+
+const MeHomePage = memo(() => {
+  return (
+    <>
+      <UserBanner />
+      <Category />
+      <Center padding={16}>
+        <BrandWatermark />
+      </Center>
+    </>
+  );
+});
+
+MeHomePage.displayName = 'MeHomePage';
+
+export default MeHomePage;

package/src/app/[variants]/(main)/(mobile)/me/(home)/layout.tsx

@@ -1,18 +1,15 @@
-import { PropsWithChildren, Suspense } from 'react';
-
-import Loading from '@/components/Loading/BrandTextLoading';
-import MobileContentLayout from '@/components/server/MobileNavLayout';
-
-import Header from './features/Header';
-
-const Layout = ({ children }: PropsWithChildren) => {
-  return (
-    <MobileContentLayout header={<Header />} withNav>
-      <Suspense fallback={<Loading />}>{children}</Suspense>
+import MobileContentLayout from "@/components/server/MobileNavLayout";
+import Loading from "@/components/Loading/BrandTextLoading";
+import { Outlet } from "react-router-dom";
+import Header from "./features/Header";
+import { Suspense } from "react";
+
+const Layout = () => {
+    return <MobileContentLayout header={<Header />} withNav>
+        <Suspense fallback={<Loading />}>
+            <Outlet />
+        </Suspense>
     </MobileContentLayout>
-  );
-};
-
-Layout.displayName = 'MeLayout';
+}
 
-export default Layout;
+export default Layout;

package/src/app/[variants]/(main)/(mobile)/me/profile/features/Category.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { ChartColumnBigIcon, LogOut, ShieldCheck, UserCircle } from 'lucide-react';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 
 import Cell, { CellProps } from '@/components/Cell';
 import { ProfileTabs } from '@/store/global/initialState';
@@ -16,26 +16,26 @@ const Category = memo(() => {
     authSelectors.isLoginWithClerk(s),
     s.logout,
   ]);
-  const router = useRouter();
+  const navigate = useNavigate();
   const { t } = useTranslation('auth');
   const items: CellProps[] = [
     {
       icon: UserCircle,
       key: ProfileTabs.Profile,
       label: t('tab.profile'),
-      onClick: () => router.push('/profile'),
+      onClick: () => navigate('/profile'),
     },
     isLoginWithClerk && {
       icon: ShieldCheck,
       key: ProfileTabs.Security,
       label: t('tab.security'),
-      onClick: () => router.push('/profile/security'),
+      onClick: () => navigate('/profile/security'),
     },
     {
       icon: ChartColumnBigIcon,
       key: ProfileTabs.Stats,
       label: t('tab.stats'),
-      onClick: () => router.push('/profile/stats'),
+      onClick: () => navigate('/profile/stats'),
     },
     isLogin && {
       type: 'divider',
@@ -46,7 +46,7 @@ const Category = memo(() => {
       label: t('signout', { ns: 'auth' }),
       onClick: () => {
         signOut();
-        router.push('/login');
+        navigate('/login');
       },
     },
   ].filter(Boolean) as CellProps[];

package/src/app/[variants]/(main)/(mobile)/me/profile/features/Header.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { ChatHeader } from '@lobehub/ui/mobile';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 import { Flexbox } from 'react-layout-kit';
 
 import { mobileHeaderSticky } from '@/styles/mobileHeader';
@@ -11,7 +11,7 @@ import { mobileHeaderSticky } from '@/styles/mobileHeader';
 const Header = memo(() => {
   const { t } = useTranslation('common');
 
-  const router = useRouter();
+  const navigate = useNavigate();
   return (
     <ChatHeader
       center={
@@ -23,7 +23,7 @@ const Header = memo(() => {
           }
         />
       }
-      onBackClick={() => router.push('/me')}
+      onBackClick={() => navigate('/me')}
       showBackButton
       style={mobileHeaderSticky}
     />

package/src/app/[variants]/(main)/(mobile)/me/profile/index.tsx

@@ -0,0 +1,16 @@
+'use client';
+
+import { memo } from 'react';
+
+
+import Category from './features/Category';
+
+const MeProfilePage = memo(() => {
+  return (
+    <Category />
+  );
+});
+
+MeProfilePage.displayName = 'MeProfilePage';
+
+export default MeProfilePage;

package/src/app/[variants]/(main)/(mobile)/me/profile/layout.tsx

@@ -1,13 +1,11 @@
-import { PropsWithChildren } from 'react';
+import MobileContentLayout from "@/components/server/MobileNavLayout";
+import { Outlet } from "react-router-dom";
+import Header from "./features/Header";
 
-import MobileContentLayout from '@/components/server/MobileNavLayout';
+const Layout = () => {
+    return <MobileContentLayout header={<Header />}>
+        <Outlet />
+    </MobileContentLayout>
+}
 
-import Header from './features/Header';
-
-const Layout = ({ children }: PropsWithChildren) => {
-  return <MobileContentLayout header={<Header />}>{children}</MobileContentLayout>;
-};
-
-Layout.displayName = 'MeProfileLayout';
-
-export default Layout;
+export default Layout;

package/src/app/[variants]/(main)/(mobile)/me/settings/features/Header.tsx

@@ -1,9 +1,9 @@
 'use client';
 
 import { ChatHeader } from '@lobehub/ui/mobile';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 import { Flexbox } from 'react-layout-kit';
 
 import { mobileHeaderSticky } from '@/styles/mobileHeader';
@@ -11,7 +11,7 @@ import { mobileHeaderSticky } from '@/styles/mobileHeader';
 const Header = memo(() => {
   const { t } = useTranslation('common');
 
-  const router = useRouter();
+  const navigate = useNavigate();
   return (
     <ChatHeader
       center={
@@ -23,7 +23,7 @@ const Header = memo(() => {
           }
         />
       }
-      onBackClick={() => router.push('/me')}
+      onBackClick={() => navigate('/me')}
       showBackButton
       style={mobileHeaderSticky}
     />

package/src/app/[variants]/(main)/(mobile)/me/settings/features/useCategory.tsx

@@ -1,12 +1,11 @@
 import { Bot, Brain, Info, Mic2, Settings2, Sparkles } from 'lucide-react';
-import { useRouter } from 'next/navigation';
 import { useTranslation } from 'react-i18next';
-
+import { useNavigate } from 'react-router-dom';
 import { CellProps } from '@/components/Cell';
 import { SettingsTabs } from '@/store/global/initialState';
 
 export const useCategory = () => {
-  const router = useRouter();
+  const navigate = useNavigate();
   const { t } = useTranslation('setting');
 
   const items: CellProps[] = [
@@ -40,6 +39,6 @@ export const useCategory = () => {
 
   return items.map((item) => ({
     ...item,
-    onClick: () => router.push(`/settings?active=${item.key}`),
+    onClick: () => navigate(`/settings?active=${item.key}`),
   }));
 };

package/src/app/[variants]/(main)/(mobile)/me/settings/index.tsx

@@ -0,0 +1,16 @@
+'use client';
+
+import { memo } from 'react';
+
+
+import Category from './features/Category';
+
+const MeSettingsPage = memo(() => {
+  return (
+    <Category />
+  );
+});
+
+MeSettingsPage.displayName = 'MeSettingsPage';
+
+export default MeSettingsPage;

package/src/app/[variants]/(main)/(mobile)/me/settings/layout.tsx

@@ -1,13 +1,15 @@
-import { PropsWithChildren } from 'react';
-
-import MobileContentLayout from '@/components/server/MobileNavLayout';
-
-import Header from './features/Header';
-
-const Layout = ({ children }: PropsWithChildren) => {
-  return <MobileContentLayout header={<Header />}>{children}</MobileContentLayout>;
-};
-
-Layout.displayName = 'MeSettingsLayout';
-
-export default Layout;
+import MobileContentLayout from "@/components/server/MobileNavLayout";
+import Loading from "@/components/Loading/BrandTextLoading";
+import { Outlet } from "react-router-dom";
+import Header from "./features/Header";
+import { Suspense } from "react";
+
+const Layout = () => {
+    return <MobileContentLayout header={<Header />} withNav>
+        <Suspense fallback={<Loading />}>
+            <Outlet />
+        </Suspense>
+    </MobileContentLayout>
+}
+
+export default Layout;

package/src/app/[variants]/(main)/changelog/_layout/Desktop/index.tsx

@@ -1,15 +1,16 @@
-import { ReactNode } from 'react';
+import { Outlet } from 'react-router-dom';
+
+import { Locales } from '@/locales/resources';
 
 import Hero from '../../features/Hero';
 import Container from './Container';
 
-type Props = { children: ReactNode };
-
-const Layout = ({ children }: Props) => {
+const Layout = (props: { locale: Locales }) => {
+  const { locale } = props;
   return (
     <Container>
       <Hero />
-      {children}
+      <Outlet context={{ locale }} />
     </Container>
   );
 };

package/src/app/[variants]/(main)/changelog/_layout/Mobile/Header.tsx

@@ -1,17 +1,17 @@
 'use client';
 
 import { ChatHeader } from '@lobehub/ui/mobile';
-import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
+import { useNavigate } from 'react-router-dom';
 
 import { mobileHeaderSticky } from '@/styles/mobileHeader';
 
 const Header = memo(() => {
   const { t } = useTranslation('changelog');
 
-  const router = useRouter();
+  const navigate = useNavigate();
   return (
     <ChatHeader
       center={
@@ -23,7 +23,7 @@ const Header = memo(() => {
           }
         />
       }
-      onBackClick={() => router.back()}
+      onBackClick={() => navigate(-1)}
       showBackButton
       style={mobileHeaderSticky}
     />

package/src/app/[variants]/(main)/changelog/_layout/Mobile/index.tsx

@@ -1,17 +1,17 @@
-import { ReactNode } from 'react';
+import { Outlet } from 'react-router-dom';
 
 import MobileContentLayout from '@/components/server/MobileNavLayout';
+import { Locales } from '@/locales/resources';
 
 import Hero from '../../features/Hero';
 import Header from './Header';
 
-type Props = { children: ReactNode };
-
-const Layout = ({ children }: Props) => {
+const Layout = (props: { locale: Locales }) => {
+  const { locale } = props;
   return (
     <MobileContentLayout header={<Header />} padding={16}>
       <Hero />
-      {children}
+      <Outlet context={{ locale }} />
     </MobileContentLayout>
   );
 };

package/src/app/[variants]/(main)/changelog/features/Post.tsx

@@ -1,10 +1,11 @@
 import { Typography } from '@lobehub/ui';
+import { Image } from '@lobehub/ui/mdx';
 import { Divider } from 'antd';
 import Link from 'next/link';
+import useSWR from 'swr';
 import urlJoin from 'url-join';
 
 import { CustomMDX } from '@/components/mdx';
-import Image from '@/components/mdx/Image';
 import { OFFICIAL_SITE } from '@/const/url';
 import { Locales } from '@/locales/resources';
 import { ChangelogService } from '@/server/services/changelog';
@@ -14,14 +15,16 @@ import GridLayout from './GridLayout';
 import PublishedTime from './PublishedTime';
 import VersionTag from './VersionTag';
 
-const Post = async ({
+const Post = ({
   id,
   mobile,
   versionRange,
   locale,
 }: ChangelogIndexItem & { branch?: string; locale: Locales; mobile?: boolean }) => {
-  const changelogService = new ChangelogService();
-  const data = await changelogService.getPostById(id, { locale });
+  const { data } = useSWR([`changelog-post-${id}`, locale], async () => {
+    const changelogService = new ChangelogService();
+    return await changelogService.getPostById(id, { locale });
+  });
 
   if (!data || !data.title) return null;
 

package/src/app/[variants]/(main)/changelog/index.tsx

@@ -0,0 +1,55 @@
+import { Fragment } from 'react';
+import { Flexbox } from 'react-layout-kit';
+import { useOutletContext } from 'react-router-dom';
+import useSWR from 'swr';
+
+import NotFound from '@/components/404';
+import { Locales } from '@/locales/resources';
+import { ChangelogService } from '@/server/services/changelog';
+import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
+
+import GridLayout from './features/GridLayout';
+import Pagination from './features/Pagination';
+import Post from './features/Post';
+import UpdateChangelogStatus from './features/UpdateChangelogStatus';
+
+const Page = (props: { isMobile: boolean }) => {
+  const { locale } = useOutletContext<{ locale: Locales }>();
+  const { isMobile } = props;
+  const { hideDocs } = useServerConfigStore(featureFlagsSelectors);
+
+  const { data } = useSWR('changelog-index', async () => {
+    const changelogService = new ChangelogService();
+    return await changelogService.getChangelogIndex();
+  });
+
+  if (hideDocs) return <NotFound />;
+
+  if (!data) return <NotFound />;
+
+  return (
+    <>
+      <Flexbox gap={isMobile ? 16 : 48}>
+        {data?.map((item) => (
+          <Fragment key={item.id}>
+            <Post locale={locale} mobile={isMobile} {...item} />
+          </Fragment>
+        ))}
+      </Flexbox>
+      <GridLayout>
+        <Pagination />
+      </GridLayout>
+      <UpdateChangelogStatus currentId={data[0]?.id} />
+    </>
+  );
+};
+
+const DesktopPage = () => {
+  return <Page isMobile={false} />;
+};
+
+const MobilePage = () => {
+  return <Page isMobile={true} />;
+};
+
+export { DesktopPage, MobilePage };

package/src/app/[variants]/(main)/chat/_layout/Desktop/index.tsx

@@ -1,15 +1,14 @@
-import { Suspense } from 'react';
 import { Flexbox } from 'react-layout-kit';
+import { Outlet } from 'react-router-dom';
 
 import { isDesktop } from '@/const/version';
 import ProtocolUrlHandler from '@/features/ProtocolUrlHandler';
 
-import { LayoutProps } from '../type';
 import RegisterHotkeys from './RegisterHotkeys';
 import SessionPanel from './SessionPanel';
 import Workspace from './Workspace';
 
-const Layout = ({ children }: LayoutProps) => {
+const Layout = () => {
   return (
     <>
       <Flexbox
@@ -19,14 +18,14 @@ const Layout = ({ children }: LayoutProps) => {
         width={'100%'}
       >
         <SessionPanel />
-        <Workspace>{children}</Workspace>
+        <Workspace>
+          <Outlet />
+        </Workspace>
       </Flexbox>
       {/* ↓ cloud slot ↓ */}
 
       {/* ↑ cloud slot ↑ */}
-      <Suspense>
-        <RegisterHotkeys />
-      </Suspense>
+      <RegisterHotkeys />
       {isDesktop && <ProtocolUrlHandler />}
     </>
   );

package/src/app/[variants]/(main)/chat/_layout/Mobile.tsx

@@ -8,7 +8,7 @@ import { withSuspense } from '@/components/withSuspense';
 import { useShowMobileWorkspace } from '@/hooks/useShowMobileWorkspace';
 
 import SessionPanelContent from '../components/SessionPanel';
-import { LayoutProps } from './type';
+import { Outlet } from 'react-router-dom';
 
 const useStyles = createStyles(({ css, token }) => ({
   main: css`
@@ -18,7 +18,7 @@ const useStyles = createStyles(({ css, token }) => ({
   `,
 }));
 
-const Layout = memo<LayoutProps>(({ children }) => {
+const Layout = memo(( ) => {
   const showMobileWorkspace = useShowMobileWorkspace();
   const { styles } = useStyles();
 
@@ -38,7 +38,7 @@ const Layout = memo<LayoutProps>(({ children }) => {
         style={showMobileWorkspace ? undefined : { display: 'none' }}
         width="100%"
       >
-        {children}
+        <Outlet />
       </Flexbox>
     </>
   );

package/src/app/[variants]/(main)/chat/components/WorkspaceLayout.tsx

@@ -14,9 +14,6 @@ import ConversationArea from './ConversationArea';
 import PortalPanel from './PortalPanel';
 import TopicSidebar from './TopicSidebar';
 
-interface WorkspaceLayoutProps {
-  mobile?: boolean;
-}
 
 const DesktopWorkspace = memo(() => (
   <>
@@ -60,14 +57,4 @@ const MobileWorkspace = memo(() => (
 
 MobileWorkspace.displayName = 'MobileWorkspace';
 
-const WorkspaceLayout = memo<WorkspaceLayoutProps>(({ mobile }) => {
-  if (mobile) {
-    return <MobileWorkspace />;
-  }
-
-  return <DesktopWorkspace />;
-});
-
-WorkspaceLayout.displayName = 'WorkspaceLayout';
-
-export default WorkspaceLayout;
+export { DesktopWorkspace, MobileWorkspace };

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatHydration/index.tsx

@@ -1,9 +1,9 @@
 'use client';
 
-import { useQueryState } from 'nuqs';
 import { memo, useLayoutEffect } from 'react';
 import { createStoreUpdater } from 'zustand-utils';
 
+import { useQueryState } from '@/hooks/useQueryParam';
 import { useChatStore } from '@/store/chat';
 
 // sync outside state to useChatStore
@@ -34,7 +34,7 @@ const ChatHydration = memo(() => {
       unsubscribeTopic();
       unsubscribeThread();
     };
-  }, []);
+  }, [setTopic, setThread]); // ✅ 现在 setValue 是稳定的，可以安全地添加到依赖数组
 
   return null;
 });

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/Desktop/MessageFromUrl.tsx

@@ -1,7 +1,7 @@
 'use client';
 
-import { useSearchParams } from 'next/navigation';
 import { useEffect } from 'react';
+import { useSearchParams } from 'react-router-dom';
 
 import { useChatStore } from '@/store/chat';
 
@@ -10,21 +10,19 @@ import { useSend } from '../useSend';
 const MessageFromUrl = () => {
   const updateMessageInput = useChatStore((s) => s.updateMessageInput);
   const { send: sendMessage } = useSend();
-  const searchParams = useSearchParams();
+  const [searchParams, setSearchParams] = useSearchParams();
 
   useEffect(() => {
     const message = searchParams.get('message');
-    if (message) {
-      // Remove message from URL
-      const params = new URLSearchParams(searchParams.toString());
-      params.delete('message');
-      const newUrl = `${window.location.pathname}?${params.toString()}`;
-      window.history.replaceState({}, '', newUrl);
-
-      updateMessageInput(message);
-      sendMessage();
-    }
-  }, [searchParams, updateMessageInput, sendMessage]);
+    if (!message) return;
+
+    const params = new URLSearchParams(searchParams.toString());
+    params.delete('message');
+    setSearchParams(params, { replace: true });
+
+    updateMessageInput(message);
+    sendMessage();
+  }, [searchParams, setSearchParams, updateMessageInput, sendMessage]);
 
   return null;
 };

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/Desktop/index.tsx

@@ -10,7 +10,6 @@ import GroupChatInput from './GroupChat';
 
 const Desktop = memo((props: { targetMemberId?: string }) => {
   const isGroupSession = useSessionStore(sessionSelectors.isCurrentSessionGroupSession);
-
   return isGroupSession ? <GroupChatInput {...props} /> : <ClassicChatInput />;
 });