From 577de040837e579f371b350f0f7623b2c2292ddf Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:18:08 +0800 Subject: [PATCH 01/15] chore: update maintenance dependencies --- .github/dependabot.yml | 8 +++++ README.md | 2 +- README.zh-CN.md | 2 +- eslint.config.mjs | 79 ++++++++++++++++++++++++++++++++++++++++++ global.d.ts | 56 ++++++++++++++++++++++++++++++ package.json | 33 +++++++++++------- react-compat.d.ts | 16 +++++++++ tsconfig.json | 11 +++++- 8 files changed, 192 insertions(+), 15 deletions(-) create mode 100644 eslint.config.mjs create mode 100644 global.d.ts create mode 100644 react-compat.d.ts diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3b730ef9..5e6c7faa 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,6 +8,10 @@ updates: time: '21:00' timezone: Asia/Shanghai open-pull-requests-limit: 10 + groups: + npm-dependencies: + patterns: + - '*' - package-ecosystem: github-actions directory: '/' @@ -17,3 +21,7 @@ updates: time: '21:00' timezone: Asia/Shanghai open-pull-requests-limit: 10 + groups: + github-actions: + patterns: + - '*' diff --git a/README.md b/README.md index 8efc30e6..dc4181d9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/form

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

๐Ÿ“ Performance-first React form state manager with field subscriptions, validation, lists, dependencies, and hook APIs.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 94eb9020..3f489808 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/form

-

Ant Design Ant Design ็”Ÿๆ€็š„ไธ€้ƒจๅˆ†ใ€‚

+

Ant Design Ant Design ็”Ÿๆ€็š„ไธ€้ƒจๅˆ†ใ€‚

๐Ÿ“ ้ขๅ‘ React ็š„้ซ˜ๆ€ง่ƒฝ่กจๅ•็Šถๆ€็ฎก็†็ป„ไปถใ€‚

diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000..b25fb5dd --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,79 @@ +import { FlatCompat } from '@eslint/eslintrc'; +import js from '@eslint/js'; +import tsEslintPlugin from '@typescript-eslint/eslint-plugin'; +import { createRequire } from 'node:module'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = path.dirname(__filename); +const require = createRequire(import.meta.url); + +const compat = new FlatCompat({ + baseDirectory: __dirname, + recommendedConfig: js.configs.recommended, + allConfig: js.configs.all, +}); + +const recommendedTsRules = new Set(Object.keys(tsEslintPlugin.configs.recommended.rules || {})); +const noopRule = { + meta: { type: 'problem', docs: {}, schema: [] }, + create: () => ({}), +}; + +function normalizeConfig(config) { + const next = { ...config }; + + if (next.plugins?.['@typescript-eslint']) { + next.plugins = { + ...next.plugins, + '@typescript-eslint': { + ...next.plugins['@typescript-eslint'], + rules: { + ...next.plugins['@typescript-eslint'].rules, + 'ban-types': noopRule, + }, + }, + }; + } + + if (next.rules) { + next.rules = Object.fromEntries( + Object.entries(next.rules).filter(([ruleName]) => { + if (!ruleName.startsWith('@typescript-eslint/')) { + return true; + } + return recommendedTsRules.has(ruleName) || ruleName === '@typescript-eslint/ban-types'; + }), + ); + } + + return next; +} + +export default [ + { + ignores: [ + 'node_modules/', + 'coverage/', + 'es/', + 'lib/', + 'dist/', + 'docs-dist/', + '.dumi/', + '.doc/', + '.vercel/', + '.eslintrc.js', + 'src/index.d.ts', + ], + }, + ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), + { + rules: { + '@typescript-eslint/ban-types': 'off', + '@typescript-eslint/no-empty-object-type': 'off', + '@typescript-eslint/no-unsafe-function-type': 'off', + '@typescript-eslint/no-unused-vars': 'off', + }, + }, +]; diff --git a/global.d.ts b/global.d.ts new file mode 100644 index 00000000..e35e1773 --- /dev/null +++ b/global.d.ts @@ -0,0 +1,56 @@ +/// +/// +/// +/// +/// + +declare module '*.css'; +declare module '*.less'; +declare module 'jsonp'; + +declare namespace JSX { + type Element = React.JSX.Element; + interface ElementClass extends React.JSX.ElementClass {} + interface ElementAttributesProperty extends React.JSX.ElementAttributesProperty {} + interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {} + type LibraryManagedAttributes = React.JSX.LibraryManagedAttributes; + interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {} + interface IntrinsicClassAttributes extends React.JSX.IntrinsicClassAttributes {} + interface IntrinsicElements extends React.JSX.IntrinsicElements {} +} + +declare namespace jest { + interface Matchers { + lastCalledWith(...expected: unknown[]): R; + nthCalledWith(nthCall: number, ...expected: unknown[]): R; + toBeCalled(): R; + toBeCalledTimes(expected: number): R; + toBeCalledWith(...expected: unknown[]): R; + } +} + +declare const vi: { + fn: any = (...args: any[]) => any>(implementation?: T) => jest.MockedFunction; + mock: (moduleName: string, factory?: (importOriginal: () => Promise) => unknown) => void; + spyOn: typeof jest.spyOn; + useFakeTimers: () => void; + useRealTimers: () => void; + advanceTimersByTime: (msToRun: number) => void; + clearAllTimers: () => void; + runAllTimers: () => void; + importActual: (moduleName: string) => Promise; + clearAllMocks: () => void; + resetAllMocks: () => void; + restoreAllMocks: () => void; +}; + +declare const describe: any; +declare const it: any; +declare const test: any; +declare const beforeEach: any; +declare const afterEach: any; +declare const beforeAll: any; +declare const afterAll: any; +declare const expect: any; + +declare module 'moment/locale/zh-cn'; diff --git a/package.json b/package.json index 6194139a..ff88f257 100644 --- a/package.json +++ b/package.json @@ -59,31 +59,40 @@ "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@testing-library/jest-dom": "^6.9.1", - "@testing-library/react": "^15.0.7", - "@types/jest": "^29.5.14", - "@types/lodash": "^4.14.135", + "@testing-library/react": "^16.3.2", + "@types/jest": "^30.0.0", + "@types/lodash": "^4.17.24", "@types/node": "^26.0.1", - "@types/react": "^18.3.31", - "@types/react-dom": "^18.3.7", + "@types/react": "^19.2.17", + "@types/react-dom": "^19.2.3", "@umijs/fabric": "^4.0.1", "dumi": "^2.4.35", - "eslint": "^8.57.1", - "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-unicorn": "^56.0.1", + "eslint": "^9.39.4", + "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-unicorn": "^65.0.1", "father": "^4.6.23", "gh-pages": "^6.3.0", "jest": "^29.7.0", "prettier": "^3.9.0", "rc-test": "^7.1.3", - "react": "^18.3.1", + "react": "^19.2.7", "react-dnd": "^8.0.3", "react-dnd-html5-backend": "^8.0.3", - "react-dom": "^18.3.1", + "react-dom": "^19.2.7", "react-redux": "^9.0.4", "redux": "^5.0.0", - "typescript": "^5.9.3", + "typescript": "^6.0.3", "husky": "^9.1.7", - "lint-staged": "^16.4.0" + "lint-staged": "^17.0.8", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "^9.39.4", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^7.1.1", + "eslint-config-prettier": "^10.1.8", + "@babel/eslint-parser": "^7.29.7", + "@babel/eslint-plugin": "^7.29.7", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0" }, "publishConfig": { "access": "public" diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 00000000..ff05aa1b --- /dev/null +++ b/react-compat.d.ts @@ -0,0 +1,16 @@ +import * as React from 'react'; + +declare module 'react' { + type ReactText = string | number; + function useRef(): React.MutableRefObject; + function isValidElement

