@lobehub/chat 0.79.3 → 0.79.5

package/src/{pages → app}/chat/mobile/index.tsx

@@ -5,12 +5,12 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import AppMobileLayout from '@/layout/AppMobileLayout';
-import Header from '@/pages/chat/features/Header';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';
 
 import Conversation from '../features/Conversation';
+import Header from '../features/Header';
 import SideBar from '../features/Sidebar';
 
 const Chat = memo(() => {

package/src/app/chat/{page.page.tsx → mobile/page.tsx}

@@ -1,4 +1,4 @@
-import Page from '@/pages/chat';
+import Page from './index';
 
 const Index = () => {
   return <Page />;

package/src/app/{page.page.tsx → chat/page.tsx}

@@ -1,4 +1,4 @@
-import Page from '@/pages/home';
+import Page from './index';
 
 const Index = () => {
   return <Page />;

package/src/{pages/chat/setting → app/chat/settings}/features/Header/Desktop.tsx

@@ -3,6 +3,8 @@ import { useRouter } from 'next/navigation';
 import { ReactNode, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { pathString } from '@/utils/url';
+
 const Header = memo<{ children: ReactNode }>(({ children }) => {
   const { t } = useTranslation('setting');
   const router = useRouter();
@@ -10,7 +12,7 @@ const Header = memo<{ children: ReactNode }>(({ children }) => {
   return (
     <ChatHeader
       left={<ChatHeaderTitle title={t('header.session')} />}
-      onBackClick={() => router.push('/chat', { hash: location.hash })}
+      onBackClick={() => router.push(pathString('/chat', { hash: location.hash }))}
       right={children}
       showBackButton
     />

package/src/{pages/chat/setting → app/chat/settings}/features/Header/Mobile.tsx

@@ -3,6 +3,8 @@ import { useRouter } from 'next/navigation';
 import { type ReactNode, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { pathString } from '@/utils/url';
+
 const Header = memo<{ children: ReactNode }>(({ children }) => {
   const { t } = useTranslation('setting');
   const router = useRouter();
@@ -10,7 +12,7 @@ const Header = memo<{ children: ReactNode }>(({ children }) => {
   return (
     <MobileNavBar
       center={<MobileNavBarTitle title={t('header.session')} />}
-      onBackClick={() => router.push('/chat/mobile', { hash: location.hash })}
+      onBackClick={() => router.push(pathString('/chat/mobile', { hash: location.hash }))}
       right={children}
       showBackButton
     />

package/src/{pages/chat/setting → app/chat/settings}/index.tsx

@@ -11,8 +11,8 @@ import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';
 
-import DesktopLayout from './layout';
 import MobileLayout from './layout.mobile';
+import DesktopLayout from './layout.pc';
 
 const EditPage = memo(() => {
   const { mobile } = useResponsive();

package/src/{pages/chat/setting/layout.tsx → app/chat/settings/layout.pc.tsx}

@@ -4,7 +4,7 @@ import { Flexbox } from 'react-layout-kit';
 import SafeSpacing from '@/components/SafeSpacing';
 import { HEADER_HEIGHT } from '@/const/layoutTokens';
 
-import ChatLayout from '../layout';
+import ChatLayout from '../layout.pc';
 import Header from './features/Header';
 
 const DesktopLayout = memo<PropsWithChildren>(({ children }) => {

package/src/app/{market/page.page.tsx → chat/settings/page.tsx}

@@ -1,4 +1,4 @@
-import Page from '@/pages/market';
+import Page from './index';
 
 const Index = () => {
   return <Page />;

package/src/{pages → app}/home/index.tsx

@@ -2,7 +2,6 @@
 
 import { memo } from 'react';
 
-import Loading from '@/pages/home/Loading';
 import {
   useEffectAfterSessionHydrated,
   useSessionHydrated,
@@ -11,6 +10,7 @@ import {
 import { sessionSelectors } from '@/store/session/selectors';
 
 import Welcome from '../welcome';
+import Loading from './Loading';
 
 const Home = memo(() => {
   const hydrated = useSessionHydrated();

package/src/app/{layout.page.tsx → layout.tsx}

@@ -1,7 +1,7 @@
-import { Analytics } from '@vercel/analytics/react';
 import { cookies } from 'next/headers';
 import { PropsWithChildren } from 'react';
 
+import Analytics from '@/components/Analytics';
 import {
   LOBE_THEME_APPEARANCE,
   LOBE_THEME_NEUTRAL_COLOR,

package/src/{pages → app}/market/features/SideBar/AgentInfo/index.tsx

@@ -3,13 +3,13 @@ import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import TokenTag from '@/pages/market/features/SideBar/AgentInfo/TokenTag';
 import { useMarketStore } from '@/store/market';
 
 import AgentCardBanner from '../../AgentCard/AgentCardBanner';
 import Comment from './Comment';
 import Header from './Header';
 import Loading from './Loading';
+import TokenTag from './TokenTag';
 import { useStyles } from './style';
 
 enum InfoTabs {

package/src/{pages → app}/market/index.tsx

@@ -10,8 +10,8 @@ import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';
 
 import AgentCard from './features/AgentCard';
 import AgentSearchBar from './features/AgentSearchBar';
-import DesktopLayout from './layout';
 import MobileLayout from './layout.mobile';
+import DesktopLayout from './layout.pc';
 
 const Market = memo(() => {
   const { t } = useTranslation('common');

package/src/{pages → app}/market/layout.mobile.tsx

@@ -2,10 +2,10 @@ import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import AppMobileLayout from '@/layout/AppMobileLayout';
-import SideBar from '@/pages/market/features/SideBar';
 import { useSwitchSideBarOnInit } from '@/store/global';
 
 import Header from './features/Header';
+import SideBar from './features/SideBar';
 
 const MarketLayout = memo<{ children: ReactNode }>(({ children }) => {
   useSwitchSideBarOnInit('market');

package/src/app/{welcome/page.page.tsx → market/page.tsx}

@@ -1,4 +1,4 @@
-import Page from '@/pages/welcome';
+import Page from './index';
 
 const Index = () => {
   return <Page />;

package/src/app/page.tsx

@@ -0,0 +1,7 @@
+import Page from './home';
+
+const Index = () => {
+  return <Page />;
+};
+
+export default Index;

package/src/{pages → app}/settings/index.tsx

@@ -9,8 +9,8 @@ import { useSwitchSideBarOnInit } from '@/store/global';
 import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';
 
 import Settings from './features/Settings';
-import DesktopLayout from './layout';
 import MobileLayout from './layout.mobile';
+import DesktopLayout from './layout.pc';
 
 const Setting = memo(() => {
   const { mobile } = useResponsive();

package/src/app/settings/page.tsx

@@ -0,0 +1,7 @@
+import Page from './index';
+
+const Index = () => {
+  return <Page />;
+};
+
+export default Index;

package/src/{pages → app}/welcome/index.tsx

@@ -9,8 +9,8 @@ import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';
 
 import Banner from './features/Banner';
 import Footer from './features/Footer';
-import Layout from './layout';
 import Mobile from './layout.mobile';
+import Layout from './layout.pc';
 
 const Welcome = memo(() => {
   const { mobile } = useResponsive();

package/src/app/welcome/page.tsx

@@ -0,0 +1,7 @@
+import Page from './index';
+
+const Index = () => {
+  return <Page />;
+};
+
+export default Index;

package/src/components/Analytics/index.tsx

@@ -0,0 +1,7 @@
+import { Analytics as VercelAnalytics } from '@vercel/analytics/react';
+
+const Analytics = () => {
+  return <VercelAnalytics />;
+};
+
+export default Analytics;

package/src/features/MobileTabBar/index.tsx

@@ -37,7 +37,7 @@ export default memo<{ className?: string }>(({ className }) => {
         icon: (active) => <Icon className={active ? styles.active : undefined} icon={Bot} />,
         key: 'market',
         onClick: () => {
-          router.push('/market', { hash: '' });
+          router.push('/market');
         },
         title: t('tab.market'),
       },

package/src/locales/default/common.ts

@@ -2,7 +2,7 @@ export default {
   about: '关于',
   advanceSettings: '高级设置',
   agentDefaultMessage:
-    '你好，我是 **{{name}}**，你可以立即与我开始对话，也可以前往 [助手设置](/chat/setting#session={{id}}) 完善我的信息。',
+    '你好，我是 **{{name}}**，你可以立即与我开始对话，也可以前往 [助手设置](/chat/settings#session={{id}}) 完善我的信息。',
   agentDefaultMessageWithSystemRole: '你好，我是 **{{name}}**，{{systemRole}}，让我们开始对话吧！',
   agentMaxToken: '会话最大长度',
   agentModel: '模型',

package/src/store/session/slices/session/initialState.ts

@@ -1,5 +1,5 @@
 import { merge } from 'lodash-es';
-import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context';
+import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
 
 import { DEFAULT_AGENT_META, DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { LobeAgentConfig, LobeAgentSession, LobeSessionType } from '@/types/session';

package/src/utils/url.test.ts

@@ -0,0 +1,51 @@
+import { pathString } from './url';
+
+describe('pathString', () => {
+  it('基本情况', () => {
+    const result = pathString('/home');
+    expect(result).toBe('/home');
+  });
+
+  it('包含查询参数的情况', () => {
+    const result = pathString('/home', { search: 'id=1&name=test' });
+    expect(result).toBe('/home?id=1&name=test');
+  });
+
+  it('包含哈希值的情况', () => {
+    const result = pathString('/home', { hash: 'top' });
+    expect(result).toBe('/home#top');
+
+    const result2 = pathString('/home', { hash: '#hash=abc' });
+    expect(result2).toBe('/home#hash=abc');
+  });
+
+  it('path 参数包含相对路径的情况', () => {
+    const result = pathString('./home');
+    expect(result).toBe('/home');
+  });
+
+  it('path 参数包含绝对路径的情况', () => {
+    const result = pathString('/home');
+    expect(result).toBe('/home');
+  });
+
+  it('path 参数包含协议的情况', () => {
+    const result = pathString('https://www.example.com/home');
+    expect(result).toBe('https://www.example.com/home');
+  });
+
+  it('path 参数包含主机名的情况', () => {
+    const result = pathString('//www.example.com/home');
+    expect(result).toBe('https://www.example.com/home');
+  });
+
+  it('path 参数包含端口号的情况', () => {
+    const result = pathString('//www.example.com:8080/home');
+    expect(result).toBe('https://www.example.com:8080/home');
+  });
+
+  it('path 参数包含特殊字符的情况', () => {
+    const result = pathString('/home/测试');
+    expect(result).toBe('/home/%E6%B5%8B%E8%AF%95');
+  });
+});

package/src/utils/url.ts

@@ -0,0 +1,23 @@
+/**
+ * Build a path string from a path and a hash/search object
+ * @param path
+ * @param hash
+ * @param search
+ */
+export const pathString = (
+  path: string,
+  {
+    hash = '',
+    search = '',
+  }: {
+    hash?: string;
+    search?: string;
+  } = {},
+) => {
+  const tempBase = 'https://a.com';
+  const url = new URL(path, tempBase);
+
+  if (hash) url.hash = hash;
+  if (search) url.search = search;
+  return url.toString().replace(tempBase, '');
+};

package/.github/dependabot.yml

@@ -1,17 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: npm
-    directory: '/'
-    schedule:
-      interval: weekly
-      time: '19:00'
-      timezone: 'Asia/Shanghai'
-    open-pull-requests-limit: 10
-    versioning-strategy: increase
-
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: monthly
-      time: '19:00'
-      timezone: 'Asia/Shanghai'

package/src/app/chat/mobile/page.page.tsx

@@ -1,7 +0,0 @@
-import Page from '@/pages/chat/mobile';
-
-const Index = () => {
-  return <Page />;
-};
-
-export default Index;

package/src/app/chat/settings/page.page.tsx

@@ -1,7 +0,0 @@
-import Page from '@/pages/chat/setting';
-
-const Index = () => {
-  return <Page />;
-};
-
-export default Index;

package/src/app/settings/page.page.tsx

@@ -1,7 +0,0 @@
-import Page from '@/pages/settings';
-
-const Index = () => {
-  return <Page />;
-};
-
-export default Index;