From ce1dce369c523b5ebe9a2b3b5d39f1d22c3ac8e6 Mon Sep 17 00:00:00 2001 From: sunshinesmilelk <1176136681@qq.com> Date: Fri, 7 Feb 2025 14:17:45 +0800 Subject: [PATCH] refactor: use libro-common instead of mana-react --- apps/docs/.dumirc.ts | 4 ++++ packages/libro-common/package.json | 11 ++++++++++- packages/libro-core/package.json | 1 - .../src/components/libro-side-toolbar-menu.tsx | 2 +- .../settings/setting-editor/setting-editor-view.tsx | 2 +- .../src/toolbar/side-toolar-more-select.tsx | 2 +- packages/libro-lab/package.json | 2 -- packages/libro-lab/src/layout/container.tsx | 2 +- packages/libro-lab/src/layout/footer/footer-view.tsx | 2 +- packages/libro-lab/src/layout/layout.tsx | 2 +- packages/libro-lab/src/layout/main.tsx | 2 +- packages/libro-lab/src/layout/saveable-tab-view.tsx | 2 +- packages/libro-language-client/package.json | 1 - packages/libro/package.json | 2 -- 14 files changed, 22 insertions(+), 15 deletions(-) diff --git a/apps/docs/.dumirc.ts b/apps/docs/.dumirc.ts index b48867bb..c9d2eee7 100644 --- a/apps/docs/.dumirc.ts +++ b/apps/docs/.dumirc.ts @@ -121,6 +121,10 @@ export default defineConfig({ getPackagesDir(), 'libro-common/es/mana-common/index.js', ), + '@difizen/libro-common/mana-react': path.resolve( + getPackagesDir(), + 'libro-common/es/mana-react/index.js', + ), }, analytics: { baidu: process.env.BAIDU_ANALYTICS, diff --git a/packages/libro-common/package.json b/packages/libro-common/package.json index f5313d6e..1a5841af 100644 --- a/packages/libro-common/package.json +++ b/packages/libro-common/package.json @@ -43,10 +43,19 @@ "@difizen/mana-app": "latest", "path-browserify": "^1.0.0", "sanitize-html": "^2.7.2", - "url-parse": "^1.5.10" + "url-parse": "^1.5.10", + "@ant-design/icons": "^5.1.0", + "classnames": "^2.3.2", + "rc-dropdown": "^3.2.0", + "rc-motion": "^2.9.2", + "rc-notification": "^5.6.0", + "rc-tabs": "^11.10.1", + "rc-util": "^4.21.1" }, "devDependencies": { "@types/react": "^18.2.25", + "@types/react-dom": "^18.2.4", + "rimraf": "latest", "@types/path-browserify": "^1.0.0", "@types/sanitize-html": "^2.6.2", "@types/url-parse": "^1.4.8" diff --git a/packages/libro-core/package.json b/packages/libro-core/package.json index 23366594..d47fd517 100644 --- a/packages/libro-core/package.json +++ b/packages/libro-core/package.json @@ -53,7 +53,6 @@ "@difizen/libro-virtualized": "^0.3.4", "@difizen/mana-app": "latest", "@difizen/mana-l10n": "latest", - "@difizen/mana-react": "latest", "classnames": "^2.3.2", "dayjs": "^1.11.10", "dnd-core": "^16.0.1", diff --git a/packages/libro-core/src/components/libro-side-toolbar-menu.tsx b/packages/libro-core/src/components/libro-side-toolbar-menu.tsx index f074bbd5..bc81f54a 100644 --- a/packages/libro-core/src/components/libro-side-toolbar-menu.tsx +++ b/packages/libro-core/src/components/libro-side-toolbar-menu.tsx @@ -1,3 +1,4 @@ +import { Menu, MenuContext } from '@difizen/libro-common/mana-react'; import type { Toolbar } from '@difizen/mana-app'; import { CommandRegistry, @@ -5,7 +6,6 @@ import { ToolbarInstance, useInject, } from '@difizen/mana-app'; -import { Menu, MenuContext } from '@difizen/mana-react'; import type { ReactNode } from 'react'; import type { LibroToolbarArags } from '../toolbar/index.js'; diff --git a/packages/libro-core/src/settings/setting-editor/setting-editor-view.tsx b/packages/libro-core/src/settings/setting-editor/setting-editor-view.tsx index 24b6a631..cc68f5e4 100644 --- a/packages/libro-core/src/settings/setting-editor/setting-editor-view.tsx +++ b/packages/libro-core/src/settings/setting-editor/setting-editor-view.tsx @@ -1,3 +1,4 @@ +import { SplitPanel } from '@difizen/libro-common/mana-react'; import { BaseView, view, @@ -11,7 +12,6 @@ import { URI, ConfigurationRegistry, } from '@difizen/mana-app'; -import { SplitPanel } from '@difizen/mana-react'; import { useEffect, useState } from 'react'; import { ConfigurationPanelView } from './configuration-panel-view.js'; diff --git a/packages/libro-core/src/toolbar/side-toolar-more-select.tsx b/packages/libro-core/src/toolbar/side-toolar-more-select.tsx index 951d8bf4..01a3ae04 100644 --- a/packages/libro-core/src/toolbar/side-toolar-more-select.tsx +++ b/packages/libro-core/src/toolbar/side-toolar-more-select.tsx @@ -1,3 +1,4 @@ +import { Menu, MenuContext } from '@difizen/libro-common/mana-react'; import type { Toolbar } from '@difizen/mana-app'; import { isMacintosh } from '@difizen/mana-app'; import { @@ -8,7 +9,6 @@ import { useObserve, } from '@difizen/mana-app'; import { l10n } from '@difizen/mana-l10n'; -import { Menu, MenuContext } from '@difizen/mana-react'; import { Popover } from 'antd'; import { ExecutableCellModel, ExecutableCellView } from '../cell/index.js'; diff --git a/packages/libro-lab/package.json b/packages/libro-lab/package.json index 518f282f..f8fb2e03 100644 --- a/packages/libro-lab/package.json +++ b/packages/libro-lab/package.json @@ -63,8 +63,6 @@ "@difizen/libro-common": "^0.3.4", "@difizen/mana-app": "latest", "@difizen/mana-l10n": "latest", - "@difizen/mana-common": "latest", - "@difizen/mana-react": "latest", "classnames": "^2.3.2", "uuid": "^9.0.0", "viewerjs": "^1.11.6" diff --git a/packages/libro-lab/src/layout/container.tsx b/packages/libro-lab/src/layout/container.tsx index 73158a97..dc44120e 100644 --- a/packages/libro-lab/src/layout/container.tsx +++ b/packages/libro-lab/src/layout/container.tsx @@ -1,6 +1,6 @@ +import { BoxPanel } from '@difizen/libro-common/mana-react'; import { singleton, Slot, view } from '@difizen/mana-app'; import { BaseView } from '@difizen/mana-app'; -import { BoxPanel } from '@difizen/mana-react'; import { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/layout/footer/footer-view.tsx b/packages/libro-lab/src/layout/footer/footer-view.tsx index a8d28b10..0adeacf3 100644 --- a/packages/libro-lab/src/layout/footer/footer-view.tsx +++ b/packages/libro-lab/src/layout/footer/footer-view.tsx @@ -1,5 +1,5 @@ +import { BoxPanel } from '@difizen/libro-common/mana-react'; import { DefaultSlotView, singleton, Slot, view } from '@difizen/mana-app'; -import { BoxPanel } from '@difizen/mana-react'; import * as React from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/layout/layout.tsx b/packages/libro-lab/src/layout/layout.tsx index dba86729..8ebd822d 100644 --- a/packages/libro-lab/src/layout/layout.tsx +++ b/packages/libro-lab/src/layout/layout.tsx @@ -1,7 +1,7 @@ +import { BoxPanel } from '@difizen/libro-common/mana-react'; import { inject, singleton, Slot, useInject, view } from '@difizen/mana-app'; import { BaseView } from '@difizen/mana-app'; import { l10n } from '@difizen/mana-l10n'; -import { BoxPanel } from '@difizen/mana-react'; import { Alert } from 'antd'; import { forwardRef } from 'react'; diff --git a/packages/libro-lab/src/layout/main.tsx b/packages/libro-lab/src/layout/main.tsx index 927dfcb1..951fab8f 100644 --- a/packages/libro-lab/src/layout/main.tsx +++ b/packages/libro-lab/src/layout/main.tsx @@ -1,6 +1,6 @@ +import { SplitPanel } from '@difizen/libro-common/mana-react'; import { singleton, Slot, useInject, view } from '@difizen/mana-app'; import { BaseView } from '@difizen/mana-app'; -import { SplitPanel } from '@difizen/mana-react'; import { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/layout/saveable-tab-view.tsx b/packages/libro-lab/src/layout/saveable-tab-view.tsx index 63f2340e..3bebe158 100644 --- a/packages/libro-lab/src/layout/saveable-tab-view.tsx +++ b/packages/libro-lab/src/layout/saveable-tab-view.tsx @@ -1,4 +1,5 @@ import { CloseOutlined } from '@ant-design/icons'; +import { Dropdown } from '@difizen/libro-common/mana-react'; import { JupyterFileService } from '@difizen/libro-jupyter'; import type { CardTabOption, View } from '@difizen/mana-app'; import { ViewManager, ViewOption } from '@difizen/mana-app'; @@ -12,7 +13,6 @@ import { ViewContext, Saveable, } from '@difizen/mana-app'; -import { Dropdown } from '@difizen/mana-react'; import { Badge } from 'antd'; import classnames from 'classnames'; diff --git a/packages/libro-language-client/package.json b/packages/libro-language-client/package.json index aa8c0103..21cd6d19 100644 --- a/packages/libro-language-client/package.json +++ b/packages/libro-language-client/package.json @@ -51,7 +51,6 @@ "@difizen/libro-common": "^0.3.4", "@difizen/libro-lsp": "^0.3.4", "@difizen/mana-app": "latest", - "@difizen/mana-common": "latest", "uuid": "^9.0.0", "@difizen/vscode-languageserver-protocol": "^3.17.6-next.2", "vscode-ws-jsonrpc": "^3.1.0", diff --git a/packages/libro/package.json b/packages/libro/package.json index 3fafc9fe..e84f32c4 100644 --- a/packages/libro/package.json +++ b/packages/libro/package.json @@ -79,8 +79,6 @@ "@difizen/libro-search-code-cell": "^0.3.4", "@difizen/mana-app": "latest", "@difizen/mana-l10n": "latest", - "@difizen/mana-common": "latest", - "@difizen/mana-react": "latest", "classnames": "^2.3.2", "uuid": "^9.0.0", "viewerjs": "^1.11.6"