From b3700a4d5ba7c34bfb8af0d5e91df90ead2b7d86 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 29 Jun 2026 18:19:46 +0800 Subject: [PATCH 01/16] 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 | 31 +++++++++++------ react-compat.d.ts | 16 +++++++++ tsconfig.json | 11 +++++- 8 files changed, 192 insertions(+), 13 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 9dbe932..c900edd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@

@rc-component/tour

-

Ant Design Part of the Ant Design ecosystem.

+

Ant Design Part of the Ant Design ecosystem.

🧭 Guided React tours with masks, target tracking, keyboard navigation, and custom panels.

diff --git a/README.zh-CN.md b/README.zh-CN.md index 504f63c..1e62db3 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -1,6 +1,6 @@

@rc-component/tour

-

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 dafcb5d..6b7b3df 100644 --- a/package.json +++ b/package.json @@ -50,26 +50,37 @@ "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@testing-library/jest-dom": "^6.9.1", - "@testing-library/react": "^15.0.7", - "@types/jest": "^29.5.14", - "@types/minimatch": "^5.1.2", + "@testing-library/react": "^16.3.2", + "@types/jest": "^30.0.0", + "@types/minimatch": "^6.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", "cheerio": "1.0.0-rc.12", "dumi": "^2.4.35", - "eslint": "^8.57.1", + "eslint": "^9.39.4", "father": "^4.6.23", "gh-pages": "^6.3.0", "prettier": "^3.9.0", "rc-test": "^7.1.3", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "typescript": "^5.9.3", + "react": "^19.2.7", + "react-dom": "^19.2.7", + "typescript": "^6.0.3", "cross-env": "^10.1.0", "husky": "^9.1.7", - "lint-staged": "^16.4.0" + "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": ">=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 b2522b5..5ccec7a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -24,9 +24,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", ".dumirc.ts", ".fatherrc.ts", "src", From eb9cf136604f20fc542bb5f33fc7d0f57fc45d97 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:21:17 +0800 Subject: [PATCH 02/16] fix: align TypeScript and ESLint compatibility --- eslint.config.mjs | 33 +++++++++++++++++++++------------ global.d.ts | 8 -------- package.json | 1 - tsconfig.json | 17 ++++++++--------- 4 files changed, 29 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/package.json b/package.json index 6b7b3df..bb6dc10 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,6 @@ "@testing-library/jest-dom": "^6.9.1", "@testing-library/react": "^16.3.2", "@types/jest": "^30.0.0", - "@types/minimatch": "^6.0.0", "@types/node": "^26.0.1", "@types/react": "^19.2.17", "@types/react-dom": "^19.2.3", diff --git a/tsconfig.json b/tsconfig.json index 5ccec7a..3da63a5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,37 +1,36 @@ { "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/tour": [ - "src/index.tsx" + "./src/index.tsx" ], "@rc-component/tour/es": [ - "src" + "./src" ], "@rc-component/tour/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 2c7b846da0d2dbb79e44d9c36088df6721489ee0 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 10:51:29 +0800 Subject: [PATCH 03/16] chore: use testing-library dom events --- package.json | 31 ++++++++++++++++--------------- tests/index.test.tsx | 3 ++- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index bb6dc10..9857c8f 100644 --- a/package.json +++ b/package.json @@ -47,39 +47,40 @@ "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", "cheerio": "1.0.0-rc.12", + "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", + "husky": "^9.1.7", + "lint-staged": "^17.0.8", "prettier": "^3.9.0", "rc-test": "^7.1.3", "react": "^19.2.7", "react-dom": "^19.2.7", - "typescript": "^6.0.3", - "cross-env": "^10.1.0", - "husky": "^9.1.7", - "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": ">=16.9.0", diff --git a/tests/index.test.tsx b/tests/index.test.tsx index 998b867..5c71d0a 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,4 +1,5 @@ -import { fireEvent, render, screen } from '@testing-library/react'; +import { fireEvent } from '@testing-library/dom'; +import { render, screen } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util'; import type { ReactNode } from 'react'; import React, { StrictMode, useRef, useState } from 'react'; From 34884bccfb6899d6318bac232e959639c0753835 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 11:16:37 +0800 Subject: [PATCH 04/16] test: keep react testing event behavior --- tests/index.test.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/index.test.tsx b/tests/index.test.tsx index 5c71d0a..998b867 100644 --- a/tests/index.test.tsx +++ b/tests/index.test.tsx @@ -1,5 +1,4 @@ -import { fireEvent } from '@testing-library/dom'; -import { render, screen } from '@testing-library/react'; +import { fireEvent, render, screen } from '@testing-library/react'; import { spyElementPrototypes } from '@rc-component/util'; import type { ReactNode } from 'react'; import React, { StrictMode, useRef, useState } from 'react'; From 6af3193c3b401dd0296b349e8ccba9a4f2a9ace9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:04:38 +0800 Subject: [PATCH 05/16] 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 9adfff5b49ad813508216db9c1a5399bb623d92e Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 30 Jun 2026 19:17:08 +0800 Subject: [PATCH 06/16] 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 42d2006c0d86866726d3905fc3a24e57b8d2bf26 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:23:24 +0800 Subject: [PATCH 07/16] 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 c900edd..f6c1cbe 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Online preview: https://tour.react-component.vercel.app/ Run the local dumi site: ```bash -npm install +ut install npm start ``` @@ -120,7 +120,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 1e62db3..ad16691 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -59,7 +59,7 @@ export default () => ( 运行本地 dumi 站点： ```bash -npm install +ut install npm start ``` @@ -120,7 +120,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 20a3e05fdb5bb05e9bb8bcfb87249d0c366a79de Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 13:30:51 +0800 Subject: [PATCH 08/16] 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 f7fe4ca978a6379a959ffe8ca4aa1dd7311eada9 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:03:56 +0800 Subject: [PATCH 09/16] chore: align maintenance dependencies --- eslint.config.mjs | 3 +++ package.json | 16 ++++++++-------- react-compat.d.ts | 12 ------------ src/Tour.tsx | 2 +- tsconfig.json | 1 - 5 files changed, 12 insertions(+), 22 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 9857c8f..f91fc9c 100644 --- a/package.json +++ b/package.json @@ -60,31 +60,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", "cheerio": "1.0.0-rc.12", "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", "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" }, "engines": { "node": ">=8.x" 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/src/Tour.tsx b/src/Tour.tsx index 8d2ef78..51169d7 100644 --- a/src/Tour.tsx +++ b/src/Tour.tsx @@ -65,7 +65,7 @@ const Tour: React.FC = props => { ...restProps } = props; - const triggerRef = React.useRef(); + const triggerRef = React.useRef(null); const [mergedCurrent, setMergedCurrent] = useControlledState( defaultCurrent || 0, diff --git a/tsconfig.json b/tsconfig.json index 3da63a5..8e11c88 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,7 +33,6 @@ "module": "ESNext" }, "include": [ - "react-compat.d.ts", "global.d.ts", ".dumirc.ts", ".fatherrc.ts", From f0aab697cf8844779189b2ef596d4a5f74c7a0f2 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:25:16 +0800 Subject: [PATCH 10/16] 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 c589d37..a51c698 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[`Tour animated placeholder true 1`] = ` From 0470f73ef782890efd3bc1f0e64100da7ca0feee Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 14:35:56 +0800 Subject: [PATCH 11/16] 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 f91fc9c..1b024f4 100644 --- a/package.json +++ b/package.json @@ -83,8 +83,8 @@ "typescript": "^6.0.3" }, "peerDependencies": { - "react": "^19.2.7", - "react-dom": "^19.2.7" + "react": ">=16.9.0", + "react-dom": ">=16.9.0" }, "engines": { "node": ">=8.x" From 93ad98a6d8a8f6d400ab99ea7ea2c5432f8da9cf Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:37:49 +0800 Subject: [PATCH 12/16] docs: use npm install in README --- README.md | 5 ++- README.zh-CN.md | 87 ++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index f6c1cbe..ee7912a 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@

English | 简体中文

- ## Highlights - Tracks step targets and renders guided panels through a trigger-backed popup. @@ -59,7 +58,7 @@ Online preview: https://tour.react-component.vercel.app/ Run the local dumi site: ```bash -ut install +npm install npm start ``` @@ -120,7 +119,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 ad16691..9feeb18 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -15,7 +15,6 @@

English | 简体中文

- ## 特性 - 跟踪步骤目标并通过触发器支持的弹层窗口渲染引导面板。 @@ -59,7 +58,7 @@ export default () => ( 运行本地 dumi 站点： ```bash -ut install +npm install npm start ``` @@ -69,58 +68,58 @@ npm start ### Tour -| 名称 | 类型 | 默认值 | 说明 | -| ----------------------- | ------------------------------------------------------------ | -------------- | ---------------------------------------------------- | -| `animated` | boolean \| `{ placeholder: boolean }` | false | 启用目标占位动画。 | -| `arrow` | boolean \| `{ pointAtCenter: boolean }` | true | 显示箭头，并可选择指向目标中心。 | -| `builtinPlacements` | TriggerProps['builtinPlacements'] \| function | - | 自定义位置映射。 | -| `className` | string | - | 面板 className。 | -| `classNames` | `Partial>` | - | 语义 className。 | -| `closable` | boolean \| object | - | 关闭按钮配置。 | -| `closeIcon` | React.ReactNode | - | 自定义关闭图标。 | -| `current` | number | - | 受控当前步骤。 | -| `defaultCurrent` | number | 0 | 初始当前步骤。 | -| `defaultOpen` | boolean | - | 初始打开状态。 | -| `disabledInteraction` | boolean | - | 禁用与目标区域的交互。 | -| `gap` | Gap | - | 目标周围的间隙偏移和半径。 | -| `getPopupContainer` | TriggerProps['getPopupContainer'] \| false | - | 弹层容器解析函数。使用 false 表示内联模式。 | -| `keyboard` | boolean | true | 启用 Escape 和箭头键导航。 | -| `mask` | boolean \| `{ style?: React.CSSProperties; color?: string }` | true | 遮罩配置。 | -| `onChange` | `(current: number) => void` | - | 当前步骤更改时调用。 | -| `onClose` | `(current: number) => void` | - | 引导关闭时调用。 | -| `onFinish` | `() => void` | - | 引导完成后调用。 | -| `onPopupAlign` | TriggerProps['onPopupAlign'] | - | 弹层对齐后调用。 | -| `open` | boolean | - | 受控打开状态。 | -| `placement` | PlacementType | - | 默认面板位置。 | -| `prefixCls` | string | `'rc-tour'` | className 前缀。 | -| `renderPanel` | `(props, current) => ReactNode` | - | 自定义面板渲染器。 | -| `rootClassName` | string | - | 根 className。 | -| `scrollIntoViewOptions` | boolean \| ScrollIntoViewOptions | 中心选项 | 目标滚动行为。 | -| `steps` | TourStepInfo[] | [] | 漫游步骤。 | -| `style` | React.CSSProperties | - | 面板风格。 | -| `styles` | `Partial>` | - | 语义化样式。 | -| `zIndex` | number | 1001 | 弹层 z 索引。 | +| 名称 | 类型 | 默认值 | 说明 | +| ----------------------- | ------------------------------------------------------------ | ----------- | ------------------------------------------- | +| `animated` | boolean \| `{ placeholder: boolean }` | false | 启用目标占位动画。 | +| `arrow` | boolean \| `{ pointAtCenter: boolean }` | true | 显示箭头，并可选择指向目标中心。 | +| `builtinPlacements` | TriggerProps['builtinPlacements'] \| function | - | 自定义位置映射。 | +| `className` | string | - | 面板 className。 | +| `classNames` | `Partial>` | - | 语义 className。 | +| `closable` | boolean \| object | - | 关闭按钮配置。 | +| `closeIcon` | React.ReactNode | - | 自定义关闭图标。 | +| `current` | number | - | 受控当前步骤。 | +| `defaultCurrent` | number | 0 | 初始当前步骤。 | +| `defaultOpen` | boolean | - | 初始打开状态。 | +| `disabledInteraction` | boolean | - | 禁用与目标区域的交互。 | +| `gap` | Gap | - | 目标周围的间隙偏移和半径。 | +| `getPopupContainer` | TriggerProps['getPopupContainer'] \| false | - | 弹层容器解析函数。使用 false 表示内联模式。 | +| `keyboard` | boolean | true | 启用 Escape 和箭头键导航。 | +| `mask` | boolean \| `{ style?: React.CSSProperties; color?: string }` | true | 遮罩配置。 | +| `onChange` | `(current: number) => void` | - | 当前步骤更改时调用。 | +| `onClose` | `(current: number) => void` | - | 引导关闭时调用。 | +| `onFinish` | `() => void` | - | 引导完成后调用。 | +| `onPopupAlign` | TriggerProps['onPopupAlign'] | - | 弹层对齐后调用。 | +| `open` | boolean | - | 受控打开状态。 | +| `placement` | PlacementType | - | 默认面板位置。 | +| `prefixCls` | string | `'rc-tour'` | className 前缀。 | +| `renderPanel` | `(props, current) => ReactNode` | - | 自定义面板渲染器。 | +| `rootClassName` | string | - | 根 className。 | +| `scrollIntoViewOptions` | boolean \| ScrollIntoViewOptions | 中心选项 | 目标滚动行为。 | +| `steps` | TourStepInfo[] | [] | 漫游步骤。 | +| `style` | React.CSSProperties | - | 面板风格。 | +| `styles` | `Partial>` | - | 语义化样式。 | +| `zIndex` | number | 1001 | 弹层 z 索引。 | ### TourStepInfo -| 名称 | 类型 | 默认值 | 说明 | -| ----------------------- | ------------------------------------------ | --------- | --------------------------- | -| `arrow` | boolean \| `{ pointAtCenter: boolean }` | inherited | 步骤箭头配置。 | -| `className` | string | - | 步骤面板 className。 | +| 名称 | 类型 | 默认值 | 说明 | +| ----------------------- | ------------------------------------------ | --------- | -------------------- | +| `arrow` | boolean \| `{ pointAtCenter: boolean }` | inherited | 步骤箭头配置。 | +| `className` | string | - | 步骤面板 className。 | | `closable` | boolean \| object | inherited | 步骤关闭按钮配置。 | -| `closeIcon` | React.ReactNode | inherited | 步骤关闭图标。 | -| `description` | React.ReactNode | - | 步骤描述。 | -| `mask` | boolean \| object | inherited | 步骤遮罩配置。 | -| `placement` | PlacementType | inherited | 步骤位置。 | +| `closeIcon` | React.ReactNode | inherited | 步骤关闭图标。 | +| `description` | React.ReactNode | - | 步骤描述。 | +| `mask` | boolean \| object | inherited | 步骤遮罩配置。 | +| `placement` | PlacementType | inherited | 步骤位置。 | | `scrollIntoViewOptions` | boolean \| ScrollIntoViewOptions | inherited | 步骤滚动行为。 | | `style` | React.CSSProperties | - | 步骤面板样式。 | -| `target` | HTMLElement \| `() => HTMLElement \| null` | - | 目标元素或解析器。 | -| `title` | React.ReactNode | - | 步骤标题。 | +| `target` | HTMLElement \| `() => HTMLElement \| null` | - | 目标元素或解析器。 | +| `title` | React.ReactNode | - | 步骤标题。 | ## 本地开发 ```bash -ut install +npm install npm start npm test npm run tsc From f91387c568e69fe331f03931eaa043e78c6117e8 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 18:47:25 +0800 Subject: [PATCH 13/16] chore: remove redundant strict tsconfig flags --- tsconfig.json | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index 8e11c88..ae9f101 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,29 +7,13 @@ "skipLibCheck": true, "esModuleInterop": true, "paths": { - "@/*": [ - "./src/*" - ], - "@@/*": [ - "./.dumi/tmp/*" - ], - "@rc-component/tour": [ - "./src/index.tsx" - ], - "@rc-component/tour/es": [ - "./src" - ], - "@rc-component/tour/es/*": [ - "./src/*" - ] + "@/*": ["./src/*"], + "@@/*": ["./.dumi/tmp/*"], + "@rc-component/tour": ["./src/index.tsx"], + "@rc-component/tour/es": ["./src"], + "@rc-component/tour/es/*": ["./src/*"] }, - "noImplicitAny": false, - "strictNullChecks": false, - "strictPropertyInitialization": false, - "strictFunctionTypes": false, "strict": false, - "noImplicitThis": false, - "strictBindCallApply": false, "module": "ESNext" }, "include": [ @@ -40,9 +24,5 @@ "tests", "docs/examples" ], - "exclude": [ - "docs-dist", - "lib", - "es" - ] + "exclude": ["docs-dist", "lib", "es"] } From f27649451885a8a55dead5177bb0860945fcc986 Mon Sep 17 00:00:00 2001 From: afc163 Date: Wed, 1 Jul 2026 19:14:13 +0800 Subject: [PATCH 14/16] chore: remove manual global test declarations --- global.d.ts | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/global.d.ts b/global.d.ts index 97e90a3..e0bd355 100644 --- a/global.d.ts +++ b/global.d.ts @@ -8,41 +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; - 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 05b07fe08cb38ec3496366139b75cbb4d9098fc7 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 2 Jul 2026 11:54:07 +0800 Subject: [PATCH 15/16] chore: migrate to native eslint flat config --- .eslintrc.js | 11 ---- eslint.config.mjs | 146 ++++++++++++++++++++++++++-------------------- package.json | 11 +--- 3 files changed, 86 insertions(+), 82 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 6d81724..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,11 +0,0 @@ -const config = { - extends: [require.resolve('@umijs/fabric/dist/eslint')], - rules: { - 'react/no-did-update-set-state': 0, - 'react/no-find-dom-node': 0, - 'import/no-extraneous-dependencies': 0, - 'react/sort-comp': 0, - }, -}; - -module.exports = config; 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 1b024f4..7271ffe 100644 --- a/package.json +++ b/package.json @@ -47,9 +47,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", @@ -60,9 +57,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", "cheerio": "1.0.0-rc.12", "cross-env": "^10.1.0", "dumi": "^2.4.38", @@ -71,16 +65,17 @@ "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", "lint-staged": "^17.0.8", "prettier": "^3.9.4", "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", From fb6dba492f6dafb7185ba607e13a6ff9e4d9f174 Mon Sep 17 00:00:00 2001 From: afc163 Date: Fri, 3 Jul 2026 10:58:13 +0800 Subject: [PATCH 16/16] 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, }, }, },