From 61503e224c1e9b8aa03cd441179708551c6d9daa Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:19:30 +0800 Subject: [PATCH 01/15] chore: update maintenance dependencies --- .eslintignore | 6 ---- .github/dependabot.yml | 8 +++++ README.md | 2 +- README.zh-CN.md | 2 +- eslint.config.mjs | 79 ++++++++++++++++++++++++++++++++++++++++++ global.d.ts | 56 ++++++++++++++++++++++++++++++ package.json | 32 +++++++++++------ react-compat.d.ts | 16 +++++++++ tsconfig.json | 12 +++++-- 9 files changed, 192 insertions(+), 21 deletions(-) delete mode 100644 .eslintignore create mode 100644 eslint.config.mjs create mode 100644 global.d.ts create mode 100644 react-compat.d.ts diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 3ae8e97..0000000 --- a/.eslintignore +++ /dev/null @@ -1,6 +0,0 @@ -.eslintrc.js -es/ -lib/ -.doc/ -docs-dist/ -.vercel/ diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 3b730ef..5e6c7fa 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 9337205..8ecc4a9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/switch

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

πŸ”˜ Accessible React switch for boolean state with controlled and uncontrolled modes.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 1a0bf93..5be0a6a 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/switch

-

Ant Design Ant Design η”Ÿζ€ηš„δΈ€ιƒ¨εˆ†γ€‚

+

Ant Design Ant Design η”Ÿζ€ηš„δΈ€ιƒ¨εˆ†γ€‚

πŸ”˜ React 开关组仢。

diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..b25fb5d --- /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 0000000..e35e177 --- /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 b980484..d98e091 100644 --- a/package.json +++ b/package.json @@ -46,27 +46,37 @@ "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": "^19.2.17", + "@types/react-dom": "^19.2.3", "@umijs/fabric": "^4.0.1", "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", "gh-pages": "^6.3.0", "husky": "^9.1.7", "less": "^4.6.7", - "lint-staged": "^16.4.0", + "lint-staged": "^17.0.8", "prettier": "^3.9.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", + "react": "^19.2.7", + "react-dom": "^19.2.7", "cross-env": "^10.1.0", "rc-test": "^7.1.3", - "typescript": "^5.9.3" + "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", + "@testing-library/jest-dom": "^6.9.1" }, "peerDependencies": { "react": ">=16.9.0", diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 0000000..ff05aa1 --- /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 9388b08..eba6160 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -31,10 +31,18 @@ "assets/*" ] }, - "strict": true, - "ignoreDeprecations": "5.0" + "strict": false, + "ignoreDeprecations": "6.0", + "noImplicitAny": false, + "strictNullChecks": false, + "strictPropertyInitialization": false, + "strictFunctionTypes": false, + "noImplicitThis": false, + "strictBindCallApply": false }, "include": [ + "react-compat.d.ts", + "global.d.ts", ".fatherrc.ts", ".dumirc.ts", "src", From fe7473aa30bd72f2f60302694b6d1cbcd2ae1912 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:21:04 +0800 Subject: [PATCH 02/15] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 33 +++++++++++++++++++++------------ global.d.ts | 8 -------- tsconfig.json | 19 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index b25fb5d..f556e5a 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 e35e177..97e90a3 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 eba6160..d2cc410 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,8 +1,7 @@ { "compilerOptions": { "target": "esnext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "lib": [ "dom", "es2017" @@ -13,32 +12,32 @@ "esModuleInterop": true, "paths": { "@/*": [ - "src/*" + "./src/*" ], "@@/*": [ - ".dumi/tmp/*" + "./.dumi/tmp/*" ], "@rc-component/switch": [ - "src/index.tsx" + "./src/index.tsx" ], "@rc-component/switch/es": [ - "src" + "./src" ], "@rc-component/switch/es/*": [ - "src/*" + "./src/*" ], "@rc-component/switch/assets/*": [ - "assets/*" + "./assets/*" ] }, "strict": false, - "ignoreDeprecations": "6.0", "noImplicitAny": false, "strictNullChecks": false, "strictPropertyInitialization": false, "strictFunctionTypes": false, "noImplicitThis": false, - "strictBindCallApply": false + "strictBindCallApply": false, + "module": "ESNext" }, "include": [ "react-compat.d.ts", From 53cc34d60c1b1ff07aac1d06e71c3b7a7a3d9eb5 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:51:16 +0800 Subject: [PATCH 03/15] chore: use testing-library dom events --- package.json | 27 ++++++++++++++------------- tests/index.spec.js | 3 ++- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index d98e091..27640c7 100644 --- a/package.json +++ b/package.json @@ -44,17 +44,29 @@ "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", + "@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", + "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", @@ -62,21 +74,10 @@ "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", - "cross-env": "^10.1.0", - "rc-test": "^7.1.3", - "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", - "@testing-library/jest-dom": "^6.9.1" + "typescript": "^6.0.3" }, "peerDependencies": { "react": ">=16.9.0", diff --git a/tests/index.spec.js b/tests/index.spec.js index c980bf3..0ecb27e 100644 --- a/tests/index.spec.js +++ b/tests/index.spec.js @@ -1,6 +1,7 @@ +import { fireEvent } from '@testing-library/dom'; import React from 'react'; import { KeyCode } from '@rc-component/util'; -import { fireEvent, render } from '@testing-library/react'; +import { render } from '@testing-library/react'; import Switch from '..'; describe('rc-switch', () => { From e8e47a47c1b21653136bf232f2225a2c923a224e Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:16:23 +0800 Subject: [PATCH 04/15] test: keep react testing event behavior --- tests/index.spec.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/index.spec.js b/tests/index.spec.js index 0ecb27e..c980bf3 100644 --- a/tests/index.spec.js +++ b/tests/index.spec.js @@ -1,7 +1,6 @@ -import { fireEvent } from '@testing-library/dom'; import React from 'react'; import { KeyCode } from '@rc-component/util'; -import { render } from '@testing-library/react'; +import { fireEvent, render } from '@testing-library/react'; import Switch from '..'; describe('rc-switch', () => { From e6c8706712d71ffe9e0f36f8de67b54109a4ba65 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:04:26 +0800 Subject: [PATCH 05/15] 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 f556e5a..3166a6d 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 ff05aa1..c509fe4 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 859eeac6155d4be234fa4db64fc6b0014ebd37ef Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:16:56 +0800 Subject: [PATCH 06/15] 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 3166a6d..0e70eed 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 0030c2b12698bd45220eef29313ce1d3cfdf82c9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:23:11 +0800 Subject: [PATCH 07/15] 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 8ecc4a9..11282e0 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Online preview: https://switch.react-component.vercel.app/ Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -76,7 +76,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 5be0a6a..c3c0ffc 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -44,7 +44,7 @@ export default () => ; 运葌本地 dumi η«™η‚ΉοΌš ```bash -npm install +ut install npm start ``` @@ -75,7 +75,7 @@ npm start ## ζœ¬εœ°εΌ€ε‘ ```bash -npm install +ut install npm start npm test npm run tsc diff --git a/vercel.json b/vercel.json index 5f9139e..20b1714 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 cee5874ca7f5b11893020174e879e69fd2d1ed19 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:30:40 +0800 Subject: [PATCH 08/15] chore: restore vercel install command --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 20b1714..5f9139e 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 ee235049130ae95f209a5d456699f55f5396a362 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:03:44 +0800 Subject: [PATCH 09/15] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 16 ++++++++-------- react-compat.d.ts | 12 ------------ tsconfig.json | 1 - 4 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 react-compat.d.ts diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed..6d13864 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -39,6 +39,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 27640c7..d09e9ea 100644 --- a/package.json +++ b/package.json @@ -57,31 +57,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", "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", "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" }, "types": "./es/index.d.ts", "style": "./assets/index.css", diff --git a/react-compat.d.ts b/react-compat.d.ts deleted file mode 100644 index c509fe4..0000000 --- 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/tsconfig.json b/tsconfig.json index d2cc410..e504ade 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,7 +40,6 @@ "module": "ESNext" }, "include": [ - "react-compat.d.ts", "global.d.ts", ".fatherrc.ts", ".dumirc.ts", From f92657f1d92c78a412de0f262b12d9645539a829 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:35:44 +0800 Subject: [PATCH 10/15] 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 d09e9ea..7a5cf51 100644 --- a/package.json +++ b/package.json @@ -80,8 +80,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=16.9.0", + "react-dom": ">=16.9.0" }, "types": "./es/index.d.ts", "style": "./assets/index.css", From f3a5a229e15f378a16ae77f536327b29f878ab97 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:37:35 +0800 Subject: [PATCH 11/15] 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 11282e0..8ecc4a9 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ Online preview: https://switch.react-component.vercel.app/ Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -76,7 +76,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 c3c0ffc..5be0a6a 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -44,7 +44,7 @@ export default () => ; 运葌本地 dumi η«™η‚ΉοΌš ```bash -ut install +npm install npm start ``` @@ -75,7 +75,7 @@ npm start ## ζœ¬εœ°εΌ€ε‘ ```bash -ut install +npm install npm start npm test npm run tsc From cb04b2670c4e061fbe058af2f3460d2a080dc6d1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:47:11 +0800 Subject: [PATCH 12/15] chore: remove redundant strict tsconfig flags --- tsconfig.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index e504ade..b54e44f 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -31,12 +31,6 @@ ] }, "strict": false, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, - "noImplicitThis": false, - "strictBindCallApply": false, "module": "ESNext" }, "include": [ From d03e8fceefff6cbad16d548bff89be84a60f6de5 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:14:00 +0800 Subject: [PATCH 13/15] chore: remove manual global test declarations --- global.d.ts | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/global.d.ts b/global.d.ts index 97e90a3..9f2d820 100644 --- a/global.d.ts +++ b/global.d.ts @@ -8,41 +8,5 @@ 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 57c7120800c4928922222f2f30643bebcc93540f Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:32:28 +0800 Subject: [PATCH 14/15] fix: address review type compatibility --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index b54e44f..ad9c988 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -30,7 +30,7 @@ "./assets/*" ] }, - "strict": false, + "strict": true, "module": "ESNext" }, "include": [ From e68206a5fc28985c8d14923bbca0052098742444 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:06 +0800 Subject: [PATCH 15/15] chore: migrate to native eslint flat config --- .eslintrc.js | 14 ----- eslint.config.mjs | 146 ++++++++++++++++++++++++++-------------------- package.json | 11 +--- 3 files changed, 86 insertions(+), 85 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 5e01f7c..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,14 +0,0 @@ -const base = require('@umijs/fabric/dist/eslint'); - -module.exports = { - ...base, - rules: { - ...base.rules, - 'no-template-curly-in-string': 0, - 'prefer-promise-reject-errors': 0, - 'react/no-array-index-key': 0, - 'react/sort-comp': 0, - 'import/no-named-as-default': 0, - 'import/no-named-as-default-member': 0, - }, -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 6d13864..d19be2a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,59 +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/', @@ -65,27 +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-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 7a5cf51..404c91b 100644 --- a/package.json +++ b/package.json @@ -44,9 +44,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", @@ -57,9 +54,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", @@ -67,9 +61,9 @@ "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", + "globals": "^17.7.0", "husky": "^9.1.7", "less": "^4.6.7", "lint-staged": "^17.0.8", @@ -77,7 +71,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",