Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

chore(web): replace deprecated third-party APIs (#44466)

Stephen Zhou7d039cb6198e
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.json
index 1109f92dbb3..6d3d52473f6 100644
--- a/oxlint-suppressions.json
+++ b/oxlint-suppressions.json
@@ -52,11 +52,6 @@
"count": 1
}
},
- "web/app/(shareLayout)/webapp-signin/check-code/page.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/(shareLayout)/webapp-signin/normalForm.tsx": {
"jsx-a11y/click-events-have-key-events": {
"count": 2
@@ -183,11 +178,6 @@
"count": 1
}
},
- "web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/app/configuration/config-var/index.tsx": {
"dify/require-disable-directive-description": {
"count": 1
@@ -328,11 +318,6 @@
"count": 1
}
},
- "web/app/components/app/deploy/shared/deployment-configuration/use-deployment-configuration-form.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/app/log/filter.tsx": {
"react/only-export-components": {
"count": 1
@@ -346,16 +331,6 @@
"count": 2
}
},
- "web/app/components/app/overview/embedded/index.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/app/overview/workflow-launch-dialog/index.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/app/text-generate/item/index.tsx": {
"dify/require-disable-directive-description": {
"count": 4
@@ -387,11 +362,6 @@
"count": 2
}
},
- "web/app/components/apps/app-card/interactions.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/agent-log-modal/index.tsx": {
"eslint-react/set-state-in-effect": {
"count": 1
@@ -413,16 +383,6 @@
"count": 2
}
},
- "web/app/components/base/amplitude/runtime.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/base/amplitude/web-app-client.ts": {
- "typescript/no-deprecated": {
- "count": 2
- }
- },
"web/app/components/base/audio-btn/audio.player.manager.ts": {
"dify/require-disable-directive-description": {
"count": 1
@@ -452,11 +412,6 @@
"count": 1
}
},
- "web/app/components/base/carousel/__tests__/index.spec.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/carousel/index.tsx": {
"eslint-react/set-state-in-effect": {
"count": 3
@@ -692,20 +647,7 @@
"count": 1
}
},
- "web/app/components/base/form/components/base/__tests__/base-form.spec.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/base/form/components/base/base-field.tsx": {
- "typescript/no-deprecated": {
- "count": 3
- }
- },
"web/app/components/base/form/components/base/base-form.tsx": {
- "typescript/no-deprecated": {
- "count": 3
- },
"typescript/no-explicit-any": {
"count": 6
}
@@ -720,31 +662,11 @@
"count": 1
}
},
- "web/app/components/base/form/components/form/actions.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/base/form/form-scenarios/base/field.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/form/form-scenarios/base/types.ts": {
"typescript/no-explicit-any": {
"count": 1
}
},
- "web/app/components/base/form/form-scenarios/base/utils.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/base/form/form-scenarios/input-field/field.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/form/form-scenarios/input-field/types.ts": {
"typescript/no-explicit-any": {
"count": 2
@@ -819,11 +741,6 @@
"count": 2
}
},
- "web/app/components/base/markdown-blocks/form.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/markdown-blocks/index.ts": {
"no-barrel-files/no-barrel-files": {
"count": 9
@@ -859,11 +776,6 @@
"count": 5
}
},
- "web/app/components/base/markdown-with-directive/components/markdown-with-directive-schema.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/node-status/index.tsx": {
"react/only-export-components": {
"count": 1
@@ -882,16 +794,6 @@
"count": 2
}
},
- "web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/base/prompt-editor/__tests__/utils.spec.ts": {
- "typescript/no-deprecated": {
- "count": 7
- }
- },
"web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx": {
"no-restricted-imports": {
"count": 1
@@ -1074,11 +976,6 @@
"count": 1
}
},
- "web/app/components/base/voice-input/mp3-encoder.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/base/zendesk/runtime.ts": {
"dify/require-disable-directive-description": {
"count": 1
@@ -1375,9 +1272,6 @@
"eslint-react/static-components": {
"count": 2
},
- "typescript/no-deprecated": {
- "count": 1
- },
"typescript/no-explicit-any": {
"count": 3
}
@@ -1455,9 +1349,6 @@
"web/app/components/datasets/documents/detail/completed/segment-list.tsx": {
"eslint-react/static-components": {
"count": 2
- },
- "typescript/no-deprecated": {
- "count": 1
}
},
"web/app/components/datasets/documents/detail/embedding/components/index.ts": {
@@ -1490,11 +1381,6 @@
"count": 3
}
},
- "web/app/components/datasets/external-api/external-api-modal/Form.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx": {
"eslint-react/set-state-in-effect": {
"count": 1
@@ -1607,11 +1493,6 @@
"count": 1
}
},
- "web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/header/account-setting/model-provider-page/__tests__/hooks.spec.ts": {
"typescript/no-deprecated": {
"count": 1
@@ -1677,11 +1558,6 @@
"count": 1
}
},
- "web/app/components/header/account-setting/resource-access-token-page/token-dialog.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/header/github-star/index.tsx": {
"@tanstack/query/prefer-query-options": {
"count": 1
@@ -1733,11 +1609,6 @@
"count": 2
}
},
- "web/app/components/plugins/marketplace/__tests__/search-params.spec.ts": {
- "typescript/no-deprecated": {
- "count": 9
- }
- },
"web/app/components/plugins/marketplace/home/__tests__/home-trending.spec.tsx": {
"typescript/no-deprecated": {
"count": 4
@@ -1769,11 +1640,6 @@
"count": 1
}
},
- "web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/plugins/plugin-auth/authorized/item.tsx": {
"jsx-a11y/click-events-have-key-events": {
"count": 1
@@ -1862,9 +1728,6 @@
"eslint-react/static-components": {
"count": 2
},
- "typescript/no-deprecated": {
- "count": 1
- },
"typescript/no-explicit-any": {
"count": 1
}
@@ -1887,15 +1750,7 @@
"count": 2
}
},
- "web/app/components/rag-pipeline/components/panel/input-field/editor/form/schema.ts": {
- "typescript/no-deprecated": {
- "count": 11
- }
- },
"web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- },
"typescript/no-explicit-any": {
"count": 1
}
@@ -1923,9 +1778,6 @@
"web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx": {
"eslint-react/static-components": {
"count": 2
- },
- "typescript/no-deprecated": {
- "count": 1
}
},
"web/app/components/rag-pipeline/components/panel/test-run/preparation/index.tsx": {
@@ -2015,11 +1867,6 @@
"count": 1
}
},
- "web/app/components/share/text-generation/result/hooks/use-result-run-state.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/share/text-generation/result/index.tsx": {
"typescript/no-explicit-any": {
"count": 1
@@ -2058,9 +1905,6 @@
"eslint-react/set-state-in-effect": {
"count": 1
},
- "typescript/no-deprecated": {
- "count": 1
- },
"typescript/no-explicit-any": {
"count": 3
}
@@ -2179,11 +2023,6 @@
"count": 2
}
},
- "web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/workflow/block-selector/constants.tsx": {
"react/only-export-components": {
"count": 3
@@ -2779,26 +2618,6 @@
"count": 1
}
},
- "web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-dataset-selection.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-input-manager.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-metadata-config.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-model-config.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/workflow/nodes/knowledge-retrieval/node.tsx": {
"eslint-react/set-state-in-effect": {
"count": 2
@@ -2844,21 +2663,6 @@
"count": 1
}
},
- "web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-structured-output-config.spec.ts": {
- "typescript/no-deprecated": {
- "count": 2
- }
- },
- "web/app/components/workflow/nodes/llm/hooks/use-llm-prompt-config.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
- "web/app/components/workflow/nodes/llm/hooks/use-llm-structured-output-config.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/app/components/workflow/nodes/llm/use-config.ts": {
"eslint-react/set-state-in-effect": {
"count": 1
@@ -3535,11 +3339,6 @@
"count": 1
}
},
- "web/features/network-access/app-binding/config-panel.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/features/skills/client.ts": {
"dify/require-disable-directive-description": {
"count": 2
@@ -3557,9 +3356,6 @@
},
"eslint-react/set-state-in-effect": {
"count": 14
- },
- "typescript/no-deprecated": {
- "count": 1
}
},
"web/features/skills/detail/file-tree-items.tsx": {
@@ -3572,11 +3368,6 @@
"count": 1
}
},
- "web/features/skills/detail/markdown-editor.tsx": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/features/skills/detail/page.tsx": {
"eslint-react/set-state-in-effect": {
"count": 4
@@ -3617,11 +3408,6 @@
"count": 1
}
},
- "web/plugins/vite/i18n-analysis/compiler.ts": {
- "typescript/no-deprecated": {
- "count": 1
- }
- },
"web/proxy.ts": {
"dify/require-disable-directive-description": {
"count": 2
diff --git a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
index ac15f5f42bc..987cb9063e6 100644
--- a/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
+++ b/web/app/(shareLayout)/webapp-signin/check-code/page.tsx
@@ -1,5 +1,5 @@
'use client'
-import type { FormEvent } from 'react'
+import type { SubmitEvent } from 'react'
import { Button } from '@langgenius/dify-ui/button'
import { Input } from '@langgenius/dify-ui/input'
import { useEffect, useRef, useState } from 'react'
@@ -78,7 +78,7 @@ export default function CheckCode() {
}
}
- const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+ const handleSubmit = (event: SubmitEvent<HTMLFormElement>) => {
event.preventDefault()
verify()
}
diff --git a/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx
index 3f4154923c0..070aaf419ca 100644
--- a/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx
@@ -84,7 +84,7 @@ describe('ConfigSelect Component', () => {
'adds an option with %s without submitting the enclosing form',
async (key) => {
const user = userEvent.setup()
- const onSubmit = vi.fn((event: React.FormEvent) => event.preventDefault())
+ const onSubmit = vi.fn((event: React.SubmitEvent) => event.preventDefault())
render(
<form onSubmit={onSubmit}>
<ConfigSelect options={[]} onChange={defaultProps.onChange} />
diff --git a/web/app/components/app/deploy/shared/deployment-configuration/use-deployment-configuration-form.ts b/web/app/components/app/deploy/shared/deployment-configuration/use-deployment-configuration-form.ts
index d5a20c628d3..9deca84cb44 100644
--- a/web/app/components/app/deploy/shared/deployment-configuration/use-deployment-configuration-form.ts
+++ b/web/app/components/app/deploy/shared/deployment-configuration/use-deployment-configuration-form.ts
@@ -1,6 +1,6 @@
'use client'
-import type { FormEventHandler } from 'react'
+import type { SubmitEventHandler } from 'react'
import type { DeploymentConfigurationQueryState } from './use-deployment-configuration-queries'
import type { DeploymentConfigurationValuesController } from './use-deployment-configuration-values'
import type { DeploymentFieldError } from './utils/field-id'
@@ -56,7 +56,7 @@ export function useDeploymentConfigurationForm({
})
const canDeploy = Boolean(appId) && !disabled && queryState.canDeploy && !deployMutation.isPending
- const handleSubmit: FormEventHandler<HTMLFormElement> = (event) => {
+ const handleSubmit: SubmitEventHandler<HTMLFormElement> = (event) => {
event.preventDefault()
if (!appId || !canDeploy || !queryState.deploymentOptions) return
diff --git a/web/app/components/app/overview/embedded/index.tsx b/web/app/components/app/overview/embedded/index.tsx
index ec76533425c..6ea968ed030 100644
--- a/web/app/components/app/overview/embedded/index.tsx
+++ b/web/app/components/app/overview/embedded/index.tsx
@@ -1,5 +1,5 @@
import type { AppDetailSiteResponse } from '@dify/contracts/api/console/apps/types.gen'
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type {
EmbeddedWebAppRoute,
WorkflowHiddenStartVariable,
@@ -109,7 +109,7 @@ const AsyncEmbeddedOptionContent = ({
}: {
option: Option
iframeUrlPromise: Promise<string>
- latestResolvedIframeUrlRef: MutableRefObject<string>
+ latestResolvedIframeUrlRef: RefObject<string>
}) => {
const iframeUrl = use(iframeUrlPromise)
latestResolvedIframeUrlRef.current = iframeUrl
diff --git a/web/app/components/app/overview/workflow-launch-dialog/index.tsx b/web/app/components/app/overview/workflow-launch-dialog/index.tsx
index 010864f8a2c..740d4a691f6 100644
--- a/web/app/components/app/overview/workflow-launch-dialog/index.tsx
+++ b/web/app/components/app/overview/workflow-launch-dialog/index.tsx
@@ -1,6 +1,6 @@
'use client'
-import type { FormEvent } from 'react'
+import type { SubmitEvent } from 'react'
import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from '../app-card-utils'
import { Button } from '@langgenius/dify-ui/button'
import {
@@ -46,7 +46,7 @@ function WorkflowLaunchForm({
}))
}
- async function handleSubmit(event: FormEvent<HTMLFormElement>) {
+ async function handleSubmit(event: SubmitEvent<HTMLFormElement>) {
event.preventDefault()
if (launchDisabled) return
diff --git a/web/app/components/apps/app-card/interactions.tsx b/web/app/components/apps/app-card/interactions.tsx
index a93edd0e898..c6ff72ee9cc 100644
--- a/web/app/components/apps/app-card/interactions.tsx
+++ b/web/app/components/apps/app-card/interactions.tsx
@@ -5,7 +5,7 @@ import type {
EnvironmentVariableItemResponse,
} from '@dify/contracts/api/console/apps/types.gen'
import type { DialogActions } from '@langgenius/dify-ui/dialog'
-import type { FormEventHandler, MouseEvent, ReactElement } from 'react'
+import type { MouseEvent, ReactElement, SubmitEventHandler } from 'react'
import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
import { zIconType } from '@dify/contracts/api/console/apps/zod.gen'
import {
@@ -361,7 +361,7 @@ export function AppCardInteractions({
const deleteNameMismatch = confirmDeleteInput !== app.name
const isDeleteConfirmDisabled = isDeleting || deleteNameMismatch
- const onDeleteDialogSubmit: FormEventHandler<HTMLFormElement> = useCallback(
+ const onDeleteDialogSubmit: SubmitEventHandler<HTMLFormElement> = useCallback(
(e) => {
e.preventDefault()
if (isDeleteConfirmDisabled) return
diff --git a/web/app/components/base/amplitude/__tests__/init.spec.ts b/web/app/components/base/amplitude/__tests__/init.spec.ts
index ec5d3311d9c..b2a4054ea66 100644
--- a/web/app/components/base/amplitude/__tests__/init.spec.ts
+++ b/web/app/components/base/amplitude/__tests__/init.spec.ts
@@ -61,6 +61,15 @@ describe('amplitude init helper', () => {
])
expect(amplitude.init).toHaveBeenCalledTimes(1)
+ expect(amplitude.init).toHaveBeenCalledWith('test-api-key', {
+ autocapture: {
+ sessions: true,
+ pageViews: true,
+ formInteractions: true,
+ fileDownloads: true,
+ attribution: true,
+ },
+ })
expect(sessionReplayPlugin).toHaveBeenCalledTimes(1)
expect(sessionReplayPlugin).toHaveBeenCalledWith({ sampleRate: 0.8 })
expect(listener).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/base/amplitude/__tests__/web-app-client.spec.ts b/web/app/components/base/amplitude/__tests__/web-app-client.spec.ts
index addb4abaeaf..e433c9c28d9 100644
--- a/web/app/components/base/amplitude/__tests__/web-app-client.spec.ts
+++ b/web/app/components/base/amplitude/__tests__/web-app-client.spec.ts
@@ -87,8 +87,7 @@ describe('WebApp Amplitude client', () => {
expect(mockWebAppClient.init).toHaveBeenCalledTimes(1)
expect(mockWebAppClient.init).toHaveBeenCalledWith('test-api-key', {
autocapture: false,
- defaultTracking: false,
- fetchRemoteConfig: false,
+ remoteConfig: { fetchRemoteConfig: false },
flushQueueSize: 1,
identityStorage: 'none',
instanceName: 'webapp',
diff --git a/web/app/components/base/amplitude/runtime.ts b/web/app/components/base/amplitude/runtime.ts
index 395191a9191..c2d960c4bb4 100644
--- a/web/app/components/base/amplitude/runtime.ts
+++ b/web/app/components/base/amplitude/runtime.ts
@@ -65,7 +65,7 @@ const createPageNameEnrichmentPlugin = (): Types.EnrichmentPlugin => {
export function initializeAmplitudeSDK(apiKey: string, sessionReplaySampleRate: number) {
amplitude.add(createPageNameEnrichmentPlugin())
amplitude.init(apiKey, {
- defaultTracking: {
+ autocapture: {
sessions: true,
pageViews: true,
formInteractions: true,
diff --git a/web/app/components/base/amplitude/web-app-client.ts b/web/app/components/base/amplitude/web-app-client.ts
index a4c2430da71..b3656fcf395 100644
--- a/web/app/components/base/amplitude/web-app-client.ts
+++ b/web/app/components/base/amplitude/web-app-client.ts
@@ -42,8 +42,7 @@ async function initializeWebAppAmplitude(): Promise<WebAppAmplitudeClient | null
client.init(AMPLITUDE_API_KEY, {
autocapture: false,
- defaultTracking: false,
- fetchRemoteConfig: false,
+ remoteConfig: { fetchRemoteConfig: false },
flushQueueSize: 1,
identityStorage: 'none',
instanceName: 'webapp',
diff --git a/web/app/components/base/carousel/__tests__/index.spec.tsx b/web/app/components/base/carousel/__tests__/index.spec.tsx
index 1cc976c9a31..689b62976a9 100644
--- a/web/app/components/base/carousel/__tests__/index.spec.tsx
+++ b/web/app/components/base/carousel/__tests__/index.spec.tsx
@@ -213,7 +213,7 @@ describe('Carousel', () => {
return null
}
- expect(() => render(<InvalidConsumer />)).toThrowError(
+ expect(() => render(<InvalidConsumer />)).toThrow(
'useCarousel must be used within a <Carousel />',
)
})
diff --git a/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx b/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx
index 2e62700e3b7..fe625ccd5a4 100644
--- a/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx
+++ b/web/app/components/base/form/components/base/__tests__/base-form.spec.tsx
@@ -1,5 +1,5 @@
import type { FormRefObject, FormSchema } from '@/app/components/base/form/types'
-import { useForm, useStore } from '@tanstack/react-form'
+import { useForm, useSelector } from '@tanstack/react-form'
import { act, fireEvent, render, screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { FormItemValidateStatusEnum, FormTypeEnum } from '@/app/components/base/form/types'
@@ -95,7 +95,7 @@ describe('BaseForm', () => {
const user = userEvent.setup()
const ExternalForm = () => {
const form = useForm({ defaultValues: { kind: 'show', title: 'External title' } })
- const kind = useStore(form.store, (state) => state.values.kind)
+ const kind = useSelector(form.store, (state) => state.values.kind)
return (
<>
<BaseForm formSchemas={baseSchemas} formFromProps={form} />
diff --git a/web/app/components/base/form/components/base/base-field.tsx b/web/app/components/base/form/components/base/base-field.tsx
index 9683b5e5d86..ca9ddde713b 100644
--- a/web/app/components/base/form/components/base/base-field.tsx
+++ b/web/app/components/base/form/components/base/base-field.tsx
@@ -18,7 +18,7 @@ import {
SelectTrigger,
SelectValue,
} from '@langgenius/dify-ui/select'
-import { useStore } from '@tanstack/react-form'
+import { useSelector } from '@tanstack/react-form'
import { isValidElement, memo, useCallback, useId, useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { CheckboxList } from '@/app/components/base/checkbox-list'
@@ -156,7 +156,7 @@ const BaseField = ({
const labelId = `${controlId}-label`
const descriptionId = `${controlId}-description`
const messageId = `${controlId}-message`
- const meta = useStore(field.form.store, (state) => state.fieldMeta[field.name])
+ const meta = useSelector(field.form.store, (state) => state.fieldMeta[field.name])
// Nonempty external errors take priority; clearing them restores client validation.
const errors = fieldState?.errors?.length ? fieldState.errors : meta?.isTouched ? meta.errors : []
const validateStatus =
@@ -204,7 +204,7 @@ const BaseField = ({
return Array.from(variables)
}, [options])
- const watchedValues = useStore(field.form.store, (s) => {
+ const watchedValues = useSelector(field.form.store, (s) => {
const result: Record<string, unknown> = {}
for (const variable of watchedVariables) result[variable] = s.values[variable]
@@ -230,7 +230,7 @@ const BaseField = ({
)
}, [options, renderI18nObject, watchedValues])
- const value = useStore(field.form.store, (s) => s.values[field.name])
+ const value = useSelector(field.form.store, (s) => s.values[field.name])
const stringValue = typeof value === 'string' ? value : undefined
const booleanValue = typeof value === 'boolean' ? value : undefined
diff --git a/web/app/components/base/form/components/base/base-form.tsx b/web/app/components/base/form/components/base/base-form.tsx
index b0960486b21..06dcd5c8234 100644
--- a/web/app/components/base/form/components/base/base-form.tsx
+++ b/web/app/components/base/form/components/base/base-form.tsx
@@ -7,7 +7,7 @@ import type {
SetFieldsParam,
} from '@/app/components/base/form/types'
import { cn } from '@langgenius/dify-ui/cn'
-import { useForm, useStore } from '@tanstack/react-form'
+import { useForm, useSelector } from '@tanstack/react-form'
import { memo, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react'
import { useGetFormValues, useGetValidators } from '@/app/components/base/form/hooks'
import { FormItemValidateStatusEnum } from '@/app/components/base/form/types'
@@ -21,7 +21,7 @@ export type BaseFormProps = {
disabled?: boolean
formFromProps?: AnyFormApi
onChange?: (field: string, value: any) => void
- onSubmit?: (e: React.FormEvent<HTMLFormElement>) => void
+ onSubmit?: (e: React.SubmitEvent<HTMLFormElement>) => void
preventDefaultSubmit?: boolean
} & Pick<
BaseFieldProps,
@@ -81,7 +81,7 @@ const BaseForm = ({
const [fieldStates, setFieldStates] = useState<Record<string, FieldState>>({})
- const showOnValues = useStore(form.store, (s: any) => {
+ const showOnValues = useSelector(form.store, (s: any) => {
const result: Record<string, any> = {}
formSchemas.forEach((schema) => {
const { show_on } = schema
@@ -192,7 +192,7 @@ const BaseForm = ({
if (!formSchemas?.length) return null
- const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+ const handleSubmit = (e: React.SubmitEvent<HTMLFormElement>) => {
if (preventDefaultSubmit) {
e.preventDefault()
e.stopPropagation()
diff --git a/web/app/components/base/form/components/form/actions.tsx b/web/app/components/base/form/components/form/actions.tsx
index 65f7291e847..116ba3f0d80 100644
--- a/web/app/components/base/form/components/form/actions.tsx
+++ b/web/app/components/base/form/components/form/actions.tsx
@@ -1,6 +1,6 @@
import type { FormType } from '../..'
import { Button } from '@langgenius/dify-ui/button'
-import { useStore } from '@tanstack/react-form'
+import { useSelector } from '@tanstack/react-form'
import { useTranslation } from 'react-i18next'
import { useFormContext } from '../..'
@@ -18,7 +18,7 @@ const Actions = ({ CustomActions }: ActionsProps) => {
const { t } = useTranslation(['common'])
const form = useFormContext()
- const [isSubmitting, canSubmit] = useStore(form.store, (state) => [
+ const [isSubmitting, canSubmit] = useSelector(form.store, (state) => [
state.isSubmitting,
state.canSubmit,
])
diff --git a/web/app/components/base/form/form-scenarios/base/field.tsx b/web/app/components/base/form/form-scenarios/base/field.tsx
index afe4585fbc1..21e900147cf 100644
--- a/web/app/components/base/form/form-scenarios/base/field.tsx
+++ b/web/app/components/base/form/form-scenarios/base/field.tsx
@@ -1,5 +1,5 @@
import type { BaseConfiguration } from './types'
-import { useStore } from '@tanstack/react-form'
+import { useSelector } from '@tanstack/react-form'
import * as React from 'react'
import { withForm } from '../..'
import { BaseFieldType } from './types'
@@ -33,7 +33,7 @@ const BaseField = ({ initialData, config }: BaseFieldProps) =>
unit,
} = config
- const isAllConditionsMet = useStore(form.store, (state) => {
+ const isAllConditionsMet = useSelector(form.store, (state) => {
const fieldValues = state.values
if (!showConditions.length) return true
return showConditions.every((condition) => {
diff --git a/web/app/components/base/form/form-scenarios/base/utils.ts b/web/app/components/base/form/form-scenarios/base/utils.ts
index b3fe1a586de..f9789da7ac8 100644
--- a/web/app/components/base/form/form-scenarios/base/utils.ts
+++ b/web/app/components/base/form/form-scenarios/base/utils.ts
@@ -1,10 +1,10 @@
-import type { ZodNumber, ZodSchema, ZodString } from 'zod'
+import type { ZodNumber, ZodString, ZodType } from 'zod'
import type { BaseConfiguration } from './types'
import * as z from 'zod'
import { BaseFieldType } from './types'
export const generateZodSchema = (fields: BaseConfiguration[]) => {
- const shape: Record<string, ZodSchema> = {}
+ const shape: Record<string, ZodType> = {}
fields.forEach((field) => {
const textFieldTypes: readonly BaseFieldType[] = [
diff --git a/web/app/components/base/form/form-scenarios/input-field/field.tsx b/web/app/components/base/form/form-scenarios/input-field/field.tsx
index 79d4b62f6db..a657c9d5841 100644
--- a/web/app/components/base/form/form-scenarios/input-field/field.tsx
+++ b/web/app/components/base/form/form-scenarios/input-field/field.tsx
@@ -1,5 +1,5 @@
import type { InputFieldConfiguration } from './types'
-import { useStore } from '@tanstack/react-form'
+import { useSelector } from '@tanstack/react-form'
import * as React from 'react'
import { withForm } from '../..'
import { InputFieldType } from './types'
@@ -31,7 +31,7 @@ const InputField = ({ initialData, config }: InputFieldProps) =>
popupProps,
} = config
- const isAllConditionsMet = useStore(form.store, (state) => {
+ const isAllConditionsMet = useSelector(form.store, (state) => {
const fieldValues = state.values
return showConditions.every((condition) => {
const { variable, value } = condition
diff --git a/web/app/components/base/markdown-blocks/form.tsx b/web/app/components/base/markdown-blocks/form.tsx
index f7d8b8d2153..a8e4681c837 100644
--- a/web/app/components/base/markdown-blocks/form.tsx
+++ b/web/app/components/base/markdown-blocks/form.tsx
@@ -238,7 +238,7 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
}, [elementChildren, formValues])
const onSubmit = useCallback(
- async (e: React.FormEvent<HTMLFormElement>) => {
+ async (e: React.SubmitEvent<HTMLFormElement>) => {
e.preventDefault()
e.stopPropagation()
if (isSubmitting) return
diff --git a/web/app/components/base/markdown-with-directive/components/__tests__/markdown-with-directive-schema.spec.ts b/web/app/components/base/markdown-with-directive/components/__tests__/markdown-with-directive-schema.spec.ts
index 93a43d95165..398a5647e46 100644
--- a/web/app/components/base/markdown-with-directive/components/__tests__/markdown-with-directive-schema.spec.ts
+++ b/web/app/components/base/markdown-with-directive/components/__tests__/markdown-with-directive-schema.spec.ts
@@ -15,6 +15,12 @@ describe('markdown-with-directive-schema', () => {
).toBe(true)
})
+ it('accepts an icon URL with surrounding whitespace', () => {
+ expect(
+ validateDirectiveProps('withiconcarditem', { icon: ' https://example.com/icon.png ' }),
+ ).toBe(true)
+ })
+
it.each([
['unknown-directive', { className: 'custom-list' }],
['withiconcarditem', { icon: 'ftp://example.com/icon.png' }],
diff --git a/web/app/components/base/markdown-with-directive/components/markdown-with-directive-schema.ts b/web/app/components/base/markdown-with-directive/components/markdown-with-directive-schema.ts
index 7bdd5cf2b01..f88bdff4177 100644
--- a/web/app/components/base/markdown-with-directive/components/markdown-with-directive-schema.ts
+++ b/web/app/components/base/markdown-with-directive/components/markdown-with-directive-schema.ts
@@ -13,7 +13,7 @@ const withIconCardItemPropsSchema = z
icon: z
.string()
.trim()
- .url()
+ .pipe(z.url())
.refine((value) => HTTP_URL_REGEX.test(value), 'icon must be a http/https URL'),
})
.strict()
diff --git a/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx b/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx
index 21d8522daa4..50bec48f048 100644
--- a/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx
+++ b/web/app/components/base/prompt-editor/__tests__/hooks.spec.tsx
@@ -16,6 +16,7 @@ import {
$getRoot,
$getSelection,
$isNodeSelection,
+ $isTextNode,
$setSelection,
COMMAND_PRIORITY_LOW,
createEditor,
@@ -305,7 +306,9 @@ describe('prompt-editor/hooks', () => {
act(() =>
editor.update(
() => {
- $getNodeByKey<TextNode>(entityKey)!.setTextContent('plain')
+ const node = $getNodeByKey(entityKey)
+ if (!$isTextNode(node)) throw new Error('Expected a text node')
+ node.setTextContent('plain')
},
{ discrete: true },
),
diff --git a/web/app/components/base/prompt-editor/__tests__/utils.spec.ts b/web/app/components/base/prompt-editor/__tests__/utils.spec.ts
index 4c7817a5735..407550e4887 100644
--- a/web/app/components/base/prompt-editor/__tests__/utils.spec.ts
+++ b/web/app/components/base/prompt-editor/__tests__/utils.spec.ts
@@ -1,6 +1,14 @@
-import type { ParagraphNode, SerializedTextNode, TextNode as TextNodeType } from 'lexical'
+import type { SerializedTextNode } from 'lexical'
import type { MenuTextMatch } from '../types'
-import { $createParagraphNode, $getRoot, $setSelection, createEditor, TextNode } from 'lexical'
+import {
+ $createParagraphNode,
+ $getRoot,
+ $isParagraphNode,
+ $isTextNode,
+ $setSelection,
+ createEditor,
+ TextNode,
+} from 'lexical'
import { $createCustomTextNode, CustomTextNode } from '../plugins/custom-text/node'
import { $createQueryBlockNode, QueryBlockNode } from '../plugins/query-block/node'
import {
@@ -52,10 +60,21 @@ const matchQuery = (text: string) => {
return start < 0 ? null : { start, end: start + '{{#query#}}'.length }
}
+function $getParagraph() {
+ const paragraph = $getRoot().getFirstChildOrThrow()
+ if (!$isParagraphNode(paragraph)) throw new Error('Expected a paragraph node')
+ return paragraph
+}
+
+function $getFirstTextNode() {
+ const node = $getParagraph().getFirstChildOrThrow()
+ if (!$isTextNode(node)) throw new Error('Expected a text node')
+ return node
+}
+
function readChildren(editor: ReturnType<typeof createTestEditor>) {
return editor.getEditorState().read(() =>
- $getRoot()
- .getFirstChildOrThrow<ParagraphNode>()
+ $getParagraph()
.getChildren()
.map((node) => ({
type: node.getType(),
@@ -92,8 +111,8 @@ describe('prompt editor text transforms', () => {
{ type: 'custom-text', text: '!' },
])
editor.getEditorState().read(() => {
- const nodes = $getRoot().getFirstChildOrThrow<ParagraphNode>().getChildren<TextNodeType>()
- expect(nodes.every((node) => node.hasFormat('bold'))).toBe(true)
+ const nodes = $getParagraph().getChildren()
+ expect(nodes.every((node) => $isTextNode(node) && node.hasFormat('bold'))).toBe(true)
})
})
@@ -115,22 +134,14 @@ describe('prompt editor text transforms', () => {
)
editor.update(
() => {
- $getRoot()
- .getFirstChildOrThrow<ParagraphNode>()
- .getFirstChildOrThrow<TextNodeType>()
- .setTextContent('alice')
+ $getFirstTextNode().setTextContent('alice')
},
{ discrete: true },
)
expect(readChildren(editor)).toEqual([{ type: 'custom-text', text: 'alice' }])
editor.getEditorState().read(() => {
- expect(
- $getRoot()
- .getFirstChildOrThrow<ParagraphNode>()
- .getFirstChildOrThrow<TextNodeType>()
- .hasFormat('italic'),
- ).toBe(true)
+ expect($getFirstTextNode().hasFormat('italic')).toBe(true)
})
})
diff --git a/web/app/components/base/voice-input/__tests__/recorder.spec.ts b/web/app/components/base/voice-input/__tests__/recorder.spec.ts
index 3f16e1fe699..0db6f765f3c 100644
--- a/web/app/components/base/voice-input/__tests__/recorder.spec.ts
+++ b/web/app/components/base/voice-input/__tests__/recorder.spec.ts
@@ -1,3 +1,4 @@
+import { Quality } from 'mediabunny'
import { createDeferred } from '@/test/deferred'
import { startVoiceRecorder } from '../recorder'
@@ -15,7 +16,8 @@ vi.mock('@mediabunny/mp3-encoder', () => ({
registerMp3Encoder: mediaMocks.registerMp3Encoder,
}))
-vi.mock('mediabunny', () => ({
+vi.mock('mediabunny', async (importOriginal) => ({
+ Quality: (await importOriginal<typeof import('mediabunny')>()).Quality,
AudioBufferSource: class MockAudioBufferSource {
constructor(config: unknown) {
mediaMocks.audioSourceConfig = config
@@ -190,7 +192,7 @@ describe('startVoiceRecorder', () => {
})
expect(mediaMocks.registerMp3Encoder).toHaveBeenCalledTimes(1)
expect(mediaMocks.audioSourceConfig).toEqual({
- bitrate: 128_000,
+ quality: new Quality({ bitrate: 128_000 }),
codec: 'mp3',
transform: {
numberOfChannels: 1,
diff --git a/web/app/components/base/voice-input/mp3-encoder.ts b/web/app/components/base/voice-input/mp3-encoder.ts
index 39bdff27ad1..011e8cbaf4b 100644
--- a/web/app/components/base/voice-input/mp3-encoder.ts
+++ b/web/app/components/base/voice-input/mp3-encoder.ts
@@ -1,5 +1,5 @@
import { registerMp3Encoder } from '@mediabunny/mp3-encoder'
-import { AudioBufferSource, BufferTarget, Mp3OutputFormat, Output } from 'mediabunny'
+import { AudioBufferSource, BufferTarget, Mp3OutputFormat, Output, Quality } from 'mediabunny'
const AUDIO_BITRATE = 128_000
const AUDIO_SAMPLE_RATE = 16_000
@@ -13,7 +13,7 @@ export function createMp3Encoder() {
target,
})
const audioSource = new AudioBufferSource({
- bitrate: AUDIO_BITRATE,
+ quality: new Quality({ bitrate: AUDIO_BITRATE }),
codec: 'mp3',
transform: {
numberOfChannels: 1,
diff --git a/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx b/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx
index c89f71eab0d..e96c8469c68 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx
@@ -1,4 +1,4 @@
-import type { ZodSchema } from 'zod'
+import type { ZodType } from 'zod'
import type { BaseConfiguration } from '@/app/components/base/form/form-scenarios/base/types'
import { useCallback, useImperativeHandle } from 'react'
import { useAppForm } from '@/app/components/base/form'
@@ -9,7 +9,7 @@ import Header from './header'
type OptionsProps = {
initialData: Record<string, any>
configurations: BaseConfiguration[]
- schema: ZodSchema
+ schema: ZodType
onSubmit: (data: Record<string, any>) => void
onPreview: () => void
ref: React.RefObject<any>
diff --git a/web/app/components/datasets/documents/detail/completed/segment-list.tsx b/web/app/components/datasets/documents/detail/completed/segment-list.tsx
index 76e94a9cc53..b8cc7e7b2fa 100644
--- a/web/app/components/datasets/documents/detail/completed/segment-list.tsx
+++ b/web/app/components/datasets/documents/detail/completed/segment-list.tsx
@@ -43,7 +43,7 @@ const SegmentList = ({
embeddingAvailable,
onClearFilter,
}: ISegmentListProps & {
- ref: React.LegacyRef<HTMLDivElement>
+ ref: React.Ref<HTMLDivElement>
}) => {
const { t } = useTranslation(['datasetDocuments'])
const docForm = useDocumentContext((s) => s.docForm)
diff --git a/web/app/components/datasets/external-api/external-api-modal/Form.tsx b/web/app/components/datasets/external-api/external-api-modal/Form.tsx
index 2974662c126..be1b03cdf5a 100644
--- a/web/app/components/datasets/external-api/external-api-modal/Form.tsx
+++ b/web/app/components/datasets/external-api/external-api-modal/Form.tsx
@@ -1,4 +1,4 @@
-import type { FC, FormEventHandler } from 'react'
+import type { FC, SubmitEventHandler } from 'react'
import type { CreateExternalAPIReq, FormSchema } from '../declarations'
import { cn } from '@langgenius/dify-ui/cn'
import { Input } from '@langgenius/dify-ui/input'
@@ -9,7 +9,7 @@ import { useDocLink } from '@/context/i18n'
type FormProps = {
id: string
- onSubmit: FormEventHandler<HTMLFormElement>
+ onSubmit: SubmitEventHandler<HTMLFormElement>
className?: string
itemClassName?: string
fieldLabelClassName?: string
diff --git a/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx
index 6e0b3cbbf57..6ca6cad974d 100644
--- a/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx
@@ -25,7 +25,7 @@ describe('InviteButton', () => {
onTestFinished(() => client.clear())
const { queryKey } = consoleQuery.workspaces.current.permission.get.queryOptions()
if (isFetching) {
- void queryClient.prefetchQuery({ queryKey, queryFn: () => new Promise(() => {}) })
+ void queryClient.query({ queryKey, queryFn: () => new Promise(() => {}) }).catch(() => {})
return
}
queryClient.setQueryData(queryKey, {
diff --git a/web/app/components/header/account-setting/resource-access-token-page/token-dialog.tsx b/web/app/components/header/account-setting/resource-access-token-page/token-dialog.tsx
index c11772bc475..8c79634172c 100644
--- a/web/app/components/header/account-setting/resource-access-token-page/token-dialog.tsx
+++ b/web/app/components/header/account-setting/resource-access-token-page/token-dialog.tsx
@@ -1,6 +1,6 @@
'use client'
-import type { FormEvent } from 'react'
+import type { SubmitEvent } from 'react'
import type { DialogState, ResourceCandidate } from './types'
import { Button } from '@langgenius/dify-ui/button'
import {
@@ -70,7 +70,7 @@ export default function ResourceAccessTokenDialog({
})
}
- const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+ const handleSubmit = (event: SubmitEvent<HTMLFormElement>) => {
event.preventDefault()
const normalizedName = name.trim()
if (!normalizedName) return
diff --git a/web/app/components/plugins/marketplace/__tests__/search-params.spec.ts b/web/app/components/plugins/marketplace/__tests__/search-params.spec.ts
index 7f0654e35f0..54adb5b605b 100644
--- a/web/app/components/plugins/marketplace/__tests__/search-params.spec.ts
+++ b/web/app/components/plugins/marketplace/__tests__/search-params.spec.ts
@@ -1,32 +1,34 @@
+import { createLoader } from 'nuqs/server'
import { describe, expect, it } from 'vite-plus/test'
import { PLUGIN_TYPE_SEARCH_MAP } from '../constants'
import { marketplaceSearchParamsParsers } from '../search-params'
+const loadSearchParams = createLoader(marketplaceSearchParamsParsers)
+
describe('marketplace search params', () => {
it('applies the expected default values', () => {
- expect(marketplaceSearchParamsParsers.category.parseServerSide(undefined)).toBe(
- PLUGIN_TYPE_SEARCH_MAP.all,
- )
- expect(marketplaceSearchParamsParsers.q.parseServerSide(undefined)).toBe('')
- expect(marketplaceSearchParamsParsers.tags.parseServerSide(undefined)).toEqual([])
- expect(marketplaceSearchParamsParsers.languages.parseServerSide(undefined)).toEqual([])
+ expect(loadSearchParams({})).toEqual({
+ category: PLUGIN_TYPE_SEARCH_MAP.all,
+ q: '',
+ tags: [],
+ languages: [],
+ })
})
it('parses supported query values with the configured parsers', () => {
expect(
- marketplaceSearchParamsParsers.category.parseServerSide(PLUGIN_TYPE_SEARCH_MAP.tool),
- ).toBe(PLUGIN_TYPE_SEARCH_MAP.tool)
- expect(marketplaceSearchParamsParsers.category.parseServerSide('unsupported')).toBe(
- PLUGIN_TYPE_SEARCH_MAP.all,
- )
- expect(marketplaceSearchParamsParsers.q.parseServerSide('keyword')).toBe('keyword')
- expect(marketplaceSearchParamsParsers.tags.parseServerSide('rag,search')).toEqual([
- 'rag',
- 'search',
- ])
- expect(marketplaceSearchParamsParsers.languages.parseServerSide('en,zh-Hans')).toEqual([
- 'en',
- 'zh-Hans',
- ])
+ loadSearchParams({
+ category: PLUGIN_TYPE_SEARCH_MAP.tool,
+ q: 'keyword',
+ tags: 'rag,search',
+ languages: 'en,zh-Hans',
+ }),
+ ).toEqual({
+ category: PLUGIN_TYPE_SEARCH_MAP.tool,
+ q: 'keyword',
+ tags: ['rag', 'search'],
+ languages: ['en', 'zh-Hans'],
+ })
+ expect(loadSearchParams({ category: 'unsupported' }).category).toBe(PLUGIN_TYPE_SEARCH_MAP.all)
})
})
diff --git a/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx b/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
index a8d9ffa6503..ae2e233b428 100644
--- a/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
@@ -10,7 +10,7 @@ import {
DialogHeaderCloseButton,
DialogTitle,
} from '@langgenius/dify-ui/dialog'
-import { useForm, useStore } from '@tanstack/react-form'
+import { useForm, useSelector } from '@tanstack/react-form'
import { memo, useCallback, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import AuthForm from '@/app/components/base/form/form-scenarios/auth'
@@ -144,7 +144,7 @@ const OAuthClientSettings = ({
const form = useForm({
defaultValues: editValues || defaultValues,
})
- const __oauth_client__ = useStore(form.store, (s) => s.values.__oauth_client__)
+ const __oauth_client__ = useSelector(form.store, (s) => s.values.__oauth_client__)
const isDisabled = disabled || doingAction
return (
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx
index 58525e36b37..43e998dfc03 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx
@@ -1,4 +1,4 @@
-import { useStore } from '@tanstack/react-form'
+import { useSelector } from '@tanstack/react-form'
import * as React from 'react'
import { withForm } from '@/app/components/base/form'
import InputField from '@/app/components/base/form/form-scenarios/input-field/field'
@@ -12,7 +12,7 @@ const HiddenFields = ({ initialData }: HiddenFieldsProps) =>
withForm({
defaultValues: initialData,
render: function Render({ form }) {
- const options = useStore(form.store, (state) => state.values.options)
+ const options = useSelector(form.store, (state) => state.values.options)
const hiddenConfigurations = useHiddenConfigurations({
options,
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/schema.ts b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/schema.ts
index 6f3e0bf4143..36c491b40f5 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/schema.ts
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/schema.ts
@@ -57,8 +57,8 @@ export const createInputFieldSchema = (
maxLength: z.number().min(1).max(TEXT_MAX_LENGTH),
default: z.string().optional(),
})
- .merge(commonSchema)
- .passthrough()
+ .extend(commonSchema.shape)
+ .loose()
}
if (type === PipelineInputVarType.number) {
return z
@@ -67,8 +67,8 @@ export const createInputFieldSchema = (
unit: z.string().optional(),
placeholder: z.string().optional(),
})
- .merge(commonSchema)
- .passthrough()
+ .extend(commonSchema.shape)
+ .loose()
}
if (type === PipelineInputVarType.select) {
return z
@@ -83,8 +83,8 @@ export const createInputFieldSchema = (
}),
default: z.string().optional(),
})
- .merge(commonSchema)
- .passthrough()
+ .extend(commonSchema.shape)
+ .loose()
}
if (type === PipelineInputVarType.singleFile) {
return z
@@ -95,8 +95,8 @@ export const createInputFieldSchema = (
allowedFileTypes: z.array(SupportedFileTypes),
}),
})
- .merge(commonSchema)
- .passthrough()
+ .extend(commonSchema.shape)
+ .loose()
}
if (type === PipelineInputVarType.multiFiles) {
return z
@@ -108,8 +108,8 @@ export const createInputFieldSchema = (
}),
maxLength: z.number().min(1).max(maxFileUploadLimit),
})
- .merge(commonSchema)
- .passthrough()
+ .extend(commonSchema.shape)
+ .loose()
}
- return commonSchema.passthrough()
+ return commonSchema.loose()
}
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
index 5cc22a24e82..bd91dd27945 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
@@ -1,5 +1,5 @@
import { RiArrowRightSLine } from '@remixicon/react'
-import { useStore } from '@tanstack/react-form'
+import { useSelector } from '@tanstack/react-form'
import * as React from 'react'
import { useTranslation } from 'react-i18next'
import { withForm } from '@/app/components/base/form'
@@ -15,7 +15,7 @@ const ShowAllSettings = ({ initialData, handleShowAllSettings }: ShowAllSettings
defaultValues: initialData,
render: function Render({ form }) {
const { t } = useTranslation(['appDebug'])
- const type = useStore(form.store, (state) => state.values.type)
+ const type = useSelector(form.store, (state) => state.values.type)
const hiddenFieldNames = useHiddenFieldNames(type)
diff --git a/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx b/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
index 925bec42275..8d9f59d7e33 100644
--- a/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
+++ b/web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx
@@ -1,4 +1,4 @@
-import type { ZodSchema } from 'zod'
+import type { ZodType } from 'zod'
import type { CustomActionsProps } from '@/app/components/base/form/components/form/actions'
import type { BaseConfiguration } from '@/app/components/base/form/form-scenarios/base/types'
import { useAppForm } from '@/app/components/base/form'
@@ -8,7 +8,7 @@ import { toast } from '@/app/notifications'
type OptionsProps = {
initialData: Record<string, unknown>
configurations: BaseConfiguration[]
- schema: ZodSchema
+ schema: ZodType
CustomActions: (props: CustomActionsProps) => React.JSX.Element
onSubmit: (data: Record<string, unknown>) => void
}
diff --git a/web/app/components/share/text-generation/result/hooks/use-result-run-state.ts b/web/app/components/share/text-generation/result/hooks/use-result-run-state.ts
index f9717996017..c406576f103 100644
--- a/web/app/components/share/text-generation/result/hooks/use-result-run-state.ts
+++ b/web/app/components/share/text-generation/result/hooks/use-result-run-state.ts
@@ -1,4 +1,4 @@
-import type { Dispatch, MutableRefObject, SetStateAction } from 'react'
+import type { Dispatch, RefObject, SetStateAction } from 'react'
import type { FeedbackType } from '@/app/components/base/chat/chat/type'
import type { WorkflowProcess } from '@/app/components/base/chat/types'
import { useBoolean } from 'ahooks'
@@ -40,7 +40,7 @@ type UseResultRunStateOptions = {
}
export type ResultRunStateController = {
- abortControllerRef: MutableRefObject<AbortController | null>
+ abortControllerRef: RefObject<AbortController | null>
clearMoreLikeThis: () => void
completionRes: string
controlClearMoreLikeThis: number
diff --git a/web/app/components/share/text-generation/run-once/index.tsx b/web/app/components/share/text-generation/run-once/index.tsx
index 3495d5416ea..38b8c621e69 100644
--- a/web/app/components/share/text-generation/run-once/index.tsx
+++ b/web/app/components/share/text-generation/run-once/index.tsx
@@ -1,4 +1,4 @@
-import type { FC, FormEvent } from 'react'
+import type { FC, SubmitEvent } from 'react'
import type { InputValueTypes } from '../types'
import type { FileEntity } from '@/app/components/base/file-uploader/types'
import type { PromptConfig } from '@/models/debug'
@@ -70,7 +70,7 @@ const RunOnce: FC<IRunOnceProps> = ({
onInputsChange(newInputs)
}
- const onSubmit = (e: FormEvent<HTMLFormElement>) => {
+ const onSubmit = (e: SubmitEvent<HTMLFormElement>) => {
e.preventDefault()
onSend()
}
diff --git a/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx b/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx
index b99536188c7..b8a40bbdd90 100644
--- a/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/all-start-blocks.spec.tsx
@@ -1,7 +1,9 @@
import type { ReactElement } from 'react'
import type { TriggerWithProvider } from '../types'
+import { QueryObserver } from '@tanstack/react-query'
import { fireEvent, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
+import { onTestFinished } from 'vite-plus/test'
import { useLocale } from '#i18n'
import { useMarketplacePlugins } from '@/app/components/plugins/marketplace/query'
import { PluginCategoryEnum } from '@/app/components/plugins/types'
@@ -9,7 +11,7 @@ import { CollectionType } from '@/app/components/tools/types'
import { useGetLanguage } from '@/context/i18n'
import { useFeaturedTriggersRecommendations } from '@/service/use-plugins'
import { useAllTriggerPlugins, useInvalidateAllTriggerPlugins } from '@/service/use-triggers'
-import { createConsoleQueryWrapper } from '@/test/console/query-data'
+import { createConsoleQueryClient, createConsoleQueryWrapper } from '@/test/console/query-data'
import { createNode } from '../../__tests__/fixtures'
import { renderWorkflowComponent } from '../../__tests__/workflow-test-env'
import { BlockEnum } from '../../types'
@@ -124,35 +126,16 @@ const createMarketplacePluginsMock = (
: undefined,
}) as UseMarketplacePluginsReturn
-const createTriggerPluginsQueryResult = (data: TriggerWithProvider[]): UseAllTriggerPluginsReturn =>
- ({
- data,
- error: null,
- isError: false,
- isPending: false,
- isLoading: false,
- isSuccess: true,
- isFetching: false,
- isRefetching: false,
- isLoadingError: false,
- isRefetchError: false,
- isInitialLoading: false,
- isPaused: false,
- isEnabled: true,
- status: 'success',
- fetchStatus: 'idle',
- dataUpdatedAt: Date.now(),
- errorUpdatedAt: 0,
- failureCount: 0,
- failureReason: null,
- errorUpdateCount: 0,
- isFetched: true,
- isFetchedAfterMount: true,
- isPlaceholderData: false,
- isStale: false,
- refetch: vi.fn(),
- promise: Promise.resolve(data),
- }) as UseAllTriggerPluginsReturn
+const createTriggerPluginsQueryResult = (
+ data: TriggerWithProvider[],
+): UseAllTriggerPluginsReturn => {
+ const queryClient = createConsoleQueryClient()
+ onTestFinished(() => queryClient.clear())
+ return new QueryObserver<TriggerWithProvider[]>(queryClient, {
+ queryKey: ['trigger-plugins'],
+ initialData: data,
+ }).getCurrentResult()
+}
const createFeaturedTriggersRecommendationsMock = (
overrides: Partial<UseFeaturedTriggersRecommendationsReturn> = {},
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-dataset-selection.ts b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-dataset-selection.ts
index a77fe9a1d50..a387fe6b54d 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-dataset-selection.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-dataset-selection.ts
@@ -1,5 +1,5 @@
import type { DatasetDetailWithPartialMembersResponse } from '@dify/contracts/api/console/datasets/types.gen'
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type { KnowledgeRetrievalNodeType } from '../types'
import { produce } from 'immer'
import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -14,7 +14,7 @@ type ModelIdentity = {
type Params = {
inputs: KnowledgeRetrievalNodeType
- inputRef: MutableRefObject<KnowledgeRetrievalNodeType>
+ inputRef: RefObject<KnowledgeRetrievalNodeType>
setInputs: (inputs: KnowledgeRetrievalNodeType) => void
payloadRetrievalMode: RETRIEVE_TYPE
updateDatasetsDetail: (datasets: DatasetDetailWithPartialMembersResponse[]) => void
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-input-manager.ts b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-input-manager.ts
index ec094b5da67..c61a0f670c8 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-input-manager.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-input-manager.ts
@@ -1,4 +1,4 @@
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type { KnowledgeRetrievalNodeType } from '../types'
import type { ValueSelector } from '@/app/components/workflow/types'
import { produce } from 'immer'
@@ -54,7 +54,7 @@ const useKnowledgeInputManager = ({ inputs, doSetInputs }: Params) => {
)
return {
- inputRef: inputRef as MutableRefObject<KnowledgeRetrievalNodeType>,
+ inputRef: inputRef as RefObject<KnowledgeRetrievalNodeType>,
setInputs,
handleQueryVarChange,
handleQueryAttachmentChange,
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-metadata-config.ts b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-metadata-config.ts
index c0db631fce4..dea754dd04d 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-metadata-config.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-metadata-config.ts
@@ -1,4 +1,4 @@
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type {
HandleAddCondition,
HandleRemoveCondition,
@@ -17,7 +17,7 @@ import { ComparisonOperator, LogicalOperator, MetadataFilteringVariableType } fr
type Params = {
id: string
- inputRef: MutableRefObject<KnowledgeRetrievalNodeType>
+ inputRef: RefObject<KnowledgeRetrievalNodeType>
setInputs: (inputs: KnowledgeRetrievalNodeType) => void
}
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-model-config.ts b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-model-config.ts
index d620e3f7f2a..7e5d01fe8f0 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-model-config.ts
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/hooks/use-knowledge-model-config.ts
@@ -1,5 +1,5 @@
import type { DatasetDetailWithPartialMembersResponse } from '@dify/contracts/api/console/datasets/types.gen'
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type { KnowledgeRetrievalNodeType, MultipleRetrievalConfig } from '../types'
import type { ModelConfig } from '@/app/components/workflow/types'
import { isEqual } from 'es-toolkit/predicate'
@@ -27,7 +27,7 @@ type TextModel = {
type Params = {
inputs: KnowledgeRetrievalNodeType
- inputRef: MutableRefObject<KnowledgeRetrievalNodeType>
+ inputRef: RefObject<KnowledgeRetrievalNodeType>
setInputs: (inputs: KnowledgeRetrievalNodeType) => void
selectedDatasets: DatasetDetailWithPartialMembersResponse[]
currentProvider?: TextProvider
diff --git a/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-structured-output-config.spec.ts b/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-structured-output-config.spec.ts
index 77f5cbdcb15..0e1a2810abf 100644
--- a/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-structured-output-config.spec.ts
+++ b/web/app/components/workflow/nodes/llm/hooks/__tests__/use-llm-structured-output-config.spec.ts
@@ -1,5 +1,5 @@
import type { AvailableModelListResponse } from '@dify/contracts/api/console/workspaces/types.gen'
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type { LLMNodeType } from '../../types'
import { act, waitFor } from '@testing-library/react'
import { ModelFeatureEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
@@ -62,7 +62,7 @@ describe('use-llm-structured-output-config', () => {
const inputRef = {
current: createPayload(),
- } as MutableRefObject<LLMNodeType>
+ } as RefObject<LLMNodeType>
const handleSetInputs = vi.fn((nextInputs: LLMNodeType) => {
inputRef.current = nextInputs
})
@@ -145,7 +145,7 @@ describe('use-llm-structured-output-config', () => {
useLLMStructuredOutputConfig({
id: 'llm-node',
model: createPayload().model,
- inputRef: { current: createPayload() } as MutableRefObject<LLMNodeType>,
+ inputRef: { current: createPayload() } as RefObject<LLMNodeType>,
setInputs: vi.fn(),
deleteNodeInspectorVars: vi.fn(),
}),
diff --git a/web/app/components/workflow/nodes/llm/hooks/use-llm-prompt-config.ts b/web/app/components/workflow/nodes/llm/hooks/use-llm-prompt-config.ts
index 83138f44d61..8a59f0479c2 100644
--- a/web/app/components/workflow/nodes/llm/hooks/use-llm-prompt-config.ts
+++ b/web/app/components/workflow/nodes/llm/hooks/use-llm-prompt-config.ts
@@ -1,5 +1,5 @@
import type { Draft } from 'immer'
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type { LLMNodeType } from '../types'
import type {
Memory,
@@ -19,7 +19,7 @@ import { EditionType, VarType } from '@/app/components/workflow/types'
type Params = {
inputs: LLMNodeType
- inputRef: MutableRefObject<LLMNodeType>
+ inputRef: RefObject<LLMNodeType>
isChatflow: boolean
isChatModel: boolean
setInputs: (inputs: LLMNodeType) => void
diff --git a/web/app/components/workflow/nodes/llm/hooks/use-llm-structured-output-config.ts b/web/app/components/workflow/nodes/llm/hooks/use-llm-structured-output-config.ts
index 8ed7aeb7c07..be9211d22ff 100644
--- a/web/app/components/workflow/nodes/llm/hooks/use-llm-structured-output-config.ts
+++ b/web/app/components/workflow/nodes/llm/hooks/use-llm-structured-output-config.ts
@@ -1,4 +1,4 @@
-import type { MutableRefObject } from 'react'
+import type { RefObject } from 'react'
import type { LLMNodeType, StructuredOutput } from '../types'
import { useQuery } from '@tanstack/react-query'
import { produce } from 'immer'
@@ -12,7 +12,7 @@ import { consoleQuery } from '@/service/console'
type Params = {
id: string
model: LLMNodeType['model']
- inputRef: MutableRefObject<LLMNodeType>
+ inputRef: RefObject<LLMNodeType>
setInputs: (inputs: LLMNodeType) => void
deleteNodeInspectorVars: (nodeId: string) => void
}
diff --git a/web/features/network-access/app-binding/config-panel.tsx b/web/features/network-access/app-binding/config-panel.tsx
index 3ca9d90c69e..9975318f342 100644
--- a/web/features/network-access/app-binding/config-panel.tsx
+++ b/web/features/network-access/app-binding/config-panel.tsx
@@ -1,7 +1,7 @@
'use client'
import type { NetworkAccessGroupCurrentIpCheckResponse } from '@dify/contracts/api/console/workspaces/types.gen'
-import type { FormEvent } from 'react'
+import type { SubmitEvent } from 'react'
import type { AccessControlDraft, AccessControlPolicy } from './draft'
import type { AccessControlAppIcon } from './index'
import type { AccessPoint } from '@/app/components/app/deploy/utils/access-point'
@@ -80,7 +80,7 @@ export function AccessControlConfigPanel({
hasSelectedPolicy &&
canSaveAccessControl({ draft, baseline, availableAccessPoints })
- const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
+ const handleSubmit = (event: SubmitEvent<HTMLFormElement>) => {
event.preventDefault()
if (!canSave) return
onSave()
diff --git a/web/features/skills/detail/file-editor.tsx b/web/features/skills/detail/file-editor.tsx
index 59d5fff3275..268e176b666 100644
--- a/web/features/skills/detail/file-editor.tsx
+++ b/web/features/skills/detail/file-editor.tsx
@@ -5,7 +5,7 @@ import type {
SkillFileResponse,
SkillVersionResponse,
} from '@dify/contracts/api/console/workspaces/types.gen'
-import type { ChangeEvent, FormEvent, KeyboardEvent } from 'react'
+import type { ChangeEvent, InputEvent, KeyboardEvent } from 'react'
import type { SkillFileMutationCoordinator } from './shared'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
@@ -667,7 +667,7 @@ export function FileEditor({
})
}
- const handleLiveBodyEditorInput = (event: FormEvent<HTMLDivElement>) => {
+ const handleLiveBodyEditorInput = (event: InputEvent<HTMLDivElement>) => {
const nextBody = serializeMarkdownLiveEditorNode(event.currentTarget).replace(/\u00A0/g, ' ')
const nextCaretOffset = getMarkdownLiveEditorSelectionOffset(event.currentTarget)
const nextContent = replaceMarkdownBody(draftContentRef.current, nextBody)
diff --git a/web/features/skills/detail/markdown-editor.tsx b/web/features/skills/detail/markdown-editor.tsx
index 2455ed08465..d34f25e037f 100644
--- a/web/features/skills/detail/markdown-editor.tsx
+++ b/web/features/skills/detail/markdown-editor.tsx
@@ -10,7 +10,7 @@ import type {
ComponentPropsWithoutRef,
CSSProperties,
FocusEventHandler,
- FormEvent,
+ InputEvent,
KeyboardEvent,
MouseEvent,
RefObject,
@@ -774,7 +774,7 @@ export function MarkdownLiveBodyEditor({
body: string
contentRevision: number
editorRef: RefObject<HTMLDivElement | null>
- onInput: (event: FormEvent<HTMLDivElement>) => void
+ onInput: (event: InputEvent<HTMLDivElement>) => void
onKeyDown: (event: KeyboardEvent<HTMLDivElement>) => void
onOpenReference: (path: string) => void
placeholder: string
diff --git a/web/plugins/vite/i18n-analysis/compiler.ts b/web/plugins/vite/i18n-analysis/compiler.ts
index 164079ffc98..5f403da4e1e 100644
--- a/web/plugins/vite/i18n-analysis/compiler.ts
+++ b/web/plugins/vite/i18n-analysis/compiler.ts
@@ -49,7 +49,7 @@ function importBindings(code: string): ImportBinding[] {
: []),
],
typeOnly:
- !!clause?.isTypeOnly ||
+ clause?.phaseModifier === ts.SyntaxKind.TypeKeyword ||
!!(
bindings &&
ts.isNamedImports(bindings) &&