Skip to content

Commit 3d82638

Browse files
authored
chore: update maintenance dependencies (#517)
* chore: update maintenance dependencies * fix: align TypeScript and ESLint compatibility * chore: use testing-library dom events * test: keep react testing event behavior * chore: address review comments * fix: keep compatible eslint export rule * chore: enable unused vars warnings * chore: remove react type compatibility shim * docs: use ut install for local setup * chore: restore vercel install command * chore: align maintenance dependencies * chore: fix upgraded test tooling * fix: preserve React peer dependency range * docs: use npm install in README * chore: remove redundant strict tsconfig flags * chore: remove manual global test declarations * chore: migrate to native eslint flat config * chore: address review comments
1 parent b03f216 commit 3d82638

10 files changed

Lines changed: 175 additions & 74 deletions

File tree

.eslintrc.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ updates:
88
time: '21:00'
99
timezone: Asia/Shanghai
1010
open-pull-requests-limit: 10
11+
groups:
12+
npm-dependencies:
13+
patterns:
14+
- '*'
1115

1216
- package-ecosystem: github-actions
1317
directory: '/'
@@ -17,3 +21,7 @@ updates:
1721
time: '21:00'
1822
timezone: Asia/Shanghai
1923
open-pull-requests-limit: 10
24+
groups:
25+
github-actions:
26+
patterns:
27+
- '*'

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
22
<h1>@rc-component/image</h1>
3-
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Part of the Ant Design ecosystem.</sub></p>
3+
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Part of the Ant Design ecosystem.</sub></p>
44
<p>🖼️ Image display, fallback, and preview tooling for React.</p>
55

66
<p>

README.zh-CN.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div align="center">
22
<h1>@rc-component/image</h1>
3-
<p><sub><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /> Ant Design 生态的一部分。</sub></p>
3+
<p><sub><a href="https://ant.design"><img alt="Ant Design" height="14" src="https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg" style="vertical-align: -0.125em;" /></a> Ant Design 生态的一部分。</sub></p>
44
<p>🖼️ React 图片预览组件,支持预览组、缩放、旋转和自定义工具栏。</p>
55

66
<p>
@@ -72,15 +72,15 @@ npm start
7272

7373
### Image
7474

75-
| 参数 | 说明 | 类型 | 默认值 |
76-
| --- | --- | --- | --- |
77-
| fallback | 加载失败时使用的图片源 | string | - |
78-
| placeholder | 图片加载前的占位内容 | boolean \| `React.ReactElement` | - |
79-
| prefixCls | 组件 className 前缀 | string | `rc-image` |
80-
| preview | 是否以及如何显示预览 | boolean \| `PreviewConfig` | true |
81-
| previewPrefixCls | 预览 className 前缀 | string | `rc-image-preview` |
82-
| src | 图片地址 | string | - |
83-
| onError | 图片加载失败时的回调 | `(event: Event) => void` | - |
75+
| 参数 | 说明 | 类型 | 默认值 |
76+
| ---------------- | ---------------------- | ------------------------------- | ------------------ |
77+
| fallback | 加载失败时使用的图片源 | string | - |
78+
| placeholder | 图片加载前的占位内容 | boolean \| `React.ReactElement` | - |
79+
| prefixCls | 组件 className 前缀 | string | `rc-image` |
80+
| preview | 是否以及如何显示预览 | boolean \| `PreviewConfig` | true |
81+
| previewPrefixCls | 预览 className 前缀 | string | `rc-image-preview` |
82+
| src | 图片地址 | string | - |
83+
| onError | 图片加载失败时的回调 | `(event: Event) => void` | - |
8484

8585
也支持原生图片属性。
8686

eslint.config.mjs

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
import js from '@eslint/js';
2+
import { defineConfig } from 'eslint/config';
3+
import { dirname } from 'node:path';
4+
import { fileURLToPath } from 'node:url';
5+
import prettier from 'eslint-config-prettier';
6+
import jest from 'eslint-plugin-jest';
7+
import react from 'eslint-plugin-react';
8+
import reactHooks from 'eslint-plugin-react-hooks';
9+
import globals from 'globals';
10+
import tseslint from 'typescript-eslint';
11+
12+
const tsconfigRootDir = dirname(fileURLToPath(import.meta.url));
13+
14+
export default defineConfig([
15+
{
16+
plugins: {
17+
'@typescript-eslint': tseslint.plugin,
18+
},
19+
},
20+
{
21+
linterOptions: {
22+
reportUnusedDisableDirectives: 'warn',
23+
},
24+
},
25+
{
26+
ignores: [
27+
'node_modules/',
28+
'coverage/',
29+
'es/',
30+
'lib/',
31+
'dist/',
32+
'docs-dist/',
33+
'.docs-dist/',
34+
'.dumi/',
35+
'.doc/',
36+
'.vercel/',
37+
],
38+
},
39+
{
40+
files: ['**/*.{js,jsx,ts,tsx}'],
41+
extends: [
42+
js.configs.recommended,
43+
react.configs.flat.recommended,
44+
react.configs.flat['jsx-runtime'],
45+
prettier,
46+
],
47+
plugins: {
48+
'react-hooks': reactHooks,
49+
},
50+
languageOptions: {
51+
globals: {
52+
...globals.browser,
53+
...globals.node,
54+
},
55+
},
56+
settings: {
57+
react: {
58+
version: 'detect',
59+
},
60+
},
61+
rules: {
62+
'no-async-promise-executor': 'off',
63+
'no-empty-pattern': 'off',
64+
'no-irregular-whitespace': 'off',
65+
'no-prototype-builtins': 'off',
66+
'no-useless-escape': 'off',
67+
'no-extra-boolean-cast': 'off',
68+
'no-undef': 'off',
69+
'no-unused-vars': 'off',
70+
'react/no-find-dom-node': 'off',
71+
'react/display-name': 'off',
72+
'react/no-unknown-property': 'off',
73+
'react/prop-types': 'off',
74+
'react-hooks/exhaustive-deps': 'warn',
75+
'react-hooks/rules-of-hooks': 'error',
76+
},
77+
},
78+
{
79+
files: ['**/*.{ts,tsx}'],
80+
extends: [...tseslint.configs.recommended],
81+
rules: {
82+
'@typescript-eslint/ban-ts-comment': 'off',
83+
'@typescript-eslint/no-empty-object-type': 'off',
84+
'@typescript-eslint/no-explicit-any': 'off',
85+
'@typescript-eslint/no-unsafe-function-type': 'off',
86+
'@typescript-eslint/no-unnecessary-type-constraint': 'off',
87+
'@typescript-eslint/no-unused-vars': 'off',
88+
},
89+
},
90+
{
91+
files: ['src/**/*.{ts,tsx}'],
92+
languageOptions: {
93+
parserOptions: {
94+
projectService: true,
95+
tsconfigRootDir,
96+
},
97+
},
98+
},
99+
{
100+
files: ['tests/**/*.{js,jsx,ts,tsx}', '**/*.{test,spec}.{js,jsx,ts,tsx}'],
101+
extends: [jest.configs['flat/recommended']],
102+
rules: {
103+
'jest/no-disabled-tests': 'off',
104+
'jest/no-done-callback': 'off',
105+
'jest/no-identical-title': 'off',
106+
'jest/expect-expect': 'off',
107+
'jest/no-alias-methods': 'off',
108+
'jest/no-conditional-expect': 'off',
109+
'jest/no-export': 'off',
110+
'jest/no-standalone-expect': 'off',
111+
'jest/valid-expect': 'off',
112+
'jest/valid-title': 'off',
113+
},
114+
},
115+
]);

global.d.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/// <reference types="jest" />
2+
/// <reference types="node" />
3+
/// <reference types="react" />
4+
/// <reference types="react-dom" />
5+
/// <reference types="@testing-library/jest-dom" />
6+
7+
declare module '*.css';
8+
declare module '*.less';
9+
declare module 'jsonp';
10+
11+
declare module 'moment/locale/zh-cn';

package.json

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,36 @@
4949
},
5050
"devDependencies": {
5151
"@ant-design/icons": "^5.0.1",
52+
"@eslint/js": "^9.39.4",
5253
"@rc-component/dialog": "^1.7.0",
5354
"@rc-component/father-plugin": "^2.2.0",
54-
"prettier": "^3.9.0",
5555
"@rc-component/np": "^1.0.4",
56+
"@testing-library/dom": "^10.4.1",
5657
"@testing-library/jest-dom": "^6.9.1",
57-
"@testing-library/react": "^15.0.7",
58-
"@types/jest": "^29.5.14",
58+
"@testing-library/react": "^16.3.2",
59+
"@types/jest": "^30.0.0",
5960
"@types/node": "^26.0.1",
60-
"@types/react": "^18.3.31",
61-
"@types/react-dom": "^18.3.7",
62-
"@umijs/fabric": "^4.0.1",
63-
"dumi": "^2.4.35",
64-
"eslint": "^8.57.1",
65-
"father": "^4.6.23",
61+
"@types/react": "^19.2.17",
62+
"@types/react-dom": "^19.2.3",
63+
"dumi": "^2.4.38",
64+
"eslint": "^9.39.4",
65+
"eslint-config-prettier": "^10.1.8",
66+
"eslint-plugin-jest": "^29.15.4",
67+
"eslint-plugin-react": "^7.37.5",
68+
"eslint-plugin-react-hooks": "^7.1.1",
69+
"father": "^4.6.24",
6670
"gh-pages": "^6.3.0",
6771
"glob": "^13.0.6",
72+
"globals": "^17.7.0",
73+
"husky": "^9.1.7",
6874
"less": "^4.6.7",
75+
"lint-staged": "^17.0.8",
76+
"prettier": "^3.9.4",
6977
"rc-test": "^7.1.3",
70-
"react": "^18.3.1",
71-
"react-dom": "^18.3.1",
72-
"typescript": "^5.9.3",
73-
"husky": "^9.1.7",
74-
"lint-staged": "^16.4.0"
78+
"react": "^19.2.7",
79+
"react-dom": "^19.2.7",
80+
"typescript": "^6.0.3",
81+
"typescript-eslint": "^8.62.1"
7582
},
7683
"peerDependencies": {
7784
"react": ">=16.9.0",

src/Preview/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ const Preview: React.FC<PreviewProps> = props => {
199199
focusTrap = true,
200200
} = props;
201201

202-
const imgRef = useRef<HTMLImageElement>();
202+
const imgRef = useRef<HTMLImageElement>(null);
203203
const wrapperRef = useRef<HTMLDivElement>(null);
204204
const triggerRef = useRef<HTMLElement>(null);
205205

tests/__snapshots__/basic.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Jest Snapshot v1, https://goo.gl/fbAQLP
1+
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
22

33
exports[`Basic snapshot 1`] = `
44
<div

tsconfig.json

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,18 @@
11
{
22
"compilerOptions": {
33
"target": "esnext",
4-
"moduleResolution": "node",
5-
"baseUrl": "./",
4+
"moduleResolution": "bundler",
65
"jsx": "react",
76
"declaration": true,
87
"skipLibCheck": true,
98
"esModuleInterop": true,
109
"paths": {
11-
"@/*": [
12-
"src/*"
13-
],
14-
"@@/*": [
15-
".dumi/tmp/*"
16-
],
17-
"@rc-component/image": [
18-
"src/index.ts"
19-
]
10+
"@/*": ["./src/*"],
11+
"@@/*": ["./.dumi/tmp/*"],
12+
"@rc-component/image": ["./src/index.ts"]
2013
},
21-
"types": [
22-
"@testing-library/jest-dom",
23-
"jest",
24-
"node"
25-
],
26-
"ignoreDeprecations": "5.0"
14+
"strict": false,
15+
"module": "ESNext"
2716
},
28-
"include": [
29-
".dumirc.ts",
30-
".fatherrc.ts",
31-
"docs",
32-
"src",
33-
"tests",
34-
"typings.d.ts"
35-
]
17+
"include": ["global.d.ts", ".dumirc.ts", ".fatherrc.ts", "docs", "src", "tests", "typings.d.ts"]
3618
}

0 commit comments

Comments
 (0)