@lobehub/chat 0.114.7 → 0.114.8

package/.i18nrc.js

@@ -1,20 +1,20 @@
 const { defineConfig } = require('@lobehub/i18n-cli');
 
 module.exports = defineConfig({
-  entry: 'locales/zh_CN',
-  entryLocale: 'zh_CN',
+  entry: 'locales/zh-CN',
+  entryLocale: 'zh-CN',
   output: 'locales',
   outputLocales: [
-    'zh_TW',
-    'en_US',
-    'ru_RU',
-    'ja_JP',
-    'ko_KR',
-    'fr_FR',
-    'tr_TR',
-    'es_ES',
-    'pt_BR',
-    'de_DE',
+    'zh-TW',
+    'en-US',
+    'ru-RU',
+    'ja-JP',
+    'ko-KR',
+    'fr-FR',
+    'tr-TR',
+    'es-ES',
+    'pt-BR',
+    'de-DE',
   ],
   temperature: 0,
   modelName: 'gpt-3.5-turbo-1106',

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 # Changelog
 
+### [Version 0.114.8](https://github.com/lobehub/lobe-chat/compare/v0.114.7...v0.114.8)
+
+<sup>Released on **2023-12-22**</sup>
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.114.7](https://github.com/lobehub/lobe-chat/compare/v0.114.6...v0.114.7)
 
 <sup>Released on **2023-12-22**</sup>

package/locales/{ru_RU → ru-RU}/setting.json

@@ -303,4 +303,4 @@
     },
     "title": "Дополнительные инструменты"
   }
-    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.114.7",
+  "version": "0.114.8",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/scripts/i18nWorkflow/const.ts

@@ -13,7 +13,6 @@ export const entryLocaleJsonFilepath = (file: string) =>
   resolve(localesDir, i18nConfig.entryLocale, file);
 export const outputLocaleJsonFilepath = (locale: string, file: string) =>
   resolve(localesDir, locale, file);
-export const srcLocalesResources = resolve(root, srcLocalesDir, 'resources');
-export const localesResourcesFilepath = (locale: string) => resolve(srcLocalesResources, locale);
+export const srcDefaultLocales = resolve(root, srcLocalesDir, 'default');
 
 export { default as i18nConfig } from '../../.i18nrc';

package/scripts/i18nWorkflow/genDefaultLocale.ts

@@ -1,13 +1,13 @@
 import { consola } from 'consola';
 import { colors } from 'consola/utils';
 