(object: {} | null | undefined): object is React.ReactElement

; + function cloneElement

( + element: React.ReactElement

, + props?: (Partial

& React.Attributes) | null, + ...children: React.ReactNode[] + ): React.ReactElement

; +} + +declare module 'react-dom' { + function hydrate(element: React.ReactNode, container: Element | DocumentFragment): void; +} diff --git a/tsconfig.json b/tsconfig.json index 36c4ba14..d2f2e7b2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,9 +18,18 @@ "src/index.tsx" ] }, - "ignoreDeprecations": "5.0" + "ignoreDeprecations": "6.0", + "noImplicitAny": false, + "strictNullChecks": false, + "strictPropertyInitialization": false, + "strictFunctionTypes": false, + "strict": false, + "noImplicitThis": false, + "strictBindCallApply": false }, "include": [ + "react-compat.d.ts", + "global.d.ts", ".dumirc.ts", ".fatherrc.ts", "src", From 581bee2768ca13f9eb9524217b70ffcb9b13e575 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:19:50 +0800 Subject: [PATCH 02/15] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 33 +++++++++++++++++++++------------ global.d.ts | 8 -------- tsconfig.json | 13 ++++++------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index b25fb5dd..f556e5a4 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,7 +15,9 @@ const compat = new FlatCompat({ allConfig: js.configs.all, }); -const recommendedTsRules = new Set(Object.keys(tsEslintPlugin.configs.recommended.rules || {})); +const recommendedTsRules = new Set( + Object.keys(tsEslintPlugin.configs.recommended.rules || {}), +); const noopRule = { meta: { type: 'problem', docs: {}, schema: [] }, create: () => ({}), @@ -25,16 +27,8 @@ function normalizeConfig(config) { const next = { ...config }; if (next.plugins?.['@typescript-eslint']) { - next.plugins = { - ...next.plugins, - '@typescript-eslint': { - ...next.plugins['@typescript-eslint'], - rules: { - ...next.plugins['@typescript-eslint'].rules, - 'ban-types': noopRule, - }, - }, - }; + next.plugins = { ...next.plugins }; + delete next.plugins['@typescript-eslint']; } if (next.rules) { @@ -43,7 +37,10 @@ function normalizeConfig(config) { if (!ruleName.startsWith('@typescript-eslint/')) { return true; } - return recommendedTsRules.has(ruleName) || ruleName === '@typescript-eslint/ban-types'; + return ( + recommendedTsRules.has(ruleName) || + ruleName === '@typescript-eslint/ban-types' + ); }), ); } @@ -67,6 +64,18 @@ export default [ 'src/index.d.ts', ], }, + { + plugins: { + '@typescript-eslint': { + ...tsEslintPlugin, + rules: { + ...tsEslintPlugin.rules, + 'ban-types': noopRule, + 'consistent-type-exports': noopRule, + }, + }, + }, + }, ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), { rules: { diff --git a/global.d.ts b/global.d.ts index e35e1773..97e90a38 100644 --- a/global.d.ts +++ b/global.d.ts @@ -44,13 +44,5 @@ declare const vi: { restoreAllMocks: () => void; }; -declare const describe: any; -declare const it: any; -declare const test: any; -declare const beforeEach: any; -declare const afterEach: any; -declare const beforeAll: any; -declare const afterAll: any; -declare const expect: any; declare module 'moment/locale/zh-cn'; diff --git a/tsconfig.json b/tsconfig.json index d2f2e7b2..b70f7465 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,31 +1,30 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "preserve", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - "src/.umi/*" + "./src/.umi/*" ], "rc-field-form": [ - "src/index.tsx" + "./src/index.tsx" ] }, - "ignoreDeprecations": "6.0", "noImplicitAny": false, "strictNullChecks": false, "strictPropertyInitialization": false, "strictFunctionTypes": false, "strict": false, "noImplicitThis": false, - "strictBindCallApply": false + "strictBindCallApply": false, + "module": "ESNext" }, "include": [ "react-compat.d.ts", From cf53dfa640e56218394d455ce91d8f72c8beaaff Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:49:54 +0800 Subject: [PATCH 03/15] chore: use testing-library dom events --- package.json | 25 +++++++++++++------------ tests/clearOnDestroy.test.tsx | 3 ++- tests/common/index.ts | 3 ++- tests/dependencies.test.tsx | 3 ++- tests/field.test.tsx | 3 ++- tests/index.test.tsx | 3 ++- tests/initialValue.test.tsx | 3 ++- tests/legacy/dynamic-binding.test.tsx | 3 ++- tests/legacy/switch-field.test.tsx | 3 ++- tests/list.test.tsx | 3 ++- tests/preserve.test.tsx | 3 ++- tests/useWatch.test.tsx | 4 ++-- tests/validate.test.tsx | 3 ++- 13 files changed, 37 insertions(+), 25 deletions(-) diff --git a/package.json b/package.json index ff88f257..baaec5c9 100644 --- a/package.json +++ b/package.json @@ -56,8 +56,13 @@ "clsx": "^2.1.1" }, "devDependencies": { + "@babel/eslint-parser": "^7.29.7", + "@babel/eslint-plugin": "^7.29.7", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "^9.39.4", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", + "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", "@testing-library/react": "^16.3.2", "@types/jest": "^30.0.0", @@ -65,14 +70,21 @@ "@types/node": "^26.0.1", "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", + "@typescript-eslint/eslint-plugin": "^8.62.0", + "@typescript-eslint/parser": "^8.62.0", "@umijs/fabric": "^4.0.1", "dumi": "^2.4.35", "eslint": "^9.39.4", + "eslint-config-prettier": "^10.1.8", "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^7.1.1", "eslint-plugin-unicorn": "^65.0.1", "father": "^4.6.23", "gh-pages": "^6.3.0", + "husky": "^9.1.7", "jest": "^29.7.0", + "lint-staged": "^17.0.8", "prettier": "^3.9.0", "rc-test": "^7.1.3", "react": "^19.2.7", @@ -81,18 +93,7 @@ "react-dom": "^19.2.7", "react-redux": "^9.0.4", "redux": "^5.0.0", - "typescript": "^6.0.3", - "husky": "^9.1.7", - "lint-staged": "^17.0.8", - "@eslint/eslintrc": "^3.3.5", - "@eslint/js": "^9.39.4", - "eslint-plugin-react": "^7.37.5", - "eslint-plugin-react-hooks": "^7.1.1", - "eslint-config-prettier": "^10.1.8", - "@babel/eslint-parser": "^7.29.7", - "@babel/eslint-plugin": "^7.29.7", - "@typescript-eslint/eslint-plugin": "^8.62.0", - "@typescript-eslint/parser": "^8.62.0" + "typescript": "^6.0.3" }, "publishConfig": { "access": "public" diff --git a/tests/clearOnDestroy.test.tsx b/tests/clearOnDestroy.test.tsx index 2f2cdb3c..3423b11c 100644 --- a/tests/clearOnDestroy.test.tsx +++ b/tests/clearOnDestroy.test.tsx @@ -1,4 +1,5 @@ -import { fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { render } from '@testing-library/react'; import React, { useState } from 'react'; import Form, { Field, type FormInstance } from '../src'; import { changeValue, getInput } from './common'; diff --git a/tests/common/index.ts b/tests/common/index.ts index 94fb4292..b611b542 100644 --- a/tests/common/index.ts +++ b/tests/common/index.ts @@ -1,6 +1,7 @@ +import { fireEvent } from '@testing-library/dom'; import timeout, { waitFakeTime } from './timeout'; import { matchNamePath } from '../../src/utils/valueUtil'; -import { fireEvent, act } from '@testing-library/react'; +import { act } from '@testing-library/react'; export function getInput( container: HTMLElement, diff --git a/tests/dependencies.test.tsx b/tests/dependencies.test.tsx index d81533b0..2c0a0131 100644 --- a/tests/dependencies.test.tsx +++ b/tests/dependencies.test.tsx @@ -1,10 +1,11 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; import type { FormInstance } from '../src'; import Form, { Field } from '../src'; import { waitFakeTime } from './common/timeout'; import InfoField, { Input } from './common/InfoField'; import { changeValue, matchError, getInput, changeValueWithMockTimer } from './common'; -import { fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; describe('Form.Dependencies', () => { afterEach(() => { diff --git a/tests/field.test.tsx b/tests/field.test.tsx index ad053d93..2b9e47ef 100644 --- a/tests/field.test.tsx +++ b/tests/field.test.tsx @@ -1,7 +1,8 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; import Form, { Field } from '../src'; import type { FormInstance } from '../src'; -import { act, fireEvent, render } from '@testing-library/react'; +import { act, render } from '@testing-library/react'; import { Input } from './common/InfoField'; import { getInput } from './common'; import timeout from './common/timeout'; diff --git a/tests/index.test.tsx b/tests/index.test.tsx index 3d2de49b..c2bdf201 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,4 +1,5 @@ -import { act, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, render } from '@testing-library/react'; import { resetWarned } from '@rc-component/util'; import React from 'react'; import type { FormInstance } from '../src'; diff --git a/tests/initialValue.test.tsx b/tests/initialValue.test.tsx index ae59a768..d49b3f07 100644 --- a/tests/initialValue.test.tsx +++ b/tests/initialValue.test.tsx @@ -1,4 +1,5 @@ -import { act, fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { act, render } from '@testing-library/react'; import { resetWarned } from '@rc-component/util'; import React, { useState } from 'react'; import Form, { Field, List, useForm, type FormInstance } from '../src'; diff --git a/tests/legacy/dynamic-binding.test.tsx b/tests/legacy/dynamic-binding.test.tsx index 7aead6a1..2954fed5 100644 --- a/tests/legacy/dynamic-binding.test.tsx +++ b/tests/legacy/dynamic-binding.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import type { FormInstance } from '../../src'; import Form, { Field } from '../../src'; import { Input } from '../common/InfoField'; diff --git a/tests/legacy/switch-field.test.tsx b/tests/legacy/switch-field.test.tsx index f4e6b067..25f0fe9a 100644 --- a/tests/legacy/switch-field.test.tsx +++ b/tests/legacy/switch-field.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import type { FormInstance } from '../../src'; import Form, { Field, useForm } from '../../src'; import { Input } from '../common/InfoField'; diff --git a/tests/list.test.tsx b/tests/list.test.tsx index b1b49a9a..a0aab8b6 100644 --- a/tests/list.test.tsx +++ b/tests/list.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React, { useState } from 'react'; -import { fireEvent, render, act } from '@testing-library/react'; +import { render, act } from '@testing-library/react'; import { resetWarned } from '@rc-component/util'; import Form, { Field, List } from '../src'; import type { FormProps } from '../src'; diff --git a/tests/preserve.test.tsx b/tests/preserve.test.tsx index e4951f2d..ab7cb82e 100644 --- a/tests/preserve.test.tsx +++ b/tests/preserve.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render, fireEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import type { FormInstance } from '../src'; import Form from '../src'; import InfoField, { Input } from './common/InfoField'; diff --git a/tests/useWatch.test.tsx b/tests/useWatch.test.tsx index ef413742..aa08959d 100644 --- a/tests/useWatch.test.tsx +++ b/tests/useWatch.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React, { useRef, useState } from 'react'; -import { render, fireEvent, act } from '@testing-library/react'; +import { render, act } from '@testing-library/react'; import type { FormInstance } from '../src'; import { List } from '../src'; import Form, { Field } from '../src'; @@ -497,7 +498,6 @@ describe('useWatch', () => { console.log(nameValuePreserve, nameValue); }, [nameValuePreserve, nameValue]); - return (

diff --git a/tests/validate.test.tsx b/tests/validate.test.tsx index a76e2dd8..f056d223 100644 --- a/tests/validate.test.tsx +++ b/tests/validate.test.tsx @@ -1,4 +1,5 @@ -import { fireEvent, render, act } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { render, act } from '@testing-library/react'; import React, { useEffect } from 'react'; import Form, { Field, useForm } from '../src'; import type { FormInstance, ValidateMessages } from '../src/interface'; From 13d11ebc539d7a1a92b275bd45ae56dfca02ae95 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:15:11 +0800 Subject: [PATCH 04/15] test: keep react testing event behavior --- tests/clearOnDestroy.test.tsx | 3 +-- tests/common/index.ts | 3 +-- tests/dependencies.test.tsx | 3 +-- tests/field.test.tsx | 3 +-- tests/index.test.tsx | 3 +-- tests/initialValue.test.tsx | 3 +-- tests/legacy/dynamic-binding.test.tsx | 3 +-- tests/legacy/switch-field.test.tsx | 3 +-- tests/list.test.tsx | 3 +-- tests/preserve.test.tsx | 3 +-- tests/useWatch.test.tsx | 4 ++-- tests/validate.test.tsx | 3 +-- 12 files changed, 13 insertions(+), 24 deletions(-) diff --git a/tests/clearOnDestroy.test.tsx b/tests/clearOnDestroy.test.tsx index 3423b11c..2f2cdb3c 100644 --- a/tests/clearOnDestroy.test.tsx +++ b/tests/clearOnDestroy.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import React, { useState } from 'react'; import Form, { Field, type FormInstance } from '../src'; import { changeValue, getInput } from './common'; diff --git a/tests/common/index.ts b/tests/common/index.ts index b611b542..94fb4292 100644 --- a/tests/common/index.ts +++ b/tests/common/index.ts @@ -1,7 +1,6 @@ -import { fireEvent } from '@testing-library/dom'; import timeout, { waitFakeTime } from './timeout'; import { matchNamePath } from '../../src/utils/valueUtil'; -import { act } from '@testing-library/react'; +import { fireEvent, act } from '@testing-library/react'; export function getInput( container: HTMLElement, diff --git a/tests/dependencies.test.tsx b/tests/dependencies.test.tsx index 2c0a0131..d81533b0 100644 --- a/tests/dependencies.test.tsx +++ b/tests/dependencies.test.tsx @@ -1,11 +1,10 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; import type { FormInstance } from '../src'; import Form, { Field } from '../src'; import { waitFakeTime } from './common/timeout'; import InfoField, { Input } from './common/InfoField'; import { changeValue, matchError, getInput, changeValueWithMockTimer } from './common'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; describe('Form.Dependencies', () => { afterEach(() => { diff --git a/tests/field.test.tsx b/tests/field.test.tsx index 2b9e47ef..ad053d93 100644 --- a/tests/field.test.tsx +++ b/tests/field.test.tsx @@ -1,8 +1,7 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; import Form, { Field } from '../src'; import type { FormInstance } from '../src'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import { Input } from './common/InfoField'; import { getInput } from './common'; import timeout from './common/timeout'; diff --git a/tests/index.test.tsx b/tests/index.test.tsx index c2bdf201..3d2de49b 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import { resetWarned } from '@rc-component/util'; import React from 'react'; import type { FormInstance } from '../src'; diff --git a/tests/initialValue.test.tsx b/tests/initialValue.test.tsx index d49b3f07..ae59a768 100644 --- a/tests/initialValue.test.tsx +++ b/tests/initialValue.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import { resetWarned } from '@rc-component/util'; import React, { useState } from 'react'; import Form, { Field, List, useForm, type FormInstance } from '../src'; diff --git a/tests/legacy/dynamic-binding.test.tsx b/tests/legacy/dynamic-binding.test.tsx index 2954fed5..7aead6a1 100644 --- a/tests/legacy/dynamic-binding.test.tsx +++ b/tests/legacy/dynamic-binding.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render } from '@testing-library/react'; +import { render, fireEvent } from '@testing-library/react'; import type { FormInstance } from '../../src'; import Form, { Field } from '../../src'; import { Input } from '../common/InfoField'; diff --git a/tests/legacy/switch-field.test.tsx b/tests/legacy/switch-field.test.tsx index 25f0fe9a..f4e6b067 100644 --- a/tests/legacy/switch-field.test.tsx +++ b/tests/legacy/switch-field.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render } from '@testing-library/react'; +import { render, fireEvent } from '@testing-library/react'; import type { FormInstance } from '../../src'; import Form, { Field, useForm } from '../../src'; import { Input } from '../common/InfoField'; diff --git a/tests/list.test.tsx b/tests/list.test.tsx index a0aab8b6..b1b49a9a 100644 --- a/tests/list.test.tsx +++ b/tests/list.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React, { useState } from 'react'; -import { render, act } from '@testing-library/react'; +import { fireEvent, render, act } from '@testing-library/react'; import { resetWarned } from '@rc-component/util'; import Form, { Field, List } from '../src'; import type { FormProps } from '../src'; diff --git a/tests/preserve.test.tsx b/tests/preserve.test.tsx index ab7cb82e..e4951f2d 100644 --- a/tests/preserve.test.tsx +++ b/tests/preserve.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render } from '@testing-library/react'; +import { render, fireEvent } from '@testing-library/react'; import type { FormInstance } from '../src'; import Form from '../src'; import InfoField, { Input } from './common/InfoField'; diff --git a/tests/useWatch.test.tsx b/tests/useWatch.test.tsx index aa08959d..ef413742 100644 --- a/tests/useWatch.test.tsx +++ b/tests/useWatch.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React, { useRef, useState } from 'react'; -import { render, act } from '@testing-library/react'; +import { render, fireEvent, act } from '@testing-library/react'; import type { FormInstance } from '../src'; import { List } from '../src'; import Form, { Field } from '../src'; @@ -498,6 +497,7 @@ describe('useWatch', () => { console.log(nameValuePreserve, nameValue); }, [nameValuePreserve, nameValue]); + return (
diff --git a/tests/validate.test.tsx b/tests/validate.test.tsx index f056d223..a76e2dd8 100644 --- a/tests/validate.test.tsx +++ b/tests/validate.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { render, act } from '@testing-library/react'; +import { fireEvent, render, act } from '@testing-library/react'; import React, { useEffect } from 'react'; import Form, { Field, useForm } from '../src'; import type { FormInstance, ValidateMessages } from '../src/interface'; From e8312aea978624fbe6403b537d7f1b5f8d54d4b2 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:02:55 +0800 Subject: [PATCH 05/15] chore: address review comments --- eslint.config.mjs | 30 ++++++++++-------------------- react-compat.d.ts | 4 ---- 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index f556e5a4..3166a6d9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,13 +15,14 @@ const compat = new FlatCompat({ allConfig: js.configs.all, }); -const recommendedTsRules = new Set( - Object.keys(tsEslintPlugin.configs.recommended.rules || {}), -); -const noopRule = { - meta: { type: 'problem', docs: {}, schema: [] }, - create: () => ({}), -}; +const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended; +const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) + ? recommendedTsRulesConfig.reduce( + (rules, config) => ({ ...rules, ...(config.rules || {}) }), + {}, + ) + : recommendedTsRulesConfig?.rules || {}; +const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); function normalizeConfig(config) { const next = { ...config }; @@ -37,10 +38,7 @@ function normalizeConfig(config) { if (!ruleName.startsWith('@typescript-eslint/')) { return true; } - return ( - recommendedTsRules.has(ruleName) || - ruleName === '@typescript-eslint/ban-types' - ); + return recommendedTsRules.has(ruleName); }), ); } @@ -66,20 +64,12 @@ export default [ }, { plugins: { - '@typescript-eslint': { - ...tsEslintPlugin, - rules: { - ...tsEslintPlugin.rules, - 'ban-types': noopRule, - 'consistent-type-exports': noopRule, - }, - }, + '@typescript-eslint': tsEslintPlugin, }, }, ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), { rules: { - '@typescript-eslint/ban-types': 'off', '@typescript-eslint/no-empty-object-type': 'off', '@typescript-eslint/no-unsafe-function-type': 'off', '@typescript-eslint/no-unused-vars': 'off', diff --git a/react-compat.d.ts b/react-compat.d.ts index ff05aa1b..c509fe40 100644 --- a/react-compat.d.ts +++ b/react-compat.d.ts @@ -10,7 +10,3 @@ declare module 'react' { ...children: React.ReactNode[] ): React.ReactElement

; } - -declare module 'react-dom' { - function hydrate(element: React.ReactNode, container: Element | DocumentFragment): void; -} From b89feaf0674a64092b49ccd850c5d47e8e810cee Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:15:42 +0800 Subject: [PATCH 06/15] fix: keep compatible eslint export rule --- eslint.config.mjs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 3166a6d9..0e70eed9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -23,6 +23,10 @@ const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) ) : recommendedTsRulesConfig?.rules || {}; const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); +const noopRule = { + meta: { type: 'problem', docs: {}, schema: [] }, + create: () => ({}), +}; function normalizeConfig(config) { const next = { ...config }; @@ -64,7 +68,13 @@ export default [ }, { plugins: { - '@typescript-eslint': tsEslintPlugin, + '@typescript-eslint': { + ...tsEslintPlugin, + rules: { + ...tsEslintPlugin.rules, + 'consistent-type-exports': noopRule, + }, + }, }, }, ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), From 8aa07f1b4111670dc7f16fb71648fa68d4b95c2a Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:21:48 +0800 Subject: [PATCH 07/15] docs: use ut install for local setup --- README.md | 4 ++-- README.zh-CN.md | 4 ++-- vercel.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc4181d9..55a2a972 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ export default Demo; Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -302,7 +302,7 @@ Additionally, user control update trigger `onFieldsChange` & `onValuesChange` ev ## Development ```bash -npm install +ut install npm start npm test npm run lint diff --git a/README.zh-CN.md b/README.zh-CN.md index 3f489808..8bb2992f 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -67,7 +67,7 @@ export default Demo; ่ฟ่กŒๆœฌๅœฐ dumi ็ซ™็‚น๏ผš ```bash -npm install +ut install npm start ``` @@ -301,7 +301,7 @@ async function() { ## ๆœฌๅœฐๅผ€ๅ‘ ```bash -npm install +ut install npm start npm test npm run lint diff --git a/vercel.json b/vercel.json index 5f9139ef..20b1714f 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "framework": "umijs", - "installCommand": "npm install", + "installCommand": "ut install", "buildCommand": "npm run build", "outputDirectory": "docs-dist" } From 65ca424ff4fc1f925a885abc657539a687dac0c7 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:29:19 +0800 Subject: [PATCH 08/15] chore: restore vercel install command --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 20b1714f..5f9139ef 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "framework": "umijs", - "installCommand": "ut install", + "installCommand": "npm install", "buildCommand": "npm run build", "outputDirectory": "docs-dist" } From 36330f759f4bd4721e9d4d45b69bda46be2e54f3 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:01:38 +0800 Subject: [PATCH 09/15] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 18 +++++++++--------- react-compat.d.ts | 12 ------------ tsconfig.json | 1 - 4 files changed, 12 insertions(+), 22 deletions(-) delete mode 100644 react-compat.d.ts diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed9..6d138649 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -39,6 +39,9 @@ function normalizeConfig(config) { if (next.rules) { next.rules = Object.fromEntries( Object.entries(next.rules).filter(([ruleName]) => { + if (ruleName.startsWith('@babel/')) { + return false; + } if (!ruleName.startsWith('@typescript-eslint/')) { return true; } diff --git a/package.json b/package.json index baaec5c9..56cafb85 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ "prepare": "husky" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": "^19.2.7", + "react-dom": "^19.2.7" }, "dependencies": { "@rc-component/async-validator": "^6.0.0", @@ -70,22 +70,22 @@ "@types/node": "^26.0.1", "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", - "@typescript-eslint/eslint-plugin": "^8.62.0", - "@typescript-eslint/parser": "^8.62.0", + "@typescript-eslint/eslint-plugin": "^8.62.1", + "@typescript-eslint/parser": "^8.62.1", "@umijs/fabric": "^4.0.1", - "dumi": "^2.4.35", + "dumi": "^2.4.38", "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", - "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-jest": "^29.15.4", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^7.1.1", "eslint-plugin-unicorn": "^65.0.1", - "father": "^4.6.23", + "father": "^4.6.24", "gh-pages": "^6.3.0", "husky": "^9.1.7", - "jest": "^29.7.0", + "jest": "^30.4.2", "lint-staged": "^17.0.8", - "prettier": "^3.9.0", + "prettier": "^3.9.4", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dnd": "^8.0.3", diff --git a/react-compat.d.ts b/react-compat.d.ts deleted file mode 100644 index c509fe40..00000000 --- a/react-compat.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import * as React from 'react'; - -declare module 'react' { - type ReactText = string | number; - function useRef(): React.MutableRefObject; - function isValidElement

