From d762574bb9857868bbeb68195482a0990f513aad Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:18:51 +0800 Subject: [PATCH 01/17] chore: update maintenance dependencies --- .github/dependabot.yml | 8 ++++ README.md | 2 +- README.zh-CN.md | 2 +- eslint.config.mjs | 84 ++++++++++++++++++++++++++++++++++++++++++ global.d.ts | 67 +++++++++++++++++++++++++++++++++ package.json | 29 ++++++++++----- react-compat.d.ts | 21 +++++++++++ tsconfig.json | 19 +++++++++- 8 files changed, 219 insertions(+), 13 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 71d2b5c8..506ee825 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/pagination

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

πŸ“„ React pagination primitives for page navigation, size changing, quick jumping, and locale-aware controls.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 21bbfd08..e5ecee46 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/pagination

-

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..dfa7e3e0 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,84 @@ +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..a8c536f7 --- /dev/null +++ b/global.d.ts @@ -0,0 +1,67 @@ +/// +/// +/// +/// +/// + +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< + C, + P + >; + 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 2ba00a51..ee338541 100644 --- a/package.json +++ b/package.json @@ -74,16 +74,16 @@ "@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", - "@testing-library/user-event": "14.5.2", - "@types/jest": "^29.5.14", + "@testing-library/react": "^16.3.2", + "@testing-library/user-event": "^14.6.1", + "@types/jest": "^30.0.0", "@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", "cross-env": "^10.1.0", "dumi": "^2.4.35", - "eslint": "^8.57.1", + "eslint": "^9.39.4", "father": "^4.6.23", "gh-pages": "^6.3.0", "glob": "^13.0.6", @@ -94,9 +94,20 @@ "prettier": "^3.9.0", "@rc-component/select": "^1.8.0", "rc-test": "^7.1.3", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "typescript": "^5.9.3" + "react": "^19.2.7", + "react-dom": "^19.2.7", + "typescript": "^6.0.3", + "@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", + "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-unicorn": "^65.0.1" }, "peerDependencies": { "react": ">=16.9.0", diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 00000000..b8bf491e --- /dev/null +++ b/react-compat.d.ts @@ -0,0 +1,21 @@ +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 3b97dca2..42f4ff93 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,8 +12,23 @@ "@@/*": [".dumi/tmp/*"], "@rc-component/pagination": ["src/index.ts"] }, - "ignoreDeprecations": "5.0" + "ignoreDeprecations": "6.0", + "noImplicitAny": false, + "strictNullChecks": false, + "strictPropertyInitialization": false, + "strictFunctionTypes": false, + "strict": false, + "noImplicitThis": false, + "strictBindCallApply": false }, - "include": [".dumirc.ts", ".fatherrc.ts", "src", "docs", "tests"], + "include": [ + "react-compat.d.ts", + "global.d.ts", + ".dumirc.ts", + ".fatherrc.ts", + "src", + "docs", + "tests" + ], "exclude": ["node_modules", "lib", "es", "dist", "docs-dist", ".dumi"] } From 25f2fbe862ee37b3a82ca434537f54db7803089c Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:20:28 +0800 Subject: [PATCH 02/17] fix: align TypeScript and ESLint compatibility --- .eslintrc.js | 1 + eslint.config.mjs | 24 ++++++++++++++---------- global.d.ts | 9 --------- tsconfig.json | 13 ++++++------- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 53bb6cbc..429224ad 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,5 +1,6 @@ module.exports = { extends: [require.resolve('@umijs/fabric/dist/eslint')], + plugins: ['@typescript-eslint'], rules: { 'no-template-curly-in-string': 0, 'prefer-promise-reject-errors': 0, diff --git a/eslint.config.mjs b/eslint.config.mjs index dfa7e3e0..f556e5a4 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -27,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) { @@ -72,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 a8c536f7..bbd470e9 100644 --- a/global.d.ts +++ b/global.d.ts @@ -55,13 +55,4 @@ 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 42f4ff93..c85420f7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,25 +1,24 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "react", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { - "@/*": ["src/*"], - "@@/*": [".dumi/tmp/*"], - "@rc-component/pagination": ["src/index.ts"] + "@/*": ["./src/*"], + "@@/*": ["./.dumi/tmp/*"], + "@rc-component/pagination": ["./src/index.ts"] }, - "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 43923d3a0f8ef3d100ef08d7da9b3ce0efd5dde9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:50:33 +0800 Subject: [PATCH 03/17] chore: use testing-library dom events --- package.json | 27 ++++++++++++++------------- tests/index.test.tsx | 3 ++- tests/jumper.test.tsx | 3 ++- tests/simple.test.tsx | 3 ++- tests/sizer.test.tsx | 3 ++- tests/two-pagination.test.tsx | 3 ++- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index ee338541..322c9b17 100644 --- a/package.json +++ b/package.json @@ -71,8 +71,14 @@ "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", + "@rc-component/select": "^1.8.0", + "@testing-library/dom": "^10.4.1", "@testing-library/jest-dom": "^6.9.1", "@testing-library/react": "^16.3.2", "@testing-library/user-event": "^14.6.1", @@ -80,10 +86,17 @@ "@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", "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", "gh-pages": "^6.3.0", "glob": "^13.0.6", @@ -92,22 +105,10 @@ "less": "^4.6.7", "lint-staged": "^17.0.8", "prettier": "^3.9.0", - "@rc-component/select": "^1.8.0", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", - "typescript": "^6.0.3", - "@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", - "eslint-plugin-jest": "^29.15.3", - "eslint-plugin-unicorn": "^65.0.1" + "typescript": "^6.0.3" }, "peerDependencies": { "react": ">=16.9.0", diff --git a/tests/index.test.tsx b/tests/index.test.tsx index 45fa5487..1d9bf198 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render, fireEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import React from 'react'; import Pagination from '../src'; import { resetWarned } from '@rc-component/util'; diff --git a/tests/jumper.test.tsx b/tests/jumper.test.tsx index f87dbcb7..ce228171 100644 --- a/tests/jumper.test.tsx +++ b/tests/jumper.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render, fireEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import Pagination from '../src'; import * as React from 'react'; diff --git a/tests/simple.test.tsx b/tests/simple.test.tsx index 568858a4..97257d71 100644 --- a/tests/simple.test.tsx +++ b/tests/simple.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent, createEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render, fireEvent, createEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import Select from '@rc-component/select'; import React, { useState } from 'react'; import Pagination from '../src'; diff --git a/tests/sizer.test.tsx b/tests/sizer.test.tsx index ba4d1d3b..7c0033de 100644 --- a/tests/sizer.test.tsx +++ b/tests/sizer.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 userEvent from '@testing-library/user-event'; import Select from '@rc-component/select'; import Pagination from '../src'; diff --git a/tests/two-pagination.test.tsx b/tests/two-pagination.test.tsx index 8d59d382..d7f3eb11 100644 --- a/tests/two-pagination.test.tsx +++ b/tests/two-pagination.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render, fireEvent } from '@testing-library/react'; +import { render } from '@testing-library/react'; import React from 'react'; import TwoPagination from './two-pagination'; From 2026b19f9385126c93ffd3e8a9faa79deb3047ea Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:15:52 +0800 Subject: [PATCH 04/17] test: keep react testing event behavior --- tests/index.test.tsx | 3 +-- tests/jumper.test.tsx | 3 +-- tests/simple.test.tsx | 3 +-- tests/sizer.test.tsx | 3 +-- tests/two-pagination.test.tsx | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/tests/index.test.tsx b/tests/index.test.tsx index 1d9bf198..45fa5487 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render } from '@testing-library/react'; +import { render, fireEvent } from '@testing-library/react'; import React from 'react'; import Pagination from '../src'; import { resetWarned } from '@rc-component/util'; diff --git a/tests/jumper.test.tsx b/tests/jumper.test.tsx index ce228171..f87dbcb7 100644 --- a/tests/jumper.test.tsx +++ b/tests/jumper.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render } from '@testing-library/react'; +import { render, fireEvent } from '@testing-library/react'; import Pagination from '../src'; import * as React from 'react'; diff --git a/tests/simple.test.tsx b/tests/simple.test.tsx index 97257d71..568858a4 100644 --- a/tests/simple.test.tsx +++ b/tests/simple.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent, createEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render } from '@testing-library/react'; +import { render, fireEvent, createEvent } from '@testing-library/react'; import Select from '@rc-component/select'; import React, { useState } from 'react'; import Pagination from '../src'; diff --git a/tests/sizer.test.tsx b/tests/sizer.test.tsx index 7c0033de..ba4d1d3b 100644 --- a/tests/sizer.test.tsx +++ b/tests/sizer.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 userEvent from '@testing-library/user-event'; import Select from '@rc-component/select'; import Pagination from '../src'; diff --git a/tests/two-pagination.test.tsx b/tests/two-pagination.test.tsx index d7f3eb11..8d59d382 100644 --- a/tests/two-pagination.test.tsx +++ b/tests/two-pagination.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import type { RenderResult } from '@testing-library/react'; -import { render } from '@testing-library/react'; +import { render, fireEvent } from '@testing-library/react'; import React from 'react'; import TwoPagination from './two-pagination'; From 495dd6fc844ae16a47a62b4991b30bd9adde719d Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:03:34 +0800 Subject: [PATCH 05/17] chore: address review comments --- eslint.config.mjs | 30 ++++++++++-------------------- react-compat.d.ts | 7 ------- 2 files changed, 10 insertions(+), 27 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 b8bf491e..9650edc7 100644 --- a/react-compat.d.ts +++ b/react-compat.d.ts @@ -12,10 +12,3 @@ declare module 'react' { ...children: React.ReactNode[] ): React.ReactElement