-import { entryLocaleJsonFilepath, i18nConfig, localesResourcesFilepath } from './const';
+import { entryLocaleJsonFilepath, i18nConfig, srcDefaultLocales } from './const';
 import { tagWhite, writeJSON } from './utils';
 
 export const genDefaultLocale = () => {
   consola.info(`Default locale is ${i18nConfig.entryLocale}...`);
 
-  const resources = require(localesResourcesFilepath(i18nConfig.entryLocale));
+  const resources = require(srcDefaultLocales);
   const data = Object.entries(resources.default);
   consola.start(`Generate default locale json, found ${data.length} namespaces...`);
 

package/scripts/i18nWorkflow/genDiff.ts

@@ -7,15 +7,15 @@ import { existsSync } from 'node:fs';
 import {
   entryLocaleJsonFilepath,
   i18nConfig,
-  localesResourcesFilepath,
   outputLocaleJsonFilepath,
+  srcDefaultLocales,
 } from './const';
 import { readJSON, tagWhite, writeJSON } from './utils';
 
 export const genDiff = () => {
   consola.start(`Diff between Dev/Prod local...`);
 
-  const resources = require(localesResourcesFilepath(i18nConfig.entryLocale));
+  const resources = require(srcDefaultLocales);
   const data = Object.entries(resources.default);
 
   for (const [ns, devJSON] of data) {

package/scripts/i18nWorkflow/index.ts

@@ -1,6 +1,5 @@
 import { genDefaultLocale } from './genDefaultLocale';
 import { genDiff } from './genDiff';
-import { genResources } from './genResources';
 import { split } from './utils';
 
 split('DIFF ANALYSIS');
@@ -9,7 +8,4 @@ genDiff();
 split('GENERATE DEFAULT LOCALE');
 genDefaultLocale();
 
-split('GENERATE RESOURCE & TOC');
-genResources();
-
 split('GENERATE I18N FILES');

package/scripts/i18nWorkflow/utils.ts

@@ -1,11 +1,9 @@
 import { consola } from 'consola';
 import { colors } from 'consola/utils';
-import { tocForResources } from 'i18next-resources-for-ts';
 import { readFileSync, writeFileSync } from 'node:fs';
 import { resolve } from 'node:path';
 
 import i18nConfig from '../../.i18nrc';
-import { srcLocalesResources } from './const';
 
 export const readJSON = (filePath: string) => {
   const data = readFileSync(filePath, 'utf8');
@@ -48,15 +46,6 @@ export const genNamespaceList = (files: string[], locale: string) => {
   }));
 };
 
-export const genToc = (files: string[], locale: string) => {
-  const ns = genNamespaceList(files, locale);
-  let toc = tocForResources(ns, srcLocalesResources).replaceAll('\\', '/');
-  if (locale === i18nConfig.entryLocale) {
-    toc = toc.replaceAll('.json', '').replaceAll('../../../locales/zh_CN', '../default');
-  }
-  return toc;
-};
-
 export const tagBlue = (text: string) => colors.bgBlueBright(colors.black(` ${text} `));
 export const tagYellow = (text: string) => colors.bgYellowBright(colors.black(` ${text} `));
 export const tagGreen = (text: string) => colors.bgGreenBright(colors.black(` ${text} `));

package/src/locales/create.ts

@@ -1,43 +1,46 @@
 import i18n from 'i18next';
 import LanguageDetector from 'i18next-browser-languagedetector';
+import resourcesToBackend from 'i18next-resources-to-backend';
 import { initReactI18next } from 'react-i18next';
 
 import { getClientConfig } from '@/config/client';
 import { DEFAULT_LANG, LOBE_LOCALE_COOKIE } from '@/const/locale';
 import { COOKIE_CACHE_DAYS } from '@/const/settings';
-import type { Namespaces } from '@/types/locale';
-import { isOnServerSide } from '@/utils/env';
-
-import { resources } from './options';
+import { isDev, isOnServerSide } from '@/utils/env';
 
 const { I18N_DEBUG, I18N_DEBUG_BROWSER, I18N_DEBUG_SERVER } = getClientConfig();
 const debugMode = I18N_DEBUG ?? isOnServerSide ? I18N_DEBUG_SERVER : I18N_DEBUG_BROWSER;
 
 export const createI18nNext = (lang?: string) => {
-  const ns: Namespaces[] = [
-    'error',
-    'common',
-    'empty',
-    'error',
-    'market',
-    'plugin',
-    'setting',
-    'welcome',
-  ];
+  const instance = i18n
+    .use(initReactI18next)
+    .use(LanguageDetector)
+    .use(
+      resourcesToBackend(async (lng: string, ns: string) => {
+        switch (lng) {
+          case 'zh-CN':
+          case 'zh': {
+            if (isDev) return import(`./default/${ns}`);
+
+            return import(`@/../locales/zh-CN/${ns}.json`);
+          }
 
-  const instance = i18n.use(initReactI18next).use(LanguageDetector);
-  //  not find a good way to handle suspense loading
-  // .use(
-  //   resourcesToBackend(
-  //     isDev ? resources : (lng: string, ns: string) => import(`../../locales/${lng}/${ns}.json`),
-  //   ),
-  // )
+          case 'en': {
+            return import(`@/../locales/en-US/${ns}.json`);
+          }
+
+          default: {
+            return import(`@/../locales/${lng}/${ns}.json`);
+          }
+        }
+      }),
+    );
 
   return {
     init: () =>
       instance.init({
         debug: debugMode,
-        defaultNS: ['error', 'common'],
+        defaultNS: ['error', 'common', 'empty'],
         detection: {
           caches: ['cookie'],
           cookieMinutes: 60 * 24 * COOKIE_CACHE_DAYS,
@@ -48,8 +51,6 @@ export const createI18nNext = (lang?: string) => {
           escapeValue: false,
         },
         lng: lang,
-        ns,
-        resources,
       }),
     instance,
   };

package/src/locales/default/index.ts

@@ -0,0 +1,23 @@
+import chat from './chat';
+import common from './common';
+import empty from './empty';
+import error from './error';
+import market from './market';
+import migration from './migration';
+import plugin from './plugin';
+import setting from './setting';
+import welcome from './welcome';
+
+const resources = {
+  chat,
+  common,
+  empty,
+  error,
+  market,
+  migration,
+  plugin,
+  setting,
+  welcome,
+} as const;
+
+export default resources;

package/src/locales/options.ts

@@ -1,6 +1,6 @@
 import type { Locales } from '@/types/locale';
 
-import _resources from './resources';
+import { locales } from './resources';
 
 type LocaleOptions = {
   label: string;
@@ -54,12 +54,4 @@ export const localeOptions: LocaleOptions = [
   },
 ] as LocaleOptions;
 
-export const supportLangs: string[] = localeOptions.map((i) => i.value);
-
-export const resources = {
-  ..._resources,
-  en: _resources['en-US'],
-  zh: _resources['zh-CN'],
-};
-
-export const supportLocales = Object.keys(resources);
+export const supportLocales: string[] = [...locales, 'en', 'zh'];

package/src/locales/resources.ts

@@ -0,0 +1,18 @@
+import resources from './default';
+
+export const locales = [
+  'de-DE',
+  'en-US',
+  'es-ES',
+  'fr-FR',
+  'ja-JP',
+  'ko-KR',
+  'pt-BR',
+  'ru-RU',
+  'tr-TR',
+  'zh-CN',
+  'zh-TW',
+] as const;
+
+export type DefaultResources = typeof resources;
+export type Locales = (typeof locales)[number];

package/scripts/i18nWorkflow/genResources.ts

@@ -1,26 +0,0 @@
-import { consola } from 'consola';
-import { colors } from 'consola/utils';
-import { writeFileSync } from 'node:fs';
-
-import { i18nConfig, localeDirJsonList, localesResourcesFilepath } from './const';
-import { genResourcesContent, genToc, tagBlue, tagGreen } from './utils';
-
-const locales = [i18nConfig.entryLocale, ...i18nConfig.outputLocales];
-
-export const genResources = () => {
-  consola.start(`Generate locale resources and types, found ${locales.length} locales...`);
-
-  for (const locale of locales) {
-    const files = localeDirJsonList(locale);
-    const toc = genToc(files, locale);
-
-    const filepath = localesResourcesFilepath(`${locale}.ts`);
-    writeFileSync(filepath, toc);
-    consola.success(tagBlue(locale), colors.gray(filepath));
-  }
-
-  const indexFilepath = localesResourcesFilepath(`index.ts`);
-  writeFileSync(indexFilepath, genResourcesContent(locales));
-
-  consola.success(tagGreen('INDEX'), colors.gray(indexFilepath));
-};

package/src/locales/resources/de_DE.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/de_DE/chat.json';
-import common from '../../../locales/de_DE/common.json';
-import empty from '../../../locales/de_DE/empty.json';
-import error from '../../../locales/de_DE/error.json';
-import market from '../../../locales/de_DE/market.json';
-import migration from '../../../locales/de_DE/migration.json';
-import plugin from '../../../locales/de_DE/plugin.json';
-import setting from '../../../locales/de_DE/setting.json';
-import welcome from '../../../locales/de_DE/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/en_US.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/en_US/chat.json';
-import common from '../../../locales/en_US/common.json';
-import empty from '../../../locales/en_US/empty.json';
-import error from '../../../locales/en_US/error.json';
-import market from '../../../locales/en_US/market.json';
-import migration from '../../../locales/en_US/migration.json';
-import plugin from '../../../locales/en_US/plugin.json';
-import setting from '../../../locales/en_US/setting.json';
-import welcome from '../../../locales/en_US/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/es_ES.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/es_ES/chat.json';
-import common from '../../../locales/es_ES/common.json';
-import empty from '../../../locales/es_ES/empty.json';
-import error from '../../../locales/es_ES/error.json';
-import market from '../../../locales/es_ES/market.json';
-import migration from '../../../locales/es_ES/migration.json';
-import plugin from '../../../locales/es_ES/plugin.json';
-import setting from '../../../locales/es_ES/setting.json';
-import welcome from '../../../locales/es_ES/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/fr_FR.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/fr_FR/chat.json';
-import common from '../../../locales/fr_FR/common.json';
-import empty from '../../../locales/fr_FR/empty.json';
-import error from '../../../locales/fr_FR/error.json';
-import market from '../../../locales/fr_FR/market.json';
-import migration from '../../../locales/fr_FR/migration.json';
-import plugin from '../../../locales/fr_FR/plugin.json';
-import setting from '../../../locales/fr_FR/setting.json';
-import welcome from '../../../locales/fr_FR/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/index.ts

@@ -1,31 +0,0 @@
-import de_DE from './de_DE';
-import en_US from './en_US';
-import es_ES from './es_ES';
-import fr_FR from './fr_FR';
-import ja_JP from './ja_JP';
-import ko_KR from './ko_KR';
-import pt_BR from './pt_BR';
-import ru_RU from './ru_RU';
-import tr_TR from './tr_TR';
-import zh_CN from './zh_CN';
-import zh_TW from './zh_TW';
-
-const resources = {
-  'de-DE': de_DE,
-  'en-US': en_US,
-  'es-ES': es_ES,
-  'fr-FR': fr_FR,
-  'ja-JP': ja_JP,
-  'ko-KR': ko_KR,
-  'pt-BR': pt_BR,
-  'ru-RU': ru_RU,
-  'tr-TR': tr_TR,
-  'zh-CN': zh_CN,
-  'zh-TW': zh_TW,
-} as const;
-export default resources;
-export const defaultResources = zh_CN;
-export type Resources = typeof resources;
-export type DefaultResources = typeof defaultResources;
-export type Namespaces = keyof DefaultResources;
-export type Locales = keyof Resources;

package/src/locales/resources/ja_JP.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/ja_JP/chat.json';
-import common from '../../../locales/ja_JP/common.json';
-import empty from '../../../locales/ja_JP/empty.json';
-import error from '../../../locales/ja_JP/error.json';
-import market from '../../../locales/ja_JP/market.json';
-import migration from '../../../locales/ja_JP/migration.json';
-import plugin from '../../../locales/ja_JP/plugin.json';
-import setting from '../../../locales/ja_JP/setting.json';
-import welcome from '../../../locales/ja_JP/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/ko_KR.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/ko_KR/chat.json';
-import common from '../../../locales/ko_KR/common.json';
-import empty from '../../../locales/ko_KR/empty.json';
-import error from '../../../locales/ko_KR/error.json';
-import market from '../../../locales/ko_KR/market.json';
-import migration from '../../../locales/ko_KR/migration.json';
-import plugin from '../../../locales/ko_KR/plugin.json';
-import setting from '../../../locales/ko_KR/setting.json';
-import welcome from '../../../locales/ko_KR/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/pt_BR.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/pt_BR/chat.json';
-import common from '../../../locales/pt_BR/common.json';
-import empty from '../../../locales/pt_BR/empty.json';
-import error from '../../../locales/pt_BR/error.json';
-import market from '../../../locales/pt_BR/market.json';
-import migration from '../../../locales/pt_BR/migration.json';
-import plugin from '../../../locales/pt_BR/plugin.json';
-import setting from '../../../locales/pt_BR/setting.json';
-import welcome from '../../../locales/pt_BR/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/ru_RU.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/ru_RU/chat.json';
-import common from '../../../locales/ru_RU/common.json';
-import empty from '../../../locales/ru_RU/empty.json';
-import error from '../../../locales/ru_RU/error.json';
-import market from '../../../locales/ru_RU/market.json';
-import migration from '../../../locales/ru_RU/migration.json';
-import plugin from '../../../locales/ru_RU/plugin.json';
-import setting from '../../../locales/ru_RU/setting.json';
-import welcome from '../../../locales/ru_RU/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/tr_TR.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/tr_TR/chat.json';
-import common from '../../../locales/tr_TR/common.json';
-import empty from '../../../locales/tr_TR/empty.json';
-import error from '../../../locales/tr_TR/error.json';
-import market from '../../../locales/tr_TR/market.json';
-import migration from '../../../locales/tr_TR/migration.json';
-import plugin from '../../../locales/tr_TR/plugin.json';
-import setting from '../../../locales/tr_TR/setting.json';
-import welcome from '../../../locales/tr_TR/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/zh_CN.ts

@@ -1,23 +0,0 @@
-import chat from '../default/chat';
-import common from '../default/common';
-import empty from '../default/empty';
-import error from '../default/error';
-import market from '../default/market';
-import migration from '../default/migration';
-import plugin from '../default/plugin';
-import setting from '../default/setting';
-import welcome from '../default/welcome';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;

package/src/locales/resources/zh_TW.ts

@@ -1,23 +0,0 @@
-import chat from '../../../locales/zh_TW/chat.json';
-import common from '../../../locales/zh_TW/common.json';
-import empty from '../../../locales/zh_TW/empty.json';
-import error from '../../../locales/zh_TW/error.json';
-import market from '../../../locales/zh_TW/market.json';
-import migration from '../../../locales/zh_TW/migration.json';
-import plugin from '../../../locales/zh_TW/plugin.json';
-import setting from '../../../locales/zh_TW/setting.json';
-import welcome from '../../../locales/zh_TW/welcome.json';
-
-const resources = {
-  chat,
-  common,
-  empty,
-  error,
-  market,
-  migration,
-  plugin,
-  setting,
-  welcome,
-} as const;
-
-export default resources;