suguo
/
dify
mirror of https://github.com/langgenius/dify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0001eb239c into d14635625c

This commit is contained in:
Stephen Zhou 2026-03-24 17:25:22 +08:00 committed by GitHub
parent d14635625c 0001eb239c
commit a0a51af0be
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 114 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
web/app/components/browser-initializer.tsx
View File

@ -1,66 +0,0 @@
'use client'
// Polyfill for Array.prototype.toSpliced (ES2023, Chrome 110+)
if (!Array.prototype.toSpliced) {
// eslint-disable-next-line no-extend-native
Array.prototype.toSpliced = function <T>(this: T[], start: number, deleteCount?: number, ...items: T[]): T[] {
const copy = this.slice()
// When deleteCount is undefined (omitted), delete to end; otherwise let splice handle coercion
if (deleteCount === undefined)
copy.splice(start, copy.length - start, ...items)
else
copy.splice(start, deleteCount, ...items)
return copy
}
}
class StorageMock {
data: Record<string, string>
constructor() {
this.data = {} as Record<string, string>
}
setItem(name: string, value: string) {
this.data[name] = value
}
getItem(name: string) {
return this.data[name] || null
}
removeItem(name: string) {
delete this.data[name]
}
clear() {
this.data = {}
}
}
let localStorage, sessionStorage
try {
localStorage = globalThis.localStorage
sessionStorage = globalThis.sessionStorage
}
catch {
localStorage = new StorageMock()
sessionStorage = new StorageMock()
}
Object.defineProperty(globalThis, 'localStorage', {
value: localStorage,
})
Object.defineProperty(globalThis, 'sessionStorage', {
value: sessionStorage,
})
const BrowserInitializer = ({
children,
}: { children: React.ReactElement }) => {
return children
}
export default BrowserInitializer

16
web/app/components/lazy-sentry-initializer.tsx
View File

@ -1,16 +0,0 @@
'use client'
import { IS_DEV } from '@/config'
import { env } from '@/env'
import dynamic from '@/next/dynamic'
const SentryInitializer = dynamic(() => import('./sentry-initializer'), { ssr: false })
const LazySentryInitializer = () => {
if (IS_DEV || !env.NEXT_PUBLIC_SENTRY_DSN)
return null
return <SentryInitializer />
}
export default LazySentryInitializer

27
web/app/components/sentry-initializer.tsx
View File

@ -1,27 +0,0 @@
'use client'
import * as Sentry from '@sentry/react'
import { useEffect } from 'react'
import { IS_DEV } from '@/config'
import { env } from '@/env'
const SentryInitializer = () => {
useEffect(() => {
const SENTRY_DSN = env.NEXT_PUBLIC_SENTRY_DSN
if (!IS_DEV && SENTRY_DSN) {
Sentry.init({
dsn: SENTRY_DSN,
integrations: [
Sentry.browserTracingIntegration(),
Sentry.replayIntegration(),
],
tracesSampleRate: 0.1,
replaysSessionSampleRate: 0.1,
replaysOnErrorSampleRate: 1.0,
})
}
}, [])
return null
}
export default SentryInitializer

29
web/app/layout.tsx
View File

