mirror of
https://github.com/langgenius/dify.git
synced 2026-05-13 08:57:28 +08:00
Conflicts resolved: - api/services/app_service.py: extend AppListParams with status + openapi_visible fields so the openapi caller's per-page visibility gate survives the dict->BaseModel refactor; openapi controller now constructs AppListParams. - pnpm-workspace.yaml: union of CLI-only entries (@napi-rs/keyring, @oclif/*) with main's bumped versions (@next/*, @orpc/*, eslint-plugin-sonarjs, eslint-plugin-storybook); kept eventsource-parser. - pnpm-lock.yaml: regenerated. - web/app/signin/utils/post-login-redirect.ts: union impl — keep main's resolvePostLoginRedirect(searchParams) + setOAuthPendingRedirect; add hardened sessionStorage-based setPostLoginRedirect for device flow with same-origin + path whitelist; device redirect takes precedence over oauth pending.
81 lines
1.7 KiB
JavaScript
81 lines
1.7 KiB
JavaScript
// @ts-check
|
|
|
|
import antfu, { GLOB_MARKDOWN } from '@antfu/eslint-config'
|
|
import md from 'eslint-markdown'
|
|
import markdownPreferences from 'eslint-plugin-markdown-preferences'
|
|
|
|
const GENERATED_IGNORES = [
|
|
'**/storybook-static/',
|
|
'**/.next/',
|
|
'web/next/',
|
|
'web/next-env.d.ts',
|
|
'**/dist/',
|
|
'**/coverage/',
|
|
'e2e/.auth/',
|
|
'e2e/cucumber-report/',
|
|
]
|
|
|
|
export default antfu(
|
|
{
|
|
ignores: original => [
|
|
'**',
|
|
'!packages/**',
|
|
'!web/**',
|
|
'!e2e/**',
|
|
'!cli/**',
|
|
'cli/docs/specs/**',
|
|
'cli/oclif.manifest.json',
|
|
'!eslint.config.mjs',
|
|
'!package.json',
|
|
'!pnpm-workspace.yaml',
|
|
'!vite.config.ts',
|
|
...GENERATED_IGNORES,
|
|
...original,
|
|
],
|
|
typescript: {
|
|
overrides: {
|
|
'ts/consistent-type-definitions': ['error', 'type'],
|
|
'ts/no-explicit-any': 'error',
|
|
'ts/no-redeclare': 'off',
|
|
},
|
|
erasableOnly: true,
|
|
},
|
|
test: {
|
|
overrides: {
|
|
'test/prefer-lowercase-title': 'off',
|
|
},
|
|
},
|
|
stylistic: {
|
|
overrides: {
|
|
'antfu/top-level-function': 'off',
|
|
},
|
|
},
|
|
e18e: false,
|
|
},
|
|
markdownPreferences.configs.standard,
|
|
{
|
|
files: [GLOB_MARKDOWN],
|
|
plugins: { md },
|
|
rules: {
|
|
'md/no-url-trailing-slash': 'error',
|
|
'markdown-preferences/prefer-link-reference-definitions': [
|
|
'error',
|
|
{
|
|
minLinks: 1,
|
|
},
|
|
],
|
|
'markdown-preferences/ordered-list-marker-sequence': [
|
|
'error',
|
|
{ increment: 'never' },
|
|
],
|
|
'markdown-preferences/definitions-last': 'error',
|
|
'markdown-preferences/sort-definitions': 'error',
|
|
},
|
|
},
|
|
{
|
|
rules: {
|
|
'node/prefer-global/process': 'off',
|
|
},
|
|
},
|
|
)
|