diff --git a/.github/dependabot.yml b/.github/dependabot.yml index afd4cd08..437d0bd3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -18,14 +18,12 @@ updates: - 17.0.0 - 17.0.1 - 17.0.2 - - dependency-name: np + - dependency-name: '@rc-component/np' versions: - - 7.2.0 - - 7.3.0 - - 7.4.0 - - dependency-name: rc-tooltip + - 1.0.0 + - dependency-name: '@rc-component/tooltip' versions: - - 5.0.2 + - 1.0.0 - dependency-name: less versions: - - 4.1.0 + - 4.1.0 \ No newline at end of file diff --git a/docs/examples/animation-draggable.jsx b/docs/examples/animation-draggable.jsx index 0448d7e4..cb298554 100644 --- a/docs/examples/animation-draggable.jsx +++ b/docs/examples/animation-draggable.jsx @@ -3,7 +3,7 @@ react/no-danger, no-param-reassign */ import React from 'react'; import { gData } from './utils/dataUtil'; import '../../assets/index.less'; -import Tree from 'rc-tree'; +import Tree from '@rc-component/tree'; const STYLE = ` .rc-tree-child-tree { diff --git a/docs/examples/animation.jsx b/docs/examples/animation.jsx index 82d345a0..7dcb5c3f 100644 --- a/docs/examples/animation.jsx +++ b/docs/examples/animation.jsx @@ -1,6 +1,6 @@ /* eslint no-console:0, react/no-danger: 0 */ -import { Provider } from 'rc-motion'; -import Tree from 'rc-tree'; +import { Provider } from '@rc-component/motion'; +import Tree from '@rc-component/tree'; import React from 'react'; import '../../assets/index.less'; import './animation.less'; diff --git a/docs/examples/basic-controlled.jsx b/docs/examples/basic-controlled.jsx index cbbbce00..8a75cb76 100644 --- a/docs/examples/basic-controlled.jsx +++ b/docs/examples/basic-controlled.jsx @@ -1,9 +1,9 @@ /* eslint-disable no-console, react/no-unescaped-entities */ import '../../assets/index.less'; import React from 'react'; -import 'rc-dialog/assets/index.css'; -import Modal from 'rc-dialog'; -import Tree, { TreeNode } from 'rc-tree'; +import '@rc-component/dialog/assets/index.css'; +import Modal from '@rc-component/dialog'; +import Tree, { TreeNode } from '@rc-component/tree'; import { gData, getRadioSelectKeys } from './utils/dataUtil'; class Demo extends React.Component { diff --git a/docs/examples/basic.jsx b/docs/examples/basic.jsx index ab986e32..55e96fc5 100644 --- a/docs/examples/basic.jsx +++ b/docs/examples/basic.jsx @@ -2,7 +2,7 @@ import React from 'react'; import '../../assets/index.less'; import './basic.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; const treeData = [ { diff --git a/docs/examples/big-data.jsx b/docs/examples/big-data.jsx index 657358ac..64c67fec 100644 --- a/docs/examples/big-data.jsx +++ b/docs/examples/big-data.jsx @@ -2,7 +2,7 @@ import React from 'react'; import Gen from './big-data-generator'; import '../../assets/index.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; class Demo extends React.Component { state = { diff --git a/docs/examples/contextmenu.jsx b/docs/examples/contextmenu.jsx index 5f8c46f5..06507e0e 100644 --- a/docs/examples/contextmenu.jsx +++ b/docs/examples/contextmenu.jsx @@ -1,10 +1,10 @@ /* eslint-disable no-console, react/no-find-dom-node */ import React from 'react'; import ReactDOM from 'react-dom'; -import Tooltip from 'rc-tooltip'; +import Tooltip from '@rc-component/tooltip'; import './contextmenu.less'; import '../../assets/index.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; function contains(root, n) { let node = n; diff --git a/docs/examples/custom-switch-icon.jsx b/docs/examples/custom-switch-icon.jsx index e783d608..6d5ed4d4 100644 --- a/docs/examples/custom-switch-icon.jsx +++ b/docs/examples/custom-switch-icon.jsx @@ -2,7 +2,7 @@ /* eslint no-alert:0 */ import React from 'react'; import '../../assets/index.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; const arrowPath = 'M869 487.8L491.2 159.9c-2.9-2.5-6.6-3.9-10.5-3.9h-88' + diff --git a/docs/examples/draggable-allow-drop.jsx b/docs/examples/draggable-allow-drop.jsx index fdacfa35..8c661ae3 100644 --- a/docs/examples/draggable-allow-drop.jsx +++ b/docs/examples/draggable-allow-drop.jsx @@ -3,7 +3,7 @@ import React from 'react'; import { gData } from './utils/dataUtil'; import './draggable.less'; import '../../assets/index.less'; -import Tree from 'rc-tree'; +import Tree from '@rc-component/tree'; function allowDrop({ dropNode, dropPosition }) { if (!dropNode.children) { diff --git a/docs/examples/dropdown.jsx b/docs/examples/dropdown.jsx index ac5add32..e7ab29d5 100644 --- a/docs/examples/dropdown.jsx +++ b/docs/examples/dropdown.jsx @@ -2,11 +2,11 @@ /* eslint no-console:0 */ /* eslint react/no-string-refs:0 */ import React from 'react'; -import Trigger from 'rc-trigger'; +import Trigger from '@rc-component/trigger'; import { gData } from './utils/dataUtil'; import './dropdown.less'; import '../../assets/index.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; const placements = { topLeft: { diff --git a/docs/examples/dynamic.jsx b/docs/examples/dynamic.jsx index 90fa1606..35c8f5f4 100644 --- a/docs/examples/dynamic.jsx +++ b/docs/examples/dynamic.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-console, react/no-access-state-in-setstate */ import '../../assets/index.less'; import React from 'react'; -import Tree from 'rc-tree'; +import Tree from '@rc-component/tree'; function generateTreeNodes(treeNode) { const arr = []; diff --git a/docs/examples/expandAction.jsx b/docs/examples/expandAction.jsx index e6482d2c..a735a473 100644 --- a/docs/examples/expandAction.jsx +++ b/docs/examples/expandAction.jsx @@ -1,7 +1,7 @@ /* eslint-disable no-console, react/no-access-state-in-setstate */ import React from 'react'; import '../../assets/index.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; const Demo = () => (
diff --git a/docs/examples/fieldNames.tsx b/docs/examples/fieldNames.tsx index 2f6ce4cf..70b350fe 100644 --- a/docs/examples/fieldNames.tsx +++ b/docs/examples/fieldNames.tsx @@ -2,7 +2,7 @@ import React from 'react'; import '../../assets/index.less'; import './basic.less'; -import Tree from 'rc-tree'; +import Tree from '@rc-component/tree'; const treeData = [ { diff --git a/docs/examples/funtionTitle.jsx b/docs/examples/funtionTitle.jsx index 338e5846..4c6560c8 100644 --- a/docs/examples/funtionTitle.jsx +++ b/docs/examples/funtionTitle.jsx @@ -2,7 +2,7 @@ import '../../assets/index.less'; import './animation.less'; import React, { useState } from 'react'; -import Tree from 'rc-tree'; +import Tree from '@rc-component/tree'; import data from './longData.json'; const STYLE = ` diff --git a/docs/examples/icon.jsx b/docs/examples/icon.jsx index 200f4361..63e42807 100644 --- a/docs/examples/icon.jsx +++ b/docs/examples/icon.jsx @@ -2,7 +2,7 @@ /* eslint no-alert:0 */ import React from 'react'; import classNames from 'classnames'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; import '../../assets/index.less'; import './icon.less'; diff --git a/docs/examples/selectable.jsx b/docs/examples/selectable.jsx index e45dc833..bcde39f7 100644 --- a/docs/examples/selectable.jsx +++ b/docs/examples/selectable.jsx @@ -2,10 +2,9 @@ import React from 'react'; import './selectable.less'; import '../../assets/index.less'; -import Tree, { TreeNode } from 'rc-tree'; +import Tree, { TreeNode } from '@rc-component/tree'; class Demo extends React.Component { - render() { return (
diff --git a/package.json b/package.json index 1172f44c..d5a37fdb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "rc-tree", - "version": "5.13.1", + "name": "@rc-component/tree", + "version": "1.0.0", "description": "tree ui component for react", "engines": { "node": ">=10.x" @@ -34,7 +34,7 @@ "docs:deploy": "gh-pages -d dist", "compile": "father build && lessc assets/index.less assets/index.css", "prepare": "husky", - "prepublishOnly": "npm run compile && np --yolo --no-publish", + "prepublishOnly": "npm run compile && rc-np", "postpublish": "npm run gh-pages", "lint": "eslint src/ --ext .tsx,.ts,.jsx,.js", "test": "rc-test", @@ -50,7 +50,7 @@ "react-dom": "*" }, "devDependencies": { - "@rc-component/father-plugin": "^1.0.2", + "@rc-component/father-plugin": "^2.0.3", "@testing-library/jest-dom": "^6.1.5", "@testing-library/react": "^16.1.0", "@types/jest": "^29.5.10", @@ -69,21 +69,20 @@ "husky": "^9.1.6", "less": "^4.2.1", "lint-staged": "^15.2.10", - "np": "^10.0.5", + "@rc-component/np": "^1.0.0", "prettier": "^3.3.3", - "rc-dialog": "^9.0.0", + "@rc-component/dialog": "^1.0.0", "rc-test": "^7.0.15", - "rc-tooltip": "^6.3.2", - "rc-trigger": "^5.0.7", + "@rc-component/tooltip": "^1.0.0", + "@rc-component/trigger": "^3.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", "typescript": "^5.3.3" }, "dependencies": { - "@babel/runtime": "^7.10.1", "classnames": "2.x", - "rc-motion": "^2.0.1", - "rc-util": "^5.16.1", + "@rc-component/motion": "^1.0.0", + "@rc-component/util": "^1.2.1", "rc-virtual-list": "^3.5.1" } } diff --git a/src/MotionTreeNode.tsx b/src/MotionTreeNode.tsx index 882c56fb..946289c6 100644 --- a/src/MotionTreeNode.tsx +++ b/src/MotionTreeNode.tsx @@ -1,6 +1,6 @@ import classNames from 'classnames'; -import CSSMotion from 'rc-motion'; -import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect'; +import CSSMotion from '@rc-component/motion'; +import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; import * as React from 'react'; import { TreeContext } from './contextTypes'; import type { FlattenNode, TreeNodeProps } from './interface'; diff --git a/src/NodeList.tsx b/src/NodeList.tsx index 2106ad55..94d4dea6 100644 --- a/src/NodeList.tsx +++ b/src/NodeList.tsx @@ -2,7 +2,7 @@ * Handle virtual list of the TreeNodes. */ -import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect'; +import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; import VirtualList, { type ListRef } from 'rc-virtual-list'; import * as React from 'react'; import MotionTreeNode from './MotionTreeNode'; diff --git a/src/Tree.tsx b/src/Tree.tsx index 97209b7c..b5726532 100644 --- a/src/Tree.tsx +++ b/src/Tree.tsx @@ -2,9 +2,9 @@ // Fully accessibility support import classNames from 'classnames'; -import KeyCode from 'rc-util/lib/KeyCode'; -import pickAttrs from 'rc-util/lib/pickAttrs'; -import warning from 'rc-util/lib/warning'; +import KeyCode from '@rc-component/util/lib/KeyCode'; +import pickAttrs from '@rc-component/util/lib/pickAttrs'; +import warning from '@rc-component/util/lib/warning'; import * as React from 'react'; import type { diff --git a/src/TreeNode.tsx b/src/TreeNode.tsx index 278aefde..4e53224f 100644 --- a/src/TreeNode.tsx +++ b/src/TreeNode.tsx @@ -1,6 +1,6 @@ import React from 'react'; import classNames from 'classnames'; -import pickAttrs from 'rc-util/lib/pickAttrs'; +import pickAttrs from '@rc-component/util/lib/pickAttrs'; import { TreeContext, UnstableContext } from './contextTypes'; import Indent from './Indent'; import type { TreeNodeProps } from './interface'; diff --git a/src/useUnmount.ts b/src/useUnmount.ts index a07b4161..b113c4ed 100644 --- a/src/useUnmount.ts +++ b/src/useUnmount.ts @@ -1,5 +1,5 @@ import * as React from 'react'; -import useLayoutEffect from 'rc-util/lib/hooks/useLayoutEffect'; +import useLayoutEffect from '@rc-component/util/lib/hooks/useLayoutEffect'; /** * Trigger only when component unmount diff --git a/src/util.tsx b/src/util.tsx index 53e4af03..0aa3c03c 100644 --- a/src/util.tsx +++ b/src/util.tsx @@ -3,7 +3,7 @@ * Legacy code. Should avoid to use if you are new to import these code. */ -import warning from 'rc-util/lib/warning'; +import warning from '@rc-component/util/lib/warning'; import React from 'react'; import type { BasicDataNode, diff --git a/src/utils/conductUtil.ts b/src/utils/conductUtil.ts index bd9a0ff6..c45e4d74 100644 --- a/src/utils/conductUtil.ts +++ b/src/utils/conductUtil.ts @@ -1,4 +1,4 @@ -import warning from 'rc-util/lib/warning'; +import warning from '@rc-component/util/lib/warning'; import type { BasicDataNode, DataEntity, diff --git a/src/utils/treeUtil.ts b/src/utils/treeUtil.ts index 95a2f72f..ec895946 100644 --- a/src/utils/treeUtil.ts +++ b/src/utils/treeUtil.ts @@ -1,6 +1,6 @@ -import toArray from 'rc-util/lib/Children/toArray'; -import omit from 'rc-util/lib/omit'; -import warning from 'rc-util/lib/warning'; +import toArray from '@rc-component/util/lib/Children/toArray'; +import omit from '@rc-component/util/lib/omit'; +import warning from '@rc-component/util/lib/warning'; import * as React from 'react'; import type { BasicDataNode, diff --git a/tests/Accessibility.spec.tsx b/tests/Accessibility.spec.tsx index a66fff7e..739dd617 100644 --- a/tests/Accessibility.spec.tsx +++ b/tests/Accessibility.spec.tsx @@ -1,6 +1,6 @@ /* eslint-disable no-undef, react/no-multi-comp */ import { fireEvent, render } from '@testing-library/react'; -import KeyCode from 'rc-util/lib/KeyCode'; +import KeyCode from '@rc-component/util/lib/KeyCode'; import React from 'react'; import Tree, { FieldDataNode } from '../src'; import { spyConsole } from './util'; diff --git a/tests/Tree.spec.tsx b/tests/Tree.spec.tsx index 31a4d4c9..25e4eba5 100644 --- a/tests/Tree.spec.tsx +++ b/tests/Tree.spec.tsx @@ -2,8 +2,8 @@ react/no-unused-state, react/prop-types, no-return-assign */ import React from 'react'; import { render, fireEvent, act } from '@testing-library/react'; -import { resetWarned } from 'rc-util/lib/warning'; -import { spyElementPrototypes } from 'rc-util/lib/test/domHook'; +import { resetWarned } from '@rc-component/util/lib/warning'; +import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import Tree, { TreeNode } from '../src'; import { objectMatcher, spyConsole, spyError } from './util'; import { UnstableContext } from '../src'; diff --git a/tests/TreeDraggable.spec.tsx b/tests/TreeDraggable.spec.tsx index d8876fd8..5fb082d2 100644 --- a/tests/TreeDraggable.spec.tsx +++ b/tests/TreeDraggable.spec.tsx @@ -1,7 +1,7 @@ /* eslint-disable no-undef, react/no-multi-comp, no-console, react/no-unused-state, react/prop-types, no-return-assign */ import { act, createEvent, fireEvent, render } from '@testing-library/react'; -import { spyElementPrototypes } from 'rc-util/lib/test/domHook'; +import { spyElementPrototypes } from '@rc-component/util/lib/test/domHook'; import React from 'react'; import Tree, { FieldDataNode, TreeNode, TreeProps } from '../src'; import { spyConsole } from './util'; diff --git a/tests/TreeMotion.spec.tsx b/tests/TreeMotion.spec.tsx index 487f34e2..7cbcb91b 100644 --- a/tests/TreeMotion.spec.tsx +++ b/tests/TreeMotion.spec.tsx @@ -5,8 +5,8 @@ import { TreeContext } from '../src/contextTypes'; import MotionTreeNode from '../src/MotionTreeNode'; import { getMinimumRangeTransitionRange } from '../src/NodeList'; -jest.mock('rc-motion/lib/util/motion', () => { - const origin = jest.requireActual('rc-motion/lib/util/motion'); +jest.mock('@rc-component/motion/lib/util/motion', () => { + const origin = jest.requireActual('@rc-component/motion/lib/util/motion'); return { ...origin, diff --git a/tests/TreeProps.spec.tsx b/tests/TreeProps.spec.tsx index d6b1038f..1e02cb4f 100644 --- a/tests/TreeProps.spec.tsx +++ b/tests/TreeProps.spec.tsx @@ -1,6 +1,6 @@ /* eslint-disable no-undef, react/no-multi-comp */ import { act, fireEvent, render } from '@testing-library/react'; -import { resetWarned } from 'rc-util/lib/warning'; +import { resetWarned } from '@rc-component/util/lib/warning'; import React from 'react'; import Tree, { FieldDataNode, TreeNode } from '../src'; import { objectMatcher, spyConsole, spyError } from './util'; diff --git a/tsconfig.json b/tsconfig.json index fe2e24f4..38b8cdfd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,23 +7,13 @@ "declaration": true, "skipLibCheck": true, "esModuleInterop": true, - "paths": { - "@/*": [ - "src/*" - ], - "@@/*": [ - "src/.umi/*" - ], - "rc-tree": [ - "src/index.ts" - ] - } + "paths": { "@/*": ["src/*"], "@@/*": ["src/.umi/*"], "@rc-component/tree": ["src/index.ts"] } }, "include": [ ".dumirc.ts", "./src/**/*.ts", "./src/**/*.tsx", "./docs/**/*.tsx", - "./tests/**/*.tsx", + "./tests/**/*.tsx" ] -} \ No newline at end of file +}