mirror of
https://github.com/langgenius/dify.git
synced 2026-05-04 01:18:05 +08:00
Merge main HEAD (segment 5) into sandboxed-agent-rebase
Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files. Preserve sandbox/agent/collaboration features while adopting main's UI refactorings (Dialog/AlertDialog/Popover), model provider updates, and enterprise features. Made-with: Cursor
This commit is contained in:
@ -24,7 +24,7 @@ const IndexingTypeValues = {
|
||||
}
|
||||
|
||||
// Mock next/link
|
||||
vi.mock('next/link', () => {
|
||||
vi.mock('@/next/link', () => {
|
||||
return function MockLink({ children, href }: { children: React.ReactNode, href: string }) {
|
||||
return <a href={href}>{children}</a>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user