From 4a7038066d3b61df8319ca808dce73e958b31790 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:19:24 +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, 191 insertions(+), 16 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 3b730ef99..5e6c7faab 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 24bbf8dc1..94a4b9fe5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/slider

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

🎚️ Accessible React slider for single values, ranges, marks, and editable handles.

diff --git a/README.zh-CN.md b/README.zh-CN.md index a8800e576..5a094eefc 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/slider

-

Ant Design Ant Design 生态的一部分。

+

Ant Design Ant Design 生态的一部分。

🎚️ React 滑动输入组件，支持范围、刻度、提示和键盘交互。

diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 000000000..b25fb5dd0 --- /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 000000000..e35e17739 --- /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 ed8cfc683..1c0490654 100644 --- a/package.json +++ b/package.json @@ -55,31 +55,38 @@ "@rc-component/trigger": "^3.5.2", "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", - "@testing-library/react": "^15.0.7", - "@types/jest": "^29.5.14", + "@testing-library/react": "^16.3.2", + "@types/jest": "^30.0.0", "@types/node": "^26.0.1", - "@types/react": "^18.3.31", - "@types/react-dom": "^18.3.7", - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", + "@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", "cross-env": "^10.1.0", "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", "father-build": "^1.18.6", "gh-pages": "^6.3.0", "glob": "^13.0.6", "less": "^4.6.7", "rc-test": "^7.1.3", - "react": "^18.3.1", - "react-dom": "^18.3.1", + "react": "^19.2.7", + "react-dom": "^19.2.7", "regenerator-runtime": "^0.14.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" }, "peerDependencies": { "react": ">=16.9.0", diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 000000000..ff05aa1bd --- /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 5b4fcdfa9..e86c85beb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,9 +27,18 @@ "assets/*" ] }, - "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 9c764dc1a5630aa4af7139a6bcc5cac4f7e7b102 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:20:58 +0800 Subject: [PATCH 02/15] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 33 +++++++++++++++++++++------------ global.d.ts | 8 -------- tsconfig.json | 19 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index b25fb5dd0..f556e5a43 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 e35e17739..97e90a388 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 e86c85beb..5debbbbcb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,40 +1,39 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "react", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - "src/.umi/*" + "./src/.umi/*" ], "@rc-component/slider": [ - "src/index.tsx" + "./src/index.tsx" ], "@rc-component/slider/es": [ - "src" + "./src" ], "@rc-component/slider/es/*": [ - "src/*" + "./src/*" ], "@rc-component/slider/assets/*": [ - "assets/*" + "./assets/*" ] }, - "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 b1e37fc23818498b542afccc029fd3b26260c84d Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:51:10 +0800 Subject: [PATCH 03/15] chore: use testing-library dom events --- package.json | 22 +++++++++++----------- tests/Range.test.tsx | 3 ++- tests/Slider.test.js | 3 ++- tests/Tooltip.test.js | 3 ++- tests/common.test.js | 3 ++- tests/marks.test.js | 3 ++- 6 files changed, 21 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 1c0490654..8e2d72ed0 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,11 @@ "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", - "prettier": "^3.9.0", "@rc-component/np": "^1.0.4", "@rc-component/tooltip": "^1.2.1", "@rc-component/trigger": "^3.5.2", @@ -66,27 +69,24 @@ "cross-env": "^10.1.0", "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", "father-build": "^1.18.6", "gh-pages": "^6.3.0", "glob": "^13.0.6", + "husky": "^9.1.7", "less": "^4.6.7", + "lint-staged": "^17.0.8", + "prettier": "^3.9.0", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", "regenerator-runtime": "^0.14.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": "^6.0.3" }, "peerDependencies": { "react": ">=16.9.0", diff --git a/tests/Range.test.tsx b/tests/Range.test.tsx index dbcbe1a2a..0800b6651 100644 --- a/tests/Range.test.tsx +++ b/tests/Range.test.tsx @@ -1,6 +1,7 @@ +import { createEvent, fireEvent } from '@testing-library/dom'; /* eslint-disable max-len, no-undef, react/no-string-refs, no-param-reassign, max-classes-per-file */ import '@testing-library/jest-dom'; -import { createEvent, fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { KeyCode as keyCode, resetWarned, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; diff --git a/tests/Slider.test.js b/tests/Slider.test.js index 2300fe046..74385cdd6 100644 --- a/tests/Slider.test.js +++ b/tests/Slider.test.js @@ -1,5 +1,6 @@ import '@testing-library/jest-dom'; -import { createEvent, fireEvent, render } from '@testing-library/react'; +import { createEvent, fireEvent } from '@testing-library/dom'; +import { render } from '@testing-library/react'; import { clsx } from 'clsx'; import { KeyCode as keyCode, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; diff --git a/tests/Tooltip.test.js b/tests/Tooltip.test.js index 944154b71..2d149638a 100644 --- a/tests/Tooltip.test.js +++ b/tests/Tooltip.test.js @@ -1,5 +1,6 @@ import '@testing-library/jest-dom'; -import { fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { render } from '@testing-library/react'; import React from 'react'; import Slider from '../src/Slider'; diff --git a/tests/common.test.js b/tests/common.test.js index 83ceb0d9c..2b34cd0c7 100644 --- a/tests/common.test.js +++ b/tests/common.test.js @@ -1,6 +1,7 @@ +import { createEvent, fireEvent } from '@testing-library/dom'; /* eslint-disable max-len, no-undef */ import '@testing-library/jest-dom'; -import { createEvent, fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { KeyCode, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; diff --git a/tests/marks.test.js b/tests/marks.test.js index c5ffd4907..4ce37f801 100644 --- a/tests/marks.test.js +++ b/tests/marks.test.js @@ -1,6 +1,7 @@ +import { fireEvent } from '@testing-library/dom'; /* eslint-disable max-len, no-undef */ import '@testing-library/jest-dom'; -import { fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; From 1e9b44ce034ffb572c531e998bff830726bcca40 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:16:17 +0800 Subject: [PATCH 04/15] test: keep react testing event behavior --- tests/Range.test.tsx | 3 +-- tests/Slider.test.js | 3 +-- tests/Tooltip.test.js | 3 +-- tests/common.test.js | 3 +-- tests/marks.test.js | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/Range.test.tsx b/tests/Range.test.tsx index 0800b6651..dbcbe1a2a 100644 --- a/tests/Range.test.tsx +++ b/tests/Range.test.tsx @@ -1,7 +1,6 @@ -import { createEvent, fireEvent } from '@testing-library/dom'; /* eslint-disable max-len, no-undef, react/no-string-refs, no-param-reassign, max-classes-per-file */ import '@testing-library/jest-dom'; -import { render } from '@testing-library/react'; +import { createEvent, fireEvent, render } from '@testing-library/react'; import { KeyCode as keyCode, resetWarned, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; diff --git a/tests/Slider.test.js b/tests/Slider.test.js index 74385cdd6..2300fe046 100644 --- a/tests/Slider.test.js +++ b/tests/Slider.test.js @@ -1,6 +1,5 @@ import '@testing-library/jest-dom'; -import { createEvent, fireEvent } from '@testing-library/dom'; -import { render } from '@testing-library/react'; +import { createEvent, fireEvent, render } from '@testing-library/react'; import { clsx } from 'clsx'; import { KeyCode as keyCode, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; diff --git a/tests/Tooltip.test.js b/tests/Tooltip.test.js index 2d149638a..944154b71 100644 --- a/tests/Tooltip.test.js +++ b/tests/Tooltip.test.js @@ -1,6 +1,5 @@ import '@testing-library/jest-dom'; -import { fireEvent } from '@testing-library/dom'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import React from 'react'; import Slider from '../src/Slider'; diff --git a/tests/common.test.js b/tests/common.test.js index 2b34cd0c7..83ceb0d9c 100644 --- a/tests/common.test.js +++ b/tests/common.test.js @@ -1,7 +1,6 @@ -import { createEvent, fireEvent } from '@testing-library/dom'; /* eslint-disable max-len, no-undef */ import '@testing-library/jest-dom'; -import { render } from '@testing-library/react'; +import { createEvent, fireEvent, render } from '@testing-library/react'; import { KeyCode, spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; diff --git a/tests/marks.test.js b/tests/marks.test.js index 4ce37f801..c5ffd4907 100644 --- a/tests/marks.test.js +++ b/tests/marks.test.js @@ -1,7 +1,6 @@ -import { fireEvent } from '@testing-library/dom'; /* eslint-disable max-len, no-undef */ import '@testing-library/jest-dom'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util'; import React from 'react'; import Slider from '../src'; From 405b175b266eec3e50ecee3e0590f914a117cce8 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:04:20 +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 f556e5a43..3166a6d9e 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 ff05aa1bd..c509fe40e 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 0560cb7e01e4afd37bfe79e7fc78171d88920560 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:16:51 +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 3166a6d9e..0e70eed92 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 a3c6fb66781b3642f7870592e139baa011ac0e03 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:23:05 +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 94a4b9fe5..54b02d1b0 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Online preview: https://slider.react-component.vercel.app/ Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -133,7 +133,7 @@ Then open `http://localhost:8000`. ## Development ```bash -npm install +ut install npm start npm test npm run tsc diff --git a/README.zh-CN.md b/README.zh-CN.md index 5a094eefc..fae45efa7 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -57,7 +57,7 @@ export default () => ( 运行本地 dumi 站点： ```bash -npm install +ut install npm start ``` @@ -132,7 +132,7 @@ npm start ## 本地开发 ```bash -npm install +ut install npm start npm test npm run tsc diff --git a/vercel.json b/vercel.json index 5f9139ef4..20b1714f5 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 3011c54cc77b2a1f320537f3fc89c019b87cbc15 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:30:35 +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 20b1714f5..5f9139ef4 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 f9d68abf20076e7ce93a4aebf8c4cd7413daa818 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:03:38 +0800 Subject: [PATCH 09/15] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 16 ++++++++-------- react-compat.d.ts | 12 ------------ tsconfig.json | 1 - 4 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 react-compat.d.ts diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed92..6d138649f 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 8e2d72ed0..5152d1ee8 100644 --- a/package.json +++ b/package.json @@ -63,25 +63,25 @@ "@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", "cross-env": "^10.1.0", - "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", "father-build": "^1.18.6", "gh-pages": "^6.3.0", "glob": "^13.0.6", "husky": "^9.1.7", "less": "^4.6.7", "lint-staged": "^17.0.8", - "prettier": "^3.9.0", + "prettier": "^3.9.4", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", @@ -89,8 +89,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": "^19.2.7", + "react-dom": "^19.2.7" }, "overrides": { "@babel/core": "^7.29.7" diff --git a/react-compat.d.ts b/react-compat.d.ts deleted file mode 100644 index c509fe40e..000000000 --- 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 5debbbbcb..ad11feed5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -36,7 +36,6 @@ "module": "ESNext" }, "include": [ - "react-compat.d.ts", "global.d.ts", ".dumirc.ts", ".fatherrc.ts", From ad6accd90cc5db840431c7bac12f97e58cdf47f7 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:25:04 +0800 Subject: [PATCH 10/15] chore: fix upgraded test tooling --- tests/__snapshots__/Range.test.tsx.snap | 2 +- tests/__snapshots__/Slider.test.js.snap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/__snapshots__/Range.test.tsx.snap b/tests/__snapshots__/Range.test.tsx.snap index 87e38f9d3..2e6de152d 100644 --- a/tests/__snapshots__/Range.test.tsx.snap +++ b/tests/__snapshots__/Range.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`Range should render Multi-Range with correct DOM structure 1`] = `

Date: Wed, 1 Jul 2026 14:35:38 +0800 Subject: [PATCH 11/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 5152d1ee8..72792fb49 100644 --- a/package.json +++ b/package.json @@ -89,8 +89,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=16.9.0", + "react-dom": ">=16.9.0" }, "overrides": { "@babel/core": "^7.29.7" From 8c1138fa169125fbf1d50ec30b0dc2b159c66da4 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:37:29 +0800 Subject: [PATCH 12/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 54b02d1b0..94a4b9fe5 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ Online preview: https://slider.react-component.vercel.app/ Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -133,7 +133,7 @@ Then open `http://localhost:8000`. ## Development ```bash -ut install +npm install npm start npm test npm run tsc diff --git a/README.zh-CN.md b/README.zh-CN.md index fae45efa7..5a094eefc 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -57,7 +57,7 @@ export default () => ( 运行本地 dumi 站点： ```bash -ut install +npm install npm start ``` @@ -132,7 +132,7 @@ npm start ## 本地开发 ```bash -ut install +npm install npm start npm test npm run tsc From d0f9adce3adf019f2f1d0fd36df278a676a817c3 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:47:06 +0800 Subject: [PATCH 13/15] chore: remove redundant strict tsconfig flags --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index ad11feed5..6eaa55573 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -26,13 +26,7 @@ "./assets/*" ] }, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, "strict": false, - "noImplicitThis": false, - "strictBindCallApply": false, "module": "ESNext" }, "include": [ From 51e199819eade96863f94ec2d41860ff52ebcefc Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:13:53 +0800 Subject: [PATCH 14/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 97e90a388..9f2d82025 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 1aaac479fd76c0112c747c141cc9425c9b693fa3 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:05 +0800 Subject: [PATCH 15/15] chore: migrate to native eslint flat config --- .eslintrc.js | 20 ------- eslint.config.mjs | 146 ++++++++++++++++++++++++++-------------------- package.json | 11 +--- 3 files changed, 86 insertions(+), 91 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index f4de1ffb8..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,20 +0,0 @@ -const base = require('@umijs/fabric/dist/eslint'); - -module.exports = { - ...base, - rules: { - ...base.rules, - 'react/no-array-index-key': 0, - 'react/sort-comp': 0, - '@typescript-eslint/no-explicit-any': 1, - '@typescript-eslint/no-empty-interface': 1, - '@typescript-eslint/no-inferrable-types': 0, - 'react/no-find-dom-node': 1, - 'react/require-default-props': 0, - 'no-confusing-arrow': 0, - 'import/no-named-as-default-member': 0, - 'import/no-extraneous-dependencies': 0, - 'jsx-a11y/label-has-for': 0, - 'jsx-a11y/label-has-associated-control': 0, - }, -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 6d138649f..d19be2a62 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 72792fb49..3b4f2dc3d 100644 --- a/package.json +++ b/package.json @@ -48,9 +48,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", @@ -63,9 +60,6 @@ "@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", "cross-env": "^10.1.0", "dumi": "^2.4.38", "eslint": "^9.39.4", @@ -73,11 +67,11 @@ "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", "father-build": "^1.18.6", "gh-pages": "^6.3.0", "glob": "^13.0.6", + "globals": "^17.7.0", "husky": "^9.1.7", "less": "^4.6.7", "lint-staged": "^17.0.8", @@ -86,7 +80,8 @@ "react": "^19.2.7", "react-dom": "^19.2.7", "regenerator-runtime": "^0.14.0", - "typescript": "^6.0.3" + "typescript": "^6.0.3", + "typescript-eslint": "^8.62.1" }, "peerDependencies": { "react": ">=16.9.0",