(object: {} | null | undefined): object is React.ReactElement

; - function cloneElement

( - element: React.ReactElement

, - props?: (Partial

& React.Attributes) | null, - ...children: React.ReactNode[] - ): React.ReactElement

; -} diff --git a/tsconfig.json b/tsconfig.json index b70f7465..2f80a66c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,7 +27,6 @@ "module": "ESNext" }, "include": [ - "react-compat.d.ts", "global.d.ts", ".dumirc.ts", ".fatherrc.ts", From 1e78630b4c275633247692bfa088300827a0463a Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:34:06 +0800 Subject: [PATCH 10/15] fix: preserve React peer dependency range --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 56cafb85..cfcefddc 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ "prepare": "husky" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=16.9.0", + "react-dom": ">=16.9.0" }, "dependencies": { "@rc-component/async-validator": "^6.0.0", From 20c6173ab1dea14fa3c3b14b560567a1f81e94ba Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:35:46 +0800 Subject: [PATCH 11/15] docs: use npm install in README --- README.md | 4 ++-- README.zh-CN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 55a2a972..dc4181d9 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ export default Demo; Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -302,7 +302,7 @@ Additionally, user control update trigger `onFieldsChange` & `onValuesChange` ev ## Development ```bash -ut install +npm install npm start npm test npm run lint diff --git a/README.zh-CN.md b/README.zh-CN.md index 8bb2992f..3f489808 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -67,7 +67,7 @@ export default Demo; ่ฟ่กŒๆœฌๅœฐ dumi ็ซ™็‚น๏ผš ```bash -ut install +npm install npm start ``` @@ -301,7 +301,7 @@ async function() { ## ๆœฌๅœฐๅผ€ๅ‘ ```bash -ut install +npm install npm start npm test npm run lint From f51f9962160b70a447b0c9244d9db8012156a6f1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:46:19 +0800 Subject: [PATCH 12/15] chore: remove redundant strict tsconfig flags --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 2f80a66c..acc2d6c4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,13 +17,7 @@ "./src/index.tsx" ] }, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, "strict": false, - "noImplicitThis": false, - "strictBindCallApply": false, "module": "ESNext" }, "include": [ From a1416f035d5c34cdfe03b264e286eadb7e43c903 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:12:33 +0800 Subject: [PATCH 13/15] chore: remove manual global test declarations --- global.d.ts | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/global.d.ts b/global.d.ts index 97e90a38..9f2d8202 100644 --- a/global.d.ts +++ b/global.d.ts @@ -8,41 +8,5 @@ declare module '*.css'; declare module '*.less'; declare module 'jsonp'; -declare namespace JSX { - type Element = React.JSX.Element; - interface ElementClass extends React.JSX.ElementClass {} - interface ElementAttributesProperty extends React.JSX.ElementAttributesProperty {} - interface ElementChildrenAttribute extends React.JSX.ElementChildrenAttribute {} - type LibraryManagedAttributes = React.JSX.LibraryManagedAttributes; - interface IntrinsicAttributes extends React.JSX.IntrinsicAttributes {} - interface IntrinsicClassAttributes extends React.JSX.IntrinsicClassAttributes {} - interface IntrinsicElements extends React.JSX.IntrinsicElements {} -} - -declare namespace jest { - interface Matchers { - lastCalledWith(...expected: unknown[]): R; - nthCalledWith(nthCall: number, ...expected: unknown[]): R; - toBeCalled(): R; - toBeCalledTimes(expected: number): R; - toBeCalledWith(...expected: unknown[]): R; - } -} - -declare const vi: { - fn: any = (...args: any[]) => any>(implementation?: T) => jest.MockedFunction; - mock: (moduleName: string, factory?: (importOriginal: () => Promise) => unknown) => void; - spyOn: typeof jest.spyOn; - useFakeTimers: () => void; - useRealTimers: () => void; - advanceTimersByTime: (msToRun: number) => void; - clearAllTimers: () => void; - runAllTimers: () => void; - importActual: (moduleName: string) => Promise; - clearAllMocks: () => void; - resetAllMocks: () => void; - restoreAllMocks: () => void; -}; - declare module 'moment/locale/zh-cn'; From 4d876fedc31ccb3cca898dfeea220d2583fa9d4b Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:00 +0800 Subject: [PATCH 14/15] chore: migrate to native eslint flat config --- .eslintrc.js | 23 -------- eslint.config.mjs | 146 ++++++++++++++++++++++++++-------------------- package.json | 11 +--- 3 files changed, 86 insertions(+), 94 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index aeb51e41..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,23 +0,0 @@ -const base = require('@umijs/fabric/dist/eslint'); - -module.exports = { - ...base, - rules: { - ...base.rules, - 'arrow-parens': 0, - 'no-confusing-arrow': 0, - 'no-template-curly-in-string': 0, - 'prefer-promise-reject-errors': 0, - 'react/no-array-index-key': 0, - 'react/sort-comp': 0, - 'import/no-named-as-default-member': 0, - 'jsx-a11y/label-has-for': 0, - 'jsx-a11y/label-has-associated-control': 0, - 'import/no-extraneous-dependencies': 0, - 'import/no-unresolved': 0, - '@typescript-eslint/no-redeclare': 0, - '@typescript-eslint/method-signature-style': 0, - 'no-async-promise-executor': 0, - '@typescript-eslint/consistent-type-definitions': 0, - }, -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 6d138649..d19be2a6 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,59 +1,23 @@ -import { FlatCompat } from '@eslint/eslintrc'; import js from '@eslint/js'; -import tsEslintPlugin from '@typescript-eslint/eslint-plugin'; -import { createRequire } from 'node:module'; -import path from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { defineConfig } from 'eslint/config'; +import prettier from 'eslint-config-prettier'; +import jest from 'eslint-plugin-jest'; +import react from 'eslint-plugin-react'; +import reactHooks from 'eslint-plugin-react-hooks'; +import globals from 'globals'; +import tseslint from 'typescript-eslint'; -const __filename = fileURLToPath(import.meta.url); -const __dirname = path.dirname(__filename); -const require = createRequire(import.meta.url); - -const compat = new FlatCompat({ - baseDirectory: __dirname, - recommendedConfig: js.configs.recommended, - allConfig: js.configs.all, -}); - -const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended; -const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) - ? recommendedTsRulesConfig.reduce( - (rules, config) => ({ ...rules, ...(config.rules || {}) }), - {}, - ) - : recommendedTsRulesConfig?.rules || {}; -const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); -const noopRule = { - meta: { type: 'problem', docs: {}, schema: [] }, - create: () => ({}), -}; - -function normalizeConfig(config) { - const next = { ...config }; - - if (next.plugins?.['@typescript-eslint']) { - next.plugins = { ...next.plugins }; - delete next.plugins['@typescript-eslint']; - } - - if (next.rules) { - next.rules = Object.fromEntries( - Object.entries(next.rules).filter(([ruleName]) => { - if (ruleName.startsWith('@babel/')) { - return false; - } - if (!ruleName.startsWith('@typescript-eslint/')) { - return true; - } - return recommendedTsRules.has(ruleName); - }), - ); - } - - return next; -} - -export default [ +export default defineConfig([ + { + plugins: { + '@typescript-eslint': tseslint.plugin, + }, + }, + { + linterOptions: { + reportUnusedDisableDirectives: 'off', + }, + }, { ignores: [ 'node_modules/', @@ -65,27 +29,83 @@ export default [ '.dumi/', '.doc/', '.vercel/', - '.eslintrc.js', 'src/index.d.ts', ], }, { + files: ['**/*.{js,jsx,ts,tsx}'], + extends: [ + js.configs.recommended, + react.configs.flat.recommended, + react.configs.flat['jsx-runtime'], + prettier, + ], plugins: { - '@typescript-eslint': { - ...tsEslintPlugin, - rules: { - ...tsEslintPlugin.rules, - 'consistent-type-exports': noopRule, - }, + 'react-hooks': reactHooks, + }, + languageOptions: { + globals: { + ...globals.browser, + ...globals.node, + }, + }, + settings: { + react: { + version: 'detect', }, }, + rules: { + 'no-async-promise-executor': 'off', + 'no-empty-pattern': 'off', + 'no-irregular-whitespace': 'off', + 'no-prototype-builtins': 'off', + 'no-useless-escape': 'off', + 'no-extra-boolean-cast': 'off', + 'no-undef': 'off', + 'no-unused-vars': 'off', + 'react/no-find-dom-node': 'off', + 'react/display-name': 'off', + 'react/no-unknown-property': 'off', + 'react/prop-types': 'off', + 'react-hooks/exhaustive-deps': 'warn', + 'react-hooks/rules-of-hooks': 'error', + }, }, - ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), { + files: ['**/*.{ts,tsx}'], + extends: [...tseslint.configs.recommended], rules: { + '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/no-empty-object-type': 'off', + '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-unsafe-function-type': 'off', + '@typescript-eslint/no-unnecessary-type-constraint': 'off', '@typescript-eslint/no-unused-vars': 'off', }, }, -]; + { + files: ['src/**/*.{ts,tsx}'], + languageOptions: { + parserOptions: { + projectService: true, + tsconfigRootDir: import.meta.dirname, + }, + }, + }, + { + files: ['tests/**/*.{js,jsx,ts,tsx}', '**/*.{test,spec}.{js,jsx,ts,tsx}'], + extends: [jest.configs['flat/recommended']], + rules: { + 'jest/no-disabled-tests': 'off', + 'jest/no-done-callback': 'off', + 'jest/no-identical-title': 'off', + 'jest/expect-expect': 'off', + 'jest/no-alias-methods': 'off', + 'jest/no-conditional-expect': 'off', + 'jest/no-export': 'off', + 'jest/no-standalone-expect': 'off', + 'jest/valid-expect': 'off', + 'jest/valid-title': 'off', + }, + }, +]); diff --git a/package.json b/package.json index cfcefddc..fd8f4f5a 100644 --- a/package.json +++ b/package.json @@ -56,9 +56,6 @@ "clsx": "^2.1.1" }, "devDependencies": { - "@babel/eslint-parser": "^7.29.7", - "@babel/eslint-plugin": "^7.29.7", - "@eslint/eslintrc": "^3.3.5", "@eslint/js": "^9.39.4", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", @@ -70,18 +67,15 @@ "@types/node": "^26.0.1", "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", - "@typescript-eslint/eslint-plugin": "^8.62.1", - "@typescript-eslint/parser": "^8.62.1", - "@umijs/fabric": "^4.0.1", "dumi": "^2.4.38", "eslint": "^9.39.4", "eslint-config-prettier": "^10.1.8", "eslint-plugin-jest": "^29.15.4", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^7.1.1", - "eslint-plugin-unicorn": "^65.0.1", "father": "^4.6.24", "gh-pages": "^6.3.0", + "globals": "^17.7.0", "husky": "^9.1.7", "jest": "^30.4.2", "lint-staged": "^17.0.8", @@ -93,7 +87,8 @@ "react-dom": "^19.2.7", "react-redux": "^9.0.4", "redux": "^5.0.0", - "typescript": "^6.0.3" + "typescript": "^6.0.3", + "typescript-eslint": "^8.62.1" }, "publishConfig": { "access": "public" From d5a8b642a495000c3324463a20625abb61873e00 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 3 Jul 2026 10:58:06 +0800 Subject: [PATCH 15/15] chore: address review comments --- eslint.config.mjs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index d19be2a6..40f08ec9 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,5 +1,7 @@ import js from '@eslint/js'; import { defineConfig } from 'eslint/config'; +import { dirname } from 'node:path'; +import { fileURLToPath } from 'node:url'; import prettier from 'eslint-config-prettier'; import jest from 'eslint-plugin-jest'; import react from 'eslint-plugin-react'; @@ -7,6 +9,8 @@ import reactHooks from 'eslint-plugin-react-hooks'; import globals from 'globals'; import tseslint from 'typescript-eslint'; +const tsconfigRootDir = dirname(fileURLToPath(import.meta.url)); + export default defineConfig([ { plugins: { @@ -15,7 +19,7 @@ export default defineConfig([ }, { linterOptions: { - reportUnusedDisableDirectives: 'off', + reportUnusedDisableDirectives: 'warn', }, }, { @@ -26,10 +30,10 @@ export default defineConfig([ 'lib/', 'dist/', 'docs-dist/', + '.docs-dist/', '.dumi/', '.doc/', '.vercel/', - 'src/index.d.ts', ], }, { @@ -88,7 +92,7 @@ export default defineConfig([ languageOptions: { parserOptions: { projectService: true, - tsconfigRootDir: import.meta.dirname, + tsconfigRootDir, }, }, },