From b6e020f36e5470c5d9236d979181e82398a2616d Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:18:12 +0800 Subject: [PATCH 01/17] chore: update maintenance dependencies --- .github/dependabot.yml | 8 ++++ README.md | 2 +- README.zh-CN.md | 2 +- eslint.config.mjs | 84 ++++++++++++++++++++++++++++++++++++++++++ global.d.ts | 67 +++++++++++++++++++++++++++++++++ package.json | 29 ++++++++++----- react-compat.d.ts | 21 +++++++++++ tsconfig.json | 55 ++++++++++----------------- 8 files changed, 221 insertions(+), 47 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 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 b67c72a..04e693c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/footer

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

🦶 Footer primitives for React, maintained in the Ant Design ecosystem.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 51e2c33..4841447 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/footer

-

Ant Design Ant Design 生态的一部分。

+

Ant Design Ant Design 生态的一部分。

🦶 React 页脚布局基础组件,服务于 Ant Design 生态页面。

diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 0000000..dfa7e3e --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,84 @@ +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..a8c536f --- /dev/null +++ b/global.d.ts @@ -0,0 +1,67 @@ +/// +/// +/// +/// +/// + +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< + C, + P + >; + 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 8d811f5..d12277e 100644 --- a/package.json +++ b/package.json @@ -54,15 +54,15 @@ "@rc-component/np": "^1.0.4", "@testing-library/dom": "^10.4.1", "@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", "@umijs/test": "^4.6.68", "dumi": "^2.4.35", - "eslint": "^8.57.1", + "eslint": "^9.39.4", "father": "^4.6.23", "gh-pages": "^6.3.0", "husky": "^9.1.7", @@ -70,12 +70,23 @@ "jest-environment-jsdom": "^29.7.0", "less": "^4.6.7", "prettier": "^3.9.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", + "react": "^19.2.7", + "react-dom": "^19.2.7", "sass": "^1.97.1", "ts-node": "^10.9.2", - "typescript": "^5.9.3", - "lint-staged": "^16.4.0" + "typescript": "^6.0.3", + "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": ">=18.0.0", diff --git a/react-compat.d.ts b/react-compat.d.ts new file mode 100644 index 0000000..b8bf491 --- /dev/null +++ b/react-compat.d.ts @@ -0,0 +1,21 @@ +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 bae44b8..72a7d3b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,47 +4,34 @@ "module": "ESNext", "moduleResolution": "node", "baseUrl": "./", - "lib": [ - "dom", - "es2017" - ], + "lib": ["dom", "es2017"], "jsx": "react", - "strict": true, + "strict": false, "esModuleInterop": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, "skipLibCheck": true, "declaration": true, - "types": [ - "jest", - "node" - ], "paths": { - "@/*": [ - "src/*" - ], - "@@/*": [ - ".dumi/tmp/*" - ], - "@rc-component/footer": [ - "src/index.tsx" - ], - "@rc-component/footer/assets": [ - "assets" - ], - "@rc-component/footer/assets/*": [ - "assets/*" - ], - "@rc-component/footer/*": [ - "src/*" - ], - "rc-footer": [ - "src/index.tsx" - ] + "@/*": ["src/*"], + "@@/*": [".dumi/tmp/*"], + "@rc-component/footer": ["src/index.tsx"], + "@rc-component/footer/assets": ["assets"], + "@rc-component/footer/assets/*": ["assets/*"], + "@rc-component/footer/*": ["src/*"], + "rc-footer": ["src/index.tsx"] }, - "ignoreDeprecations": "5.0" + "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", @@ -52,9 +39,5 @@ "docs/examples", "type.d.ts" ], - "exclude": [ - "docs-dist", - "lib", - "es" - ] + "exclude": ["docs-dist", "lib", "es"] } From 88c165a4300fed6ed8181037a8995bc4168fc18c Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:19:53 +0800 Subject: [PATCH 02/17] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 24 ++++++++++++++---------- global.d.ts | 9 --------- tsconfig.json | 18 ++++++++---------- 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index dfa7e3e..f556e5a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -27,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) { @@ -72,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 a8c536f..bbd470e 100644 --- a/global.d.ts +++ b/global.d.ts @@ -55,13 +55,4 @@ 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 72a7d3b..4a04d8b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,8 +2,7 @@ "compilerOptions": { "target": "esnext", "module": "ESNext", - "moduleResolution": "node", - "baseUrl": "./", + "moduleResolution": "bundler", "lib": ["dom", "es2017"], "jsx": "react", "strict": false, @@ -13,15 +12,14 @@ "skipLibCheck": true, "declaration": true, "paths": { - "@/*": ["src/*"], - "@@/*": [".dumi/tmp/*"], - "@rc-component/footer": ["src/index.tsx"], - "@rc-component/footer/assets": ["assets"], - "@rc-component/footer/assets/*": ["assets/*"], - "@rc-component/footer/*": ["src/*"], - "rc-footer": ["src/index.tsx"] + "@/*": ["./src/*"], + "@@/*": ["./.dumi/tmp/*"], + "@rc-component/footer": ["./src/index.tsx"], + "@rc-component/footer/assets": ["./assets"], + "@rc-component/footer/assets/*": ["./assets/*"], + "@rc-component/footer/*": ["./src/*"], + "rc-footer": ["./src/index.tsx"] }, - "ignoreDeprecations": "6.0", "noImplicitAny": false, "strictNullChecks": false, "strictPropertyInitialization": false, From 4545e8cf6e72753d1c5faad5f74c46c7d807e068 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:49:57 +0800 Subject: [PATCH 03/17] chore: use testing-library dom events --- package.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index d12277e..7ff2b0c 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,10 @@ "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", @@ -59,34 +63,30 @@ "@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", "@umijs/test": "^4.6.68", "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", "husky": "^9.1.7", "jest": "^29.7.0", "jest-environment-jsdom": "^29.7.0", "less": "^4.6.7", + "lint-staged": "^17.0.8", "prettier": "^3.9.0", "react": "^19.2.7", "react-dom": "^19.2.7", "sass": "^1.97.1", "ts-node": "^10.9.2", - "typescript": "^6.0.3", - "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": ">=18.0.0", From 689b3bac82e1604d425df61121c568a3db00119b Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:02:59 +0800 Subject: [PATCH 04/17] chore: address review comments --- eslint.config.mjs | 30 ++++++++++-------------------- react-compat.d.ts | 7 ------- 2 files changed, 10 insertions(+), 27 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 b8bf491..9650edc 100644 --- a/react-compat.d.ts +++ b/react-compat.d.ts @@ -12,10 +12,3 @@ declare module 'react' { ...children: React.ReactNode[] ): React.ReactElement