@ -9,10 +9,8 @@ import { getLocaleOnServer } from '@/i18n-config/server'
import { ToastProvider } from './components/base/toast'
import { ToastHost } from './components/base/ui/toast'
import { TooltipProvider } from './components/base/ui/tooltip'
import BrowserInitializer from './components/browser-initializer'
import { AgentationLoader } from './components/devtools/agentation-loader'
import { ReactScanLoader } from './components/devtools/react-scan/loader'
import LazySentryInitializer from './components/lazy-sentry-initializer'
import { I18nServerProvider } from './components/provider/i18n-server'
import RoutePrefixHandle from './routePrefixHandle'
import './styles/globals.css'
@ -56,7 +54,6 @@ const LocaleLayout = async ({
className="h-full select-auto"
{...datasetMap}
>
<LazySentryInitializer />
<div className="isolate h-full">
<JotaiProvider>
<ThemeProvider
@ -67,20 +64,18 @@ const LocaleLayout = async ({
enableColorScheme={false}
>
<NuqsAdapter>
<BrowserInitializer>
<TanstackQueryInitializer>
<I18nServerProvider>
<ToastHost timeout={5000} limit={3} />
<ToastProvider>
<GlobalPublicStoreProvider>
<TooltipProvider delay={300} closeDelay={200}>
{children}
</TooltipProvider>
</GlobalPublicStoreProvider>
</ToastProvider>
</I18nServerProvider>
</TanstackQueryInitializer>
</BrowserInitializer>
<TanstackQueryInitializer>
<I18nServerProvider>
<ToastHost timeout={5000} limit={3} />
<ToastProvider>
<GlobalPublicStoreProvider>
<TooltipProvider delay={300} closeDelay={200}>
{children}
</TooltipProvider>
</GlobalPublicStoreProvider>
</ToastProvider>
</I18nServerProvider>
</TanstackQueryInitializer>
</NuqsAdapter>
</ThemeProvider>
</JotaiProvider>

81
web/instrumentation-client.ts Normal file
View File

@ -0,0 +1,81 @@
import { IS_DEV } from '@/config'
import { env } from '@/env'
async function main() {
// Polyfill for Array.prototype.toSpliced (ES2023, Chrome 110+)
if (!Array.prototype.toSpliced) {
// eslint-disable-next-line no-extend-native
Array.prototype.toSpliced = function <T>(this: T[], start: number, deleteCount?: number, ...items: T[]): T[] {
const copy = this.slice()
// When deleteCount is undefined (omitted), delete to end; otherwise let splice handle coercion
if (deleteCount === undefined)
copy.splice(start, copy.length - start, ...items)
else
copy.splice(start, deleteCount, ...items)
return copy
}
}
if (!('localStorage' in globalThis) || !('sessionStorage' in globalThis)) {
class StorageMock {
data: Record<string, string>
constructor() {
this.data = {} as Record<string, string>
}
setItem(name: string, value: string) {
this.data[name] = value
}
getItem(name: string) {
return this.data[name] || null
}
removeItem(name: string) {
delete this.data[name]
}
clear() {
this.data = {}
}
}
let localStorage, sessionStorage
try {
localStorage = globalThis.localStorage
sessionStorage = globalThis.sessionStorage
}
catch {
localStorage = new StorageMock()
sessionStorage = new StorageMock()
}
Object.defineProperty(globalThis, 'localStorage', {
value: localStorage,
})
Object.defineProperty(globalThis, 'sessionStorage', {
value: sessionStorage,
})
}
const SENTRY_DSN = env.NEXT_PUBLIC_SENTRY_DSN
if (!IS_DEV && SENTRY_DSN) {
const Sentry = await import('@sentry/react')
Sentry.init({
dsn: SENTRY_DSN,
integrations: [
Sentry.browserTracingIntegration(),
Sentry.replayIntegration(),
],
tracesSampleRate: 0.1,
replaysSessionSampleRate: 0.1,
replaysOnErrorSampleRate: 1.0,
})
}
}
main()

2
web/package.json
View File

@ -241,7 +241,7 @@
"tsx": "4.21.0",
"typescript": "5.9.3",
"uglify-js": "3.19.3",
"vinext": "0.0.34",
"vinext": "https://pkg.pr.new/vinext@6859019",
"vite": "npm:@voidzero-dev/vite-plus-core@0.1.13",
"vite-plugin-inspect": "11.3.3",
"vite-plus": "0.1.13",

7
web/plugins/vite/inject-target.ts Normal file
View File

@ -0,0 +1,7 @@
import path from 'node:path'
export const rootClientInjectTargetRelativePath = 'instrumentation-client.ts'
export const getRootClientInjectTarget = (projectRoot: string): string => {
return path.resolve(projectRoot, rootClientInjectTargetRelativePath)
}

11
web/pnpm-lock.yaml
View File

@ -606,8 +606,8 @@ importers:
specifier: 3.19.3
version: 3.19.3
vinext:
specifier: 0.0.34
version: 0.0.34(1a91bf00ec5f7fb5f0ffb625316f9d01)
specifier: https://pkg.pr.new/vinext@6859019
version: https://pkg.pr.new/vinext@6859019(1a91bf00ec5f7fb5f0ffb625316f9d01)
vite:
specifier: npm:@voidzero-dev/vite-plus-core@0.1.13
version: '@voidzero-dev/vite-plus-core@0.1.13(@types/node@25.5.0)(esbuild@0.27.2)(jiti@1.21.7)(sass@1.98.0)(terser@5.46.1)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)'
@ -7770,8 +7770,9 @@ packages:
vfile@6.0.3:
resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
vinext@0.0.34:
resolution: {integrity: sha512-igBP6UrL/tEtT73hPFt6EKmHTKd4lsSZ8luV5oQjmDWPcgGew3FaSt/7vo6qK42mj7yfg5MjvmQ2VmQrm2z8Cw==}
vinext@https://pkg.pr.new/vinext@6859019:
resolution: {integrity: sha512-Tjx8jsem3o6dSRUUISVzXpY6d/pgF2rdZ84gji+DP8/+m+RLos5A4i4nB7/Pd4PoRJDx95RWUX3z8O9Dv7vSsw==, tarball: https://pkg.pr.new/vinext@6859019}
version: 0.0.5
engines: {node: '>=22'}
hasBin: true
peerDependencies:
@ -15977,7 +15978,7 @@ snapshots:
'@types/unist': 3.0.3
vfile-message: 4.0.3
vinext@0.0.34(1a91bf00ec5f7fb5f0ffb625316f9d01):
vinext@https://pkg.pr.new/vinext@6859019(1a91bf00ec5f7fb5f0ffb625316f9d01):
dependencies:
'@unpic/react': 1.0.2(next@16.2.1(@babel/core@7.29.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(sass@1.98.0))(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
'@vercel/og': 0.8.6

14
web/vite.config.ts
View File

@ -1,4 +1,3 @@
import path from 'node:path'
import { fileURLToPath } from 'node:url'
import react from '@vitejs/plugin-react'
import vinext from 'vinext'
@ -6,11 +5,12 @@ import Inspect from 'vite-plugin-inspect'
import { defineConfig } from 'vite-plus'
import { createCodeInspectorPlugin, createForceInspectorClientInjectionPlugin } from './plugins/vite/code-inspector'
import { customI18nHmrPlugin } from './plugins/vite/custom-i18n-hmr'
import { getRootClientInjectTarget } from './plugins/vite/inject-target'
import { nextStaticImageTestPlugin } from './plugins/vite/next-static-image-test'
const projectRoot = path.dirname(fileURLToPath(import.meta.url))
const projectRoot = fileURLToPath(new URL('.', import.meta.url))
const isCI = !!process.env.CI
const browserInitializerInjectTarget = path.resolve(projectRoot, 'app/components/browser-initializer.tsx')
const rootClientInjectTarget = getRootClientInjectTarget(projectRoot)
export default defineConfig(({ mode }) => {
const isTest = mode === 'test'
@ -39,17 +39,17 @@ export default defineConfig(({ mode }) => {
: [
Inspect(),
createCodeInspectorPlugin({
injectTarget: browserInitializerInjectTarget,
injectTarget: rootClientInjectTarget,
}),
createForceInspectorClientInjectionPlugin({
injectTarget: browserInitializerInjectTarget,
injectTarget: rootClientInjectTarget,
projectRoot,
}),
react(),
vinext({ react: false }),
customI18nHmrPlugin({ injectTarget: browserInitializerInjectTarget }),
customI18nHmrPlugin({ injectTarget: rootClientInjectTarget }),
// reactGrabOpenFilePlugin({
// injectTarget: browserInitializerInjectTarget,
// injectTarget: rootClientInjectTarget,
// projectRoot,
// }),
],