From 2b4e5525a8c8ae604a3427ddbea9a8ade7247f56 Mon Sep 17 00:00:00 2001 From: arvinxx Date: Sun, 31 Aug 2025 19:36:34 +0800 Subject: [PATCH 1/5] clean --- .../environment-variables/basic.mdx | 7 ------ .../environment-variables/basic.zh-CN.mdx | 7 ------ next.config.ts | 2 -- packages/const/src/url.ts | 3 +-- src/libs/trpc/client/edge.ts | 3 +-- src/services/_url.ts | 25 +++++-------------- src/services/share.ts | 3 +-- 7 files changed, 9 insertions(+), 41 deletions(-) diff --git a/docs/self-hosting/environment-variables/basic.mdx b/docs/self-hosting/environment-variables/basic.mdx index feea4f2a3d8a3..70863bfe48717 100644 --- a/docs/self-hosting/environment-variables/basic.mdx +++ b/docs/self-hosting/environment-variables/basic.mdx @@ -37,13 +37,6 @@ When using the `random` mode, a random API Key will be selected from the availab When using the `turn` mode, the API Keys will be retrieved in a polling manner according to the specified order. -### `NEXT_PUBLIC_BASE_PATH` - -- Type: Optional -- Description: Add a `basePath` for LobeChat. -- Default: - -- Example: `/test` - ### `DEFAULT_AGENT_CONFIG` - Type: Optional diff --git a/docs/self-hosting/environment-variables/basic.zh-CN.mdx b/docs/self-hosting/environment-variables/basic.zh-CN.mdx index 75615f0de947a..dec2692e65b85 100644 --- a/docs/self-hosting/environment-variables/basic.zh-CN.mdx +++ b/docs/self-hosting/environment-variables/basic.zh-CN.mdx @@ -34,13 +34,6 @@ LobeChat 在部署时提供了一些额外的配置项，你可以使用环境 使用 `turn` 模式下，将按照填写的顺序，轮询获取得到 API Key。 -### `NEXT_PUBLIC_BASE_PATH` - -- 类型：可选 -- 描述：为 LobeChat 添加 `basePath` -- 默认值: `-` -- 示例: `/test` - ### `DEFAULT_AGENT_CONFIG` - 类型：可选 diff --git a/next.config.ts b/next.config.ts index c3a94dd54d24e..42a67303a91b8 100644 --- a/next.config.ts +++ b/next.config.ts @@ -13,7 +13,6 @@ const shouldUseCSP = process.env.ENABLED_CSP === '1'; // if you need to proxy the api endpoint to remote server -const basePath = process.env.NEXT_PUBLIC_BASE_PATH; const isStandaloneMode = buildWithDocker || isDesktop; const standaloneConfig: NextConfig = { @@ -23,7 +22,6 @@ const standaloneConfig: NextConfig = { const nextConfig: NextConfig = { ...(isStandaloneMode ? standaloneConfig : {}), - basePath, compress: isProd, experimental: { optimizePackageImports: [ diff --git a/packages/const/src/url.ts b/packages/const/src/url.ts index 228cefed2d872..2ef1183a1cd40 100644 --- a/packages/const/src/url.ts +++ b/packages/const/src/url.ts @@ -1,7 +1,6 @@ import qs from 'query-string'; import urlJoin from 'url-join'; -import { withBasePath } from '@/utils/basePath'; import { isDev } from '@/utils/env'; import { INBOX_SESSION_ID } from './session'; @@ -56,7 +55,7 @@ export const SESSION_CHAT_URL = (id: string = INBOX_SESSION_ID, mobile?: boolean url: '/chat', }); -export const imageUrl = (filename: string) => withBasePath(`/images/${filename}`); +export const imageUrl = (filename: string) => `/images/${filename}`; export const LOBE_URL_IMPORT_NAME = 'settings'; diff --git a/src/libs/trpc/client/edge.ts b/src/libs/trpc/client/edge.ts index 0e0f5c2711e66..d5ba2050c1eb2 100644 --- a/src/libs/trpc/client/edge.ts +++ b/src/libs/trpc/client/edge.ts @@ -3,7 +3,6 @@ import superjson from 'superjson'; import { isDesktop } from '@/const/version'; import type { EdgeRouter } from '@/server/routers/edge'; -import { withBasePath } from '@/utils/basePath'; import { fetchWithDesktopRemoteRPC } from '@/utils/electron/desktopRemoteRPCFetch'; export const edgeClient = createTRPCClient({ @@ -21,7 +20,7 @@ export const edgeClient = createTRPCClient({ }, maxURLLength: 2083, transformer: superjson, - url: withBasePath('/trpc/edge'), + url: '/trpc/edge', }), ], }); diff --git a/src/services/_url.ts b/src/services/_url.ts index 38175cc732a0a..e545aff9fb7d3 100644 --- a/src/services/_url.ts +++ b/src/services/_url.ts @@ -1,20 +1,7 @@ /* eslint-disable sort-keys-fix/sort-keys-fix */ -import { transform } from 'lodash-es'; - -import { withBasePath } from '@/utils/basePath'; - -const mapWithBasePath = (apis: T): T => { - return transform(apis, (result, value, key) => { - if (typeof value === 'string') { - // @ts-ignore - result[key] = withBasePath(value); - } else { - result[key] = value; - } - }); -}; -export const API_ENDPOINTS = mapWithBasePath({ + +export const API_ENDPOINTS = { oauth: '/api/auth', proxy: '/webapi/proxy', @@ -26,11 +13,11 @@ export const API_ENDPOINTS = mapWithBasePath({ trace: '/webapi/trace', // chat - chat: (provider: string) => withBasePath(`/webapi/chat/${provider}`), + chat: (provider: string) => `/webapi/chat/${provider}`, // models - models: (provider: string) => withBasePath(`/webapi/models/${provider}`), - modelPull: (provider: string) => withBasePath(`/webapi/models/${provider}/pull`), + models: (provider: string) => `/webapi/models/${provider}`, + modelPull: (provider: string) => `/webapi/models/${provider}/pull`, // image images: (provider: string) => `/webapi/text-to-image/${provider}`, @@ -42,4 +29,4 @@ export const API_ENDPOINTS = mapWithBasePath({ tts: '/webapi/tts/openai', edge: '/webapi/tts/edge', microsoft: '/webapi/tts/microsoft', -}); +}; diff --git a/src/services/share.ts b/src/services/share.ts index 3e2f6f324e4e9..110d25b969bb6 100644 --- a/src/services/share.ts +++ b/src/services/share.ts @@ -2,7 +2,6 @@ import type { PartialDeep } from 'type-fest'; import { LOBE_URL_IMPORT_NAME } from '@/const/url'; import { UserSettings } from '@/types/user/settings'; -import { withBasePath } from '@/utils/basePath'; class ShareService { /** @@ -11,7 +10,7 @@ class ShareService { * @returns The share settings URL. */ public createShareSettingsUrl = (settings: PartialDeep) => { - return withBasePath(`/?${LOBE_URL_IMPORT_NAME}=${encodeURI(JSON.stringify(settings))}`); + return `/?${LOBE_URL_IMPORT_NAME}=${encodeURI(JSON.stringify(settings))}`; }; /** From fae0baa9f6ac2fa54a9c84a030b542b12b9b4bce Mon Sep 17 00:00:00 2001 From: arvinxx Date: Sun, 31 Aug 2025 19:37:06 +0800 Subject: [PATCH 2/5] remove --- packages/utils/src/basePath.ts | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 packages/utils/src/basePath.ts diff --git a/packages/utils/src/basePath.ts b/packages/utils/src/basePath.ts deleted file mode 100644 index cfa4bac868fe8..0000000000000 --- a/packages/utils/src/basePath.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { appEnv } from '@/envs/app'; - -export const withBasePath = (path: string) => appEnv.NEXT_PUBLIC_BASE_PATH + path; From f9cf26eeb3ca95c5b0c35d3a9ad2efb199fbd68f Mon Sep 17 00:00:00 2001 From: arvinxx Date: Sun, 31 Aug 2025 20:03:56 +0800 Subject: [PATCH 3/5] fix --- src/app/[variants]/metadata.ts | 8 +------- src/envs/app.ts | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/app/[variants]/metadata.ts b/src/app/[variants]/metadata.ts index 0f873fb5948f9..e08b50b1ca5ae 100644 --- a/src/app/[variants]/metadata.ts +++ b/src/app/[variants]/metadata.ts @@ -2,16 +2,10 @@ import { BRANDING_LOGO_URL, BRANDING_NAME, ORG_NAME } from '@/const/branding'; import { DEFAULT_LANG } from '@/const/locale'; import { OFFICIAL_URL, OG_URL } from '@/const/url'; import { isCustomBranding, isCustomORG } from '@/const/version'; -import { appEnv } from '@/envs/app'; import { translation } from '@/server/translation'; import { DynamicLayoutProps } from '@/types/next'; import { RouteVariants } from '@/utils/server/routeVariants'; -const BASE_PATH = appEnv.NEXT_PUBLIC_BASE_PATH; - -// if there is a base path, then we don't need the manifest -const noManifest = !!BASE_PATH; - export const generateMetadata = async (props: DynamicLayoutProps) => { const locale = await RouteVariants.getLocale(props); const { t } = await translation('metadata', locale); @@ -32,7 +26,7 @@ export const generateMetadata = async (props: DynamicLayoutProps) => { icon: '/favicon.ico?v=1', shortcut: '/favicon-32x32.ico?v=1', }, - manifest: noManifest ? undefined : '/manifest.json', + manifest: '/manifest.json', metadataBase: new URL(OFFICIAL_URL), openGraph: { description: t('chat.description', { appName: BRANDING_NAME }), diff --git a/src/envs/app.ts b/src/envs/app.ts index 71f92c0d91b6d..938d84587636b 100644 --- a/src/envs/app.ts +++ b/src/envs/app.ts @@ -32,7 +32,6 @@ export const getAppConfig = () => { return createEnv({ client: { - NEXT_PUBLIC_BASE_PATH: z.string(), NEXT_PUBLIC_ENABLE_SENTRY: z.boolean(), }, server: { @@ -59,8 +58,6 @@ export const getAppConfig = () => { SSRF_ALLOW_IP_ADDRESS_LIST: z.string().optional(), }, runtimeEnv: { - NEXT_PUBLIC_BASE_PATH: process.env.NEXT_PUBLIC_BASE_PATH || '', - // Sentry NEXT_PUBLIC_ENABLE_SENTRY: !!process.env.NEXT_PUBLIC_SENTRY_DSN, From a04d6085c8d381a75b71c7ecae981e733625b3f4 Mon Sep 17 00:00:00 2001 From: arvinxx Date: Sun, 31 Aug 2025 20:09:44 +0800 Subject: [PATCH 4/5] move config to envs --- packages/model-runtime/src/ModelRuntime.test.ts | 2 +- src/components/Analytics/Google.tsx | 2 +- src/components/Analytics/LobeAnalyticsProviderWrapper.tsx | 2 +- src/components/Analytics/Vercel.tsx | 2 +- src/components/Analytics/index.tsx | 2 +- src/config/__tests__/analytics.test.ts | 2 +- src/config/__tests__/client.test.ts | 2 +- src/{config => envs}/analytics.ts | 0 src/{config => envs}/debug.ts | 0 src/{config => envs}/knowledge.ts | 0 src/{config => envs}/langfuse.ts | 0 src/{config => envs}/tools.ts | 0 src/libs/analytics/index.ts | 2 +- src/libs/traces/index.test.ts | 2 +- src/libs/traces/index.ts | 2 +- src/libs/unstructured/index.ts | 2 +- src/locales/create.ts | 2 +- src/server/globalConfig/index.test.ts | 2 +- src/server/globalConfig/index.ts | 4 ++-- src/server/modules/ContentChunk/index.ts | 2 +- src/server/routers/tools/search.test.ts | 2 +- src/server/services/search/impls/searxng/index.ts | 2 +- src/server/services/search/index.ts | 2 +- 23 files changed, 19 insertions(+), 19 deletions(-) rename src/{config => envs}/analytics.ts (100%) rename src/{config => envs}/debug.ts (100%) rename src/{config => envs}/knowledge.ts (100%) rename src/{config => envs}/langfuse.ts (100%) rename src/{config => envs}/tools.ts (100%) diff --git a/packages/model-runtime/src/ModelRuntime.test.ts b/packages/model-runtime/src/ModelRuntime.test.ts index 460e9db0f4541..6bfa704a9d586 100644 --- a/packages/model-runtime/src/ModelRuntime.test.ts +++ b/packages/model-runtime/src/ModelRuntime.test.ts @@ -5,7 +5,7 @@ import { Langfuse } from 'langfuse'; import { LangfuseGenerationClient, LangfuseTraceClient } from 'langfuse-core'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import * as langfuseCfg from '@/config/langfuse'; +import * as langfuseCfg from '@/envs/langfuse'; import { createTraceOptions } from '@/server/modules/ModelRuntime'; import { ChatStreamPayload, LobeOpenAI, ModelProvider, ModelRuntime } from '.'; diff --git a/src/components/Analytics/Google.tsx b/src/components/Analytics/Google.tsx index 14196a007f5fa..415bdad029137 100644 --- a/src/components/Analytics/Google.tsx +++ b/src/components/Analytics/Google.tsx @@ -1,6 +1,6 @@ import { GoogleAnalytics as GA } from '@next/third-parties/google'; -import { analyticsEnv } from '@/config/analytics'; +import { analyticsEnv } from '@/envs/analytics'; const GoogleAnalytics = () => ; diff --git a/src/components/Analytics/LobeAnalyticsProviderWrapper.tsx b/src/components/Analytics/LobeAnalyticsProviderWrapper.tsx index fed793e38b0cc..b8fc3c3f76ee2 100644 --- a/src/components/Analytics/LobeAnalyticsProviderWrapper.tsx +++ b/src/components/Analytics/LobeAnalyticsProviderWrapper.tsx @@ -1,7 +1,7 @@ import { ReactNode, memo } from 'react'; import { LobeAnalyticsProvider } from '@/components/Analytics/LobeAnalyticsProvider'; -import { analyticsEnv } from '@/config/analytics'; +import { analyticsEnv } from '@/envs/analytics'; import { isDev } from '@/utils/env'; type Props = { diff --git a/src/components/Analytics/Vercel.tsx b/src/components/Analytics/Vercel.tsx index d395796f0e596..73ab7013137d4 100644 --- a/src/components/Analytics/Vercel.tsx +++ b/src/components/Analytics/Vercel.tsx @@ -1,7 +1,7 @@ import { Analytics } from '@vercel/analytics/react'; import { memo } from 'react'; -import { analyticsEnv } from '@/config/analytics'; +import { analyticsEnv } from '@/envs/analytics'; const VercelAnalytics = memo(() => ); diff --git a/src/components/Analytics/index.tsx b/src/components/Analytics/index.tsx index 618aed3942d06..9aee24d48025b 100644 --- a/src/components/Analytics/index.tsx +++ b/src/components/Analytics/index.tsx @@ -1,7 +1,7 @@ import dynamic from 'next/dynamic'; -import { analyticsEnv } from '@/config/analytics'; import { isDesktop } from '@/const/version'; +import { analyticsEnv } from '@/envs/analytics'; import Desktop from './Desktop'; import Google from './Google'; diff --git a/src/config/__tests__/analytics.test.ts b/src/config/__tests__/analytics.test.ts index 3ed849f59fd20..b6318c1ed1312 100644 --- a/src/config/__tests__/analytics.test.ts +++ b/src/config/__tests__/analytics.test.ts @@ -1,7 +1,7 @@ // @vitest-environment node import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { analyticsEnv, getAnalyticsConfig } from '../analytics'; +import { analyticsEnv, getAnalyticsConfig } from '../../envs/analytics'; beforeEach(() => { // 在每个测试用例之前,清除所有的 console.warn mock diff --git a/src/config/__tests__/client.test.ts b/src/config/__tests__/client.test.ts index 7e43c6ea975e7..b5e6d7cde3de1 100644 --- a/src/config/__tests__/client.test.ts +++ b/src/config/__tests__/client.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { getDebugConfig } from '../debug'; +import { getDebugConfig } from '../../envs/debug'; // 测试前重置 process.env vi.stubGlobal('process', { diff --git a/src/config/analytics.ts b/src/envs/analytics.ts similarity index 100% rename from src/config/analytics.ts rename to src/envs/analytics.ts diff --git a/src/config/debug.ts b/src/envs/debug.ts similarity index 100% rename from src/config/debug.ts rename to src/envs/debug.ts diff --git a/src/config/knowledge.ts b/src/envs/knowledge.ts similarity index 100% rename from src/config/knowledge.ts rename to src/envs/knowledge.ts diff --git a/src/config/langfuse.ts b/src/envs/langfuse.ts similarity index 100% rename from src/config/langfuse.ts rename to src/envs/langfuse.ts diff --git a/src/config/tools.ts b/src/envs/tools.ts similarity index 100% rename from src/config/tools.ts rename to src/envs/tools.ts diff --git a/src/libs/analytics/index.ts b/src/libs/analytics/index.ts index abb7fa910550f..772945ec74e4d 100644 --- a/src/libs/analytics/index.ts +++ b/src/libs/analytics/index.ts @@ -1,7 +1,7 @@ import { createServerAnalytics } from '@lobehub/analytics/server'; -import { analyticsEnv } from '@/config/analytics'; import { BUSINESS_LINE } from '@/const/analytics'; +import { analyticsEnv } from '@/envs/analytics'; import { isDev } from '@/utils/env'; export const serverAnalytics = createServerAnalytics({ diff --git a/src/libs/traces/index.test.ts b/src/libs/traces/index.test.ts index 4953ab234ff13..3aba34d73b83c 100644 --- a/src/libs/traces/index.test.ts +++ b/src/libs/traces/index.test.ts @@ -3,7 +3,7 @@ import { Langfuse } from 'langfuse'; import { CreateLangfuseTraceBody } from 'langfuse-core'; import { describe, expect, it, vi } from 'vitest'; -import * as server from '@/config/langfuse'; +import * as server from '@/envs/langfuse'; import { TraceClient } from './index'; diff --git a/src/libs/traces/index.ts b/src/libs/traces/index.ts index 1191d4105b277..9b783dd742b85 100644 --- a/src/libs/traces/index.ts +++ b/src/libs/traces/index.ts @@ -1,8 +1,8 @@ import { Langfuse } from 'langfuse'; import { CreateLangfuseTraceBody } from 'langfuse-core'; -import { getLangfuseConfig } from '@/config/langfuse'; import { CURRENT_VERSION } from '@/const/version'; +import { getLangfuseConfig } from '@/envs/langfuse'; import { TraceEventClient } from '@/libs/traces/event'; /** diff --git a/src/libs/unstructured/index.ts b/src/libs/unstructured/index.ts index 7b603f38cc6d8..4377f01e54997 100644 --- a/src/libs/unstructured/index.ts +++ b/src/libs/unstructured/index.ts @@ -4,7 +4,7 @@ import { UnstructuredClient } from 'unstructured-client'; import { Strategy } from 'unstructured-client/sdk/models/shared'; import { PartitionResponse } from 'unstructured-client/src/sdk/models/operations'; -import { knowledgeEnv } from '@/config/knowledge'; +import { knowledgeEnv } from '@/envs/knowledge'; export enum ChunkingStrategy { Basic = 'basic', diff --git a/src/locales/create.ts b/src/locales/create.ts index bffd4a0a44bbb..58ff993d69642 100644 --- a/src/locales/create.ts +++ b/src/locales/create.ts @@ -4,8 +4,8 @@ import resourcesToBackend from 'i18next-resources-to-backend'; import { initReactI18next } from 'react-i18next'; import { isRtlLang } from 'rtl-detect'; -import { getDebugConfig } from '@/config/debug'; import { DEFAULT_LANG } from '@/const/locale'; +import { getDebugConfig } from '@/envs/debug'; import { normalizeLocale } from '@/locales/resources'; import { isDev, isOnServerSide } from '@/utils/env'; diff --git a/src/server/globalConfig/index.test.ts b/src/server/globalConfig/index.test.ts index 7c77b8cd41a1f..720da2e33635c 100644 --- a/src/server/globalConfig/index.test.ts +++ b/src/server/globalConfig/index.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; -import { knowledgeEnv } from '@/config/knowledge'; import { getAppConfig } from '@/envs/app'; +import { knowledgeEnv } from '@/envs/knowledge'; import { SystemEmbeddingConfig } from '@/types/knowledgeBase'; import { FilesConfigItem } from '@/types/user/settings/filesConfig'; diff --git a/src/server/globalConfig/index.ts b/src/server/globalConfig/index.ts index 05bd6b589e3b9..78aa9d85c3bed 100644 --- a/src/server/globalConfig/index.ts +++ b/src/server/globalConfig/index.ts @@ -1,10 +1,10 @@ import { authEnv } from '@/config/auth'; import { fileEnv } from '@/config/file'; -import { knowledgeEnv } from '@/config/knowledge'; -import { langfuseEnv } from '@/config/langfuse'; import { enableNextAuth } from '@/const/auth'; import { isDesktop } from '@/const/version'; import { appEnv, getAppConfig } from '@/envs/app'; +import { knowledgeEnv } from '@/envs/knowledge'; +import { langfuseEnv } from '@/envs/langfuse'; import { parseSystemAgent } from '@/server/globalConfig/parseSystemAgent'; import { GlobalServerConfig } from '@/types/serverConfig'; diff --git a/src/server/modules/ContentChunk/index.ts b/src/server/modules/ContentChunk/index.ts index 89f632e548371..a1bd517ae1463 100644 --- a/src/server/modules/ContentChunk/index.ts +++ b/src/server/modules/ContentChunk/index.ts @@ -1,7 +1,7 @@ import { Strategy } from 'unstructured-client/sdk/models/shared'; -import { knowledgeEnv } from '@/config/knowledge'; import type { NewChunkItem, NewUnstructuredChunkItem } from '@/database/schemas'; +import { knowledgeEnv } from '@/envs/knowledge'; import { ChunkingLoader } from '@/libs/langchain'; import { ChunkingStrategy, Unstructured } from '@/libs/unstructured'; diff --git a/src/server/routers/tools/search.test.ts b/src/server/routers/tools/search.test.ts index d61110b019118..7999df5139d84 100644 --- a/src/server/routers/tools/search.test.ts +++ b/src/server/routers/tools/search.test.ts @@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server'; import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { toolsEnv } from '@/config/tools'; +import { toolsEnv } from '@/envs/tools'; import { SearXNGClient } from '@/server/services/search/impls/searxng/client'; import { SEARCH_SEARXNG_NOT_CONFIG } from '@/types/tool/search'; diff --git a/src/server/services/search/impls/searxng/index.ts b/src/server/services/search/impls/searxng/index.ts index b25dde3fad66b..aeec453049050 100644 --- a/src/server/services/search/impls/searxng/index.ts +++ b/src/server/services/search/impls/searxng/index.ts @@ -1,6 +1,6 @@ import { TRPCError } from '@trpc/server'; -import { toolsEnv } from '@/config/tools'; +import { toolsEnv } from '@/envs/tools'; import { SearXNGClient } from '@/server/services/search/impls/searxng/client'; import { SEARCH_SEARXNG_NOT_CONFIG, UniformSearchResponse } from '@/types/tool/search'; diff --git a/src/server/services/search/index.ts b/src/server/services/search/index.ts index 29fc334089e31..af40d7f5c827c 100644 --- a/src/server/services/search/index.ts +++ b/src/server/services/search/index.ts @@ -1,7 +1,7 @@ import { CrawlImplType, Crawler } from '@lobechat/web-crawler'; import pMap from 'p-map'; -import { toolsEnv } from '@/config/tools'; +import { toolsEnv } from '@/envs/tools'; import { SearchParams } from '@/types/tool/search'; import { SearchImplType, SearchServiceImpl, createSearchServiceImpl } from './impls'; From a8ddc1279c7ddb828705c4b862a9b1376836b9e8 Mon Sep 17 00:00:00 2001 From: arvinxx Date: Sun, 31 Aug 2025 20:25:12 +0800 Subject: [PATCH 5/5] remove envs --- src/server/globalConfig/index.test.ts | 3 +-- src/server/services/search/impls/searxng/index.test.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/server/globalConfig/index.test.ts b/src/server/globalConfig/index.test.ts index 720da2e33635c..bb2c6398e5180 100644 --- a/src/server/globalConfig/index.test.ts +++ b/src/server/globalConfig/index.test.ts @@ -1,7 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; import { getAppConfig } from '@/envs/app'; -import { knowledgeEnv } from '@/envs/knowledge'; import { SystemEmbeddingConfig } from '@/types/knowledgeBase'; import { FilesConfigItem } from '@/types/user/settings/filesConfig'; @@ -13,7 +12,7 @@ vi.mock('@/envs/app', () => ({ getAppConfig: vi.fn(), })); -vi.mock('@/config/knowledge', () => ({ +vi.mock('@/envs/knowledge', () => ({ knowledgeEnv: { DEFAULT_FILES_CONFIG: 'test_config', }, diff --git a/src/server/services/search/impls/searxng/index.test.ts b/src/server/services/search/impls/searxng/index.test.ts index 46ebad5edc707..9b3b5d1371aa8 100644 --- a/src/server/services/search/impls/searxng/index.test.ts +++ b/src/server/services/search/impls/searxng/index.test.ts @@ -5,7 +5,7 @@ import { SearXNGClient } from './client'; import { hetongxue } from './fixtures/searXNG'; import { SearXNGImpl } from './index'; -vi.mock('@/config/tools', () => ({ +vi.mock('@/envs/tools', () => ({ toolsEnv: { SEARXNG_URL: 'https://demo.com', },