@lobehub/lobehub 2.0.0-next.213 → 2.0.0-next.215

package/src/utils/server/routeVariants.test.ts

@@ -11,7 +11,6 @@ describe('RouteVariants', () => {
       expect(DEFAULT_VARIANTS).toEqual({
         isMobile: false,
         locale: DEFAULT_LANG,
-        theme: 'light',
       });
     });
   });
@@ -21,30 +20,27 @@ describe('RouteVariants', () => {
       const variants: IRouteVariants = {
         isMobile: false,
         locale: 'en-US',
-        theme: 'light',
       };
       const result = RouteVariants.serializeVariants(variants);
-      expect(result).toBe('en-US__0__light');
+      expect(result).toBe('en-US__0');
     });
 
     it('should serialize variants with mobile enabled', () => {
       const variants: IRouteVariants = {
         isMobile: true,
         locale: 'zh-CN',
-        theme: 'dark',
       };
       const result = RouteVariants.serializeVariants(variants);
-      expect(result).toBe('zh-CN__1__dark');
+      expect(result).toBe('zh-CN__1');
     });
 
     it('should serialize variants with different locales', () => {
       const variants: IRouteVariants = {
         isMobile: false,
         locale: 'ja-JP',
-        theme: 'light',
       };
       const result = RouteVariants.serializeVariants(variants);
-      expect(result).toBe('ja-JP__0__light');
+      expect(result).toBe('ja-JP__0');
     });
 
     it('should serialize variants with custom colors', () => {
@@ -53,31 +49,28 @@ describe('RouteVariants', () => {
         locale: 'en-US',
         neutralColor: '#cccccc',
         primaryColor: '#ff0000',
-        theme: 'dark',
       };
       const result = RouteVariants.serializeVariants(variants);
-      expect(result).toBe('en-US__1__dark');
+      expect(result).toBe('en-US__1');
     });
   });
 
   describe('deserializeVariants', () => {
     it('should deserialize valid serialized string', () => {
-      const serialized = 'en-US__0__light';
+      const serialized = 'en-US__0';
       const result = RouteVariants.deserializeVariants(serialized);
       expect(result).toEqual({
         isMobile: false,
         locale: 'en-US',
-        theme: 'light',
       });
     });
 
     it('should deserialize mobile variants', () => {
-      const serialized = 'zh-CN__1__dark';
+      const serialized = 'zh-CN__1';
       const result = RouteVariants.deserializeVariants(serialized);
       expect(result).toEqual({
         isMobile: true,
         locale: 'zh-CN',
-        theme: 'dark',
       });
     });
 
@@ -94,22 +87,11 @@ describe('RouteVariants', () => {
     });
 
     it('should handle invalid locale by falling back to default', () => {
-      const serialized = 'invalid-locale__0__light';
+      const serialized = 'invalid-locale__0';
       const result = RouteVariants.deserializeVariants(serialized);
       expect(result).toEqual({
         isMobile: false,
         locale: DEFAULT_LANG,
-        theme: 'light',
-      });
-    });
-
-    it('should handle invalid theme by falling back to default', () => {
-      const serialized = 'en-US__0__invalid-theme';
-      const result = RouteVariants.deserializeVariants(serialized);
-      expect(result).toEqual({
-        isMobile: false,
-        locale: 'en-US',
-        theme: 'light',
       });
     });
 
@@ -120,19 +102,19 @@ describe('RouteVariants', () => {
     });
 
     it('should handle isMobile value correctly for "0"', () => {
-      const serialized = 'en-US__0__dark';
+      const serialized = 'en-US__0';
       const result = RouteVariants.deserializeVariants(serialized);
       expect(result.isMobile).toBe(false);
     });
 
     it('should handle isMobile value correctly for "1"', () => {
-      const serialized = 'en-US__1__dark';
+      const serialized = 'en-US__1';
       const result = RouteVariants.deserializeVariants(serialized);
       expect(result.isMobile).toBe(true);
     });
 
     it('should handle isMobile value correctly for other values', () => {
-      const serialized = 'en-US__2__dark';
+      const serialized = 'en-US__2';
       const result = RouteVariants.deserializeVariants(serialized);
       expect(result.isMobile).toBe(false);
     });
@@ -141,25 +123,23 @@ describe('RouteVariants', () => {
   describe('getVariantsFromProps', () => {
     it('should extract and deserialize variants from props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'en-US__0__light' }),
+        params: Promise.resolve({ variants: 'en-US__0' }),
       };
       const result = await RouteVariants.getVariantsFromProps(props);
       expect(result).toEqual({
         isMobile: false,
         locale: 'en-US',
-        theme: 'light',
       });
     });
 
     it('should handle mobile variants from props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'zh-CN__1__dark' }),
+        params: Promise.resolve({ variants: 'zh-CN__1' }),
       };
       const result = await RouteVariants.getVariantsFromProps(props);
       expect(result).toEqual({
         isMobile: true,
         locale: 'zh-CN',
-        theme: 'dark',
       });
     });
 
@@ -175,7 +155,7 @@ describe('RouteVariants', () => {
   describe('getIsMobile', () => {
     it('should extract isMobile as false from props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'en-US__0__light' }),
+        params: Promise.resolve({ variants: 'en-US__0' }),
       };
       const result = await RouteVariants.getIsMobile(props);
       expect(result).toBe(false);
@@ -183,7 +163,7 @@ describe('RouteVariants', () => {
 
     it('should extract isMobile as true from props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'en-US__1__dark' }),
+        params: Promise.resolve({ variants: 'en-US__1' }),
       };
       const result = await RouteVariants.getIsMobile(props);
       expect(result).toBe(true);
@@ -201,7 +181,7 @@ describe('RouteVariants', () => {
   describe('getLocale', () => {
     it('should extract locale from props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'zh-CN__0__light' }),
+        params: Promise.resolve({ variants: 'zh-CN__0' }),
       };
       const result = await RouteVariants.getLocale(props);
       expect(result).toBe('zh-CN');
@@ -209,7 +189,7 @@ describe('RouteVariants', () => {
 
     it('should extract different locale from props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'ja-JP__1__dark' }),
+        params: Promise.resolve({ variants: 'ja-JP__1' }),
       };
       const result = await RouteVariants.getLocale(props);
       expect(result).toBe('ja-JP');
@@ -225,7 +205,7 @@ describe('RouteVariants', () => {
 
     it('should return default locale for invalid locale in props', async () => {
       const props: DynamicLayoutProps = {
-        params: Promise.resolve({ variants: 'invalid-locale__0__light' }),
+        params: Promise.resolve({ variants: 'invalid-locale__0' }),
       };
       const result = await RouteVariants.getLocale(props);
       expect(result).toBe(DEFAULT_LANG);
@@ -254,24 +234,14 @@ describe('RouteVariants', () => {
       });
     });
 
-    it('should create variants with custom theme', () => {
-      const result = RouteVariants.createVariants({ theme: 'dark' });
-      expect(result).toEqual({
-        ...DEFAULT_VARIANTS,
-        theme: 'dark',
-      });
-    });
-
     it('should create variants with multiple custom options', () => {
       const result = RouteVariants.createVariants({
         isMobile: true,
         locale: 'ja-JP',
-        theme: 'dark',
       });
       expect(result).toEqual({
         isMobile: true,
         locale: 'ja-JP',
-        theme: 'dark',
       });
     });
 
@@ -293,14 +263,12 @@ describe('RouteVariants', () => {
         locale: 'zh-CN',
         neutralColor: '#aaaaaa',
         primaryColor: '#00ff00',
-        theme: 'dark',
       });
       expect(result).toEqual({
         isMobile: true,
         locale: 'zh-CN',
         neutralColor: '#aaaaaa',
         primaryColor: '#00ff00',
-        theme: 'dark',
       });
     });
   });
@@ -310,7 +278,6 @@ describe('RouteVariants', () => {
       const original: IRouteVariants = {
         isMobile: true,
         locale: 'zh-CN',
-        theme: 'dark',
       };
       const serialized = RouteVariants.serializeVariants(original);
       const deserialized = RouteVariants.deserializeVariants(serialized);
@@ -329,7 +296,6 @@ describe('RouteVariants', () => {
         const original: IRouteVariants = {
           isMobile: false,
           locale: locale as any,
-          theme: 'light',
         };
         const serialized = RouteVariants.serializeVariants(original);
         const deserialized = RouteVariants.deserializeVariants(serialized);

package/src/utils/server/routeVariants.ts

@@ -3,7 +3,6 @@ import { RouteVariants } from '@lobechat/desktop-bridge';
 import { type DynamicLayoutProps } from '@/types/next';
 
 export { LOBE_LOCALE_COOKIE } from '@/const/locale';
-export { LOBE_THEME_APPEARANCE } from '@/const/theme';
 export {
   DEFAULT_LANG,
   DEFAULT_VARIANTS,