mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2025-12-23 10:00:08 +08:00
refactor: remove heroui
This commit is contained in:
parent
d01609fc36
commit
f3bbd4ed44
@ -146,7 +146,6 @@
|
|||||||
"@eslint/js": "^9.22.0",
|
"@eslint/js": "^9.22.0",
|
||||||
"@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
|
"@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
|
||||||
"@hello-pangea/dnd": "^18.0.1",
|
"@hello-pangea/dnd": "^18.0.1",
|
||||||
"@heroui/react": "^2.8.3",
|
|
||||||
"@kangfenmao/keyv-storage": "^0.1.0",
|
"@kangfenmao/keyv-storage": "^0.1.0",
|
||||||
"@langchain/community": "^1.0.0",
|
"@langchain/community": "^1.0.0",
|
||||||
"@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
|
"@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
|
||||||
@ -348,6 +347,7 @@
|
|||||||
"striptags": "^3.2.0",
|
"striptags": "^3.2.0",
|
||||||
"styled-components": "^6.1.11",
|
"styled-components": "^6.1.11",
|
||||||
"swr": "^2.3.6",
|
"swr": "^2.3.6",
|
||||||
|
"tailwind-merge": "^3.3.1",
|
||||||
"tailwindcss": "^4.1.13",
|
"tailwindcss": "^4.1.13",
|
||||||
"tar": "^7.4.3",
|
"tar": "^7.4.3",
|
||||||
"tiny-pinyin": "^1.3.2",
|
"tiny-pinyin": "^1.3.2",
|
||||||
|
|||||||
@ -9,7 +9,6 @@ import { PersistGate } from 'redux-persist/integration/react'
|
|||||||
import TopViewContainer from './components/TopView'
|
import TopViewContainer from './components/TopView'
|
||||||
import AntdProvider from './context/AntdProvider'
|
import AntdProvider from './context/AntdProvider'
|
||||||
import { CodeStyleProvider } from './context/CodeStyleProvider'
|
import { CodeStyleProvider } from './context/CodeStyleProvider'
|
||||||
import { HeroUIProvider } from './context/HeroUIProvider'
|
|
||||||
import { NotificationProvider } from './context/NotificationProvider'
|
import { NotificationProvider } from './context/NotificationProvider'
|
||||||
import StyleSheetManager from './context/StyleSheetManager'
|
import StyleSheetManager from './context/StyleSheetManager'
|
||||||
import { ThemeProvider } from './context/ThemeProvider'
|
import { ThemeProvider } from './context/ThemeProvider'
|
||||||
@ -33,23 +32,21 @@ function App(): React.ReactElement {
|
|||||||
return (
|
return (
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<HeroUIProvider>
|
<StyleSheetManager>
|
||||||
<StyleSheetManager>
|
<ThemeProvider>
|
||||||
<ThemeProvider>
|
<AntdProvider>
|
||||||
<AntdProvider>
|
<NotificationProvider>
|
||||||
<NotificationProvider>
|
<CodeStyleProvider>
|
||||||
<CodeStyleProvider>
|
<PersistGate loading={null} persistor={persistor}>
|
||||||
<PersistGate loading={null} persistor={persistor}>
|
<TopViewContainer>
|
||||||
<TopViewContainer>
|
<Router />
|
||||||
<Router />
|
</TopViewContainer>
|
||||||
</TopViewContainer>
|
</PersistGate>
|
||||||
</PersistGate>
|
</CodeStyleProvider>
|
||||||
</CodeStyleProvider>
|
</NotificationProvider>
|
||||||
</NotificationProvider>
|
</AntdProvider>
|
||||||
</AntdProvider>
|
</ThemeProvider>
|
||||||
</ThemeProvider>
|
</StyleSheetManager>
|
||||||
</StyleSheetManager>
|
|
||||||
</HeroUIProvider>
|
|
||||||
</QueryClientProvider>
|
</QueryClientProvider>
|
||||||
</Provider>
|
</Provider>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1,10 +1,6 @@
|
|||||||
@import 'tailwindcss' source('../../../../renderer');
|
@import 'tailwindcss' source('../../../../renderer');
|
||||||
@import 'tw-animate-css';
|
@import 'tw-animate-css';
|
||||||
|
|
||||||
/* heroui */
|
|
||||||
@plugin '../../hero.ts';
|
|
||||||
@source '../../../../../node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}';
|
|
||||||
|
|
||||||
@custom-variant dark (&:is(.dark *));
|
@custom-variant dark (&:is(.dark *));
|
||||||
|
|
||||||
/* 如需自定义:
|
/* 如需自定义:
|
||||||
@ -156,11 +152,6 @@
|
|||||||
body {
|
body {
|
||||||
@apply bg-background text-foreground;
|
@apply bg-background text-foreground;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* To disable drag title bar on toast. tailwind css doesn't provide such class name. */
|
|
||||||
.hero-toast {
|
|
||||||
-webkit-app-region: no-drag;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
import { HeroUIProvider } from '@heroui/react'
|
|
||||||
import { useSettings } from '@renderer/hooks/useSettings'
|
|
||||||
|
|
||||||
const AppHeroUIProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
|
|
||||||
const { language } = useSettings()
|
|
||||||
return (
|
|
||||||
<HeroUIProvider className="flex h-full w-full flex-1" locale={language}>
|
|
||||||
{children}
|
|
||||||
</HeroUIProvider>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
export { AppHeroUIProvider as HeroUIProvider }
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
import { heroui } from '@heroui/react'
|
|
||||||
export default heroui()
|
|
||||||
@ -2,7 +2,6 @@ import '@renderer/databases'
|
|||||||
|
|
||||||
import { ErrorBoundary } from '@renderer/components/ErrorBoundary'
|
import { ErrorBoundary } from '@renderer/components/ErrorBoundary'
|
||||||
import { getToastUtilities } from '@renderer/components/TopView/toast'
|
import { getToastUtilities } from '@renderer/components/TopView/toast'
|
||||||
import { HeroUIProvider } from '@renderer/context/HeroUIProvider'
|
|
||||||
import { useSettings } from '@renderer/hooks/useSettings'
|
import { useSettings } from '@renderer/hooks/useSettings'
|
||||||
import store, { persistor } from '@renderer/store'
|
import store, { persistor } from '@renderer/store'
|
||||||
import { useEffect } from 'react'
|
import { useEffect } from 'react'
|
||||||
@ -42,19 +41,17 @@ function MiniWindow(): React.ReactElement {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<HeroUIProvider>
|
<ThemeProvider>
|
||||||
<ThemeProvider>
|
<AntdProvider>
|
||||||
<AntdProvider>
|
<CodeStyleProvider>
|
||||||
<CodeStyleProvider>
|
<PersistGate loading={null} persistor={persistor}>
|
||||||
<PersistGate loading={null} persistor={persistor}>
|
<ErrorBoundary>
|
||||||
<ErrorBoundary>
|
<MiniWindowContent />
|
||||||
<MiniWindowContent />
|
</ErrorBoundary>
|
||||||
</ErrorBoundary>
|
</PersistGate>
|
||||||
</PersistGate>
|
</CodeStyleProvider>
|
||||||
</CodeStyleProvider>
|
</AntdProvider>
|
||||||
</AntdProvider>
|
</ThemeProvider>
|
||||||
</ThemeProvider>
|
|
||||||
</HeroUIProvider>
|
|
||||||
</Provider>
|
</Provider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -7,7 +7,6 @@ import { loggerService } from '@logger'
|
|||||||
import { getToastUtilities } from '@renderer/components/TopView/toast'
|
import { getToastUtilities } from '@renderer/components/TopView/toast'
|
||||||
import AntdProvider from '@renderer/context/AntdProvider'
|
import AntdProvider from '@renderer/context/AntdProvider'
|
||||||
import { CodeStyleProvider } from '@renderer/context/CodeStyleProvider'
|
import { CodeStyleProvider } from '@renderer/context/CodeStyleProvider'
|
||||||
import { HeroUIProvider } from '@renderer/context/HeroUIProvider'
|
|
||||||
import { ThemeProvider } from '@renderer/context/ThemeProvider'
|
import { ThemeProvider } from '@renderer/context/ThemeProvider'
|
||||||
import storeSyncService from '@renderer/services/StoreSyncService'
|
import storeSyncService from '@renderer/services/StoreSyncService'
|
||||||
import store, { persistor } from '@renderer/store'
|
import store, { persistor } from '@renderer/store'
|
||||||
@ -43,17 +42,15 @@ const App: FC = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Provider store={store}>
|
<Provider store={store}>
|
||||||
<HeroUIProvider>
|
<ThemeProvider>
|
||||||
<ThemeProvider>
|
<AntdProvider>
|
||||||
<AntdProvider>
|
<CodeStyleProvider>
|
||||||
<CodeStyleProvider>
|
<PersistGate loading={null} persistor={persistor}>
|
||||||
<PersistGate loading={null} persistor={persistor}>
|
<SelectionActionApp />
|
||||||
<SelectionActionApp />
|
</PersistGate>
|
||||||
</PersistGate>
|
</CodeStyleProvider>
|
||||||
</CodeStyleProvider>
|
</AntdProvider>
|
||||||
</AntdProvider>
|
</ThemeProvider>
|
||||||
</ThemeProvider>
|
|
||||||
</HeroUIProvider>
|
|
||||||
</Provider>
|
</Provider>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user