youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-03-21 06:18:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/model-plugins-implementing' into deploy/dev

Browse Source
This commit is contained in:
yyh
2026-03-12 23:12:29 +08:00
parent 33626cb3e1 d0054e28fe
commit 92eb6de4de
7 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/tests/unit_tests/services/test_website_service.py
View File

@ -125,7 +125,7 @@ def test_get_credentials_and_config_selects_plugin_id_and_key_firecrawl(monkeypa
@pytest.mark.parametrize(
("provider", "plugin_id"),
[
("watercrawl", "langgenius/watercrawl_datasource"),
("watercrawl", "watercrawl/watercrawl_datasource"),
("jinareader", "langgenius/jina_datasource"),
],
)

2
web/app/layout.tsx
View File

@ -1,6 +1,6 @@
import type { Viewport } from 'next'
import { Agentation } from 'agentation'
import { Provider as JotaiProvider } from 'jotai'
import { Provider as JotaiProvider } from 'jotai/react'
import { ThemeProvider } from 'next-themes'
import { Instrument_Serif } from 'next/font/google'
import { NuqsAdapter } from 'nuqs/adapters/next/app'

3
web/eslint-suppressions.json
View File

@ -6521,9 +6521,6 @@
"no-restricted-imports": {
"count": 1
},
"tailwindcss/no-unnecessary-whitespace": {
"count": 1
},
"ts/no-explicit-any": {
"count": 1
}

1
web/i18n-config/settings.ts
View File

@ -6,6 +6,7 @@ export function getInitOptions(): InitOptions {
// We do not have en for fallback
load: 'currentOnly',
fallbackLng: 'en-US',
showSupportNotice: false,
partialBundledLanguages: true,
keySeparator: false,
ns: namespaces,

2
web/package.json
View File

@ -237,7 +237,7 @@
"tsx": "4.21.0",
"typescript": "5.9.3",
"uglify-js": "3.19.3",
"vinext": "https://pkg.pr.new/hyoban/vinext/vinext@fe9a72c",
"vinext": "0.0.29",
"vite": "8.0.0-beta.18",
"vite-plugin-inspect": "11.3.3",
"vite-tsconfig-paths": "6.1.1",

13
web/pnpm-lock.yaml generated
View File

@ -589,8 +589,8 @@ importers:
specifier: 3.19.3
version: 3.19.3
vinext:
specifier: https://pkg.pr.new/hyoban/vinext/vinext@fe9a72c
version: https://pkg.pr.new/hyoban/vinext/vinext@fe9a72c(@mdx-js/rollup@3.1.1(rollup@4.59.0))(@vitejs/plugin-rsc@0.5.21(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3))(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(typescript@5.9.3)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
specifier: 0.0.29
version: 0.0.29(@mdx-js/rollup@3.1.1(rollup@4.59.0))(@vitejs/plugin-rsc@0.5.21(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3))(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(typescript@5.9.3)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
vite:
specifier: 8.0.0-beta.18
version: 8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
@ -7286,9 +7286,8 @@ packages:
vfile@6.0.3:
resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
vinext@https://pkg.pr.new/hyoban/vinext/vinext@fe9a72c:
resolution: {integrity: sha512-Nh4JoTECpSqnXMeFh7QG/zzWwPxQ2dP10e5pZ8nqJ10rQr9Z5MQdsGKYqmH9IE6/aEW/9CVS1O9cquLpM3zFQw==, tarball: https://pkg.pr.new/hyoban/vinext/vinext@fe9a72c}
version: 0.0.5
vinext@0.0.29:
resolution: {integrity: sha512-T7kzhgX2TbM+unIHaehiz5H7D2i0TLWhUUqvdnu5PgiBzCSMiH8G2rzE7dA8Tc1oEhywuzYP+pt5bfXkk9lk+w==}
engines: {node: '>=22'}
hasBin: true
peerDependencies:
@ -7297,7 +7296,7 @@ packages:
react: '>=19.2.0'
react-dom: '>=19.2.0'
react-server-dom-webpack: ^19.2.4
vite: ^7.0.0
vite: ^7.0.0 || ^8.0.0-beta.0
peerDependenciesMeta:
'@mdx-js/rollup':
optional: true
@ -15327,7 +15326,7 @@ snapshots:
'@types/unist': 3.0.3
vfile-message: 4.0.3
vinext@https://pkg.pr.new/hyoban/vinext/vinext@fe9a72c(@mdx-js/rollup@3.1.1(rollup@4.59.0))(@vitejs/plugin-rsc@0.5.21(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3))(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(typescript@5.9.3)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
vinext@0.0.29(@mdx-js/rollup@3.1.1(rollup@4.59.0))(@vitejs/plugin-rsc@0.5.21(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)))(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3))(react-dom@19.2.4(react@19.2.4))(react-server-dom-webpack@19.2.4(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(webpack@5.105.4(esbuild@0.27.2)(uglify-js@3.19.3)))(react@19.2.4)(typescript@5.9.3)(vite@8.0.0-beta.18(@types/node@25.4.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
dependencies:
'@unpic/react': 1.0.2(next@16.1.6(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.97.3))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
'@vercel/og': 0.8.6

6
web/vite.config.ts
View File

@ -20,6 +20,7 @@ export default defineConfig(({ mode }) => {
return {
plugins: isTest
? [
// TODO: remove tsconfigPaths from test config after vitest supports it natively
tsconfigPaths(),
react(),
{
@ -34,7 +35,6 @@ export default defineConfig(({ mode }) => {
]
: isStorybook
? [
tsconfigPaths(),
react(),
]
: [
@ -54,9 +54,7 @@ export default defineConfig(({ mode }) => {
// }),
],
resolve: {
alias: {
'~@': projectRoot,
},
tsconfigPaths: true,
},
// vinext related config