From 7bee061044aee1afec435366226860739e969561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Fri, 15 May 2026 14:50:08 +0800 Subject: [PATCH 1/3] chore: forbid rc deep imports --- .eslintrc.js | 22 ++++++++++++++++++++++ package.json | 10 ++++++---- src/Immutable.tsx | 2 +- src/context.tsx | 4 +--- 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index dc20b71..88d7b97 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,9 +1,31 @@ const base = require('@umijs/fabric/dist/eslint'); +const restrictedPackageDirectoryImports = [ + '@rc-component/*/es', + '@rc-component/*/es/**', + '@rc-component/*/lib', + '@rc-component/*/lib/**', + 'rc-*/es', + 'rc-*/es/**', + 'rc-*/lib', + 'rc-*/lib/**', +]; + module.exports = { ...base, rules: { ...base.rules, + 'no-restricted-imports': [ + 'error', + { + patterns: [ + { + group: restrictedPackageDirectoryImports, + message: 'Do not import package internals from es/lib. Import from the package root.', + }, + ], + }, + ], 'react/no-find-dom-node': 0, 'jsx-a11y/label-has-associated-control': 0, 'jsx-a11y/label-has-for': 0, diff --git a/package.json b/package.json index da4f740..3bb1431 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "tsc": "tsc --noEmit" }, "dependencies": { - "@rc-component/util": "^1.3.0" + "@rc-component/util": "^1.11.0" }, "devDependencies": { "@rc-component/father-plugin": "^2.0.2", @@ -45,10 +45,12 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@types/warning": "^3.0.0", + "@typescript-eslint/eslint-plugin": "^5.62.0", + "@typescript-eslint/parser": "^5.62.0", "@umijs/fabric": "^4.0.0", "dumi": "^2.0.15", "eslint": "^8.54.0", - "eslint-plugin-jest": "^28.2.0", + "eslint-plugin-jest": "^27.9.0", "eslint-plugin-unicorn": "^52.0.0", "father": "^4.0.0", "rc-test": "^7.0.14", @@ -57,7 +59,7 @@ "typescript": "^5.0.2" }, "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" + "react": ">=18.0.0", + "react-dom": ">=18.0.0" } } diff --git a/src/Immutable.tsx b/src/Immutable.tsx index 67a3b2d..4a70674 100644 --- a/src/Immutable.tsx +++ b/src/Immutable.tsx @@ -1,4 +1,4 @@ -import { supportRef } from '@rc-component/util/lib/ref'; +import { supportRef } from '@rc-component/util'; import * as React from 'react'; export type CompareProps> = ( diff --git a/src/context.tsx b/src/context.tsx index 3e2285e..c8ddcca 100644 --- a/src/context.tsx +++ b/src/context.tsx @@ -1,6 +1,4 @@ -import useEvent from '@rc-component/util/lib/hooks/useEvent'; -import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; -import isEqual from '@rc-component/util/lib/isEqual'; +import { isEqual, useEvent, useLayoutEffect } from '@rc-component/util'; import * as React from 'react'; import { unstable_batchedUpdates } from 'react-dom'; From 0743701ca2e698720d615dfd3b55b5476ee2ffc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Sun, 17 May 2026 09:20:39 +0800 Subject: [PATCH 2/3] chore: remove local deep import lint rule --- .eslintrc.js | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 88d7b97..dc20b71 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,31 +1,9 @@ const base = require('@umijs/fabric/dist/eslint'); -const restrictedPackageDirectoryImports = [ - '@rc-component/*/es', - '@rc-component/*/es/**', - '@rc-component/*/lib', - '@rc-component/*/lib/**', - 'rc-*/es', - 'rc-*/es/**', - 'rc-*/lib', - 'rc-*/lib/**', -]; - module.exports = { ...base, rules: { ...base.rules, - 'no-restricted-imports': [ - 'error', - { - patterns: [ - { - group: restrictedPackageDirectoryImports, - message: 'Do not import package internals from es/lib. Import from the package root.', - }, - ], - }, - ], 'react/no-find-dom-node': 0, 'jsx-a11y/label-has-associated-control': 0, 'jsx-a11y/label-has-for': 0, From d110452e30a928a05e5dbbb1faf6e06edc87bdb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=89=B3=E5=85=B5?= Date: Mon, 18 May 2026 11:50:02 +0800 Subject: [PATCH 3/3] chore: bump father-plugin --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bb1431..8e2f14e 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@rc-component/util": "^1.11.0" }, "devDependencies": { - "@rc-component/father-plugin": "^2.0.2", + "@rc-component/father-plugin": "^2.2.0", "@rc-component/np": "^1.0.4", "@types/jest": "^29.5.0", "@types/node": "^24.5.2",