; } - -declare module 'react-dom' { - function hydrate( - element: React.ReactNode, - container: Element | DocumentFragment, - ): void; -} From c273e62011da5edb86d441f22239fda36a1161fc Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:15:45 +0800 Subject: [PATCH 05/17] 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 d6f4b9a085508207022542ce9c6cec6f8997d500 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 12:53:04 +0800 Subject: [PATCH 06/17] chore: preserve local eslint rule overrides --- eslint.config.mjs | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 0e70eed..ec58853 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -15,6 +15,7 @@ const compat = new FlatCompat({ allConfig: js.configs.all, }); +const legacyConfig = require('./.eslintrc.js'); const recommendedTsRulesConfig = tsEslintPlugin.configs.recommended; const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) ? recommendedTsRulesConfig.reduce( @@ -23,6 +24,18 @@ const recommendedTsRulesObject = Array.isArray(recommendedTsRulesConfig) ) : recommendedTsRulesConfig?.rules || {}; const recommendedTsRules = new Set(Object.keys(recommendedTsRulesObject)); + +function hasCurrentTsRule(ruleName) { + const tsRuleName = ruleName.replace('@typescript-eslint/', ''); + return Boolean(tsEslintPlugin.rules[tsRuleName]); +} +const localTsRules = new Set( + Object.keys(legacyConfig.rules || {}).filter( + (ruleName) => + ruleName.startsWith('@typescript-eslint/') && hasCurrentTsRule(ruleName), + ), +); + const noopRule = { meta: { type: 'problem', docs: {}, schema: [] }, create: () => ({}), @@ -42,7 +55,7 @@ function normalizeConfig(config) { if (!ruleName.startsWith('@typescript-eslint/')) { return true; } - return recommendedTsRules.has(ruleName); + return recommendedTsRules.has(ruleName) || localTsRules.has(ruleName); }), ); } @@ -77,7 +90,7 @@ export default [ }, }, }, - ...compat.config(require('./.eslintrc.js')).map(normalizeConfig), + ...compat.config(legacyConfig).map(normalizeConfig), { rules: { '@typescript-eslint/no-empty-object-type': 'off', From 8d360b7b5af97b284d5eeaea274eeecf9a891bf7 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:08:45 +0800 Subject: [PATCH 07/17] chore: remove react type compatibility shim --- react-compat.d.ts | 14 -------------- tsconfig.json | 1 - 2 files changed, 15 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 9650edc..0000000 --- a/react-compat.d.ts +++ /dev/null @@ -1,14 +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 4a04d8b..491dc00 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -28,7 +28,6 @@ "strictBindCallApply": false }, "include": [ - "react-compat.d.ts", "global.d.ts", ".fatherrc.ts", ".dumirc.ts", From 932db6b40eef6777b258d5660334b41afaf0fe8f Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:13:37 +0800 Subject: [PATCH 08/17] chore: enable strict type checking --- tsconfig.json | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 491dc00..5fa92d7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ "moduleResolution": "bundler", "lib": ["dom", "es2017"], "jsx": "react", - "strict": false, + "strict": true, "esModuleInterop": true, "experimentalDecorators": true, "emitDecoratorMetadata": true, @@ -19,13 +19,7 @@ "@rc-component/footer/assets/*": ["./assets/*"], "@rc-component/footer/*": ["./src/*"], "rc-footer": ["./src/index.tsx"] - }, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, - "noImplicitThis": false, - "strictBindCallApply": false + } }, "include": [ "global.d.ts", From 069b58cfff3c248573b736fe682d61f64783895a Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:21:51 +0800 Subject: [PATCH 09/17] 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 04e693c..a816d51 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ export default () => ( Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -122,7 +122,7 @@ Then open `http://localhost:8000`. ## Development ```bash -npm install +ut install npm start ``` diff --git a/README.zh-CN.md b/README.zh-CN.md index 4841447..35a8776 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -74,7 +74,7 @@ export default () => ( 运行本地 dumi 站点: ```bash -npm install +ut install npm start ``` @@ -122,7 +122,7 @@ npm start ## 本地开发 ```bash -npm install +ut install npm start ``` diff --git a/vercel.json b/vercel.json index abcaed3..e9fe94a 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "buildCommand": "npm run build", "outputDirectory": "docs-dist", - "installCommand": "npm install --ignore-scripts --no-audit --loglevel=warn", + "installCommand": "ut install", "framework": null } From 58f751992cde027695b0d1605c9e835bd8f51c5b Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:29:22 +0800 Subject: [PATCH 10/17] chore: restore vercel install command --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index e9fe94a..abcaed3 100644 --- a/vercel.json +++ b/vercel.json @@ -1,6 +1,6 @@ { "buildCommand": "npm run build", "outputDirectory": "docs-dist", - "installCommand": "ut install", + "installCommand": "npm install --ignore-scripts --no-audit --loglevel=warn", "framework": null } From 875148f9f5f1f8b27b5c8b81ebb160c423003dca Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:01:41 +0800 Subject: [PATCH 11/17] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index ec58853..6815434 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -52,6 +52,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 7ff2b0c..6ffc9ce 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "docs:build:gh-pages": "GH_PAGES=1 npm run docs:build" }, "dependencies": { - "@babel/runtime": "^7.28.4", + "@babel/runtime": "^7.29.7", "clsx": "^2.1.1" }, "devDependencies": { @@ -63,25 +63,25 @@ "@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", "@umijs/test": "^4.6.68", - "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", - "jest": "^29.7.0", - "jest-environment-jsdom": "^29.7.0", + "jest": "^30.4.2", + "jest-environment-jsdom": "^30.4.1", "less": "^4.6.7", "lint-staged": "^17.0.8", - "prettier": "^3.9.0", + "prettier": "^3.9.4", "react": "^19.2.7", "react-dom": "^19.2.7", "sass": "^1.97.1", @@ -89,8 +89,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": ">=18.0.0", - "react-dom": ">=18.0.0" + "react": "^19.2.7", + "react-dom": "^19.2.7" }, "husky": { "hooks": { From ac6d417321aae78908b38ac98db15b766d7c8805 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:23:53 +0800 Subject: [PATCH 12/17] chore: fix upgraded test tooling --- tests/__snapshots__/index.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/__snapshots__/index.test.tsx.snap b/tests/__snapshots__/index.test.tsx.snap index 3015dea..6f162ea 100644 --- a/tests/__snapshots__/index.test.tsx.snap +++ b/tests/__snapshots__/index.test.tsx.snap @@ -1,4 +1,4 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP +// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing exports[`rc-footer render Footer 1`] = ` { From 30be039f214527bc71a0120e526338aafc09a9e5 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:34:09 +0800 Subject: [PATCH 13/17] 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 6ffc9ce..e9319ae 100644 --- a/package.json +++ b/package.json @@ -89,8 +89,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=18.0.0", + "react-dom": ">=18.0.0" }, "husky": { "hooks": { From 75233dab50a9b52ee9aeedb0bde8e1856d0a2101 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:35:49 +0800 Subject: [PATCH 14/17] 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 a816d51..04e693c 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ export default () => ( Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -122,7 +122,7 @@ Then open `http://localhost:8000`. ## Development ```bash -ut install +npm install npm start ``` diff --git a/README.zh-CN.md b/README.zh-CN.md index 35a8776..4841447 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -74,7 +74,7 @@ export default () => ( 运行本地 dumi 站点: ```bash -ut install +npm install npm start ``` @@ -122,7 +122,7 @@ npm start ## 本地开发 ```bash -ut install +npm install npm start ``` From f629fb4370648b1188c919478b8a92c1be1081be Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:12:36 +0800 Subject: [PATCH 15/17] chore: remove manual global test declarations --- global.d.ts | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/global.d.ts b/global.d.ts index bbd470e..e0bd355 100644 --- a/global.d.ts +++ b/global.d.ts @@ -8,51 +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< - C, - P - >; - 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 abf0a7fcbc4ed6f3779eff660f00a6a0b363a944 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:00 +0800 Subject: [PATCH 16/17] chore: migrate to native eslint flat config --- .eslintrc.js | 13 ---- eslint.config.mjs | 159 ++++++++++++++++++++++++---------------------- package.json | 11 +--- 3 files changed, 86 insertions(+), 97 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index cf8ad0b..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,13 +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, - '@typescript-eslint/no-explicit-any': 0, - }, -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index 6815434..d19be2a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,72 +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 legacyConfig = require('./.eslintrc.js'); -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 hasCurrentTsRule(ruleName) { - const tsRuleName = ruleName.replace('@typescript-eslint/', ''); - return Boolean(tsEslintPlugin.rules[tsRuleName]); -} -const localTsRules = new Set( - Object.keys(legacyConfig.rules || {}).filter( - (ruleName) => - ruleName.startsWith('@typescript-eslint/') && hasCurrentTsRule(ruleName), - ), -); - -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) || localTsRules.has(ruleName); - }), - ); - } - - return next; -} - -export default [ +export default defineConfig([ + { + plugins: { + '@typescript-eslint': tseslint.plugin, + }, + }, + { + linterOptions: { + reportUnusedDisableDirectives: 'off', + }, + }, { ignores: [ 'node_modules/', @@ -78,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(legacyConfig).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 e9319ae..3b48e29 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,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", @@ -63,9 +60,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", "@umijs/test": "^4.6.68", "dumi": "^2.4.38", "eslint": "^9.39.4", @@ -73,9 +67,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", "jest": "^30.4.2", "jest-environment-jsdom": "^30.4.1", @@ -86,7 +80,8 @@ "react-dom": "^19.2.7", "sass": "^1.97.1", "ts-node": "^10.9.2", - "typescript": "^6.0.3" + "typescript": "^6.0.3", + "typescript-eslint": "^8.62.1" }, "peerDependencies": { "react": ">=18.0.0", From 6dca59f984ef7b7612cb494558fdebaed6ab282a Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 3 Jul 2026 10:58:06 +0800 Subject: [PATCH 17/17] 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 d19be2a..40f08ec 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, }, }, },