diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 8d7a800d..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - extends: [require.resolve('@umijs/fabric/dist/eslint')], - rules: { - 'react/no-did-update-set-state': 0, - 'react/no-find-dom-node': 0, - 'import/no-extraneous-dependencies': 0, - }, -}; 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 ee0e3e66..5b343618 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/util

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

🛠️ Shared React utilities for rc-component packages.

@@ -15,7 +15,6 @@

English | 简体中文

- ## Highlights - Built for React and maintained by the rc-component team. diff --git a/README.zh-CN.md b/README.zh-CN.md index 0b3e6dbc..169a32f1 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/util

-

Ant Design Ant Design 生态的一部分。

+

Ant Design Ant Design 生态的一部分。

🛠️ rc-component 共享工具集合,包含 DOM、React 和测试辅助能力。

@@ -15,7 +15,6 @@

English | 简体中文

- ## 特性 - 面向 React 构建,并由 rc-component 团队维护。 @@ -58,14 +57,14 @@ npm start 该包提供在 rc-component 和 Ant Design 包中复用的小型聚焦工具。优先导入公开入口;针对 DOM、React 或测试辅助能力,可使用子路径导入。 -| 范围 | 示例 | -| --------------- | ---------------------------------------------------------------------------------- | -| React hooks | `useEvent`, `useLayoutEffect`, `useMergedState`, `useState` 辅助方法 | -| React 工具 | `Children/toArray`, `composeRef`, `pickAttrs`, `Portal` | -| DOM 工具 | `Dom/canUseDom`, `Dom/contains`, `Dom/dynamicCSS`, `Dom/focus`, `getScrollBarSize` | -| 异步辅助方法 | `raf`, `raf.cancel` | -| 警告工具 | `warning`, `noteOnce`, `resetWarned` | -| 测试工具 | `test/domHook` 用于 DOM 原型 spy | +| 范围 | 示例 | +| ------------ | ---------------------------------------------------------------------------------- | +| React hooks | `useEvent`, `useLayoutEffect`, `useMergedState`, `useState` 辅助方法 | +| React 工具 | `Children/toArray`, `composeRef`, `pickAttrs`, `Portal` | +| DOM 工具 | `Dom/canUseDom`, `Dom/contains`, `Dom/dynamicCSS`, `Dom/focus`, `getScrollBarSize` | +| 异步辅助方法 | `raf`, `raf.cancel` | +| 警告工具 | `warning`, `noteOnce`, `resetWarned` | +| 测试工具 | `test/domHook` 用于 DOM 原型 spy | `docs/examples` 中的示例覆盖了常用的子路径辅助工具。 diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 00000000..40f08ec9 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,115 @@ +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'; +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: { + '@typescript-eslint': tseslint.plugin, + }, + }, + { + linterOptions: { + reportUnusedDisableDirectives: 'warn', + }, + }, + { + ignores: [ + 'node_modules/', + 'coverage/', + 'es/', + 'lib/', + 'dist/', + 'docs-dist/', + '.docs-dist/', + '.dumi/', + '.doc/', + '.vercel/', + ], + }, + { + files: ['**/*.{js,jsx,ts,tsx}'], + extends: [ + js.configs.recommended, + react.configs.flat.recommended, + react.configs.flat['jsx-runtime'], + prettier, + ], + plugins: { + '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', + }, + }, + { + 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, + }, + }, + }, + { + 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/global.d.ts b/global.d.ts new file mode 100644 index 00000000..e0bd355c --- /dev/null +++ b/global.d.ts @@ -0,0 +1,11 @@ +/// +/// +/// +/// +/// + +declare module '*.css'; +declare module '*.less'; +declare module 'jsonp'; + +declare module 'moment/locale/zh-cn'; diff --git a/package.json b/package.json index 0e98b6bb..2c4cca38 100644 --- a/package.json +++ b/package.json @@ -45,34 +45,40 @@ "react-is": "^18.2.0" }, "devDependencies": { + "@eslint/js": "^9.39.4", "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", - "@testing-library/react": "^15.0.7", - "@types/jest": "^29.5.14", + "@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": "^18.3.31", - "@types/react-dom": "^18.3.7", - "@types/react-is": "^19.0.0", - "@types/responselike": "^1.0.0", + "@types/react": "^19.2.17", + "@types/react-dom": "^19.2.3", + "@types/react-is": "^19.2.0", + "@types/responselike": "^1.0.3", "@types/warning": "^3.0.4", - "@umijs/fabric": "^4.0.1", "cross-env": "^10.1.0", - "dumi": "^2.4.35", - "eslint": "^8.57.1", - "eslint-plugin-jest": "^27.9.0", - "eslint-plugin-unicorn": "^56.0.1", - "father": "^4.6.23", + "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", + "father": "^4.6.24", + "gh-pages": "^6.3.0", "glob": "^13.0.6", + "globals": "^17.7.0", "husky": "^9.1.7", - "lint-staged": "^16.4.0", - "prettier": "^3.9.0", + "lint-staged": "^17.0.8", + "prettier": "^3.9.4", "rc-test": "^7.1.3", - "react": "^18.3.1", + "react": "^19.2.7", "react-19": "npm:react@19.0.0", - "react-dom": "^18.3.1", + "react-dom": "^19.2.7", "react-dom-19": "npm:react-dom@19.0.0", - "typescript": "^5.9.3", - "gh-pages": "^6.3.0" + "typescript": "^6.0.3", + "typescript-eslint": "^8.62.1" }, "peerDependencies": { "react": ">=18.0.0", diff --git a/src/test/domHook.ts b/src/test/domHook.ts index 12532fe7..692d781f 100644 --- a/src/test/domHook.ts +++ b/src/test/domHook.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable no-param-reassign */ const NO_EXIST = { __NOT_EXIST: true }; diff --git a/tests/hooks-17.test.tsx b/tests/hooks-17.test.tsx index 1c84e57e..e999107e 100644 --- a/tests/hooks-17.test.tsx +++ b/tests/hooks-17.test.tsx @@ -3,6 +3,8 @@ import * as React from 'react'; import { renderToString } from 'react-dom/server'; import useId, { resetUuid } from '../src/hooks/useId'; +const isReact19 = React.version.startsWith('19'); + jest.mock('react', () => { const react = jest.requireActual('react'); @@ -51,7 +53,7 @@ describe('hooks-17', () => { { hydrate: true, container: holder }, ); - matchId(container, 'rc_unique_1'); + matchId(container, isReact19 ? 'rc_unique_0' : 'rc_unique_1'); errorSpy.mockRestore(); process.env.NODE_ENV = originEnv; diff --git a/tests/ref.test.tsx b/tests/ref.test.tsx index 78a3014f..562ef565 100644 --- a/tests/ref.test.tsx +++ b/tests/ref.test.tsx @@ -11,6 +11,8 @@ import { useComposeRef, } from '../src/ref'; +const isReact19 = React.version.startsWith('19'); + describe('ref', () => { const errSpy = jest.spyOn(console, 'error'); @@ -117,7 +119,7 @@ describe('ref', () => { , ); expect(supportRef(FC)).toBeFalsy(); - expect(supportRef(holderRef.current.props.children)).toBeFalsy(); + expect(supportRef(holderRef.current.props.children)).toBe(isReact19); }); it('forwardRef function component', () => { @@ -163,7 +165,7 @@ describe('ref', () => { , ); expect(supportRef(MemoFC)).toBeFalsy(); - expect(supportRef(holderRef.current.props.children)).toBeFalsy(); + expect(supportRef(holderRef.current.props.children)).toBe(isReact19); }); it('memo of forwardRef function component', () => { @@ -196,7 +198,7 @@ describe('ref', () => { it('FC', () => { const FC = () =>
; const RefFC = React.forwardRef(FC); - expect(supportNodeRef()).toBeFalsy(); + expect(supportNodeRef()).toBe(isReact19); expect(supportNodeRef()).toBeTruthy(); }); @@ -218,6 +220,7 @@ describe('ref', () => { const node =
; expect(getNodeRef(node)).toBe(ref); + expect(getNodeRef(null)).toBeNull(); expect(errSpy).not.toHaveBeenCalled(); }); diff --git a/tsconfig.json b/tsconfig.json index 391c4119..344877b1 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,50 +1,31 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "preserve", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { - "@/*": [ - "src/*" - ], - "@@/*": [ - ".dumi/tmp/*" - ], - "@rc-component/util": [ - "src/index.ts" - ], - "@rc-component/util/es": [ - "src" - ], - "@rc-component/util/es/*": [ - "src/*" - ], - "rc-util": [ - "src/index.ts" - ], - "rc-util/es": [ - "src" - ], - "rc-util/es/*": [ - "src/*" - ] + "@/*": ["./src/*"], + "@@/*": ["./.dumi/tmp/*"], + "@rc-component/util": ["./src/index.ts"], + "@rc-component/util/es": ["./src"], + "@rc-component/util/es/*": ["./src/*"], + "rc-util": ["./src/index.ts"], + "rc-util/es": ["./src"], + "rc-util/es/*": ["./src/*"] }, - "ignoreDeprecations": "5.0" + "strict": false, + "module": "ESNext" }, "include": [ + "global.d.ts", ".fatherrc.ts", ".dumirc.ts", "src", "tests", "docs/examples" ], - "exclude": [ - "docs-dist", - "lib", - "es" - ] + "exclude": ["docs-dist", "lib", "es"] }