@lobehub/chat 1.43.2 → 1.43.4

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 1.43.4](https://github.com/lobehub/lobe-chat/compare/v1.43.3...v1.43.4)
+
+<sup>Released on **2025-01-06**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix format short number.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix format short number, closes [#5294](https://github.com/lobehub/lobe-chat/issues/5294) ([d8a29ec](https://github.com/lobehub/lobe-chat/commit/d8a29ec))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.43.3](https://github.com/lobehub/lobe-chat/compare/v1.43.2...v1.43.3)
+
+<sup>Released on **2025-01-04**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Upgrade `@clerk/nextjs` to v6.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Upgrade `@clerk/nextjs` to v6, closes [#5291](https://github.com/lobehub/lobe-chat/issues/5291) ([de09895](https://github.com/lobehub/lobe-chat/commit/de09895))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.43.2](https://github.com/lobehub/lobe-chat/compare/v1.43.1...v1.43.2)
 
 <sup>Released on **2025-01-04**</sup>

package/changelog/v1.json

@@ -1,4 +1,22 @@
 [
+  {
+    "children": {
+      "fixes": [
+        "Fix format short number."
+      ]
+    },
+    "date": "2025-01-06",
+    "version": "1.43.4"
+  },
+  {
+    "children": {
+      "improvements": [
+        "Upgrade @clerk/nextjs to v6."
+      ]
+    },
+    "date": "2025-01-04",
+    "version": "1.43.3"
+  },
   {
     "children": {
       "fixes": [

package/next.config.ts

@@ -10,7 +10,6 @@ const enableReactScan = !!process.env.REACT_SCAN_MONITOR_API_KEY;
 const isUsePglite = process.env.NEXT_PUBLIC_CLIENT_DB === 'pglite';
 
 // if you need to proxy the api endpoint to remote server
-const API_PROXY_ENDPOINT = process.env.API_PROXY_ENDPOINT || '';
 
 const basePath = process.env.NEXT_PUBLIC_BASE_PATH;
 
@@ -28,7 +27,6 @@ const nextConfig: NextConfig = {
     ],
     webVitalsAttribution: ['CLS', 'LCP'],
   },
-
   async headers() {
     return [
       {
@@ -166,14 +164,10 @@ const nextConfig: NextConfig = {
       source: '/welcome',
     },
   ],
-  rewrites: async () => [
-    // due to google api not work correct in some countries
-    // we need a proxy to bypass the restriction
-    { destination: `${API_PROXY_ENDPOINT}/api/chat/google`, source: '/api/chat/google' },
-  ],
-
   serverExternalPackages: ['@electric-sql/pglite'],
 
+  transpilePackages: ['pdfjs-dist', 'mermaid'],
+
   webpack(config) {
     config.experiments = {
       asyncWebAssembly: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.43.2",
+  "version": "1.43.4",
   "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",
@@ -115,7 +115,7 @@
     "@baiducloud/qianfan": "^0.1.9",
     "@cfworker/json-schema": "^4.0.0",
     "@clerk/localizations": "^3.3.0",
-    "@clerk/nextjs": "^5.7.5",
+    "@clerk/nextjs": "^6.9.6",
     "@clerk/themes": "^2.1.37",
     "@codesandbox/sandpack-react": "^2.19.9",
     "@cyntler/react-doc-viewer": "^1.17.0",

package/src/features/User/DataStatistics.tsx

@@ -3,7 +3,7 @@
 import { Icon, Tooltip } from '@lobehub/ui';
 import { Badge } from 'antd';
 import { createStyles } from 'antd-style';
-import { isNumber, isUndefined } from 'lodash-es';
+import { isUndefined } from 'lodash-es';
 import { LoaderCircle } from 'lucide-react';
 import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -14,6 +14,7 @@ import { messageService } from '@/services/message';
 import { sessionService } from '@/services/session';
 import { topicService } from '@/services/topic';
 import { useServerConfigStore } from '@/store/serverConfig';
+import { formatShortenNumber } from '@/utils/format';
 import { today } from '@/utils/time';
 
 const useStyles = createStyles(({ css, token }) => ({
@@ -42,23 +43,6 @@ const useStyles = createStyles(({ css, token }) => ({
   `,
 }));
 
-const formatNumber = (num: any) => {
-  if (!isNumber(num)) return num;
-  // 使用Intl.NumberFormat来添加千分号
-  const formattedWithComma = new Intl.NumberFormat('en-US').format(num);
-
-  // 格式化为 K 或 M
-  if (num >= 10_000_000) {
-    return (num / 1_000_000).toFixed(1) + 'M';
-  } else if (num >= 10_000) {
-    return (num / 1000).toFixed(1) + 'K';
-  } else if (num === 0) {
-    return 0;
-  } else {
-    return formattedWithComma;
-  }
-};
-
 const DataStatistics = memo<Omit<FlexboxProps, 'children'>>(({ style, ...rest }) => {
   const mobile = useServerConfigStore((s) => s.isMobile);
   // sessions
@@ -128,7 +112,7 @@ const DataStatistics = memo<Omit<FlexboxProps, 'children'>>(({ style, ...rest })
               key={item.key}
             >
               <Flexbox gap={2}>
-                <div className={styles.count}>{formatNumber(item.count)}</div>
+                <div className={styles.count}>{formatShortenNumber(item.count)}</div>
                 <div className={styles.title}>{item.title}</div>
               </Flexbox>
               {showBadge && (
@@ -150,7 +134,7 @@ const DataStatistics = memo<Omit<FlexboxProps, 'children'>>(({ style, ...rest })
         return (
           <Flexbox className={styles.card} flex={1} gap={2} key={item.key}>
             <Flexbox horizontal>
-              <div className={styles.count}>{formatNumber(item.count)}</div>
+              <div className={styles.count}>{formatShortenNumber(item.count)}</div>
             </Flexbox>
             <div className={styles.title}>{item.title}</div>
           </Flexbox>

package/src/layout/AuthProvider/Clerk/index.tsx

@@ -44,6 +44,7 @@ const Clerk = memo(({ children }: PropsWithChildren) => {
   return (
     <ClerkProvider
       appearance={updatedAppearance}
+      dynamic
       localization={localization}
       signUpUrl={!enableClerkSignUp ? '/login' : '/signup'} // Redirect sign-up to sign-in if disabled
     >

package/src/middleware.ts

@@ -54,8 +54,8 @@ const isProtectedRoute = createRouteMatcher([
 
 export default authEnv.NEXT_PUBLIC_ENABLE_CLERK_AUTH
   ? clerkMiddleware(
-      (auth, req) => {
-        if (isProtectedRoute(req)) auth().protect();
+      async (auth, req) => {
+        if (isProtectedRoute(req)) await auth.protect();
       },
       {
         // https://github.com/lobehub/lobe-chat/pull/3084

package/src/utils/format.test.ts

@@ -16,7 +16,6 @@ import {
   formatTokenNumber,
 } from './format';
 
-// 保留你已经编写的测试用例
 describe('format', () => {
   describe('formatSize', () => {
     it('should format bytes to KB correctly', () => {
@@ -128,10 +127,13 @@ describe('format', () => {
       expect(formatShortenNumber(9999)).toBe('9,999');
     });
 
-    it('should format numbers between 10,000 and 9,999,999 correctly', () => {
+    it('should format numbers between 10,000 and 999,999 correctly', () => {
       expect(formatShortenNumber(10000)).toBe('10.0K');
       expect(formatShortenNumber(123456)).toBe('123.5K');
-      expect(formatShortenNumber(9999999)).toBe('10000.0K');
+      expect(formatShortenNumber(998000)).toBe('998.0K');
+      expect(formatShortenNumber(999999)).toBe('1000.0K');
+      expect(formatShortenNumber(1000000)).toBe('1.0M');
+      expect(formatShortenNumber(9999999)).toBe('10.0M');
     });
 
     it('should format numbers 10,000,000 and above correctly', () => {

package/src/utils/format.ts

@@ -69,7 +69,7 @@ export const formatShortenNumber = (num: any) => {
   const formattedWithComma = new Intl.NumberFormat('en-US').format(num);
 
   // 格式化为 K 或 M
-  if (num >= 10_000_000) {
+  if (num >= 1_000_000) {
     return (num / 1_000_000).toFixed(1) + 'M';
   } else if (num >= 10_000) {
     return (num / 1000).toFixed(1) + 'K';

package/src/utils/server/auth.ts

@@ -5,7 +5,7 @@ import NextAuthEdge from '@/libs/next-auth/edge';
 
 export const getUserAuth = async () => {
   if (enableClerk) {
-    const clerkAuth = auth();
+    const clerkAuth = await auth();
 
     const userId = clerkAuth.userId;
     return { clerkAuth: auth, userId };