@lobehub/chat 0.82.9 → 0.83.1

package/src/store/global/selectors.ts

@@ -1,36 +1 @@
-import { DEFAULT_AGENT_META } from '@/const/meta';
-import { DEFAULT_AGENT, DEFAULT_AGENT_CONFIG, DEFAULT_SETTINGS } from '@/const/settings';
-import { GlobalSettings } from '@/types/settings';
-import { merge } from '@/utils/merge';
-
-import { GlobalStore } from './store';
-
-const currentSettings = (s: GlobalStore) => merge(DEFAULT_SETTINGS, s.settings);
-
-const defaultAgent = (s: GlobalStore) => merge(DEFAULT_AGENT, s.settings.defaultAgent);
-
-const defaultAgentConfig = (s: GlobalStore) => merge(DEFAULT_AGENT_CONFIG, defaultAgent(s).config);
-
-const defaultAgentMeta = (s: GlobalStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
-
-const openAIAPIKeySelectors = (s: GlobalStore) =>
-  s.settings.languageModel.openAI.OPENAI_API_KEY || s.settings.OPENAI_API_KEY;
-
-export const exportSettings = (s: GlobalStore) => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { OPENAI_API_KEY: _, password: __, ...settings } = s.settings;
-
-  return settings as GlobalSettings;
-};
-
-export const globalSelectors = {
-  currentSettings,
-  defaultAgent,
-  defaultAgentConfig,
-  defaultAgentMeta,
-  exportSettings,
-};
-
-export const settingsSelectors = {
-  openAIAPI: openAIAPIKeySelectors,
-};
+export * from './selectors/settings';

package/src/store/global/slices/common.ts

@@ -1,7 +1,7 @@
 import { produce } from 'immer';
-import { merge } from 'lodash-es';
 import type { StateCreator } from 'zustand/vanilla';
 
+import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
 import type { GlobalPreference, GlobalState, Guide, SidebarTabKey } from '../initialState';
@@ -47,14 +47,13 @@ export const createCommonSlice: StateCreator<
   },
   updateGuideState: (guide) => {
     const { updatePreference } = get();
-    const nextGuide = merge({}, get().preference.guide, guide);
+    const nextGuide = merge(get().preference.guide, guide);
     updatePreference({ guide: nextGuide });
   },
-
   updatePreference: (preference, action) => {
     set(
       produce((draft: GlobalState) => {
-        draft.preference = merge({}, draft.preference, preference);
+        draft.preference = merge(draft.preference, preference);
       }),
       false,
       action,

package/src/types/locale.ts

@@ -1 +1,5 @@
+import { Locales } from '@/locales/resources';
+
 export type * from '@/locales/resources';
+
+export type LocaleMode = Locales | 'auto';

package/src/types/settings.ts

@@ -1,7 +1,7 @@
 import type { NeutralColors, PrimaryColors } from '@lobehub/ui';
 import type { ThemeMode } from 'antd-style';
 
-import type { Locales } from '@/locales/resources';
+import { LocaleMode } from '@/types/locale';
 import type { LobeAgentSession } from '@/types/session';
 
 export interface GlobalBaseSettings {
@@ -36,7 +36,7 @@ export interface GlobalBaseSettings {
    * @deprecated
    */
   historyCount?: number;
-  language: Locales;
+  language: LocaleMode;
   neutralColor?: NeutralColors;
   password: string;
   primaryColor?: PrimaryColors;

package/src/utils/env.ts

@@ -1 +1,3 @@
 export const isDev = process.env.NODE_ENV === 'development';
+
+export const isOnServerSide = typeof window === 'undefined';

package/src/utils/responsive.ts

@@ -12,7 +12,7 @@ export const isMobileDevice = () => {
   const { get } = headers();
   const ua = get('user-agent');
 
-  console.log(ua);
+  // console.log(ua);
   const device = new UAParser(ua || '').getDevice();
 
   return device.type === 'mobile';

package/src/utils/switchLang.ts

@@ -1,6 +1,10 @@
 import { changeLanguage } from 'i18next';
 
-export const switchLang = (lang: string) => {
+import { LocaleMode } from '@/types/locale';
+
+export const switchLang = (locale: LocaleMode) => {
+  const lang = locale === 'auto' ? navigator.language : locale;
+
   changeLanguage(lang);
   document.documentElement.lang = lang;
 };

package/src/app/settings/agent/index.tsx

@@ -1,20 +0,0 @@
-'use client';
-
-import { memo } from 'react';
-
-import { useSwitchSideBarOnInit } from '@/store/global/hooks/useSwitchSettingsOnInit';
-import { SettingsTabs } from '@/store/global/initialState';
-
-import Layout from '../index';
-import Agent from './Agent';
-
-const AgentSetting = memo(() => {
-  useSwitchSideBarOnInit(SettingsTabs.Agent);
-  return (
-    <Layout>
-      <Agent />
-    </Layout>
-  );
-});
-
-export default AgentSetting;

package/src/app/settings/common/index.tsx

@@ -1,20 +0,0 @@
-'use client';
-
-import { memo } from 'react';
-
-import { useSwitchSideBarOnInit } from '@/store/global/hooks/useSwitchSettingsOnInit';
-import { SettingsTabs } from '@/store/global/initialState';
-
-import Layout from '../index';
-import Common from './Common';
-
-const CommonSetting = memo(() => {
-  useSwitchSideBarOnInit(SettingsTabs.Common);
-  return (
-    <Layout>
-      <Common />
-    </Layout>
-  );
-});
-
-export default CommonSetting;

package/src/app/settings/llm/index.tsx

@@ -1,20 +0,0 @@
-'use client';
-
-import { memo } from 'react';
-
-import { useSwitchSideBarOnInit } from '@/store/global/hooks/useSwitchSettingsOnInit';
-import { SettingsTabs } from '@/store/global/initialState';
-
-import Layout from '../index';
-import LLM from './LLM';
-
-const LLMSetting = memo(() => {
-  useSwitchSideBarOnInit(SettingsTabs.LLM);
-  return (
-    <Layout>
-      <LLM />
-    </Layout>
-  );
-});
-
-export default LLMSetting;

package/src/layout/GlobalLayout/style.ts

@@ -1,18 +0,0 @@
-import { createStyles } from 'antd-style';
-
-export const useStyles = createStyles(({ css, token }) => ({
-  bg: css`
-    overflow-y: scroll;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-
-    height: 100%;
-
-    background: ${token.colorBgLayout};
-
-    :has(#ChatLayout, #FlowLayout) {
-      overflow: hidden;
-    }
-  `,
-}));