From 4fac652e244f54747dbd6d1617118fd638526228 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:18:17 +0800 Subject: [PATCH 01/18] 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 | 29 +++++++++++----- react-compat.d.ts | 16 +++++++++ tsconfig.json | 16 +++++---- 8 files changed, 191 insertions(+), 17 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 2a2cde2f..add7d03c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/image

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

🖼️ Image display, fallback, and preview tooling for React.

diff --git a/README.zh-CN.md b/README.zh-CN.md index e512d438..eee0099d 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/image

-

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 355d10cf..892ba62a 100644 --- a/package.json +++ b/package.json @@ -54,24 +54,35 @@ "prettier": "^3.9.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", + "@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", + "@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": "^9.39.4", "father": "^4.6.23", "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", - "typescript": "^5.9.3", + "react": "^19.2.7", + "react-dom": "^19.2.7", + "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", + "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..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 f17405ba..9a0fdb71 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,14 +18,18 @@ "src/index.ts" ] }, - "types": [ - "@testing-library/jest-dom", - "jest", - "node" - ], - "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", "docs", From a4031d864e6398764eae7aae18c752f628ecdeef Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:19:58 +0800 Subject: [PATCH 02/18] 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 9a0fdb71..becca78b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,31 +1,30 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "react", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - ".dumi/tmp/*" + "./.dumi/tmp/*" ], "@rc-component/image": [ - "src/index.ts" + "./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 61f96096ad3c7806b48123321591fb3ae9010b65 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:50:02 +0800 Subject: [PATCH 03/18] chore: use testing-library dom events --- package.json | 31 ++++++++++++++++--------------- tests/basic.test.tsx | 3 ++- tests/controlled.test.tsx | 3 ++- tests/crossOrigin.test.tsx | 3 ++- tests/fallback.test.tsx | 3 ++- tests/placeholder.test.tsx | 3 ++- tests/preview.test.tsx | 3 ++- tests/previewGroup.test.tsx | 3 ++- tests/previewTouch.test.tsx | 3 ++- 9 files changed, 32 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 892ba62a..97341a12 100644 --- a/package.json +++ b/package.json @@ -49,40 +49,41 @@ }, "devDependencies": { "@ant-design/icons": "^5.0.1", + "@babel/eslint-parser": "^7.29.7", + "@babel/eslint-plugin": "^7.29.7", + "@eslint/eslintrc": "^3.3.5", + "@eslint/js": "^9.39.4", "@rc-component/dialog": "^1.7.0", "@rc-component/father-plugin": "^2.2.0", - "prettier": "^3.9.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", "@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", "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", - "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", - "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/basic.test.tsx b/tests/basic.test.tsx index 243d0870..7e0f03ea 100644 --- a/tests/basic.test.tsx +++ b/tests/basic.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 React from 'react'; import Image, { CoverConfig } from '../src'; diff --git a/tests/controlled.test.tsx b/tests/controlled.test.tsx index ee243e29..141f64b0 100644 --- a/tests/controlled.test.tsx +++ b/tests/controlled.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 React from 'react'; import Image from '../src'; diff --git a/tests/crossOrigin.test.tsx b/tests/crossOrigin.test.tsx index b9710b3a..1c64e8e7 100644 --- a/tests/crossOrigin.test.tsx +++ b/tests/crossOrigin.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render, fireEvent, act } from '@testing-library/react'; +import { render, act } from '@testing-library/react'; import Image from '../src'; describe('CrossOrigin', () => { diff --git a/tests/fallback.test.tsx b/tests/fallback.test.tsx index 841f49c1..2a42e166 100644 --- a/tests/fallback.test.tsx +++ b/tests/fallback.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 React from 'react'; import Image from '../src'; diff --git a/tests/placeholder.test.tsx b/tests/placeholder.test.tsx index d609c254..28b0ee6a 100644 --- a/tests/placeholder.test.tsx +++ b/tests/placeholder.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import { spyElementPrototypes } from '@rc-component/util'; -import { act, fireEvent, render } from '@testing-library/react'; +import { act, render } from '@testing-library/react'; import React from 'react'; import Image from '../src'; diff --git a/tests/preview.test.tsx b/tests/preview.test.tsx index 23007613..0ba8c323 100644 --- a/tests/preview.test.tsx +++ b/tests/preview.test.tsx @@ -1,3 +1,4 @@ +import { createEvent, fireEvent } from '@testing-library/dom'; import CloseOutlined from '@ant-design/icons/CloseOutlined'; import LeftOutlined from '@ant-design/icons/LeftOutlined'; import RightOutlined from '@ant-design/icons/RightOutlined'; @@ -7,7 +8,7 @@ import ZoomInOutlined from '@ant-design/icons/ZoomInOutlined'; import ZoomOutOutlined from '@ant-design/icons/ZoomOutOutlined'; import Dialog from '@rc-component/dialog'; import { spyElementPrototypes } from '@rc-component/util'; -import { act, createEvent, fireEvent, render } from '@testing-library/react'; +import { act, render } from '@testing-library/react'; import React from 'react'; jest.mock('../src/Preview', () => { diff --git a/tests/previewGroup.test.tsx b/tests/previewGroup.test.tsx index c13b6337..dd76b462 100644 --- a/tests/previewGroup.test.tsx +++ b/tests/previewGroup.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import { KeyCode } from '@rc-component/util'; -import { act, fireEvent, render } from '@testing-library/react'; +import { act, render } from '@testing-library/react'; import React from 'react'; import Image from '../src'; diff --git a/tests/previewTouch.test.tsx b/tests/previewTouch.test.tsx index d8410586..64d859f3 100644 --- a/tests/previewTouch.test.tsx +++ b/tests/previewTouch.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; import { spyElementPrototypes } from '@rc-component/util'; -import { act, fireEvent, render } from '@testing-library/react'; +import { act, render } from '@testing-library/react'; import React from 'react'; import Image from '../src'; From ec419baea93671c876266f47d1aaaf908bbda1eb Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:15:15 +0800 Subject: [PATCH 04/18] test: keep react testing event behavior --- tests/basic.test.tsx | 3 +-- tests/controlled.test.tsx | 3 +-- tests/crossOrigin.test.tsx | 3 +-- tests/fallback.test.tsx | 3 +-- tests/placeholder.test.tsx | 3 +-- tests/preview.test.tsx | 3 +-- tests/previewGroup.test.tsx | 3 +-- tests/previewTouch.test.tsx | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/tests/basic.test.tsx b/tests/basic.test.tsx index 7e0f03ea..243d0870 100644 --- a/tests/basic.test.tsx +++ b/tests/basic.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 React from 'react'; import Image, { CoverConfig } from '../src'; diff --git a/tests/controlled.test.tsx b/tests/controlled.test.tsx index 141f64b0..ee243e29 100644 --- a/tests/controlled.test.tsx +++ b/tests/controlled.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 React from 'react'; import Image from '../src'; diff --git a/tests/crossOrigin.test.tsx b/tests/crossOrigin.test.tsx index 1c64e8e7..b9710b3a 100644 --- a/tests/crossOrigin.test.tsx +++ b/tests/crossOrigin.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; -import { render, act } from '@testing-library/react'; +import { render, fireEvent, act } from '@testing-library/react'; import Image from '../src'; describe('CrossOrigin', () => { diff --git a/tests/fallback.test.tsx b/tests/fallback.test.tsx index 2a42e166..841f49c1 100644 --- a/tests/fallback.test.tsx +++ b/tests/fallback.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 React from 'react'; import Image from '../src'; diff --git a/tests/placeholder.test.tsx b/tests/placeholder.test.tsx index 28b0ee6a..d609c254 100644 --- a/tests/placeholder.test.tsx +++ b/tests/placeholder.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import { spyElementPrototypes } from '@rc-component/util'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import React from 'react'; import Image from '../src'; diff --git a/tests/preview.test.tsx b/tests/preview.test.tsx index 0ba8c323..23007613 100644 --- a/tests/preview.test.tsx +++ b/tests/preview.test.tsx @@ -1,4 +1,3 @@ -import { createEvent, fireEvent } from '@testing-library/dom'; import CloseOutlined from '@ant-design/icons/CloseOutlined'; import LeftOutlined from '@ant-design/icons/LeftOutlined'; import RightOutlined from '@ant-design/icons/RightOutlined'; @@ -8,7 +7,7 @@ import ZoomInOutlined from '@ant-design/icons/ZoomInOutlined'; import ZoomOutOutlined from '@ant-design/icons/ZoomOutOutlined'; import Dialog from '@rc-component/dialog'; import { spyElementPrototypes } from '@rc-component/util'; -import { act, render } from '@testing-library/react'; +import { act, createEvent, fireEvent, render } from '@testing-library/react'; import React from 'react'; jest.mock('../src/Preview', () => { diff --git a/tests/previewGroup.test.tsx b/tests/previewGroup.test.tsx index dd76b462..c13b6337 100644 --- a/tests/previewGroup.test.tsx +++ b/tests/previewGroup.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import { KeyCode } from '@rc-component/util'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import React from 'react'; import Image from '../src'; diff --git a/tests/previewTouch.test.tsx b/tests/previewTouch.test.tsx index 64d859f3..d8410586 100644 --- a/tests/previewTouch.test.tsx +++ b/tests/previewTouch.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; import { spyElementPrototypes } from '@rc-component/util'; -import { act, render } from '@testing-library/react'; +import { act, fireEvent, render } from '@testing-library/react'; import React from 'react'; import Image from '../src'; From a4c0696819e120f22de42e608405e6e83f82372b Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:03:03 +0800 Subject: [PATCH 05/18] 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 a5abe7ce8c25701b04cd5d7fdedceced889a80dc Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:15:50 +0800 Subject: [PATCH 06/18] 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 153531186a9e77770015fc80309c599e93e4a45f Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 12:42:29 +0800 Subject: [PATCH 07/18] chore: enable unused vars warnings --- eslint.config.mjs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed9..455a5d23 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -17,10 +17,7 @@ const compat = new FlatCompat({ const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended; const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) - ? recommendedTsRulesConfig.reduce( - (rules, config) => ({ ...rules, ...(config.rules || {}) }), - {}, - ) + ? recommendedTsRulesConfig.reduce((rules, config) => ({ ...rules, ...(config.rules || {}) }), {}) : recommendedTsRulesConfig?.rules || {}; const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); const noopRule = { @@ -82,7 +79,13 @@ export default [ rules: { '@typescript-eslint/no-empty-object-type': 'off', '@typescript-eslint/no-unsafe-function-type': 'off', - '@typescript-eslint/no-unused-vars': 'off', + '@typescript-eslint/no-unused-vars': [ + 'warn', + { + argsIgnorePattern: '^_', + varsIgnorePattern: '^_', + }, + ], }, }, ]; From f711f1c04c8eb312f80fb1dbeaac35d78ccf9bb5 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:08:50 +0800 Subject: [PATCH 08/18] chore: remove react type compatibility shim --- react-compat.d.ts | 12 ------------ src/Preview/index.tsx | 2 +- tsconfig.json | 23 ++++------------------- 3 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 react-compat.d.ts 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/src/Preview/index.tsx b/src/Preview/index.tsx index a90d9ff9..464d6ff7 100644 --- a/src/Preview/index.tsx +++ b/src/Preview/index.tsx @@ -199,7 +199,7 @@ const Preview: React.FC = props => { focusTrap = true, } = props; - const imgRef = useRef(); + const imgRef = useRef(null); const wrapperRef = useRef(null); const triggerRef = useRef(null); diff --git a/tsconfig.json b/tsconfig.json index becca78b..ca72e654 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,15 +7,9 @@ "skipLibCheck": true, "esModuleInterop": true, "paths": { - "@/*": [ - "./src/*" - ], - "@@/*": [ - "./.dumi/tmp/*" - ], - "@rc-component/image": [ - "./src/index.ts" - ] + "@/*": ["./src/*"], + "@@/*": ["./.dumi/tmp/*"], + "@rc-component/image": ["./src/index.ts"] }, "noImplicitAny": false, "strictNullChecks": false, @@ -26,14 +20,5 @@ "strictBindCallApply": false, "module": "ESNext" }, - "include": [ - "react-compat.d.ts", - "global.d.ts", - ".dumirc.ts", - ".fatherrc.ts", - "docs", - "src", - "tests", - "typings.d.ts" - ] + "include": ["global.d.ts", ".dumirc.ts", ".fatherrc.ts", "docs", "src", "tests", "typings.d.ts"] } From 8ea6433bfd1b9aa13bc0e19b1cc6b9a996e498ca Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:21:56 +0800 Subject: [PATCH 09/18] docs: use ut install for local setup --- README.md | 4 ++-- README.zh-CN.md | 22 +++++++++++----------- vercel.json | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index add7d03c..e49463e4 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ export default function App() { Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -179,7 +179,7 @@ type ToolbarRenderInfoType = { ## Development ```bash -npm install +ut install npm start ``` diff --git a/README.zh-CN.md b/README.zh-CN.md index eee0099d..07f63484 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -62,7 +62,7 @@ export default function App() { 运行本地 dumi 站点: ```bash -npm install +ut install npm start ``` @@ -72,15 +72,15 @@ npm start ### Image -| 参数 | 说明 | 类型 | 默认值 | -| --- | --- | --- | --- | -| fallback | 加载失败时使用的图片源 | string | - | -| placeholder | 图片加载前的占位内容 | boolean \| `React.ReactElement` | - | -| prefixCls | 组件 className 前缀 | string | `rc-image` | -| preview | 是否以及如何显示预览 | boolean \| `PreviewConfig` | true | -| previewPrefixCls | 预览 className 前缀 | string | `rc-image-preview` | -| src | 图片地址 | string | - | -| onError | 图片加载失败时的回调 | `(event: Event) => void` | - | +| 参数 | 说明 | 类型 | 默认值 | +| ---------------- | ---------------------- | ------------------------------- | ------------------ | +| fallback | 加载失败时使用的图片源 | string | - | +| placeholder | 图片加载前的占位内容 | boolean \| `React.ReactElement` | - | +| prefixCls | 组件 className 前缀 | string | `rc-image` | +| preview | 是否以及如何显示预览 | boolean \| `PreviewConfig` | true | +| previewPrefixCls | 预览 className 前缀 | string | `rc-image-preview` | +| src | 图片地址 | string | - | +| onError | 图片加载失败时的回调 | `(event: Event) => void` | - | 也支持原生图片属性。 @@ -179,7 +179,7 @@ type ToolbarRenderInfoType = { ## 本地开发 ```bash -npm install +ut install npm start ``` 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 5d91fe7599822363c663535292a640e6ae4d7e13 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:29:26 +0800 Subject: [PATCH 10/18] 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 70afa2c234c7b7cd15bba259c28b5c8f955e0c7d Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:01:47 +0800 Subject: [PATCH 11/18] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 455a5d23..5c5b13fd 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -36,6 +36,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 97341a12..70711f5b 100644 --- a/package.json +++ b/package.json @@ -63,31 +63,31 @@ "@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", "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", "typescript": "^6.0.3" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": "^19.2.7", + "react-dom": "^19.2.7" }, "publishConfig": { "access": "public" From 4d8e200d4719e6105721d9cadf1fcaaf01e36b9d Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:23:58 +0800 Subject: [PATCH 12/18] chore: fix upgraded test tooling --- tests/__snapshots__/basic.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/__snapshots__/basic.test.tsx.snap b/tests/__snapshots__/basic.test.tsx.snap index 5a7d1946..a5b4711f 100644 --- a/tests/__snapshots__/basic.test.tsx.snap +++ b/tests/__snapshots__/basic.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`Basic snapshot 1`] = `

Date: Wed, 1 Jul 2026 14:34:14 +0800 Subject: [PATCH 13/18] 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 70711f5b..253d6571 100644 --- a/package.json +++ b/package.json @@ -86,8 +86,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=16.9.0", + "react-dom": ">=16.9.0" }, "publishConfig": { "access": "public" From 97d73a2226479d7721bcf386145e144417a19080 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:35:54 +0800 Subject: [PATCH 14/18] 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 e49463e4..add7d03c 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ export default function App() { Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -179,7 +179,7 @@ type ToolbarRenderInfoType = { ## Development ```bash -ut install +npm install npm start ``` diff --git a/README.zh-CN.md b/README.zh-CN.md index 07f63484..12cfa841 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -62,7 +62,7 @@ export default function App() { 运行本地 dumi 站点: ```bash -ut install +npm install npm start ``` @@ -179,7 +179,7 @@ type ToolbarRenderInfoType = { ## 本地开发 ```bash -ut install +npm install npm start ``` From a3b6ef359975b03e9d17702e2207a536dfdfd7cd Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:46:22 +0800 Subject: [PATCH 15/18] chore: remove redundant strict tsconfig flags --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index ca72e654..63e031d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,13 +11,7 @@ "@@/*": ["./.dumi/tmp/*"], "@rc-component/image": ["./src/index.ts"] }, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, "strict": false, - "noImplicitThis": false, - "strictBindCallApply": false, "module": "ESNext" }, "include": ["global.d.ts", ".dumirc.ts", ".fatherrc.ts", "docs", "src", "tests", "typings.d.ts"] From cdb17a9f802ede39d48769a373c37dad93f63449 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:12:41 +0800 Subject: [PATCH 16/18] chore: remove manual global test declarations --- global.d.ts | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/global.d.ts b/global.d.ts index 97e90a38..e0bd355c 100644 --- a/global.d.ts +++ b/global.d.ts @@ -8,41 +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; - 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 6bc4c7f202d96243c98947048c24329286617689 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:00 +0800 Subject: [PATCH 17/18] chore: migrate to native eslint flat config --- .eslintrc.js | 22 ------- eslint.config.mjs | 151 ++++++++++++++++++++++++++-------------------- 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 0848e636..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,22 +0,0 @@ -const base = require('@umijs/fabric/dist/eslint'); - -module.exports = { - ...base, - rules: { - ...base.rules, - 'arrow-parens': 0, - '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, - 'jsx-a11y/label-has-for': 0, - 'jsx-a11y/label-has-associated-control': 0, - 'jsx-a11y/control-has-associated-label': 0, - 'jsx-a11y/alt-text': 0, - }, -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 5c5b13fd..d19be2a6 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,56 +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/', @@ -62,33 +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-unused-vars': [ - 'warn', - { - argsIgnorePattern: '^_', - varsIgnorePattern: '^_', - }, - ], + '@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 253d6571..491ac4ab 100644 --- a/package.json +++ b/package.json @@ -49,9 +49,6 @@ }, "devDependencies": { "@ant-design/icons": "^5.0.1", - "@babel/eslint-parser": "^7.29.7", - "@babel/eslint-plugin": "^7.29.7", - "@eslint/eslintrc": "^3.3.5", "@eslint/js": "^9.39.4", "@rc-component/dialog": "^1.7.0", "@rc-component/father-plugin": "^2.2.0", @@ -63,19 +60,16 @@ "@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", "glob": "^13.0.6", + "globals": "^17.7.0", "husky": "^9.1.7", "less": "^4.6.7", "lint-staged": "^17.0.8", @@ -83,7 +77,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 662ff70e84aef6983bde599e3e2fadea62ddf41b Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 3 Jul 2026 10:58:06 +0800 Subject: [PATCH 18/18] 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, }, }, },