From ad970e609a785a185fecc3dac0a29ce7d90b98eb Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:20:09 +0800 Subject: [PATCH 1/7] 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 | 38 ++++++++++++-------- react-compat.d.ts | 16 +++++++++ tsconfig.json | 11 +++++- 8 files changed, 195 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 ee0e3e66..0c6bb1ca 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.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 0b3e6dbc..e568ae90 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 ε’Œζ΅‹θ―•θΎ…εŠ©θƒ½εŠ›γ€‚

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 0e98b6bb..ed893336 100644 --- a/package.json +++ b/package.json @@ -47,32 +47,42 @@ "devDependencies": { "@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/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", + "eslint": "^9.39.4", + "eslint-plugin-jest": "^29.15.3", + "eslint-plugin-unicorn": "^65.0.1", "father": "^4.6.23", "glob": "^13.0.6", "husky": "^9.1.7", - "lint-staged": "^16.4.0", + "lint-staged": "^17.0.8", "prettier": "^3.9.0", "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", + "gh-pages": "^6.3.0", + "@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", + "@testing-library/jest-dom": "^6.9.1" }, "peerDependencies": { "react": ">=18.0.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 391c4119..a18cba2d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,9 +33,18 @@ "src/*" ] }, - "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", ".fatherrc.ts", ".dumirc.ts", "src", From efb181a337004e25184a81e3d81159c7b2a9e354 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:21:35 +0800 Subject: [PATCH 2/7] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 33 +++++++++++++++++++++------------ global.d.ts | 8 -------- tsconfig.json | 23 +++++++++++------------ 3 files changed, 32 insertions(+), 32 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 a18cba2d..68337174 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,46 +1,45 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "jsx": "preserve", "declaration": true, "skipLibCheck": true, "esModuleInterop": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - ".dumi/tmp/*" + "./.dumi/tmp/*" ], "@rc-component/util": [ - "src/index.ts" + "./src/index.ts" ], "@rc-component/util/es": [ - "src" + "./src" ], "@rc-component/util/es/*": [ - "src/*" + "./src/*" ], "rc-util": [ - "src/index.ts" + "./src/index.ts" ], "rc-util/es": [ - "src" + "./src" ], "rc-util/es/*": [ - "src/*" + "./src/*" ] }, - "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 eb231a15c7b29e7ab58f80f3a0b73c8b9e2330d9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:51:46 +0800 Subject: [PATCH 3/7] chore: use testing-library dom events --- package.json | 25 +++++++++++++------------ tests/KeyCode.test.ts | 2 +- tests/hooks.test.tsx | 3 ++- tests/ref.test.tsx | 3 ++- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index ed893336..24bf865a 100644 --- a/package.json +++ b/package.json @@ -45,8 +45,14 @@ "react-is": "^18.2.0" }, "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", + "@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", @@ -55,13 +61,19 @@ "@types/react-is": "^19.2.0", "@types/responselike": "^1.0.3", "@types/warning": "^3.0.4", + "@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", "husky": "^9.1.7", "lint-staged": "^17.0.8", @@ -71,18 +83,7 @@ "react-19": "npm:react@19.0.0", "react-dom": "^19.2.7", "react-dom-19": "npm:react-dom@19.0.0", - "typescript": "^6.0.3", - "gh-pages": "^6.3.0", - "@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", - "@testing-library/jest-dom": "^6.9.1" + "typescript": "^6.0.3" }, "peerDependencies": { "react": ">=18.0.0", diff --git a/tests/KeyCode.test.ts b/tests/KeyCode.test.ts index 25f00ac3..d644946e 100644 --- a/tests/KeyCode.test.ts +++ b/tests/KeyCode.test.ts @@ -1,5 +1,5 @@ +import { createEvent } from '@testing-library/dom'; import KeyCode from '../src/KeyCode'; -import { createEvent } from '@testing-library/react'; describe('KeyCode.isEditableTarget', () => { it('check editable target', () => { diff --git a/tests/hooks.test.tsx b/tests/hooks.test.tsx index f8004eb5..b7f86035 100644 --- a/tests/hooks.test.tsx +++ b/tests/hooks.test.tsx @@ -1,4 +1,5 @@ -import { fireEvent, render } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { render } from '@testing-library/react'; import * as React from 'react'; import { renderToString } from 'react-dom/server'; import useId from '../src/hooks/useId'; diff --git a/tests/ref.test.tsx b/tests/ref.test.tsx index 78a3014f..b0161022 100644 --- a/tests/ref.test.tsx +++ b/tests/ref.test.tsx @@ -1,5 +1,6 @@ +import { fireEvent } from '@testing-library/dom'; /* eslint-disable no-eval */ -import { fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import type { ReactNode } from 'react'; import React from 'react'; import useEvent from '../src/hooks/useEvent'; From 805f2ce6c647579bbab2170ca9f6138fb10b8455 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:16:55 +0800 Subject: [PATCH 4/7] test: keep react testing event behavior --- tests/KeyCode.test.ts | 2 +- tests/hooks-17.test.tsx | 4 +++- tests/hooks.test.tsx | 3 +-- tests/ref.test.tsx | 11 ++++++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tests/KeyCode.test.ts b/tests/KeyCode.test.ts index d644946e..25f00ac3 100644 --- a/tests/KeyCode.test.ts +++ b/tests/KeyCode.test.ts @@ -1,5 +1,5 @@ -import { createEvent } from '@testing-library/dom'; import KeyCode from '../src/KeyCode'; +import { createEvent } from '@testing-library/react'; describe('KeyCode.isEditableTarget', () => { it('check editable target', () => { 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/hooks.test.tsx b/tests/hooks.test.tsx index b7f86035..f8004eb5 100644 --- a/tests/hooks.test.tsx +++ b/tests/hooks.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import * as React from 'react'; import { renderToString } from 'react-dom/server'; import useId from '../src/hooks/useId'; diff --git a/tests/ref.test.tsx b/tests/ref.test.tsx index b0161022..b9130710 100644 --- a/tests/ref.test.tsx +++ b/tests/ref.test.tsx @@ -1,6 +1,5 @@ -import { fireEvent } from '@testing-library/dom'; /* eslint-disable no-eval */ -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import type { ReactNode } from 'react'; import React from 'react'; import useEvent from '../src/hooks/useEvent'; @@ -12,6 +11,8 @@ import { useComposeRef, } from '../src/ref'; +const isReact19 = React.version.startsWith('19'); + describe('ref', () => { const errSpy = jest.spyOn(console, 'error'); @@ -118,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', () => { @@ -164,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', () => { @@ -197,7 +198,7 @@ describe('ref', () => { it('FC', () => { const FC = () =>

; const RefFC = React.forwardRef(FC); - expect(supportNodeRef()).toBeFalsy(); + expect(supportNodeRef()).toBe(isReact19); expect(supportNodeRef()).toBeTruthy(); }); From 45b4e3537571b3ccdb6e2f41957b8295f8ca1eab Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:35:17 +0800 Subject: [PATCH 5/7] test: cover getNodeRef fallback --- tests/ref.test.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/ref.test.tsx b/tests/ref.test.tsx index b9130710..562ef565 100644 --- a/tests/ref.test.tsx +++ b/tests/ref.test.tsx @@ -220,6 +220,7 @@ describe('ref', () => { const node =
; expect(getNodeRef(node)).toBe(ref); + expect(getNodeRef(null)).toBeNull(); expect(errSpy).not.toHaveBeenCalled(); }); From 2228f95f49f074ed4a1f894cf3fa3b164088db9b Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:04:52 +0800 Subject: [PATCH 6/7] chore: address review comments --- eslint.config.mjs | 30 ++++++++++-------------------- react-compat.d.ts | 4 ---- src/test/domHook.ts | 1 - 3 files changed, 10 insertions(+), 25 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; -} 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 }; From 418f841c665fbbdc7caa89feb4b9479b8ba1452e Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:17:26 +0800 Subject: [PATCH 7/7] 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),