; } - -declare module 'react-dom' { - function hydrate( - element: React.ReactNode, - container: Element | DocumentFragment, - ): void; -} From e75b31afd4076636828459d33bd37510ab47806a Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:16:21 +0800 Subject: [PATCH 06/17] 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 b2daf121d38d98ba42ffc6dd2079ad04afaa3a67 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 12:53:22 +0800 Subject: [PATCH 07/17] chore: preserve local eslint rule overrides --- eslint.config.mjs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed9..ec58853b 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,6 +15,7 @@ const compat = new FlatCompat({ allConfig: js.configs.all, }); +const legacyConfig = require('./.eslintrc.js'); const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended; const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) ? recommendedTsRulesConfig.reduce( @@ -23,6 +24,18 @@ const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) ) : recommendedTsRulesConfig?.rules || {}; const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); + +function hasCurrentTsRule(ruleName) { + const tsRuleName = ruleName.replace('@typescript-eslint/', ''); + return Boolean(tsEslintPlugin.rules[tsRuleName]); +} +const localTsRules = new Set( + Object.keys(legacyConfig.rules || {}).filter( + (ruleName) => + ruleName.startsWith('@typescript-eslint/') && hasCurrentTsRule(ruleName), + ), +); + const noopRule = { meta: { type: 'problem', docs: {}, schema: [] }, create: () => ({}), @@ -42,7 +55,7 @@ function normalizeConfig(config) { if (!ruleName.startsWith('@typescript-eslint/')) { return true; } - return recommendedTsRules.has(ruleName); + return recommendedTsRules.has(ruleName) || localTsRules.has(ruleName); }), ); } @@ -77,7 +90,7 @@ export default [ }, }, }, - ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), + ...compat.config(legacyConfig).map(normalizeConfig), { rules: { '@typescript-eslint/no-empty-object-type': 'off', From d43ecc3ac739b54e00c73519f90fa4025fa26678 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:22:30 +0800 Subject: [PATCH 08/17] 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 506ee825..949cd4e0 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ export default () => ( Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -107,7 +107,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 e5ecee46..6ab86517 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -58,7 +58,7 @@ export default () => ( 运葌本地 dumi η«™η‚ΉοΌš ```bash -npm install +ut install npm start ``` @@ -107,7 +107,7 @@ npm start ## ζœ¬εœ°εΌ€ε‘ ```bash -npm install +ut install npm start npm test npm run tsc 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 43e67ef0734a34010679cbf44c839de8ef078751 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:29:58 +0800 Subject: [PATCH 09/17] 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 54643fb51758bb5833977c60a6d1c746c5553b5f Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:02:44 +0800 Subject: [PATCH 10/17] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 16 ++++++++-------- react-compat.d.ts | 14 -------------- tsconfig.json | 1 - 4 files changed, 11 insertions(+), 23 deletions(-) delete mode 100644 react-compat.d.ts diff --git a/eslint.config.mjs b/eslint.config.mjs index ec58853b..68154342 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -52,6 +52,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 322c9b17..b73afc28 100644 --- a/package.json +++ b/package.json @@ -86,33 +86,33 @@ "@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", "gh-pages": "^6.3.0", "glob": "^13.0.6", "husky": "^9.1.7", "identity-obj-proxy": "^3.0.0", "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", "typescript": "^6.0.3" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": "^19.2.7", + "react-dom": "^19.2.7" }, "cnpm": { "mode": "npm" diff --git a/react-compat.d.ts b/react-compat.d.ts deleted file mode 100644 index 9650edc7..00000000 --- a/react-compat.d.ts +++ /dev/null @@ -1,14 +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 c85420f7..f2cca45c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -21,7 +21,6 @@ "module": "ESNext" }, "include": [ - "react-compat.d.ts", "global.d.ts", ".dumirc.ts", ".fatherrc.ts", From 0b32b3fcc7fef907fb0656757a901b1bbc686d53 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:24:35 +0800 Subject: [PATCH 11/17] chore: fix upgraded test tooling --- tests/__snapshots__/demo.test.tsx.snap | 2 +- tests/__snapshots__/index.test.tsx.snap | 2 +- tests/__snapshots__/options.test.tsx.snap | 2 +- tests/__snapshots__/simple.test.tsx.snap | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/__snapshots__/demo.test.tsx.snap b/tests/__snapshots__/demo.test.tsx.snap index fcc202a7..2b1ffd7e 100644 --- a/tests/__snapshots__/demo.test.tsx.snap +++ b/tests/__snapshots__/demo.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`Example align 1`] = `

diff --git a/tests/__snapshots__/index.test.tsx.snap b/tests/__snapshots__/index.test.tsx.snap index 8d3a53fe..64df2540 100644 --- a/tests/__snapshots__/index.test.tsx.snap +++ b/tests/__snapshots__/index.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[` 1`] = ` [ diff --git a/tests/__snapshots__/options.test.tsx.snap b/tests/__snapshots__/options.test.tsx.snap index 5bb32df2..18ff0e58 100644 --- a/tests/__snapshots__/options.test.tsx.snap +++ b/tests/__snapshots__/options.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`Options should render correctly 1`] = `
  • Date: Wed, 1 Jul 2026 14:34:52 +0800 Subject: [PATCH 12/17] 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 b73afc28..34679302 100644 --- a/package.json +++ b/package.json @@ -111,8 +111,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=16.9.0", + "react-dom": ">=16.9.0" }, "cnpm": { "mode": "npm" From 68a8f1d835c5d93de7ff513df27dc85a2d73f01c Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:36:42 +0800 Subject: [PATCH 13/17] 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 949cd4e0..506ee825 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ export default () => ( Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -107,7 +107,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 6ab86517..e5ecee46 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -58,7 +58,7 @@ export default () => ( 运葌本地 dumi η«™η‚ΉοΌš ```bash -ut install +npm install npm start ``` @@ -107,7 +107,7 @@ npm start ## ζœ¬εœ°εΌ€ε‘ ```bash -ut install +npm install npm start npm test npm run tsc From 6e2d4be400670aeb9daf6b487b632b2927e45e29 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:46:45 +0800 Subject: [PATCH 14/17] chore: remove redundant strict tsconfig flags --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index f2cca45c..022e7d5b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,13 +11,7 @@ "@@/*": ["./.dumi/tmp/*"], "@rc-component/pagination": ["./src/index.ts"] }, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, "strict": false, - "noImplicitThis": false, - "strictBindCallApply": false, "module": "ESNext" }, "include": [ From a12488f4700767c023d0901d06122e0b52f1efa0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:13:20 +0800 Subject: [PATCH 15/17] chore: remove manual global test declarations --- global.d.ts | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/global.d.ts b/global.d.ts index bbd470e9..e0bd355c 100644 --- a/global.d.ts +++ b/global.d.ts @@ -8,51 +8,4 @@ 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< - C, - P - >; - 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 ff2a1a6d2e2414de2e8fdb270426777cea5fe315 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:03 +0800 Subject: [PATCH 16/17] chore: migrate to native eslint flat config --- .eslintrc.js | 13 ---- eslint.config.mjs | 160 ++++++++++++++++++++++++---------------------- package.json | 11 +--- 3 files changed, 87 insertions(+), 97 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 429224ad..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - extends: [require.resolve('@umijs/fabric/dist/eslint')], - plugins: ['@typescript-eslint'], - rules: { - 'no-template-curly-in-string': 0, - 'prefer-promise-reject-errors': 0, - 'react/no-array-index-key': 0, - 'react/sort-comp': 0, - '@typescript-eslint/no-explicit-any': 0, - 'jsx-a11y/role-supports-aria-props': 0, - 'jsx-a11y/no-noninteractive-tabindex': 0, - }, -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 68154342..9c62a8fd 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,72 +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 legacyConfig = require('./.eslintrc.js'); -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 hasCurrentTsRule(ruleName) { - const tsRuleName = ruleName.replace('@typescript-eslint/', ''); - return Boolean(tsEslintPlugin.rules[tsRuleName]); -} -const localTsRules = new Set( - Object.keys(legacyConfig.rules || {}).filter( - (ruleName) => - ruleName.startsWith('@typescript-eslint/') && hasCurrentTsRule(ruleName), - ), -); - -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) || localTsRules.has(ruleName); - }), - ); - } - - return next; -} - -export default [ +export default defineConfig([ + { + plugins: { + '@typescript-eslint': tseslint.plugin, + }, + }, + { + linterOptions: { + reportUnusedDisableDirectives: 'off', + }, + }, { ignores: [ 'node_modules/', @@ -78,27 +29,84 @@ export default [ '.dumi/', '.doc/', '.vercel/', - '.eslintrc.js', + 'src/locale/*.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(legacyConfig).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 34679302..8b45fc94 100644 --- a/package.json +++ b/package.json @@ -71,9 +71,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", @@ -86,9 +83,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", @@ -96,10 +90,10 @@ "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", "glob": "^13.0.6", + "globals": "^17.7.0", "husky": "^9.1.7", "identity-obj-proxy": "^3.0.0", "less": "^4.6.7", @@ -108,7 +102,8 @@ "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", - "typescript": "^6.0.3" + "typescript": "^6.0.3", + "typescript-eslint": "^8.62.1" }, "peerDependencies": { "react": ">=16.9.0", From 1bcfb28c8ed931efa379201e7b25e6ccaa422de9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 3 Jul 2026 10:58:09 +0800 Subject: [PATCH 17/17] 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 9c62a8fd..35b4884c 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,11 +30,11 @@ export default defineConfig([ 'lib/', 'dist/', 'docs-dist/', + '.docs-dist/', '.dumi/', '.doc/', '.vercel/', 'src/locale/*.js', - 'src/index.d.ts', ], }, { @@ -89,7 +93,7 @@ export default defineConfig([ languageOptions: { parserOptions: { projectService: true, - tsconfigRootDir: import.meta.dirname, + tsconfigRootDir, }, }, },