From 99ee9e80b0d5eb531cfeee8bd418d7ba34758d3a Mon Sep 17 00:00:00 2001 From: sunshinesmilelk <1176136681@qq.com> Date: Fri, 7 Feb 2025 22:10:21 +0800 Subject: [PATCH] refactor: rename mana-app as app --- apps/docs/.dumi/theme/layouts/DocLayout.tsx | 2 +- apps/docs/.dumi/theme/modules/github.ts | 2 +- apps/docs/.dumi/theme/modules/module.ts | 2 +- apps/docs/.dumi/theme/slots/Header/index.tsx | 2 +- apps/docs/.dumirc.ts | 4 +- apps/docs/src/lab/app.ts | 6 +-- apps/docs/src/lab/index.tsx | 6 +-- apps/docs/src/output/app.ts | 9 ++--- apps/docs/src/output/content.ts | 2 +- apps/docs/src/output/index.tsx | 6 +-- apps/docs/src/terminal/app.ts | 8 ++-- apps/docs/src/terminal/demo-module/app.tsx | 4 +- apps/docs/src/terminal/demo-module/index.ts | 2 +- apps/docs/src/terminal/index.tsx | 6 +-- apps/docs/src/workbench/app.ts | 12 +++--- apps/docs/src/workbench/index.tsx | 2 +- .../layout/workbench-layout.view.tsx | 4 +- .../inline-completion-contribution.ts | 2 +- .../inline-completion-provider.ts | 2 +- .../inline-completion-request.ts | 2 +- .../src/ai-inline-completions/module.ts | 2 +- .../src/ai-native-code-block.tsx | 2 +- .../src/ai-native-command-contribution.tsx | 12 ++---- .../libro-ai-native/src/ai-native-command.ts | 2 +- .../src/ai-native-for-cell-view.tsx | 14 +++---- .../src/ai-native-output-top.tsx | 2 +- .../libro-ai-native/src/ai-native-service.ts | 2 +- .../src/ai-side-toolbar-selector.tsx | 2 +- .../src/chat-slot-contribution.ts | 4 +- packages/libro-ai-native/src/chat-view.tsx | 4 +- .../src/error-output-model.tsx | 9 +---- .../src/libro-ai-msg-item-model.ts | 2 +- .../src/libro-ai-native-chat-service.ts | 2 +- .../src/libro-ai-native-chat-view.tsx | 8 +--- .../src/libro-ai-native-color-registry.ts | 6 +-- packages/libro-ai-native/src/module.ts | 2 +- .../src/app-file-command-contribution.tsx | 9 +++-- packages/libro-app/src/app-open-handler.ts | 6 +-- packages/libro-app/src/app-view.tsx | 2 +- packages/libro-app/src/app-viewer.tsx | 6 +-- packages/libro-app/src/module.ts | 2 +- .../src/code-cell-contribution.ts | 2 +- .../libro-code-cell/src/code-cell-model.ts | 6 +-- .../libro-code-cell/src/code-cell-view.tsx | 4 +- packages/libro-code-cell/src/module.ts | 2 +- .../src/code-editor-info-manager.ts | 2 +- .../inline-completions-manager.ts | 4 +- .../inline-completions-protocol.ts | 2 +- .../src/code-editor-manager.ts | 4 +- .../src/code-editor-model.ts | 4 +- .../src/code-editor-protocol.ts | 4 +- .../src/code-editor-settings.ts | 4 +- .../src/code-editor-state-manager.ts | 8 ++-- .../src/code-editor-view.tsx | 2 +- .../libro-code-editor/src/language-specs.ts | 6 +-- packages/libro-code-editor/src/module.ts | 2 +- .../src/editor-contribution.ts | 2 +- packages/libro-codemirror/src/editor.ts | 4 +- packages/libro-codemirror/src/module.ts | 2 +- packages/libro-codemirror/src/monitor.ts | 2 +- .../src/editor-options-registry.ts | 2 +- .../src/index.ts | 4 +- .../src/language-worker-registry.ts | 4 +- .../src/lazy-loader-registry.ts | 4 +- .../src/options-registry.ts | 2 +- .../src/default-worker-contribution.ts | 2 +- .../libro-cofine-editor-core/src/e2-editor.ts | 4 +- .../src/editor-handler-registry.ts | 4 +- .../src/initialize-provider.ts | 4 +- .../src/mana-export.ts | 2 +- .../src/monaco-environment.ts | 6 +-- .../src/monaco-loader.ts | 2 +- .../src/monaco-module.ts | 2 +- .../src/snippets-suggest-registry.ts | 4 +- .../src/theme-registry.ts | 4 +- .../src/editor-contribution.ts | 2 +- .../src/language/json/json-contribution.ts | 2 +- .../src/language/json/module.ts | 2 +- .../src/language/julia/julia-contribution.ts | 2 +- .../src/language/julia/module.ts | 2 +- .../src/language/python/module.ts | 2 +- .../python/python-language-feature.ts | 2 +- .../src/language/r/module.ts | 2 +- .../src/language/r/r-contribution.ts | 2 +- .../src/language/sql/module.ts | 2 +- .../src/language/sql/sql-contribution.ts | 2 +- .../src/libro-e2-editor.ts | 8 +--- .../libro-e2-inline-completion-register.ts | 4 +- .../src/libro-e2-preload.ts | 4 +- .../libro-cofine-editor/src/libro-sql-api.ts | 2 +- packages/libro-cofine-editor/src/module.ts | 2 +- .../libro-cofine-editor/src/placeholder.ts | 4 +- .../theme/libro-python-theme-contribution.ts | 2 +- .../libro-cofine-editor/src/theme/module.ts | 2 +- .../src/monaco-grammar-registry.ts | 2 +- .../src/monaco-module.ts | 2 +- .../src/monaco-textmate-service.ts | 4 +- .../src/monaco-theme-registry.ts | 4 +- .../src/textmate-contribution.ts | 2 +- .../src/textmate-registry.ts | 4 +- .../src/textmate-theme-contribution.ts | 2 +- packages/libro-common/package.json | 6 +-- .../src/{mana-app => app}/app.tsx | 2 +- .../file-tree/file-selection.ts | 4 +- .../file-tree/file-service.ts | 2 +- .../file-tree/file-tree-component.tsx | 0 .../file-tree/file-tree-icon.tsx | 4 +- .../file-tree/file-tree-label-provider.ts | 16 +++++--- .../file-tree/file-tree-model.ts | 18 ++++----- .../file-tree/file-tree-protocol.ts | 0 .../file-tree/file-tree-view.tsx | 26 ++++++------- .../{mana-app => app}/file-tree/file-tree.ts | 25 ++++++------- .../src/{mana-app => app}/file-tree/files.ts | 0 .../file-tree/filesystem-utils.ts | 2 +- .../src/{mana-app => app}/file-tree/index.ts | 0 .../src/{mana-app => app}/file-tree/module.ts | 14 ++++--- .../file-tree/selection-command-handler.ts | 0 .../file-tree/style/file-icon.less | 4 +- .../src/{mana-app => app}/index.spec.ts | 0 packages/libro-common/src/app/index.ts | 37 +++++++++++++++++++ .../src/{mana-app => app}/label/index.ts | 4 +- .../label/label-provider.tsx | 0 .../src/{mana-app => app}/menu/index.ts | 12 +++--- .../menu/menu-bar-render.tsx | 12 +++--- .../menu/menu-color-registry.ts | 0 .../{mana-app => app}/menu/menu-context.tsx | 0 .../menu/menu-item-keeper.tsx | 4 +- .../menu/menu-item-render.tsx | 6 +-- .../{mana-app => app}/menu/menu-protocol.ts | 0 .../{mana-app => app}/menu/menu-render.tsx | 14 +++---- .../src/{mana-app => app}/menu/menu.tsx | 4 +- .../src/{mana-app => app}/modal/index.ts | 16 ++++---- .../modal/modal-contribution.ts | 2 +- .../modal/modal-protocol.tsx | 0 .../{mana-app => app}/modal/modal-render.tsx | 2 +- .../{mana-app => app}/modal/modal-service.ts | 4 +- .../{mana-app => app}/notification/index.less | 0 .../{mana-app => app}/notification/index.ts | 6 +-- .../notification/protocol.ts | 0 .../notification/service.tsx | 2 +- .../src/{mana-app => app}/style/index.less | 4 +- .../{mana-app => app}/style/style-protocol.ts | 0 .../src/{mana-app => app}/toolbar/index.less | 0 .../src/{mana-app => app}/toolbar/index.ts | 6 +-- .../toolbar/toolbar-item-keeper.tsx | 4 +- .../toolbar/toolbar-item-render.tsx | 4 +- .../toolbar/toolbar-protocol.ts | 0 .../toolbar/toolbar-render.tsx | 10 ++--- .../toolbar/toolbar-visible-render.tsx | 2 +- .../src/{mana-app => app}/toolbar/toolbar.tsx | 4 +- .../tree/components/index.tsx | 0 .../tree/components/tree-ident.tsx | 6 +-- .../components/tree-node-caption-affix.tsx | 10 ++--- .../tree/components/tree-node-caption.tsx | 10 ++--- .../tree/components/tree-node-expansion.tsx | 12 +++--- .../components/tree-node-icon-decorator.tsx | 13 ++++--- .../tree/components/tree-node-icon.tsx | 0 .../components/tree-node-tail-decoration.tsx | 10 ++--- .../tree/components/tree-node.tsx | 8 ++-- .../tree/components/tree-switch-icon.tsx | 0 .../src/{mana-app => app}/tree/index.ts | 0 packages/libro-common/src/app/tree/module.ts | 30 +++++++++++++++ .../{mana-app => app}/tree/style/index.less | 0 .../tree/style/tree-decorator.less | 0 .../{mana-app => app}/tree/tree-decorator.ts | 4 +- .../{mana-app => app}/tree/tree-expansion.ts | 4 +- .../src/{mana-app => app}/tree/tree-impl.ts | 4 +- .../{mana-app => app}/tree/tree-iterator.ts | 6 +-- .../tree/tree-label-provider.ts | 4 +- .../src/{mana-app => app}/tree/tree-model.ts | 12 +++--- .../{mana-app => app}/tree/tree-navigation.ts | 2 +- .../{mana-app => app}/tree/tree-protocol.ts | 0 .../tree/tree-selection-impl.ts | 10 ++--- .../tree/tree-selection-state.ts | 6 +-- .../{mana-app => app}/tree/tree-selection.ts | 2 +- .../tree/tree-view-decoration.ts | 0 .../src/{mana-app => app}/tree/tree.ts | 2 +- .../{mana-app => app}/tree/view/index.less | 0 .../src/{mana-app => app}/tree/view/index.ts | 0 .../tree/view/tree-view-decorator.ts | 10 ++--- .../tree/view/tree-view-module.ts | 12 +++--- .../tree/view/tree-view-selection.ts | 0 .../{mana-app => app}/tree/view/tree-view.tsx | 30 +++++++-------- .../src/{mana-app => app}/typings/index.d.ts | 0 .../src/{mana-app => app}/view/box/index.tsx | 0 .../view/components/index.ts | 0 .../view/components/loading/index.less | 0 .../view/components/loading/index.tsx | 0 .../{mana-app => app}/view/flex/index.less | 0 .../src/{mana-app => app}/view/flex/index.tsx | 0 .../view/header/header-view.tsx | 0 .../{mana-app => app}/view/header/index.less | 0 .../{mana-app => app}/view/header/index.ts | 6 +-- .../src/{mana-app => app}/view/index.ts | 0 .../view/tab/card-tab-view.tsx | 4 +- .../src/{mana-app => app}/view/tab/index.less | 0 .../src/{mana-app => app}/view/tab/index.ts | 0 .../view/tab/side-tab-view.tsx | 6 +-- .../{mana-app => app}/view/tab/tab-menu.ts | 0 .../view/tab/tab-protocol.ts | 0 .../{mana-app => app}/view/tab/tab-view.tsx | 6 +-- .../src/core/components/application.tsx | 2 +- .../src/core/components/index.less | 2 +- packages/libro-common/src/mana-app/index.ts | 37 ------------------- .../libro-common/src/mana-app/tree/module.ts | 30 --------------- packages/libro-common/src/polling/poll.ts | 4 +- packages/libro-common/src/polling/protocol.ts | 2 +- .../src/protocol/cell-protocol.ts | 2 +- packages/libro-common/src/url.ts | 2 +- .../src/add-cell/libro-add-cell-module.ts | 2 +- .../libro-add-cell-slot-contribution.ts | 4 +- .../src/add-cell/libro-add-cell-view.tsx | 2 +- .../src/cell/libro-cell-contribution.ts | 2 +- .../libro-core/src/cell/libro-cell-model.ts | 4 +- .../libro-core/src/cell/libro-cell-module.ts | 2 +- .../src/cell/libro-cell-protocol.ts | 4 +- .../libro-core/src/cell/libro-cell-service.ts | 8 ++-- .../libro-core/src/cell/libro-cell-view.tsx | 19 ++++------ .../src/cell/libro-edit-cell-view.tsx | 2 +- .../src/cell/libro-executable-cell-model.ts | 2 +- .../src/cell/libro-executable-cell-view.ts | 6 +-- packages/libro-core/src/collapse-service.ts | 2 +- .../src/command/document-commands.ts | 2 +- .../libro-core/src/command/kernel-command.ts | 2 +- .../src/command/libro-command-contribution.ts | 6 +-- .../src/command/libro-command-register.ts | 4 +- packages/libro-core/src/command/module.ts | 2 +- .../src/command/notebook-commands.ts | 2 +- .../src/components/dnd-cell-item-render.tsx | 2 +- .../dnd-component/default-dnd-content.tsx | 4 +- .../src/components/dnd-component/dnd-list.tsx | 2 +- .../dnd-component/virtualized-manager.ts | 2 +- .../src/components/libro-component.tsx | 4 +- .../components/libro-side-toolbar-menu.tsx | 4 +- .../src/components/libro-view-header.tsx | 2 +- .../src/content/libro-content-contribution.ts | 2 +- .../src/content/libro-content-module.ts | 2 +- .../src/content/libro-content-protocol.ts | 2 +- .../src/content/libro-content-service.ts | 4 +- .../libro-save-content-contribution.ts | 2 +- .../libro-formatter-json-contribution.ts | 2 +- .../src/formatter/libro-formatter-manager.ts | 4 +- .../src/formatter/libro-formatter-module.ts | 2 +- .../src/formatter/libro-formatter-protocol.ts | 2 +- .../libro-formatter-string-contribution.ts | 2 +- ...ro-formatter-trans-default-contribution.ts | 2 +- packages/libro-core/src/libro-context-key.ts | 8 ++-- .../libro-core/src/libro-keybind-registry.ts | 4 +- packages/libro-core/src/libro-model.ts | 8 ++-- packages/libro-core/src/libro-protocol.ts | 4 +- packages/libro-core/src/libro-service.ts | 10 ++--- .../src/libro-setting-contribution.ts | 2 +- packages/libro-core/src/libro-setting.ts | 2 +- packages/libro-core/src/libro-view-tracker.ts | 2 +- packages/libro-core/src/libro-view.tsx | 2 +- .../libro-core/src/libro-workspace-service.ts | 4 +- packages/libro-core/src/module.ts | 4 +- .../libro-core/src/output/output-area.tsx | 12 ++---- .../src/output/output-contribution.ts | 2 +- .../libro-core/src/output/output-model.tsx | 4 +- .../libro-core/src/output/output-module.ts | 2 +- .../libro-core/src/output/output-protocol.ts | 6 +-- packages/libro-core/src/settings/module.ts | 2 +- .../configuration-panel-view.tsx | 4 +- .../configuration-render-contribution.ts | 7 +--- .../setting-editor/default-node-render.tsx | 2 +- .../src/settings/setting-editor/module.ts | 2 +- .../setting-editor/setting-editor-view.tsx | 2 +- .../setting-editor/setting-tree-service.ts | 6 +-- .../setting-editor/setting-tree-view.tsx | 4 +- .../src/settings/settings-contribution.tsx | 4 +- .../src/settings/settings-modal.tsx | 6 +-- .../src/settings/settings-protocol.ts | 2 +- .../libro-core/src/slot/libro-slot-manager.ts | 6 +-- .../src/slot/libro-slot-protocol.ts | 4 +- .../libro-core/src/slot/libro-slot-view.tsx | 8 ++-- packages/libro-core/src/slot/module.ts | 2 +- .../src/theme/libro-color-registry.ts | 6 +-- .../src/toolbar/all-outputs-scroll-icon.tsx | 2 +- .../src/toolbar/change-cell-to-selector.tsx | 4 +- .../src/toolbar/hide-all-selector.tsx | 4 +- .../libro-core/src/toolbar/libro-toolbar.tsx | 6 +-- packages/libro-core/src/toolbar/module.ts | 2 +- .../restart-clear-outputs-contribution.tsx | 2 +- .../toolbar/restart-clear-outputs-modal.tsx | 2 +- packages/libro-core/src/toolbar/save-icon.tsx | 4 +- .../src/toolbar/shutdown-contribution.tsx | 2 +- .../libro-core/src/toolbar/shutdown-modal.tsx | 2 +- .../src/toolbar/side-toolar-more-select.tsx | 6 +-- packages/libro-core/src/utils/index.ts | 2 +- .../src/virtualized-manager-helper.ts | 2 +- .../libro-core/src/virtualized-manager.ts | 2 +- .../add-between-cell-command-contribution.ts | 4 +- .../src/add-between-cell/add-between-cell.tsx | 6 +-- .../src/add-between-cell/module.ts | 2 +- .../src/cell/jupyter-code-cell-model.ts | 4 +- .../src/cell/jupyter-code-cell-view.tsx | 6 +-- .../src/command/command-contribution.ts | 4 +- .../src/command/keybinding-contribution.ts | 2 +- .../src/components/cell-execution-tip.tsx | 2 +- .../components/cell-input-bottom-blank.tsx | 2 +- .../components/cell-output-bottom-blank.tsx | 2 +- .../src/config/config-contribution.ts | 6 +-- packages/libro-jupyter/src/config/config.ts | 2 +- .../src/contents/content-contribution.ts | 4 +- .../src/contents/save-content-contribution.ts | 2 +- .../src/file/file-color-registry.ts | 6 +-- .../libro-jupyter/src/file/file-command.tsx | 6 +-- .../file/file-create-modal-contribution.ts | 2 +- .../src/file/file-create-modal.tsx | 8 ++-- .../file/file-createdir-modal-contribution.ts | 2 +- .../src/file/file-createdir-modal.tsx | 10 ++--- .../libro-jupyter/src/file/file-name-alias.ts | 4 +- .../file/file-rename-modal-contribution.ts | 2 +- .../src/file/file-rename-modal.tsx | 4 +- .../libro-jupyter/src/file/file-service.ts | 6 +-- .../src/file/file-tree-label-provider.ts | 8 +--- .../src/file/file-view/index.tsx | 6 +-- packages/libro-jupyter/src/file/module.ts | 2 +- .../src/file/navigatable-view.tsx | 8 ++-- .../src/file/open-handler-contribution.ts | 6 +-- .../keybind-instructions-contribution.tsx | 11 ++---- .../keybind-instructions-icon.tsx | 2 +- .../keybind-instructions-items.tsx | 2 +- .../keybind-instructions-view.tsx | 8 ++-- .../src/keybind-instructions/module.ts | 2 +- .../src/libro-jupyter-file-service.ts | 8 ++-- .../libro-jupyter/src/libro-jupyter-model.ts | 6 +-- .../src/libro-jupyter-protocol.ts | 2 +- .../libro-jupyter-server-launch-manager.ts | 2 +- .../libro-jupyter/src/libro-jupyter-view.tsx | 4 +- .../src/libro-jupyter-workspace.ts | 6 +-- packages/libro-jupyter/src/module-noeditor.ts | 2 +- packages/libro-jupyter/src/module.ts | 2 +- .../src/output/libro-jupyter-outputarea.tsx | 2 +- .../libro-jupyter/src/rendermime/module.ts | 2 +- .../src/rendermime/plotly-render.tsx | 2 +- .../plotly-rendermime-contribution.ts | 2 +- .../libro-jupyter/src/theme/color-registry.ts | 6 +-- .../src/toolbar/kernel-selector-dropdown.tsx | 2 +- .../toolbar/kernel-status-and-selector.tsx | 2 +- .../src/toolbar/run-selector.tsx | 4 +- .../toolbar/save-file-error-contribution.ts | 2 +- .../src/toolbar/save-file-error.tsx | 6 +-- .../src/toolbar/side-toolbar-run-selector.tsx | 2 +- .../src/toolbar/toolbar-contribution.tsx | 4 +- .../src/widget/box/contribution.ts | 2 +- .../libro-jupyter/src/widget/box/view.tsx | 2 +- packages/libro-jupyter/src/widget/comm.ts | 2 +- .../widget/instance-progress/contribution.ts | 2 +- .../src/widget/instance-progress/view.tsx | 2 +- .../libro-jupyter/src/widget/libro-widgets.ts | 12 ++---- packages/libro-jupyter/src/widget/module.ts | 2 +- .../src/widget/progress/contribution.ts | 2 +- .../src/widget/progress/view.tsx | 2 +- packages/libro-jupyter/src/widget/protocol.ts | 2 +- .../src/widget/widget-manager.ts | 2 +- .../src/widget/widget-render.tsx | 2 +- .../widget/widget-rendermime-contribution.ts | 2 +- .../src/widget/widget-view-contribution.ts | 2 +- .../libro-jupyter/src/widget/widget-view.tsx | 4 +- packages/libro-kernel/src/basemanager.ts | 6 +-- .../src/contents/contents-drive.ts | 6 +-- .../src/contents/contents-manager.ts | 6 +-- .../src/contents/contents-module.ts | 2 +- .../src/contents/contents-protocol.ts | 2 +- packages/libro-kernel/src/kernel/future.ts | 4 +- .../src/kernel/kernel-connection.ts | 10 ++--- .../libro-kernel/src/kernel/kernel-module.ts | 2 +- .../src/kernel/libro-kernel-manager.ts | 8 ++-- .../src/kernel/libro-kernel-protocol.ts | 2 +- .../libro-kernel/src/kernel/libro-kernel.ts | 4 +- packages/libro-kernel/src/kernel/restapi.ts | 2 +- .../src/kernelspec/kernelspec-module.ts | 2 +- .../libro-kernel/src/kernelspec/kernelspec.ts | 2 +- .../libro-kernel/src/kernelspec/manager.ts | 10 ++--- .../libro-kernel/src/kernelspec/restapi.ts | 2 +- .../src/libro-kernel-connection-manager.ts | 4 +- packages/libro-kernel/src/module.ts | 2 +- packages/libro-kernel/src/page-config.ts | 2 +- .../src/server/server-connection.ts | 2 +- .../libro-kernel/src/server/server-manager.ts | 6 +-- .../libro-kernel/src/server/server-module.ts | 2 +- .../src/session/libro-session-manager.ts | 10 ++--- .../libro-kernel/src/session/libro-session.ts | 2 +- packages/libro-kernel/src/session/restapi.ts | 2 +- .../src/session/session-module.ts | 2 +- .../src/command/lab-menu-contribution.tsx | 10 ++--- .../libro-lab/src/command/menu-bar-view.tsx | 2 +- packages/libro-lab/src/command/module.ts | 2 +- .../src/config/config-contribution.ts | 6 +-- packages/libro-lab/src/config/config.ts | 2 +- .../editor-viewer/code-editor-open-handler.ts | 8 ++-- .../src/editor-viewer/code-editor-viewer.tsx | 10 ++--- .../src/editor-viewer/json-langauge.ts | 2 +- .../src/editor-viewer/julia-language.ts | 2 +- .../libro-default-open-handler.ts | 6 +-- .../editor-viewer/libro-default-viewer.tsx | 6 +-- .../libro-lab/src/editor-viewer/module.ts | 2 +- .../libro-lab/src/editor-viewer/r-language.ts | 2 +- packages/libro-lab/src/github-link/index.tsx | 4 +- .../src/guide/content-contribution.ts | 4 +- packages/libro-lab/src/guide/guide-view.tsx | 4 +- packages/libro-lab/src/image-viewer/module.ts | 2 +- .../src/image-viewer/open-handler.ts | 6 +-- .../libro-lab/src/image-viewer/viewer.tsx | 6 +-- .../collapse/collapse-content.tsx | 2 +- .../collapse/index.tsx | 2 +- .../collapse/kernel-collapse-content-item.tsx | 2 +- .../collapse/page-collapse-content.tsx | 2 +- .../kernel-and-terminal-panel-view.tsx | 2 +- .../kernel-color-registry.ts | 6 +-- .../src/kernel-and-terminal-panel/module.ts | 2 +- .../panel-command.tsx | 6 +-- .../libro-lab/src/kernel-manager/index.tsx | 4 +- packages/libro-lab/src/lab-app.ts | 4 +- packages/libro-lab/src/lab-color-registry.ts | 6 +-- .../libro-lab/src/lang-switcher/index.tsx | 4 +- packages/libro-lab/src/layout/brand/brand.tsx | 2 +- packages/libro-lab/src/layout/container.tsx | 4 +- .../src/layout/content-bottom-tab-view.tsx | 4 +- .../footer/current-file-footer-view.tsx | 2 +- .../src/layout/footer/footer-view.tsx | 2 +- .../src/layout/footer/status-footer-view.tsx | 2 +- .../libro-lab/src/layout/layout-service.ts | 8 ++-- packages/libro-lab/src/layout/layout.tsx | 10 +---- packages/libro-lab/src/layout/main.tsx | 4 +- packages/libro-lab/src/layout/module.ts | 2 +- .../src/layout/saveable-tab-view.tsx | 10 ++--- .../libro-lab/src/layout/side-tab-view.tsx | 6 +-- packages/libro-lab/src/module.tsx | 2 +- .../src/toc/libro-toc-panel-view.tsx | 2 +- packages/libro-lab/src/toc/module.ts | 2 +- .../src/welcome/entry-point-view.tsx | 4 +- .../libro-lab/src/welcome/welcome-view.tsx | 4 +- .../src/common/vscodeAdaptor/fileWatcher.ts | 2 +- .../src/common/vscodeAdaptor/libroWindow.ts | 2 +- .../common/vscodeAdaptor/libroWorkspace.ts | 2 +- .../src/common/vscodeAdaptor/lspEnv.ts | 4 +- .../common/vscodeAdaptor/monacoLanguages.ts | 2 +- .../src/common/vscodeAdaptor/vscodeAdaptor.ts | 2 +- .../src/libro-language-client-contribution.ts | 6 +-- .../src/libro-language-client-manager.ts | 7 +--- packages/libro-language-client/src/module.ts | 2 +- packages/libro-lsp/src/adapters/adapter.ts | 6 +-- .../src/adapters/notebook-adapter.ts | 4 +- .../libro-lsp/src/adapters/status-message.ts | 4 +- packages/libro-lsp/src/connection-manager.ts | 4 +- packages/libro-lsp/src/connection.ts | 6 +-- packages/libro-lsp/src/extractors/manager.ts | 2 +- packages/libro-lsp/src/feature.ts | 6 +-- .../libro-lsp/src/lsp-app-contribution.ts | 4 +- packages/libro-lsp/src/manager.ts | 6 +-- packages/libro-lsp/src/module.ts | 2 +- packages/libro-lsp/src/monitor.ts | 4 +- packages/libro-lsp/src/tokens.ts | 2 +- packages/libro-lsp/src/virtual/document.ts | 6 +-- .../src/ws-connection/ws-connection.ts | 4 +- .../src/markdown-cell-contribution.ts | 2 +- .../src/markdown-cell-model.ts | 4 +- .../src/markdown-cell-module.ts | 2 +- .../src/markdown-cell-view.tsx | 8 ++-- .../libro-markdown/src/config-contribution.ts | 4 +- packages/libro-markdown/src/config.ts | 2 +- .../libro-markdown/src/markdown-render.ts | 2 +- packages/libro-markdown/src/module.ts | 2 +- .../display-data-output-contribution.ts | 4 +- .../display-data-output-model.tsx | 4 +- .../display-data-output-module.ts | 2 +- .../error-output/error-output-contribution.ts | 4 +- .../src/error-output/error-output-model.tsx | 4 +- .../src/error-output/error-output-module.ts | 2 +- .../stream-output-contribution.ts | 4 +- .../src/stream-output/stream-output-model.tsx | 4 +- .../src/stream-output/stream-output-module.ts | 2 +- packages/libro-prompt-cell/src/code-block.tsx | 2 +- .../src/input-handler/chat-record-input.tsx | 2 +- .../src/input-handler/variable-name-input.tsx | 2 +- ...ter-code-output-rendermime-contribution.ts | 2 +- ...bro-formatter-prompt-magic-contribution.ts | 2 +- packages/libro-prompt-cell/src/module.ts | 2 +- .../src/prompt-cell-command-contribution.ts | 4 +- .../src/prompt-cell-contribution.ts | 4 +- .../src/prompt-cell-model.ts | 12 +++--- .../src/prompt-cell-script.ts | 2 +- .../src/prompt-cell-view.tsx | 2 +- .../src/prompt-output-render.tsx | 2 +- .../prompt-output-rendermime-contribution.ts | 2 +- packages/libro-raw-cell/src/module.ts | 2 +- .../src/raw-cell-contribution.ts | 2 +- packages/libro-raw-cell/src/raw-cell-model.ts | 2 +- packages/libro-raw-cell/src/raw-cell-view.tsx | 6 +-- .../src/components/html-render.tsx | 2 +- .../src/components/image-render.tsx | 2 +- .../src/components/latex-render.tsx | 2 +- .../src/components/markdown-render.tsx | 2 +- .../src/components/svg-render.tsx | 2 +- .../src/components/text-render.tsx | 2 +- .../libro-rendermime/src/rendermime-module.ts | 2 +- .../src/rendermime-protocol.ts | 2 +- .../src/rendermime-registry.ts | 6 +-- .../libro-rendermime/src/rendermime-utils.ts | 2 +- .../code-cell-search-provider-contribution.ts | 4 +- .../src/code-cell-search-provider.ts | 2 +- .../src/code-editor-cell-search-provider.ts | 12 +++--- packages/libro-search-code-cell/src/module.ts | 2 +- .../src/search-highlighter.ts | 4 +- .../src/abstract-search-provider.ts | 8 ++-- .../src/libro-cell-search-provider.ts | 6 +-- .../src/libro-search-generic-provider.ts | 6 +-- .../libro-search/src/libro-search-manager.ts | 7 +--- .../libro-search/src/libro-search-model.ts | 6 +-- .../libro-search/src/libro-search-protocol.ts | 6 +-- .../libro-search/src/libro-search-provider.ts | 4 +- .../libro-search/src/libro-search-utils.ts | 2 +- .../libro-search/src/libro-search-view.tsx | 6 +-- packages/libro-search/src/module.ts | 2 +- packages/libro-shared-model/src/api.ts | 2 +- packages/libro-shared-model/src/ymodels.ts | 4 +- .../libro-formatter-sql-magic-contribution.ts | 2 +- .../libro-formatter-sql-trans-contribution.ts | 2 +- .../src/libro-sql-cell-color-registry.ts | 4 +- .../src/libro-sql-cell-contribution.ts | 4 +- .../src/libro-sql-cell-model.ts | 4 +- .../src/libro-sql-cell-script.ts | 2 +- .../src/libro-sql-cell-view.tsx | 4 +- packages/libro-sql-cell/src/module.ts | 2 +- packages/libro-terminal/src/command.ts | 12 +++--- packages/libro-terminal/src/configuration.ts | 4 +- packages/libro-terminal/src/connection.ts | 10 ++--- packages/libro-terminal/src/manager.ts | 8 ++-- packages/libro-terminal/src/module.ts | 2 +- packages/libro-terminal/src/restapi.ts | 2 +- packages/libro-terminal/src/stateful-view.ts | 4 +- packages/libro-terminal/src/theme-service.ts | 6 +-- packages/libro-terminal/src/view.tsx | 4 +- packages/libro-toc/src/cell-toc-provider.ts | 6 +-- .../libro-toc/src/libro-toc-color-registry.ts | 6 +-- packages/libro-toc/src/module.ts | 2 +- .../src/provider/markdown-toc-provider.ts | 2 +- .../src/provider/output-toc-provider.ts | 4 +- .../libro-toc/src/toc-collapse-service.ts | 4 +- packages/libro-toc/src/toc-configuration.ts | 6 +-- packages/libro-toc/src/toc-contribution.ts | 4 +- packages/libro-toc/src/toc-manager.ts | 2 +- packages/libro-toc/src/toc-protocol.ts | 6 +-- packages/libro-toc/src/toc-provider.ts | 12 ++---- packages/libro-toc/src/toc-view.tsx | 8 ++-- packages/libro-widget/src/module.ts | 2 +- .../libro-widget/src/slider/contribution.ts | 2 +- packages/libro-widget/src/slider/view.tsx | 2 +- .../libro-widget/src/text/contribution.ts | 2 +- packages/libro-widget/src/text/view.tsx | 2 +- 553 files changed, 1103 insertions(+), 1185 deletions(-) rename packages/libro-common/src/{mana-app => app}/app.tsx (92%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-selection.ts (95%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-service.ts (98%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree-component.tsx (100%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree-icon.tsx (77%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree-label-provider.ts (81%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree-model.ts (94%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree-protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree-view.tsx (95%) rename packages/libro-common/src/{mana-app => app}/file-tree/file-tree.ts (90%) rename packages/libro-common/src/{mana-app => app}/file-tree/files.ts (100%) rename packages/libro-common/src/{mana-app => app}/file-tree/filesystem-utils.ts (94%) rename packages/libro-common/src/{mana-app => app}/file-tree/index.ts (100%) rename packages/libro-common/src/{mana-app => app}/file-tree/module.ts (59%) rename packages/libro-common/src/{mana-app => app}/file-tree/selection-command-handler.ts (100%) rename packages/libro-common/src/{mana-app => app}/file-tree/style/file-icon.less (92%) rename packages/libro-common/src/{mana-app => app}/index.spec.ts (100%) create mode 100644 packages/libro-common/src/app/index.ts rename packages/libro-common/src/{mana-app => app}/label/index.ts (81%) rename packages/libro-common/src/{mana-app => app}/label/label-provider.tsx (100%) rename packages/libro-common/src/{mana-app => app}/menu/index.ts (66%) rename packages/libro-common/src/{mana-app => app}/menu/menu-bar-render.tsx (81%) rename packages/libro-common/src/{mana-app => app}/menu/menu-color-registry.ts (100%) rename packages/libro-common/src/{mana-app => app}/menu/menu-context.tsx (100%) rename packages/libro-common/src/{mana-app => app}/menu/menu-item-keeper.tsx (94%) rename packages/libro-common/src/{mana-app => app}/menu/menu-item-render.tsx (70%) rename packages/libro-common/src/{mana-app => app}/menu/menu-protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/menu/menu-render.tsx (89%) rename packages/libro-common/src/{mana-app => app}/menu/menu.tsx (97%) rename packages/libro-common/src/{mana-app => app}/modal/index.ts (63%) rename packages/libro-common/src/{mana-app => app}/modal/modal-contribution.ts (88%) rename packages/libro-common/src/{mana-app => app}/modal/modal-protocol.tsx (100%) rename packages/libro-common/src/{mana-app => app}/modal/modal-render.tsx (91%) rename packages/libro-common/src/{mana-app => app}/modal/modal-service.ts (99%) rename packages/libro-common/src/{mana-app => app}/notification/index.less (100%) rename packages/libro-common/src/{mana-app => app}/notification/index.ts (54%) rename packages/libro-common/src/{mana-app => app}/notification/protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/notification/service.tsx (99%) rename packages/libro-common/src/{mana-app => app}/style/index.less (99%) rename packages/libro-common/src/{mana-app => app}/style/style-protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/toolbar/index.less (100%) rename packages/libro-common/src/{mana-app => app}/toolbar/index.ts (75%) rename packages/libro-common/src/{mana-app => app}/toolbar/toolbar-item-keeper.tsx (96%) rename packages/libro-common/src/{mana-app => app}/toolbar/toolbar-item-render.tsx (86%) rename packages/libro-common/src/{mana-app => app}/toolbar/toolbar-protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/toolbar/toolbar-render.tsx (91%) rename packages/libro-common/src/{mana-app => app}/toolbar/toolbar-visible-render.tsx (93%) rename packages/libro-common/src/{mana-app => app}/toolbar/toolbar.tsx (98%) rename packages/libro-common/src/{mana-app => app}/tree/components/index.tsx (100%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-ident.tsx (91%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node-caption-affix.tsx (87%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node-caption.tsx (93%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node-expansion.tsx (73%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node-icon-decorator.tsx (87%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node-icon.tsx (100%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node-tail-decoration.tsx (91%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-node.tsx (84%) rename packages/libro-common/src/{mana-app => app}/tree/components/tree-switch-icon.tsx (100%) rename packages/libro-common/src/{mana-app => app}/tree/index.ts (100%) create mode 100644 packages/libro-common/src/app/tree/module.ts rename packages/libro-common/src/{mana-app => app}/tree/style/index.less (100%) rename packages/libro-common/src/{mana-app => app}/tree/style/tree-decorator.less (100%) rename packages/libro-common/src/{mana-app => app}/tree/tree-decorator.ts (99%) rename packages/libro-common/src/{mana-app => app}/tree/tree-expansion.ts (97%) rename packages/libro-common/src/{mana-app => app}/tree/tree-impl.ts (98%) rename packages/libro-common/src/{mana-app => app}/tree/tree-iterator.ts (97%) rename packages/libro-common/src/{mana-app => app}/tree/tree-label-provider.ts (92%) rename packages/libro-common/src/{mana-app => app}/tree/tree-model.ts (98%) rename packages/libro-common/src/{mana-app => app}/tree/tree-navigation.ts (94%) rename packages/libro-common/src/{mana-app => app}/tree/tree-protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/tree/tree-selection-impl.ts (96%) rename packages/libro-common/src/{mana-app => app}/tree/tree-selection-state.ts (98%) rename packages/libro-common/src/{mana-app => app}/tree/tree-selection.ts (98%) rename packages/libro-common/src/{mana-app => app}/tree/tree-view-decoration.ts (100%) rename packages/libro-common/src/{mana-app => app}/tree/tree.ts (99%) rename packages/libro-common/src/{mana-app => app}/tree/view/index.less (100%) rename packages/libro-common/src/{mana-app => app}/tree/view/index.ts (100%) rename packages/libro-common/src/{mana-app => app}/tree/view/tree-view-decorator.ts (92%) rename packages/libro-common/src/{mana-app => app}/tree/view/tree-view-module.ts (51%) rename packages/libro-common/src/{mana-app => app}/tree/view/tree-view-selection.ts (100%) rename packages/libro-common/src/{mana-app => app}/tree/view/tree-view.tsx (97%) rename packages/libro-common/src/{mana-app => app}/typings/index.d.ts (100%) rename packages/libro-common/src/{mana-app => app}/view/box/index.tsx (100%) rename packages/libro-common/src/{mana-app => app}/view/components/index.ts (100%) rename packages/libro-common/src/{mana-app => app}/view/components/loading/index.less (100%) rename packages/libro-common/src/{mana-app => app}/view/components/loading/index.tsx (100%) rename packages/libro-common/src/{mana-app => app}/view/flex/index.less (100%) rename packages/libro-common/src/{mana-app => app}/view/flex/index.tsx (100%) rename packages/libro-common/src/{mana-app => app}/view/header/header-view.tsx (100%) rename packages/libro-common/src/{mana-app => app}/view/header/index.less (100%) rename packages/libro-common/src/{mana-app => app}/view/header/index.ts (77%) rename packages/libro-common/src/{mana-app => app}/view/index.ts (100%) rename packages/libro-common/src/{mana-app => app}/view/tab/card-tab-view.tsx (90%) rename packages/libro-common/src/{mana-app => app}/view/tab/index.less (100%) rename packages/libro-common/src/{mana-app => app}/view/tab/index.ts (100%) rename packages/libro-common/src/{mana-app => app}/view/tab/side-tab-view.tsx (94%) rename packages/libro-common/src/{mana-app => app}/view/tab/tab-menu.ts (100%) rename packages/libro-common/src/{mana-app => app}/view/tab/tab-protocol.ts (100%) rename packages/libro-common/src/{mana-app => app}/view/tab/tab-view.tsx (95%) delete mode 100644 packages/libro-common/src/mana-app/index.ts delete mode 100644 packages/libro-common/src/mana-app/tree/module.ts diff --git a/apps/docs/.dumi/theme/layouts/DocLayout.tsx b/apps/docs/.dumi/theme/layouts/DocLayout.tsx index bd1a0b80..7ea747b5 100644 --- a/apps/docs/.dumi/theme/layouts/DocLayout.tsx +++ b/apps/docs/.dumi/theme/layouts/DocLayout.tsx @@ -1,4 +1,4 @@ -import { ManaComponents } from '@difizen/libro-common/mana-app'; +import { ManaComponents } from '@difizen/libro-common/app'; import { Helmet, useLocation, useSiteData } from 'dumi'; import DefaultLayout from 'dumi/theme-default/layouts/DocLayout'; import React, { useEffect } from 'react'; diff --git a/apps/docs/.dumi/theme/modules/github.ts b/apps/docs/.dumi/theme/modules/github.ts index 3613ce6a..244e05d5 100644 --- a/apps/docs/.dumi/theme/modules/github.ts +++ b/apps/docs/.dumi/theme/modules/github.ts @@ -1,4 +1,4 @@ -import { prop, singleton } from '@difizen/libro-common/mana-app'; +import { prop, singleton } from '@difizen/libro-common/app'; import { Octokit } from 'octokit'; @singleton() diff --git a/apps/docs/.dumi/theme/modules/module.ts b/apps/docs/.dumi/theme/modules/module.ts index def50150..6fa8fc2b 100644 --- a/apps/docs/.dumi/theme/modules/module.ts +++ b/apps/docs/.dumi/theme/modules/module.ts @@ -1,4 +1,4 @@ -import { ManaAppPreset, ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaAppPreset, ManaModule } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { langBundles } from '../lang/index'; diff --git a/apps/docs/.dumi/theme/slots/Header/index.tsx b/apps/docs/.dumi/theme/slots/Header/index.tsx index 9f50c0b3..3c18259a 100644 --- a/apps/docs/.dumi/theme/slots/Header/index.tsx +++ b/apps/docs/.dumi/theme/slots/Header/index.tsx @@ -1,6 +1,6 @@ import { GithubOutlined } from '@ant-design/icons'; import { CloseOutlined, MenuOutlined } from '@ant-design/icons'; -import { ThemeService, useInject } from '@difizen/libro-common/mana-app'; +import { ThemeService, useInject } from '@difizen/libro-common/app'; import { l10n, L10nLang } from '@difizen/libro-common/l10n'; import { Button } from 'antd'; import { useRouteMeta, Link, usePrefersColor, useSiteData, history} from 'dumi'; diff --git a/apps/docs/.dumirc.ts b/apps/docs/.dumirc.ts index 93525633..26337ac4 100644 --- a/apps/docs/.dumirc.ts +++ b/apps/docs/.dumirc.ts @@ -129,9 +129,9 @@ export default defineConfig({ getPackagesDir(), 'libro-common/es/l10n/index.js', ), - '@difizen/libro-common/mana-app': path.resolve( + '@difizen/libro-common/app': path.resolve( getPackagesDir(), - 'libro-common/es/mana-app/index.js', + 'libro-common/es/app/index.js', ), }, analytics: { diff --git a/apps/docs/src/lab/app.ts b/apps/docs/src/lab/app.ts index a4f4f070..ed11d31c 100644 --- a/apps/docs/src/lab/app.ts +++ b/apps/docs/src/lab/app.ts @@ -1,9 +1,5 @@ import { ServerConnection, ServerManager } from '@difizen/libro'; -import { - ApplicationContribution, - inject, - singleton, -} from '@difizen/libro-common/mana-app'; +import { ApplicationContribution, inject, singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ApplicationContribution }) export class LibroApp implements ApplicationContribution { diff --git a/apps/docs/src/lab/index.tsx b/apps/docs/src/lab/index.tsx index 1b1dcb7a..bd4487b4 100644 --- a/apps/docs/src/lab/index.tsx +++ b/apps/docs/src/lab/index.tsx @@ -1,9 +1,5 @@ import { LibroLabModule } from '@difizen/libro'; -import { - ManaAppPreset, - ManaComponents, - ManaModule, -} from '@difizen/libro-common/mana-app'; +import { ManaAppPreset, ManaComponents, ManaModule } from '@difizen/libro-common/app'; import { LibroApp } from './app.js'; import './index.less'; diff --git a/apps/docs/src/output/app.ts b/apps/docs/src/output/app.ts index a27c01ee..8acd940a 100644 --- a/apps/docs/src/output/app.ts +++ b/apps/docs/src/output/app.ts @@ -1,10 +1,7 @@ import { LibroService } from '@difizen/libro'; -import { RootSlotId } from '@difizen/libro-common/mana-app'; -import { - ApplicationContribution, - SlotViewManager, -} from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { RootSlotId } from '@difizen/libro-common/app'; +import { ApplicationContribution, SlotViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ApplicationContribution }) export class LibroApp implements ApplicationContribution { diff --git a/apps/docs/src/output/content.ts b/apps/docs/src/output/content.ts index 4ab079b6..315d2742 100644 --- a/apps/docs/src/output/content.ts +++ b/apps/docs/src/output/content.ts @@ -1,6 +1,6 @@ import type { INotebookContent } from '@difizen/libro'; import { ContentContribution } from '@difizen/libro'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import content from './OutputExamples.ipynb.json'; diff --git a/apps/docs/src/output/index.tsx b/apps/docs/src/output/index.tsx index dba38e9a..171ab836 100644 --- a/apps/docs/src/output/index.tsx +++ b/apps/docs/src/output/index.tsx @@ -1,9 +1,5 @@ import { LibroJupyterModule } from '@difizen/libro'; -import { - ManaAppPreset, - ManaComponents, - ManaModule, -} from '@difizen/libro-common/mana-app'; +import { ManaAppPreset, ManaComponents, ManaModule } from '@difizen/libro-common/app'; import { LibroApp } from './app.js'; import { ExampleContentContribution } from './content.js'; diff --git a/apps/docs/src/terminal/app.ts b/apps/docs/src/terminal/app.ts index 2972ec9f..68075ca4 100644 --- a/apps/docs/src/terminal/app.ts +++ b/apps/docs/src/terminal/app.ts @@ -1,8 +1,8 @@ import { ServerConnection, ServerManager } from '@difizen/libro'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; -import { SlotViewManager } from '@difizen/libro-common/mana-app'; -import { ApplicationContribution, ViewManager } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ConfigurationService } from '@difizen/libro-common/app'; +import { SlotViewManager } from '@difizen/libro-common/app'; +import { ApplicationContribution, ViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ApplicationContribution }) export class LibroApp implements ApplicationContribution { diff --git a/apps/docs/src/terminal/demo-module/app.tsx b/apps/docs/src/terminal/demo-module/app.tsx index 5d42a743..66062f9f 100644 --- a/apps/docs/src/terminal/demo-module/app.tsx +++ b/apps/docs/src/terminal/demo-module/app.tsx @@ -1,6 +1,6 @@ import type { TerminalViewOption } from '@difizen/libro'; import { TerminalManager, LibroTerminalView } from '@difizen/libro'; -import type { Disposable } from '@difizen/libro-common/mana-app'; +import type { Disposable } from '@difizen/libro-common/app'; import { BaseView, ViewInstance, @@ -10,7 +10,7 @@ import { singleton, useInject, view, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Button, Card, Checkbox, Flex, Form, Input, Space, Tabs } from 'antd'; import type { FC } from 'react'; import { forwardRef, useCallback, useEffect, useState } from 'react'; diff --git a/apps/docs/src/terminal/demo-module/index.ts b/apps/docs/src/terminal/demo-module/index.ts index d2c89c49..e323332c 100644 --- a/apps/docs/src/terminal/demo-module/index.ts +++ b/apps/docs/src/terminal/demo-module/index.ts @@ -3,7 +3,7 @@ import { ManaModule, RootSlotId, createSlotPreference, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { AppView } from './app.js'; // 用于文档测试页面 diff --git a/apps/docs/src/terminal/index.tsx b/apps/docs/src/terminal/index.tsx index 380952fb..0292a250 100644 --- a/apps/docs/src/terminal/index.tsx +++ b/apps/docs/src/terminal/index.tsx @@ -1,8 +1,4 @@ -import { - ManaAppPreset, - ManaComponents, - ManaModule, -} from '@difizen/libro-common/mana-app'; +import { ManaAppPreset, ManaComponents, ManaModule } from '@difizen/libro-common/app'; import { LibroApp } from './app.js'; import { TerminalDemoModule } from './demo-module/index.js'; diff --git a/apps/docs/src/workbench/app.ts b/apps/docs/src/workbench/app.ts index 94cf994c..198487c4 100644 --- a/apps/docs/src/workbench/app.ts +++ b/apps/docs/src/workbench/app.ts @@ -3,12 +3,12 @@ import { LibroJupyterConfiguration, ServerManager, } from '@difizen/libro'; -import type { FileTreeView } from '@difizen/libro-common/mana-app'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; -import { FileTreeViewFactory, SlotViewManager } from '@difizen/libro-common/mana-app'; -import { URI } from '@difizen/libro-common/mana-app'; -import { ApplicationContribution, ViewManager } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import type { FileTreeView } from '@difizen/libro-common/app'; +import { ConfigurationService } from '@difizen/libro-common/app'; +import { FileTreeViewFactory, SlotViewManager } from '@difizen/libro-common/app'; +import { URI } from '@difizen/libro-common/app'; +import { ApplicationContribution, ViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { LibroWorkbenchSlots } from './layout/workbench-layout.view.js'; diff --git a/apps/docs/src/workbench/index.tsx b/apps/docs/src/workbench/index.tsx index 37875c96..07e8dc18 100644 --- a/apps/docs/src/workbench/index.tsx +++ b/apps/docs/src/workbench/index.tsx @@ -7,7 +7,7 @@ import { RootSlotId, CardTabView, FileTreeView, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LibroApp } from './app.js'; import { LibroWorkbenchLayoutView, LibroWorkbenchSlots } from './layout/index.js'; diff --git a/apps/docs/src/workbench/layout/workbench-layout.view.tsx b/apps/docs/src/workbench/layout/workbench-layout.view.tsx index 9544b48a..2a35a4a2 100644 --- a/apps/docs/src/workbench/layout/workbench-layout.view.tsx +++ b/apps/docs/src/workbench/layout/workbench-layout.view.tsx @@ -1,5 +1,5 @@ -import { singleton, Slot, view } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { singleton, Slot, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { BoxPanel } from '@difizen/libro-common/react'; import { forwardRef } from 'react'; diff --git a/packages/libro-ai-native/src/ai-inline-completions/inline-completion-contribution.ts b/packages/libro-ai-native/src/ai-inline-completions/inline-completion-contribution.ts index c80d6d34..93e67685 100644 --- a/packages/libro-ai-native/src/ai-inline-completions/inline-completion-contribution.ts +++ b/packages/libro-ai-native/src/ai-inline-completions/inline-completion-contribution.ts @@ -1,7 +1,7 @@ import type { InlineCompletionRegistry } from '@difizen/libro-code-editor'; import { InlineCompletionContribution } from '@difizen/libro-code-editor'; import { Sequencer } from '@difizen/libro-code-editor'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { AICompletionProvider } from './inline-completion-provider.js'; diff --git a/packages/libro-ai-native/src/ai-inline-completions/inline-completion-provider.ts b/packages/libro-ai-native/src/ai-inline-completions/inline-completion-provider.ts index 6bc8aab1..e622b80e 100644 --- a/packages/libro-ai-native/src/ai-inline-completions/inline-completion-provider.ts +++ b/packages/libro-ai-native/src/ai-inline-completions/inline-completion-provider.ts @@ -4,7 +4,7 @@ import type { IIntelligentCompletionsResult, ICompletionContext, } from '@difizen/libro-code-editor'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { AiCompletionRequest } from './inline-completion-request.js'; import { raceCancellation, sleep } from './utils.js'; diff --git a/packages/libro-ai-native/src/ai-inline-completions/inline-completion-request.ts b/packages/libro-ai-native/src/ai-inline-completions/inline-completion-request.ts index 005ccfe4..3a5f9329 100644 --- a/packages/libro-ai-native/src/ai-inline-completions/inline-completion-request.ts +++ b/packages/libro-ai-native/src/ai-inline-completions/inline-completion-request.ts @@ -4,7 +4,7 @@ import type { IIntelligentCompletionsResult, EditorCancellationToken, } from '@difizen/libro-code-editor'; -import { transient } from '@difizen/libro-common/mana-app'; +import { transient } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import { generateInstructionsPrompt } from './Prompt/instruction.js'; diff --git a/packages/libro-ai-native/src/ai-inline-completions/module.ts b/packages/libro-ai-native/src/ai-inline-completions/module.ts index 1852626b..c1241d79 100644 --- a/packages/libro-ai-native/src/ai-inline-completions/module.ts +++ b/packages/libro-ai-native/src/ai-inline-completions/module.ts @@ -1,5 +1,5 @@ import { CodeEditorModule } from '@difizen/libro-code-editor'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { AICompletionContribution } from './inline-completion-contribution.js'; import { AICompletionProvider } from './inline-completion-provider.js'; diff --git a/packages/libro-ai-native/src/ai-native-code-block.tsx b/packages/libro-ai-native/src/ai-native-code-block.tsx index cb1cb7c5..e56664ee 100644 --- a/packages/libro-ai-native/src/ai-native-code-block.tsx +++ b/packages/libro-ai-native/src/ai-native-code-block.tsx @@ -1,7 +1,7 @@ import { CopyOutlined } from '@ant-design/icons'; import { l10n } from '@difizen/libro-common/l10n'; import { LibroCodeCellView } from '@difizen/libro-jupyter'; -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; import { Button, message } from 'antd'; import copy from 'copy-to-clipboard'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; diff --git a/packages/libro-ai-native/src/ai-native-command-contribution.tsx b/packages/libro-ai-native/src/ai-native-command-contribution.tsx index dc47c994..7549d6c4 100644 --- a/packages/libro-ai-native/src/ai-native-command-contribution.tsx +++ b/packages/libro-ai-native/src/ai-native-command-contribution.tsx @@ -1,12 +1,8 @@ import { CommentOutlined } from '@ant-design/icons'; -import type { CommandRegistry, ToolbarRegistry } from '@difizen/libro-common/mana-app'; -import { inject } from '@difizen/libro-common/mana-app'; -import { CommandContribution } from '@difizen/libro-common/mana-app'; -import { - singleton, - ToolbarContribution, - ViewManager, -} from '@difizen/libro-common/mana-app'; +import type { CommandRegistry, ToolbarRegistry } from '@difizen/libro-common/app'; +import { inject } from '@difizen/libro-common/app'; +import { CommandContribution } from '@difizen/libro-common/app'; +import { singleton, ToolbarContribution, ViewManager } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { LibroCommandRegister, diff --git a/packages/libro-ai-native/src/ai-native-command.ts b/packages/libro-ai-native/src/ai-native-command.ts index 57d2e64b..b8cf2532 100644 --- a/packages/libro-ai-native/src/ai-native-command.ts +++ b/packages/libro-ai-native/src/ai-native-command.ts @@ -1,4 +1,4 @@ -import type { Command } from '@difizen/libro-common/mana-app'; +import type { Command } from '@difizen/libro-common/app'; export const AINativeCommands: Record = { Explain: { diff --git a/packages/libro-ai-native/src/ai-native-for-cell-view.tsx b/packages/libro-ai-native/src/ai-native-for-cell-view.tsx index 4bc7dd4d..66fd1a13 100644 --- a/packages/libro-ai-native/src/ai-native-for-cell-view.tsx +++ b/packages/libro-ai-native/src/ai-native-for-cell-view.tsx @@ -7,13 +7,13 @@ import { ChatEvent } from '@difizen/magent-chat'; import type { ToAutoFactory } from '@difizen/magent-core'; import { Fetcher } from '@difizen/magent-core'; import { toAutoFactory } from '@difizen/magent-core'; -import type { ViewComponent } from '@difizen/libro-common/mana-app'; -import { ViewOption } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { useObserve } from '@difizen/libro-common/mana-app'; -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; -import { inject } from '@difizen/libro-common/mana-app'; -import { BaseView, transient, view } from '@difizen/libro-common/mana-app'; +import type { ViewComponent } from '@difizen/libro-common/app'; +import { ViewOption } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { useObserve } from '@difizen/libro-common/app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; +import { inject } from '@difizen/libro-common/app'; +import { BaseView, transient, view } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Button } from 'antd'; import type { ParsedEvent } from 'eventsource-parser/stream'; diff --git a/packages/libro-ai-native/src/ai-native-output-top.tsx b/packages/libro-ai-native/src/ai-native-output-top.tsx index b7286f0c..352d920c 100644 --- a/packages/libro-ai-native/src/ai-native-output-top.tsx +++ b/packages/libro-ai-native/src/ai-native-output-top.tsx @@ -1,5 +1,5 @@ import type { CellView } from '@difizen/libro-jupyter'; -import { useInject, ViewManager, ViewRender } from '@difizen/libro-common/mana-app'; +import { useInject, ViewManager, ViewRender } from '@difizen/libro-common/app'; import { useEffect, useState } from 'react'; import './index.less'; diff --git a/packages/libro-ai-native/src/ai-native-service.ts b/packages/libro-ai-native/src/ai-native-service.ts index 644c21d8..cc6532e7 100644 --- a/packages/libro-ai-native/src/ai-native-service.ts +++ b/packages/libro-ai-native/src/ai-native-service.ts @@ -5,7 +5,7 @@ import { prop, singleton, ViewManager, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LibroAINativeForCellView } from './ai-native-for-cell-view.js'; import type { LibroChatView } from './chat-view.js'; diff --git a/packages/libro-ai-native/src/ai-side-toolbar-selector.tsx b/packages/libro-ai-native/src/ai-side-toolbar-selector.tsx index 9c8dd9ba..44be2c9f 100644 --- a/packages/libro-ai-native/src/ai-side-toolbar-selector.tsx +++ b/packages/libro-ai-native/src/ai-side-toolbar-selector.tsx @@ -1,6 +1,6 @@ import type { LibroSideToolbarMenuItemType } from '@difizen/libro-jupyter'; import { LibroSideToolbarMenu } from '@difizen/libro-jupyter'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Popover } from 'antd'; diff --git a/packages/libro-ai-native/src/chat-slot-contribution.ts b/packages/libro-ai-native/src/chat-slot-contribution.ts index ca1f2732..b1b554dc 100644 --- a/packages/libro-ai-native/src/chat-slot-contribution.ts +++ b/packages/libro-ai-native/src/chat-slot-contribution.ts @@ -4,8 +4,8 @@ import type { LibroSlot, } from '@difizen/libro-jupyter'; import { LibroExtensionSlotContribution } from '@difizen/libro-jupyter'; -import { ViewManager } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { LibroAINativeService } from './ai-native-service.js'; import { LibroChatView } from './chat-view.js'; diff --git a/packages/libro-ai-native/src/chat-view.tsx b/packages/libro-ai-native/src/chat-view.tsx index 9f1b8e16..6d5335b5 100644 --- a/packages/libro-ai-native/src/chat-view.tsx +++ b/packages/libro-ai-native/src/chat-view.tsx @@ -5,7 +5,7 @@ import { LibroSlotView, } from '@difizen/libro-jupyter'; import type { DisplayView, LibroView } from '@difizen/libro-jupyter'; -import type { ConfigurationService } from '@difizen/libro-common/mana-app'; +import type { ConfigurationService } from '@difizen/libro-common/app'; import { BaseView, prop, @@ -16,7 +16,7 @@ import { useInject, ViewInstance, ViewRender, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { useRef } from 'react'; import 'katex/dist/katex.min.css'; // 引入 KaTeX 样式 diff --git a/packages/libro-ai-native/src/error-output-model.tsx b/packages/libro-ai-native/src/error-output-model.tsx index a9165475..cfa5f7a4 100644 --- a/packages/libro-ai-native/src/error-output-model.tsx +++ b/packages/libro-ai-native/src/error-output-model.tsx @@ -6,13 +6,8 @@ import { RenderMimeRegistry, renderText, } from '@difizen/libro-jupyter'; -import { prop, transient } from '@difizen/libro-common/mana-app'; -import { - getOrigin, - useInject, - view, - ViewInstance, -} from '@difizen/libro-common/mana-app'; +import { prop, transient } from '@difizen/libro-common/app'; +import { getOrigin, useInject, view, ViewInstance } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Button } from 'antd'; import { forwardRef, createRef, useEffect } from 'react'; diff --git a/packages/libro-ai-native/src/libro-ai-msg-item-model.ts b/packages/libro-ai-native/src/libro-ai-msg-item-model.ts index b64cb02d..477db4cb 100644 --- a/packages/libro-ai-native/src/libro-ai-msg-item-model.ts +++ b/packages/libro-ai-native/src/libro-ai-msg-item-model.ts @@ -9,7 +9,7 @@ import type { IChatMessageItem, } from '@difizen/magent-chat'; import { autoFactory, AutoFactoryOption } from '@difizen/magent-core'; -import { inject, prop } from '@difizen/libro-common/mana-app'; +import { inject, prop } from '@difizen/libro-common/app'; @autoFactory() export class LibroAIChatMessageItemModel { diff --git a/packages/libro-ai-native/src/libro-ai-native-chat-service.ts b/packages/libro-ai-native/src/libro-ai-native-chat-service.ts index cf9a7868..750b823e 100644 --- a/packages/libro-ai-native/src/libro-ai-native-chat-service.ts +++ b/packages/libro-ai-native/src/libro-ai-native-chat-service.ts @@ -1,7 +1,7 @@ import type { IChatEvent, IChatMessageItem } from '@difizen/magent-chat'; import { ChatEvent } from '@difizen/magent-chat'; import { LibroChatService } from '@difizen/magent-libro'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import type { ParsedEvent } from 'eventsource-parser/stream'; import { EventSourceParserStream } from 'eventsource-parser/stream'; diff --git a/packages/libro-ai-native/src/libro-ai-native-chat-view.tsx b/packages/libro-ai-native/src/libro-ai-native-chat-view.tsx index 023afaf0..ad5e68d3 100644 --- a/packages/libro-ai-native/src/libro-ai-native-chat-view.tsx +++ b/packages/libro-ai-native/src/libro-ai-native-chat-view.tsx @@ -1,12 +1,6 @@ import type { CellView, LibroView } from '@difizen/libro-jupyter'; import { ChatView, ChatComponents } from '@difizen/magent-chat'; -import { - inject, - prop, - transient, - view, - ViewOption, -} from '@difizen/libro-common/mana-app'; +import { inject, prop, transient, view, ViewOption } from '@difizen/libro-common/app'; import rehypeKatex from 'rehype-katex'; import rehypeRaw from 'rehype-raw'; import breaks from 'remark-breaks'; diff --git a/packages/libro-ai-native/src/libro-ai-native-color-registry.ts b/packages/libro-ai-native/src/libro-ai-native-color-registry.ts index ef55c082..7bb25f9d 100644 --- a/packages/libro-ai-native/src/libro-ai-native-color-registry.ts +++ b/packages/libro-ai-native/src/libro-ai-native-color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color } from '@difizen/libro-common/mana-app'; -import { singleton, ColorContribution } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color } from '@difizen/libro-common/app'; +import { singleton, ColorContribution } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class LibroAINativeColorRegistry implements ColorContribution { diff --git a/packages/libro-ai-native/src/module.ts b/packages/libro-ai-native/src/module.ts index 730951c7..159895a7 100644 --- a/packages/libro-ai-native/src/module.ts +++ b/packages/libro-ai-native/src/module.ts @@ -2,7 +2,7 @@ import { CodeEditorModule } from '@difizen/libro-code-editor'; import { CellOutputTopProvider, ErrorOutputModel } from '@difizen/libro-jupyter'; import { ChatView } from '@difizen/magent-chat'; import { LibroChatModule, LibroChatService } from '@difizen/magent-libro'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroAICompletionModule } from './ai-inline-completions/module.js'; import { LibroAINativeCommandContribution } from './ai-native-command-contribution.js'; diff --git a/packages/libro-app/src/app-file-command-contribution.tsx b/packages/libro-app/src/app-file-command-contribution.tsx index 1a6c57bd..8d9b32da 100644 --- a/packages/libro-app/src/app-file-command-contribution.tsx +++ b/packages/libro-app/src/app-file-command-contribution.tsx @@ -1,9 +1,12 @@ +import { l10n } from '@difizen/libro-common/l10n'; import { FileTreeContextMenuGroups, JupyterFileService } from '@difizen/libro-jupyter'; +import { message } from 'antd'; + import type { CommandRegistry, MenuRegistry, ViewManager, -} from '@difizen/libro-common/mana-app'; +} from '../../libro-common/es/app/index.js'; import { ConfigurationService, CommandContribution, @@ -13,9 +16,7 @@ import { ModalService, OpenerService, singleton, -} from '@difizen/libro-common/mana-app'; -import { l10n } from '@difizen/libro-common/l10n'; -import { message } from 'antd'; +} from '../../libro-common/es/app/index.js'; export const AppFileCommands = { OPEN_FILE_BY_LIBRO_APP: { diff --git a/packages/libro-app/src/app-open-handler.ts b/packages/libro-app/src/app-open-handler.ts index 14f13220..dc4401b3 100644 --- a/packages/libro-app/src/app-open-handler.ts +++ b/packages/libro-app/src/app-open-handler.ts @@ -1,12 +1,12 @@ import { LibroJupyterConfiguration } from '@difizen/libro-jupyter'; -import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/mana-app'; -import { ConfigurationService, inject } from '@difizen/libro-common/mana-app'; +import type { URI, ViewOpenHandlerOptions } from '../../libro-common/es/app/index.js'; +import { ConfigurationService, inject } from '../../libro-common/es/app/index.js'; import { NavigatableViewOpenHandler, OpenHandler, singleton, Priority, -} from '@difizen/libro-common/mana-app'; +} from '../../libro-common/es/app/index.js'; import type { LibroAppViewer } from './app-viewer.js'; import { AppViewerFactory } from './protocol.js'; diff --git a/packages/libro-app/src/app-view.tsx b/packages/libro-app/src/app-view.tsx index 8a572569..2a1174ea 100644 --- a/packages/libro-app/src/app-view.tsx +++ b/packages/libro-app/src/app-view.tsx @@ -17,7 +17,7 @@ import { ViewInstance, ViewOption, ViewRender, -} from '@difizen/libro-common/mana-app'; +} from '../../libro-common/es/app/index.js'; import { l10n } from '@difizen/libro-common/l10n'; import type { RadioChangeEvent } from 'antd'; import { Radio, Button } from 'antd'; diff --git a/packages/libro-app/src/app-viewer.tsx b/packages/libro-app/src/app-viewer.tsx index 0a30b6a8..c1bcd23d 100644 --- a/packages/libro-app/src/app-viewer.tsx +++ b/packages/libro-app/src/app-viewer.tsx @@ -1,5 +1,5 @@ -import type { NavigatableView } from '@difizen/libro-common/mana-app'; -import { ViewRender, ViewManager } from '@difizen/libro-common/mana-app'; +import type { NavigatableView } from '../../libro-common/es/app/index.js'; +import { ViewRender, ViewManager } from '../../libro-common/es/app/index.js'; import { BaseView, inject, @@ -15,7 +15,7 @@ import { Deferred, URI, CommandRegistry, -} from '@difizen/libro-common/mana-app'; +} from '../../libro-common/es/app/index.js'; import { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-app/src/module.ts b/packages/libro-app/src/module.ts index 57d832c3..40e9b5fa 100644 --- a/packages/libro-app/src/module.ts +++ b/packages/libro-app/src/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '../../libro-common/es/app/index.js'; import { AppFileCommandContribution } from './app-file-command-contribution.js'; import { LibroAppOpenHandler } from './app-open-handler.js'; diff --git a/packages/libro-code-cell/src/code-cell-contribution.ts b/packages/libro-code-cell/src/code-cell-contribution.ts index aacc302c..1c01a99f 100644 --- a/packages/libro-code-cell/src/code-cell-contribution.ts +++ b/packages/libro-code-cell/src/code-cell-contribution.ts @@ -2,7 +2,7 @@ import type { LanguageSpecRegistry } from '@difizen/libro-code-editor'; import { LanguageSpecContribution } from '@difizen/libro-code-editor'; import { CellModelContribution, CellViewContribution } from '@difizen/libro-core'; import type { CellMeta, CellModel, CellOptions } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { CodeCellModelFactory } from './code-cell-protocol.js'; import { LibroCodeCellView } from './code-cell-view.js'; diff --git a/packages/libro-code-cell/src/code-cell-model.ts b/packages/libro-code-cell/src/code-cell-model.ts index b2565bd6..506c62da 100644 --- a/packages/libro-code-cell/src/code-cell-model.ts +++ b/packages/libro-code-cell/src/code-cell-model.ts @@ -2,9 +2,9 @@ import { MIME } from '@difizen/libro-common'; import type { ICodeCell, ExecutionCount } from '@difizen/libro-common'; import type { ExecutableCellModel } from '@difizen/libro-core'; import { CellOptions, LibroCellModel } from '@difizen/libro-core'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { inject, prop, transient, ViewManager } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; +import { inject, prop, transient, ViewManager } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; /** * 基础的可执行代码的cell, 带有执行能力 diff --git a/packages/libro-code-cell/src/code-cell-view.tsx b/packages/libro-code-cell/src/code-cell-view.tsx index e948bacc..8380f0df 100644 --- a/packages/libro-code-cell/src/code-cell-view.tsx +++ b/packages/libro-code-cell/src/code-cell-view.tsx @@ -6,7 +6,7 @@ import type { ICodeCell, IOutput } from '@difizen/libro-common'; import { CellUri } from '@difizen/libro-common'; import { isOutput } from '@difizen/libro-common'; import { l10n } from '@difizen/libro-common/l10n'; /* eslint-disable react-hooks/exhaustive-deps */ -import type { ViewSize } from '@difizen/libro-common/mana-app'; +import type { ViewSize } from '@difizen/libro-common/app'; import { getOrigin, inject, @@ -20,7 +20,7 @@ import { ViewRender, watch, Deferred, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { IOutputAreaOption, LibroCell, diff --git a/packages/libro-code-cell/src/module.ts b/packages/libro-code-cell/src/module.ts index 91bdcc3d..96dbdf4d 100644 --- a/packages/libro-code-cell/src/module.ts +++ b/packages/libro-code-cell/src/module.ts @@ -1,6 +1,6 @@ import { CodeEditorModule } from '@difizen/libro-code-editor'; import { CellOptions } from '@difizen/libro-core'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { CodeEditorCellContribution } from './code-cell-contribution.js'; import { LibroCodeCellModel } from './code-cell-model.js'; diff --git a/packages/libro-code-editor/src/code-editor-info-manager.ts b/packages/libro-code-editor/src/code-editor-info-manager.ts index 33c4ff8e..451aef5a 100644 --- a/packages/libro-code-editor/src/code-editor-info-manager.ts +++ b/packages/libro-code-editor/src/code-editor-info-manager.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton() export class CodeEditorInfoManager { diff --git a/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-manager.ts b/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-manager.ts index 2455ae0b..40e9a324 100644 --- a/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-manager.ts +++ b/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-manager.ts @@ -1,10 +1,10 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; import { contrib, Priority, singleton, ApplicationContribution, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { InlineCompletionImplement, diff --git a/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-protocol.ts b/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-protocol.ts index 1442ee16..5ea1716f 100644 --- a/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-protocol.ts +++ b/packages/libro-code-editor/src/code-editor-inline-completions/inline-completions-protocol.ts @@ -1,4 +1,4 @@ -import { Syringe } from '@difizen/libro-common/mana-app'; +import { Syringe } from '@difizen/libro-common/app'; import type { IPosition, IRange } from '../code-editor-protocol.js'; diff --git a/packages/libro-code-editor/src/code-editor-manager.ts b/packages/libro-code-editor/src/code-editor-manager.ts index d3bc8991..8090c906 100644 --- a/packages/libro-code-editor/src/code-editor-manager.ts +++ b/packages/libro-code-editor/src/code-editor-manager.ts @@ -1,11 +1,11 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; import { Priority, ViewManager, contrib, inject, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { CodeEditorInfoManager } from './code-editor-info-manager.js'; import type { IModel } from './code-editor-model.js'; diff --git a/packages/libro-code-editor/src/code-editor-model.ts b/packages/libro-code-editor/src/code-editor-model.ts index 501bcedf..d31ea12b 100644 --- a/packages/libro-code-editor/src/code-editor-model.ts +++ b/packages/libro-code-editor/src/code-editor-model.ts @@ -1,6 +1,6 @@ import type { CellType } from '@difizen/libro-common'; -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; -import { prop, transient, Emitter } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; +import { prop, transient, Emitter } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import type { ITextSelection } from './code-editor-protocol.js'; diff --git a/packages/libro-code-editor/src/code-editor-protocol.ts b/packages/libro-code-editor/src/code-editor-protocol.ts index 1cfdfa00..6a1fc73f 100644 --- a/packages/libro-code-editor/src/code-editor-protocol.ts +++ b/packages/libro-code-editor/src/code-editor-protocol.ts @@ -1,6 +1,6 @@ import type { JSONObject, JSONValue } from '@difizen/libro-common'; -import type { Disposable, Event, ThemeType } from '@difizen/libro-common/mana-app'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event, ThemeType } from '@difizen/libro-common/app'; +import { Syringe } from '@difizen/libro-common/app'; import type { IModel } from './code-editor-model.js'; diff --git a/packages/libro-code-editor/src/code-editor-settings.ts b/packages/libro-code-editor/src/code-editor-settings.ts index 6df47371..5e084a3c 100644 --- a/packages/libro-code-editor/src/code-editor-settings.ts +++ b/packages/libro-code-editor/src/code-editor-settings.ts @@ -6,12 +6,12 @@ import { Emitter, ConfigurationContribution, ConfigurationService, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { Disposable, ConfigurationNode, ConfigurationStorage, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import type { IEditorConfig } from './code-editor-protocol.js'; diff --git a/packages/libro-code-editor/src/code-editor-state-manager.ts b/packages/libro-code-editor/src/code-editor-state-manager.ts index 5781a6da..8ce80c2b 100644 --- a/packages/libro-code-editor/src/code-editor-state-manager.ts +++ b/packages/libro-code-editor/src/code-editor-state-manager.ts @@ -1,7 +1,7 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { Priority } from '@difizen/libro-common/mana-app'; -import { contrib } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { Priority } from '@difizen/libro-common/app'; +import { contrib } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import type { IModel } from './code-editor-model.js'; import type { EditorState, IEditorStateOptions } from './code-editor-protocol.js'; diff --git a/packages/libro-code-editor/src/code-editor-view.tsx b/packages/libro-code-editor/src/code-editor-view.tsx index e1d951d2..578a51cd 100644 --- a/packages/libro-code-editor/src/code-editor-view.tsx +++ b/packages/libro-code-editor/src/code-editor-view.tsx @@ -6,7 +6,7 @@ import { ThemeService, view, ViewOption, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { forwardRef, memo } from 'react'; import { CodeEditorInfoManager } from './code-editor-info-manager.js'; diff --git a/packages/libro-code-editor/src/language-specs.ts b/packages/libro-code-editor/src/language-specs.ts index 735f2519..8edec94e 100644 --- a/packages/libro-code-editor/src/language-specs.ts +++ b/packages/libro-code-editor/src/language-specs.ts @@ -1,6 +1,6 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { ApplicationContribution } from '@difizen/libro-common/mana-app'; -import { contrib, singleton, Syringe } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { ApplicationContribution } from '@difizen/libro-common/app'; +import { contrib, singleton, Syringe } from '@difizen/libro-common/app'; export const LanguageSpecContribution = Syringe.defineToken('LanguageSpecContribution'); export interface LanguageSpecContribution { diff --git a/packages/libro-code-editor/src/module.ts b/packages/libro-code-editor/src/module.ts index 3b181b79..19e3b27e 100644 --- a/packages/libro-code-editor/src/module.ts +++ b/packages/libro-code-editor/src/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { CodeEditorInfoManager } from './code-editor-info-manager.js'; import { diff --git a/packages/libro-codemirror/src/editor-contribution.ts b/packages/libro-codemirror/src/editor-contribution.ts index c23ea873..2d3409e1 100644 --- a/packages/libro-codemirror/src/editor-contribution.ts +++ b/packages/libro-codemirror/src/editor-contribution.ts @@ -1,7 +1,7 @@ import type { CodeEditorFactory } from '@difizen/libro-code-editor'; import { CodeEditorContribution } from '@difizen/libro-code-editor'; import { MIME } from '@difizen/libro-common'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { codeMirrorDefaultConfig } from './editor.js'; import { codeMirrorEditorFactory, stateFactory } from './factory.js'; diff --git a/packages/libro-codemirror/src/editor.ts b/packages/libro-codemirror/src/editor.ts index 2f972834..46ea0584 100644 --- a/packages/libro-codemirror/src/editor.ts +++ b/packages/libro-codemirror/src/editor.ts @@ -39,8 +39,8 @@ import { removeAllWhereFromArray, } from '@difizen/libro-common'; import type { LSPProvider } from '@difizen/libro-lsp'; -import { Deferred, Disposable, Emitter } from '@difizen/libro-common/mana-app'; -import { getOrigin, watch } from '@difizen/libro-common/mana-app'; +import { Deferred, Disposable, Emitter } from '@difizen/libro-common/app'; +import { getOrigin, watch } from '@difizen/libro-common/app'; import type { SyntaxNodeRef } from '@lezer/common'; import { v4 } from 'uuid'; diff --git a/packages/libro-codemirror/src/module.ts b/packages/libro-codemirror/src/module.ts index d76192d3..3dd78bd0 100644 --- a/packages/libro-codemirror/src/module.ts +++ b/packages/libro-codemirror/src/module.ts @@ -1,5 +1,5 @@ import { CodeEditorModule } from '@difizen/libro-code-editor'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { CodeMirrorEditorContribution } from './editor-contribution.js'; diff --git a/packages/libro-codemirror/src/monitor.ts b/packages/libro-codemirror/src/monitor.ts index c2940c69..c6efd5ad 100644 --- a/packages/libro-codemirror/src/monitor.ts +++ b/packages/libro-codemirror/src/monitor.ts @@ -1,5 +1,5 @@ import { EditorView, hasHoverTooltips } from '@codemirror/view'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import { Emitter } from '@difizen/libro-common/app'; import { closeCompletionEffect, diff --git a/packages/libro-cofine-editor-contribution/src/editor-options-registry.ts b/packages/libro-cofine-editor-contribution/src/editor-options-registry.ts index e94bb566..6eab6677 100644 --- a/packages/libro-cofine-editor-contribution/src/editor-options-registry.ts +++ b/packages/libro-cofine-editor-contribution/src/editor-options-registry.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import type monaco from '@difizen/monaco-editor-core'; @singleton() diff --git a/packages/libro-cofine-editor-contribution/src/index.ts b/packages/libro-cofine-editor-contribution/src/index.ts index a0108e90..34ac93ee 100644 --- a/packages/libro-cofine-editor-contribution/src/index.ts +++ b/packages/libro-cofine-editor-contribution/src/index.ts @@ -1,5 +1,5 @@ -import type { Disposable } from '@difizen/libro-common/mana-app'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import type { Disposable } from '@difizen/libro-common/app'; +import { Syringe } from '@difizen/libro-common/app'; import type monaco from '@difizen/monaco-editor-core'; export const EditorHandlerContribution = Syringe.defineToken( diff --git a/packages/libro-cofine-editor-contribution/src/language-worker-registry.ts b/packages/libro-cofine-editor-contribution/src/language-worker-registry.ts index bab4bb83..6a2c522f 100644 --- a/packages/libro-cofine-editor-contribution/src/language-worker-registry.ts +++ b/packages/libro-cofine-editor-contribution/src/language-worker-registry.ts @@ -1,5 +1,5 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, singleton, Syringe } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, singleton, Syringe } from '@difizen/libro-common/app'; export const LanguageWorkerContribution = Syringe.defineToken( 'LanguageWorkerContribution', diff --git a/packages/libro-cofine-editor-contribution/src/lazy-loader-registry.ts b/packages/libro-cofine-editor-contribution/src/lazy-loader-registry.ts index 7058304d..6d35e059 100644 --- a/packages/libro-cofine-editor-contribution/src/lazy-loader-registry.ts +++ b/packages/libro-cofine-editor-contribution/src/lazy-loader-registry.ts @@ -1,5 +1,5 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, singleton, Syringe } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, singleton, Syringe } from '@difizen/libro-common/app'; export const LazyLoaderRegistryContribution = Syringe.defineToken( 'LazyLoaderRegistryContribution', diff --git a/packages/libro-cofine-editor-contribution/src/options-registry.ts b/packages/libro-cofine-editor-contribution/src/options-registry.ts index 11abc6cc..16c21009 100644 --- a/packages/libro-cofine-editor-contribution/src/options-registry.ts +++ b/packages/libro-cofine-editor-contribution/src/options-registry.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton() export class LanguageOptionsRegistry { diff --git a/packages/libro-cofine-editor-core/src/default-worker-contribution.ts b/packages/libro-cofine-editor-core/src/default-worker-contribution.ts index 16546796..591a71a7 100644 --- a/packages/libro-cofine-editor-core/src/default-worker-contribution.ts +++ b/packages/libro-cofine-editor-core/src/default-worker-contribution.ts @@ -1,6 +1,6 @@ import type { LanguageWorkerRegistry } from '@difizen/libro-cofine-editor-contribution'; import { LanguageWorkerContribution } from '@difizen/libro-cofine-editor-contribution'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import pkg from '../package.json'; diff --git a/packages/libro-cofine-editor-core/src/e2-editor.ts b/packages/libro-cofine-editor-core/src/e2-editor.ts index 7fbfdd82..2e297407 100644 --- a/packages/libro-cofine-editor-core/src/e2-editor.ts +++ b/packages/libro-cofine-editor-core/src/e2-editor.ts @@ -1,5 +1,5 @@ -import { DisposableCollection } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { DisposableCollection } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { EditorHanlerRegistry } from './editor-handler-registry.js'; diff --git a/packages/libro-cofine-editor-core/src/editor-handler-registry.ts b/packages/libro-cofine-editor-core/src/editor-handler-registry.ts index d66fc8bd..4d2830f1 100644 --- a/packages/libro-cofine-editor-core/src/editor-handler-registry.ts +++ b/packages/libro-cofine-editor-core/src/editor-handler-registry.ts @@ -1,6 +1,6 @@ import { EditorHandlerContribution } from '@difizen/libro-cofine-editor-contribution'; -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, singleton } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; @singleton() diff --git a/packages/libro-cofine-editor-core/src/initialize-provider.ts b/packages/libro-cofine-editor-core/src/initialize-provider.ts index c0241b06..56b8ab66 100644 --- a/packages/libro-cofine-editor-core/src/initialize-provider.ts +++ b/packages/libro-cofine-editor-core/src/initialize-provider.ts @@ -1,10 +1,10 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; import { contrib, DefaultContributionProvider, singleton, Syringe, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type monaco from '@difizen/monaco-editor-core'; export const InitializeContribution = Syringe.defineToken('InitializeContribution'); diff --git a/packages/libro-cofine-editor-core/src/mana-export.ts b/packages/libro-cofine-editor-core/src/mana-export.ts index cd5cf1f4..05a20cf5 100644 --- a/packages/libro-cofine-editor-core/src/mana-export.ts +++ b/packages/libro-cofine-editor-core/src/mana-export.ts @@ -1,4 +1,4 @@ -import type { Container } from '@difizen/libro-common/mana-app'; +import type { Container } from '@difizen/libro-common/app'; import { MonacoEnvironment } from './monaco-environment.js'; diff --git a/packages/libro-cofine-editor-core/src/monaco-environment.ts b/packages/libro-cofine-editor-core/src/monaco-environment.ts index 2a0fc794..11800a0a 100644 --- a/packages/libro-cofine-editor-core/src/monaco-environment.ts +++ b/packages/libro-cofine-editor-core/src/monaco-environment.ts @@ -2,9 +2,9 @@ import { LanguageWorkerRegistry, LazyLoaderRegistry, } from '@difizen/libro-cofine-editor-contribution'; -import type { Syringe } from '@difizen/libro-common/mana-app'; -import { Deferred } from '@difizen/libro-common/mana-app'; -import { GlobalContainer } from '@difizen/libro-common/mana-app'; +import type { Syringe } from '@difizen/libro-common/app'; +import { Deferred } from '@difizen/libro-common/app'; +import { GlobalContainer } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { InitializeProvider } from './initialize-provider.js'; diff --git a/packages/libro-cofine-editor-core/src/monaco-loader.ts b/packages/libro-cofine-editor-core/src/monaco-loader.ts index b7114e9b..17ef07d5 100644 --- a/packages/libro-cofine-editor-core/src/monaco-loader.ts +++ b/packages/libro-cofine-editor-core/src/monaco-loader.ts @@ -1,4 +1,4 @@ -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; export const MonacoLoaderConfig = Symbol('MonacoLoaderConfig'); diff --git a/packages/libro-cofine-editor-core/src/monaco-module.ts b/packages/libro-cofine-editor-core/src/monaco-module.ts index ed4f426e..8135ec24 100644 --- a/packages/libro-cofine-editor-core/src/monaco-module.ts +++ b/packages/libro-cofine-editor-core/src/monaco-module.ts @@ -7,7 +7,7 @@ import { LazyLoaderRegistry, LazyLoaderRegistryContribution, } from '@difizen/libro-cofine-editor-contribution'; -import { Contribution, Module, Syringe } from '@difizen/libro-common/mana-app'; +import { Contribution, Module, Syringe } from '@difizen/libro-common/app'; import 'reflect-metadata'; import { DefaultWorkerContribution } from './default-worker-contribution.js'; diff --git a/packages/libro-cofine-editor-core/src/snippets-suggest-registry.ts b/packages/libro-cofine-editor-core/src/snippets-suggest-registry.ts index ddd2ad2c..fb98e802 100644 --- a/packages/libro-cofine-editor-core/src/snippets-suggest-registry.ts +++ b/packages/libro-cofine-editor-core/src/snippets-suggest-registry.ts @@ -1,5 +1,5 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, singleton, Syringe } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, singleton, Syringe } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { InitializeContribution } from './initialize-provider.js'; diff --git a/packages/libro-cofine-editor-core/src/theme-registry.ts b/packages/libro-cofine-editor-core/src/theme-registry.ts index 820ca1f2..f75a32b0 100644 --- a/packages/libro-cofine-editor-core/src/theme-registry.ts +++ b/packages/libro-cofine-editor-core/src/theme-registry.ts @@ -1,5 +1,5 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, inject, singleton, Syringe } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, inject, singleton, Syringe } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { InitializeContribution } from './initialize-provider.js'; diff --git a/packages/libro-cofine-editor/src/editor-contribution.ts b/packages/libro-cofine-editor/src/editor-contribution.ts index ccf043fa..3e98fe2e 100644 --- a/packages/libro-cofine-editor/src/editor-contribution.ts +++ b/packages/libro-cofine-editor/src/editor-contribution.ts @@ -3,7 +3,7 @@ import { CodeEditorContribution, LanguageSpecRegistry, } from '@difizen/libro-code-editor'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { e2StateFactory, diff --git a/packages/libro-cofine-editor/src/language/json/json-contribution.ts b/packages/libro-cofine-editor/src/language/json/json-contribution.ts index 9c51ee1b..655a35a6 100644 --- a/packages/libro-cofine-editor/src/language/json/json-contribution.ts +++ b/packages/libro-cofine-editor/src/language/json/json-contribution.ts @@ -1,5 +1,5 @@ import { InitializeContribution } from '@difizen/libro-cofine-editor-core'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { setTokensLanguage } from './theme-provider.js'; diff --git a/packages/libro-cofine-editor/src/language/json/module.ts b/packages/libro-cofine-editor/src/language/json/module.ts index 637cce7c..f8bea292 100644 --- a/packages/libro-cofine-editor/src/language/json/module.ts +++ b/packages/libro-cofine-editor/src/language/json/module.ts @@ -1,4 +1,4 @@ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import { JsonContribution } from './json-contribution.js'; diff --git a/packages/libro-cofine-editor/src/language/julia/julia-contribution.ts b/packages/libro-cofine-editor/src/language/julia/julia-contribution.ts index 2feaeac7..083c2e6d 100644 --- a/packages/libro-cofine-editor/src/language/julia/julia-contribution.ts +++ b/packages/libro-cofine-editor/src/language/julia/julia-contribution.ts @@ -1,5 +1,5 @@ import { InitializeContribution } from '@difizen/libro-cofine-editor-core'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { setTokensLanguage } from './theme-provider.js'; diff --git a/packages/libro-cofine-editor/src/language/julia/module.ts b/packages/libro-cofine-editor/src/language/julia/module.ts index 32b8d4f3..2eb2e6d3 100644 --- a/packages/libro-cofine-editor/src/language/julia/module.ts +++ b/packages/libro-cofine-editor/src/language/julia/module.ts @@ -1,4 +1,4 @@ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import { JuliaContribution } from './julia-contribution.js'; diff --git a/packages/libro-cofine-editor/src/language/python/module.ts b/packages/libro-cofine-editor/src/language/python/module.ts index fc87db3f..c04c72a2 100644 --- a/packages/libro-cofine-editor/src/language/python/module.ts +++ b/packages/libro-cofine-editor/src/language/python/module.ts @@ -1,4 +1,4 @@ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import { PythonContribution } from './python-language-feature.js'; diff --git a/packages/libro-cofine-editor/src/language/python/python-language-feature.ts b/packages/libro-cofine-editor/src/language/python/python-language-feature.ts index cc0f155d..92d0f60b 100644 --- a/packages/libro-cofine-editor/src/language/python/python-language-feature.ts +++ b/packages/libro-cofine-editor/src/language/python/python-language-feature.ts @@ -9,7 +9,7 @@ import type { TextmateRegistry, } from '@difizen/libro-cofine-textmate'; import { LanguageGrammarDefinitionContribution } from '@difizen/libro-cofine-textmate'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { languages } from '@difizen/monaco-editor-core'; import * as monaco from '@difizen/monaco-editor-core'; diff --git a/packages/libro-cofine-editor/src/language/r/module.ts b/packages/libro-cofine-editor/src/language/r/module.ts index 75af65f2..6c84d1dc 100644 --- a/packages/libro-cofine-editor/src/language/r/module.ts +++ b/packages/libro-cofine-editor/src/language/r/module.ts @@ -1,4 +1,4 @@ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import { RContribution } from './r-contribution.js'; diff --git a/packages/libro-cofine-editor/src/language/r/r-contribution.ts b/packages/libro-cofine-editor/src/language/r/r-contribution.ts index d4da20f7..29039336 100644 --- a/packages/libro-cofine-editor/src/language/r/r-contribution.ts +++ b/packages/libro-cofine-editor/src/language/r/r-contribution.ts @@ -1,5 +1,5 @@ import { InitializeContribution } from '@difizen/libro-cofine-editor-core'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { setTokensLanguage } from './theme-provider.js'; diff --git a/packages/libro-cofine-editor/src/language/sql/module.ts b/packages/libro-cofine-editor/src/language/sql/module.ts index 8ac1b502..ee5906be 100644 --- a/packages/libro-cofine-editor/src/language/sql/module.ts +++ b/packages/libro-cofine-editor/src/language/sql/module.ts @@ -1,4 +1,4 @@ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import { SqlContribution } from './sql-contribution.js'; diff --git a/packages/libro-cofine-editor/src/language/sql/sql-contribution.ts b/packages/libro-cofine-editor/src/language/sql/sql-contribution.ts index 22fa5a2e..02b9d2ba 100644 --- a/packages/libro-cofine-editor/src/language/sql/sql-contribution.ts +++ b/packages/libro-cofine-editor/src/language/sql/sql-contribution.ts @@ -1,5 +1,5 @@ import { InitializeContribution } from '@difizen/libro-cofine-editor-core'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { id } from './config.js'; diff --git a/packages/libro-cofine-editor/src/libro-e2-editor.ts b/packages/libro-cofine-editor/src/libro-e2-editor.ts index 592c6fbc..8d61b1d3 100644 --- a/packages/libro-cofine-editor/src/libro-e2-editor.ts +++ b/packages/libro-cofine-editor/src/libro-e2-editor.ts @@ -28,12 +28,8 @@ import { ThemeService, transient, watch, -} from '@difizen/libro-common/mana-app'; -import { - Disposable, - DisposableCollection, - Emitter, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { Disposable, DisposableCollection, Emitter } from '@difizen/libro-common/app'; import { editor, KeyCode, Selection } from '@difizen/monaco-editor-core'; import 'resize-observer-polyfill'; import * as monaco from '@difizen/monaco-editor-core'; diff --git a/packages/libro-cofine-editor/src/libro-e2-inline-completion-register.ts b/packages/libro-cofine-editor/src/libro-e2-inline-completion-register.ts index e8045a4f..aecb7151 100644 --- a/packages/libro-cofine-editor/src/libro-e2-inline-completion-register.ts +++ b/packages/libro-cofine-editor/src/libro-e2-inline-completion-register.ts @@ -1,6 +1,6 @@ import { InlineCompletionManager } from '@difizen/libro-code-editor'; -import { ApplicationContribution } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ApplicationContribution } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; @singleton({ contrib: [ApplicationContribution] }) diff --git a/packages/libro-cofine-editor/src/libro-e2-preload.ts b/packages/libro-cofine-editor/src/libro-e2-preload.ts index 5f6b7bf5..bb2e0a56 100644 --- a/packages/libro-cofine-editor/src/libro-e2-preload.ts +++ b/packages/libro-cofine-editor/src/libro-e2-preload.ts @@ -1,6 +1,6 @@ import { MonacoEnvironment } from '@difizen/libro-cofine-editor-core'; -import type { Syringe } from '@difizen/libro-common/mana-app'; -import { Deferred } from '@difizen/libro-common/mana-app'; +import type { Syringe } from '@difizen/libro-common/app'; +import { Deferred } from '@difizen/libro-common/app'; import { JSONLanguageFeature } from './language/json/module.js'; import { JuliaLanguageFeature } from './language/julia/module.js'; diff --git a/packages/libro-cofine-editor/src/libro-sql-api.ts b/packages/libro-cofine-editor/src/libro-sql-api.ts index ff599911..968c34fa 100644 --- a/packages/libro-cofine-editor/src/libro-sql-api.ts +++ b/packages/libro-cofine-editor/src/libro-sql-api.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton() export class LibroSQLRequestAPI { diff --git a/packages/libro-cofine-editor/src/module.ts b/packages/libro-cofine-editor/src/module.ts index 58d3a421..49d17b27 100644 --- a/packages/libro-cofine-editor/src/module.ts +++ b/packages/libro-cofine-editor/src/module.ts @@ -1,6 +1,6 @@ import type { EditorState, IEditorOptions } from '@difizen/libro-code-editor'; import { CodeEditorModule } from '@difizen/libro-code-editor'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroE2EditorContribution } from './editor-contribution.js'; import { diff --git a/packages/libro-cofine-editor/src/placeholder.ts b/packages/libro-cofine-editor/src/placeholder.ts index f6189625..46d4343f 100644 --- a/packages/libro-cofine-editor/src/placeholder.ts +++ b/packages/libro-cofine-editor/src/placeholder.ts @@ -1,5 +1,5 @@ -import type { Disposable } from '@difizen/libro-common/mana-app'; -import { DisposableCollection } from '@difizen/libro-common/mana-app'; +import type { Disposable } from '@difizen/libro-common/app'; +import { DisposableCollection } from '@difizen/libro-common/app'; import { editor } from '@difizen/monaco-editor-core'; import type { MonacoEditorType } from './types.js'; diff --git a/packages/libro-cofine-editor/src/theme/libro-python-theme-contribution.ts b/packages/libro-cofine-editor/src/theme/libro-python-theme-contribution.ts index fa5f082d..9775acaf 100644 --- a/packages/libro-cofine-editor/src/theme/libro-python-theme-contribution.ts +++ b/packages/libro-cofine-editor/src/theme/libro-python-theme-contribution.ts @@ -1,7 +1,7 @@ /* eslint-disable global-require */ import type { ThemeRegistry } from '@difizen/libro-cofine-editor-core'; import { ThemeContribution } from '@difizen/libro-cofine-editor-core'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import jupyterDark from './data/jupyter_dark.json'; import jupyterHCDark from './data/jupyter_hc_dark.json'; diff --git a/packages/libro-cofine-editor/src/theme/module.ts b/packages/libro-cofine-editor/src/theme/module.ts index 776fcb74..e524e707 100644 --- a/packages/libro-cofine-editor/src/theme/module.ts +++ b/packages/libro-cofine-editor/src/theme/module.ts @@ -1,4 +1,4 @@ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import { LibroPythonThemeContribution } from './libro-python-theme-contribution.js'; diff --git a/packages/libro-cofine-textmate/src/monaco-grammar-registry.ts b/packages/libro-cofine-textmate/src/monaco-grammar-registry.ts index 532f20e1..fba3bce2 100644 --- a/packages/libro-cofine-textmate/src/monaco-grammar-registry.ts +++ b/packages/libro-cofine-textmate/src/monaco-grammar-registry.ts @@ -1,4 +1,4 @@ -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { IOnigLib, IRawGrammar, IRawTheme } from 'vscode-textmate'; import { Registry, parseRawGrammar } from 'vscode-textmate'; diff --git a/packages/libro-cofine-textmate/src/monaco-module.ts b/packages/libro-cofine-textmate/src/monaco-module.ts index ee565cb9..97d8a556 100644 --- a/packages/libro-cofine-textmate/src/monaco-module.ts +++ b/packages/libro-cofine-textmate/src/monaco-module.ts @@ -1,7 +1,7 @@ /* eslint-disable func-names */ /* eslint-disable global-require */ -import { Module } from '@difizen/libro-common/mana-app'; +import { Module } from '@difizen/libro-common/app'; import * as oniguruma from 'vscode-oniguruma'; import * as onig from 'vscode-oniguruma/release/onig.wasm'; diff --git a/packages/libro-cofine-textmate/src/monaco-textmate-service.ts b/packages/libro-cofine-textmate/src/monaco-textmate-service.ts index 09c7af84..fc89d99e 100644 --- a/packages/libro-cofine-textmate/src/monaco-textmate-service.ts +++ b/packages/libro-cofine-textmate/src/monaco-textmate-service.ts @@ -1,12 +1,12 @@ import { EditorHandlerContribution } from '@difizen/libro-cofine-editor-core'; -import type { Contribution } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; import { Disposable, DisposableCollection, contrib, inject, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { ILanguageService } from '@difizen/monaco-editor-core/esm/vs/editor/common/languages/language.js'; import { TokenizationRegistry } from '@difizen/monaco-editor-core/esm/vs/editor/common/languages.js'; diff --git a/packages/libro-cofine-textmate/src/monaco-theme-registry.ts b/packages/libro-cofine-textmate/src/monaco-theme-registry.ts index e7fdda2d..845abc8c 100644 --- a/packages/libro-cofine-textmate/src/monaco-theme-registry.ts +++ b/packages/libro-cofine-textmate/src/monaco-theme-registry.ts @@ -6,8 +6,8 @@ import { MixedThemeRegistry, InitializeContribution, } from '@difizen/libro-cofine-editor-core'; -import type { Color } from '@difizen/libro-common/mana-app'; -import { Emitter, inject, singleton } from '@difizen/libro-common/mana-app'; +import type { Color } from '@difizen/libro-common/app'; +import { Emitter, inject, singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { StandaloneServices } from '@difizen/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices.js'; import { IStandaloneThemeService } from '@difizen/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme.js'; diff --git a/packages/libro-cofine-textmate/src/textmate-contribution.ts b/packages/libro-cofine-textmate/src/textmate-contribution.ts index f69dd312..d3366cdb 100644 --- a/packages/libro-cofine-textmate/src/textmate-contribution.ts +++ b/packages/libro-cofine-textmate/src/textmate-contribution.ts @@ -1,4 +1,4 @@ -import { Syringe } from '@difizen/libro-common/mana-app'; +import { Syringe } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import type { TextmateRegistry } from './textmate-registry.js'; diff --git a/packages/libro-cofine-textmate/src/textmate-registry.ts b/packages/libro-cofine-textmate/src/textmate-registry.ts index a19c7f43..ff66781c 100644 --- a/packages/libro-cofine-textmate/src/textmate-registry.ts +++ b/packages/libro-cofine-textmate/src/textmate-registry.ts @@ -1,8 +1,8 @@ /* eslint-disable no-console */ /* eslint-disable no-restricted-syntax */ -import { Disposable } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { Disposable } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import type { IGrammarConfiguration } from 'vscode-textmate'; import type { TokenizerOption } from './textmate-tokenizer.js'; diff --git a/packages/libro-cofine-textmate/src/textmate-theme-contribution.ts b/packages/libro-cofine-textmate/src/textmate-theme-contribution.ts index 56b91dff..35a49764 100644 --- a/packages/libro-cofine-textmate/src/textmate-theme-contribution.ts +++ b/packages/libro-cofine-textmate/src/textmate-theme-contribution.ts @@ -1,7 +1,7 @@ /* eslint-disable global-require */ import type { ThemeRegistry } from '@difizen/libro-cofine-editor-core'; import { ThemeContribution } from '@difizen/libro-cofine-editor-core'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import darkDefaults from './data/monaco-themes/vscode/dark_defaults.json'; import darkEditor from './data/monaco-themes/vscode/dark_editor.json'; diff --git a/packages/libro-common/package.json b/packages/libro-common/package.json index 0377dc65..c81d4597 100644 --- a/packages/libro-common/package.json +++ b/packages/libro-common/package.json @@ -37,9 +37,9 @@ "typings": "./es/core/index.js", "default": "./es/core/index.js" }, - "./mana-app": { - "typings": "./es/mana-app/index.js", - "default": "./es/mana-app/index.js" + "./app": { + "typings": "./es/app/index.js", + "default": "./es/app/index.js" }, "./package.json": "./package.json" }, diff --git a/packages/libro-common/src/mana-app/app.tsx b/packages/libro-common/src/app/app.tsx similarity index 92% rename from packages/libro-common/src/mana-app/app.tsx rename to packages/libro-common/src/app/app.tsx index 3e5cd973..c9102a78 100644 --- a/packages/libro-common/src/mana-app/app.tsx +++ b/packages/libro-common/src/app/app.tsx @@ -1,7 +1,7 @@ import { ApplicationContribution, localStorageService } from '../core/index.js'; import { inject, singleton } from '../ioc/index.js'; -import { NotificationService } from './notification/service'; +import { NotificationService } from './notification/service.js'; @singleton({ contrib: [ApplicationContribution] }) export class ManaApplication implements ApplicationContribution { diff --git a/packages/libro-common/src/mana-app/file-tree/file-selection.ts b/packages/libro-common/src/app/file-tree/file-selection.ts similarity index 95% rename from packages/libro-common/src/mana-app/file-tree/file-selection.ts rename to packages/libro-common/src/app/file-tree/file-selection.ts index e3e4c77f..069cff83 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-selection.ts +++ b/packages/libro-common/src/app/file-tree/file-selection.ts @@ -1,7 +1,7 @@ import type { SelectionService } from '../../core/index.js'; -import { FileStat } from './files'; -import { SelectionCommandHandler } from './selection-command-handler'; +import { FileStat } from './files.js'; +import { SelectionCommandHandler } from './selection-command-handler.js'; export interface FileSelection { fileStat: FileStat; diff --git a/packages/libro-common/src/mana-app/file-tree/file-service.ts b/packages/libro-common/src/app/file-tree/file-service.ts similarity index 98% rename from packages/libro-common/src/mana-app/file-tree/file-service.ts rename to packages/libro-common/src/app/file-tree/file-service.ts index 9c02ad3d..9cebd7ae 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-service.ts +++ b/packages/libro-common/src/app/file-tree/file-service.ts @@ -10,7 +10,7 @@ import type { FileChangesEvent, FileOperationEvent, FileStatWithMetadata, -} from './files'; +} from './files.js'; const defaultFileMeta = { mtime: 0, diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-component.tsx b/packages/libro-common/src/app/file-tree/file-tree-component.tsx similarity index 100% rename from packages/libro-common/src/mana-app/file-tree/file-tree-component.tsx rename to packages/libro-common/src/app/file-tree/file-tree-component.tsx diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-icon.tsx b/packages/libro-common/src/app/file-tree/file-tree-icon.tsx similarity index 77% rename from packages/libro-common/src/mana-app/file-tree/file-tree-icon.tsx rename to packages/libro-common/src/app/file-tree/file-tree-icon.tsx index 19ac6a82..1a21f4e7 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-tree-icon.tsx +++ b/packages/libro-common/src/app/file-tree/file-tree-icon.tsx @@ -1,8 +1,8 @@ import { ViewInstance } from '../../core/index.js'; import { useInject } from '../../observable/index.js'; -import type { TreeNodeProps } from '../tree/tree'; +import type { TreeNodeProps } from '../tree/tree.js'; -import type { FileTreeView } from './file-tree-view'; +import type { FileTreeView } from './file-tree-view.js'; export function TreeNodeIcon(props: TreeNodeProps) { const fileTree = useInject(ViewInstance); diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts b/packages/libro-common/src/app/file-tree/file-tree-label-provider.ts similarity index 81% rename from packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts rename to packages/libro-common/src/app/file-tree/file-tree-label-provider.ts index 64b1d4e5..bdd6c255 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-tree-label-provider.ts +++ b/packages/libro-common/src/app/file-tree/file-tree-label-provider.ts @@ -1,12 +1,16 @@ import type { URI } from '../../common/index.js'; import { singleton, inject } from '../../ioc/index.js'; -import type { DidChangeLabelEvent } from '../label'; -import { LabelProvider, LabelProviderContribution, URIIconReference } from '../label'; -import { TreeLabelProvider } from '../tree/tree-label-provider'; - -import { FileStatNode } from './file-tree'; -import type { FileStat } from './files'; +import type { DidChangeLabelEvent } from '../label/index.js'; +import { + LabelProvider, + LabelProviderContribution, + URIIconReference, +} from '../label/index.js'; +import { TreeLabelProvider } from '../tree/tree-label-provider.js'; + +import { FileStatNode } from './file-tree.js'; +import type { FileStat } from './files.js'; @singleton({ contrib: LabelProviderContribution }) export class FileTreeLabelProvider implements LabelProviderContribution { diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-model.ts b/packages/libro-common/src/app/file-tree/file-tree-model.ts similarity index 94% rename from packages/libro-common/src/mana-app/file-tree/file-tree-model.ts rename to packages/libro-common/src/app/file-tree/file-tree-model.ts index 66086dd8..28040f23 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-tree-model.ts +++ b/packages/libro-common/src/app/file-tree/file-tree-model.ts @@ -3,7 +3,7 @@ import { Deferred } from '../../common/index.js'; import { URI } from '../../common/index.js'; import { inject, postConstruct, singleton } from '../../ioc/index.js'; -import { LabelProvider } from '../label'; +import { LabelProvider } from '../label/index.js'; import { Tree, TreeExpansionService, @@ -11,20 +11,20 @@ import { TreeModelImpl, TreeNavigationService, TreeSelectionService, -} from '../tree'; -import type { CompositeTreeNode, TreeNode } from '../tree'; +} from '../tree/index.js'; +import type { CompositeTreeNode, TreeNode } from '../tree/index.js'; -import { FileService } from './file-service'; -import { DirNode, FileNode, FileStatNode } from './file-tree'; -import type { FileTree } from './file-tree'; -import type { FileChange, FileChangesEvent, FileOperationEvent } from './files'; +import { FileService } from './file-service.js'; +import { DirNode, FileNode, FileStatNode } from './file-tree.js'; +import type { FileTree } from './file-tree.js'; +import type { FileChange, FileChangesEvent, FileOperationEvent } from './files.js'; import { FileChangeType, FileOperation, FileOperationError, FileOperationResult, -} from './files'; -import { FileSystemUtils } from './filesystem-utils'; +} from './files.js'; +import { FileSystemUtils } from './filesystem-utils.js'; @singleton({ token: TreeModel }) export class FileTreeModel extends TreeModelImpl { diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-protocol.ts b/packages/libro-common/src/app/file-tree/file-tree-protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/file-tree/file-tree-protocol.ts rename to packages/libro-common/src/app/file-tree/file-tree-protocol.ts diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx b/packages/libro-common/src/app/file-tree/file-tree-view.tsx similarity index 95% rename from packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx rename to packages/libro-common/src/app/file-tree/file-tree-view.tsx index df71750d..83986f00 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-tree-view.tsx +++ b/packages/libro-common/src/app/file-tree/file-tree-view.tsx @@ -3,26 +3,26 @@ import type { LegacyRef } from 'react'; import * as React from 'react'; import { forwardRef, lazy, Suspense } from 'react'; -import { l10n } from '../../l10n/index.js'; /* eslint-disable @typescript-eslint/no-unused-vars */ import { URI } from '../../common/index.js'; import { Disposable, DisposableCollection, isCancelled } from '../../common/index.js'; import { ManaModule, SelectionService, view } from '../../core/index.js'; import { ViewInstance } from '../../core/index.js'; import type { MenuPath } from '../../core/index.js'; -import { useInject } from '../../observable/index.js'; import { singleton, inject } from '../../ioc/index.js'; -import { LabelProvider } from '../label'; -import { TreeModel } from '../tree'; -import { CompositeTreeNode, TreeNode } from '../tree/tree'; -import { TreeDecoratorService } from '../tree/tree-decorator'; -import type { NodeProps } from '../tree/tree-protocol'; -import { TreeProps } from '../tree/tree-protocol'; -import { TreeView, TreeViewDecorator, TreeViewModule } from '../tree/view'; +import { l10n } from '../../l10n/index.js'; /* eslint-disable @typescript-eslint/no-unused-vars */ +import { useInject } from '../../observable/index.js'; +import { LabelProvider } from '../label/index.js'; +import { TreeModel } from '../tree/index.js'; +import { TreeDecoratorService } from '../tree/tree-decorator.js'; +import type { NodeProps } from '../tree/tree-protocol.js'; +import { TreeProps } from '../tree/tree-protocol.js'; +import { CompositeTreeNode, TreeNode } from '../tree/tree.js'; +import { TreeView, TreeViewDecorator, TreeViewModule } from '../tree/view/index.js'; -import { DirNode, FileStatNode, FileStatNodeData, FileTree } from './file-tree'; -import { FileTreeModel } from './file-tree-model'; -import { FileTreeContextMenuPath, URINode } from './file-tree-protocol'; -import { FileStat, FileType } from './files'; +import { FileTreeModel } from './file-tree-model.js'; +import { FileTreeContextMenuPath, URINode } from './file-tree-protocol.js'; +import { DirNode, FileStatNode, FileStatNodeData, FileTree } from './file-tree.js'; +import { FileStat, FileType } from './files.js'; export const FILE_TREE_CLASS = 'mana-file-tree'; export const FILE_STAT_NODE_CLASS = 'mana-FileStatNode'; diff --git a/packages/libro-common/src/mana-app/file-tree/file-tree.ts b/packages/libro-common/src/app/file-tree/file-tree.ts similarity index 90% rename from packages/libro-common/src/mana-app/file-tree/file-tree.ts rename to packages/libro-common/src/app/file-tree/file-tree.ts index 1208cabe..e6ee27a9 100644 --- a/packages/libro-common/src/mana-app/file-tree/file-tree.ts +++ b/packages/libro-common/src/app/file-tree/file-tree.ts @@ -1,20 +1,19 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable @typescript-eslint/no-use-before-define */ import type { URI } from '../../common/index.js'; -import { getOrigin } from '../../observable/index.js'; import { inject, singleton } from '../../ioc/index.js'; - -import type { TreeNode, CompositeTreeNode } from '../tree/tree'; -import { Tree } from '../tree/tree'; -import type { ExpandableTreeNode } from '../tree/tree-expansion'; -import { TreeImpl } from '../tree/tree-impl'; -import type { SelectableTreeNode } from '../tree/tree-selection'; - -import type { FileSelection } from './file-selection'; -import { FileService } from './file-service'; -import type { URINode } from './file-tree-protocol'; -import type { FileStat, FileType, Stat } from './files'; -import { FileOperationError, FileOperationResult } from './files'; +import { getOrigin } from '../../observable/index.js'; +import type { ExpandableTreeNode } from '../tree/tree-expansion.js'; +import { TreeImpl } from '../tree/tree-impl.js'; +import type { SelectableTreeNode } from '../tree/tree-selection.js'; +import { Tree } from '../tree/tree.js'; +import type { TreeNode, CompositeTreeNode } from '../tree/tree.js'; + +import type { FileSelection } from './file-selection.js'; +import { FileService } from './file-service.js'; +import type { URINode } from './file-tree-protocol.js'; +import type { FileStat, FileType, Stat } from './files.js'; +import { FileOperationError, FileOperationResult } from './files.js'; @singleton({ token: Tree }) export class FileTree extends TreeImpl { diff --git a/packages/libro-common/src/mana-app/file-tree/files.ts b/packages/libro-common/src/app/file-tree/files.ts similarity index 100% rename from packages/libro-common/src/mana-app/file-tree/files.ts rename to packages/libro-common/src/app/file-tree/files.ts diff --git a/packages/libro-common/src/mana-app/file-tree/filesystem-utils.ts b/packages/libro-common/src/app/file-tree/filesystem-utils.ts similarity index 94% rename from packages/libro-common/src/mana-app/file-tree/filesystem-utils.ts rename to packages/libro-common/src/app/file-tree/filesystem-utils.ts index fbe91db9..664ac4aa 100644 --- a/packages/libro-common/src/mana-app/file-tree/filesystem-utils.ts +++ b/packages/libro-common/src/app/file-tree/filesystem-utils.ts @@ -1,6 +1,6 @@ import { URI } from '../../common/index.js'; -import type { FileStat } from './files'; +import type { FileStat } from './files.js'; export namespace FileSystemUtils { /** diff --git a/packages/libro-common/src/mana-app/file-tree/index.ts b/packages/libro-common/src/app/file-tree/index.ts similarity index 100% rename from packages/libro-common/src/mana-app/file-tree/index.ts rename to packages/libro-common/src/app/file-tree/index.ts diff --git a/packages/libro-common/src/mana-app/file-tree/module.ts b/packages/libro-common/src/app/file-tree/module.ts similarity index 59% rename from packages/libro-common/src/mana-app/file-tree/module.ts rename to packages/libro-common/src/app/file-tree/module.ts index 5fb408bc..52404b50 100644 --- a/packages/libro-common/src/mana-app/file-tree/module.ts +++ b/packages/libro-common/src/app/file-tree/module.ts @@ -1,11 +1,15 @@ import { ManaModule } from '../../core/index.js'; -import { DefaultTreeNodeComponents, TreeModule, TreeNodeComponents } from '../tree'; +import { + DefaultTreeNodeComponents, + TreeModule, + TreeNodeComponents, +} from '../tree/index.js'; -import { FileService } from './file-service'; -import { TreeNodeIcon } from './file-tree-icon'; -import { FileTreeLabelProvider } from './file-tree-label-provider'; -import { FileTreeView } from './file-tree-view'; +import { FileService } from './file-service.js'; +import { TreeNodeIcon } from './file-tree-icon.js'; +import { FileTreeLabelProvider } from './file-tree-label-provider.js'; +import { FileTreeView } from './file-tree-view.js'; export const FileTreeModule = ManaModule.create() .register(FileTreeView) diff --git a/packages/libro-common/src/mana-app/file-tree/selection-command-handler.ts b/packages/libro-common/src/app/file-tree/selection-command-handler.ts similarity index 100% rename from packages/libro-common/src/mana-app/file-tree/selection-command-handler.ts rename to packages/libro-common/src/app/file-tree/selection-command-handler.ts diff --git a/packages/libro-common/src/mana-app/file-tree/style/file-icon.less b/packages/libro-common/src/app/file-tree/style/file-icon.less similarity index 92% rename from packages/libro-common/src/mana-app/file-tree/style/file-icon.less rename to packages/libro-common/src/app/file-tree/style/file-icon.less index 00f74e1f..928026d2 100644 --- a/packages/libro-common/src/mana-app/file-tree/style/file-icon.less +++ b/packages/libro-common/src/app/file-tree/style/file-icon.less @@ -40,12 +40,12 @@ text-align: center; } -.mana-app-sides .mana-file-icons-js { +.app-sides .mana-file-icons-js { max-height: none; line-height: inherit; } -.mana-app-sides .mana-file-icons-js::before { +.app-sides .mana-file-icons-js::before { margin-right: 0; font-size: var(--mana-sidebar-icon-size); } diff --git a/packages/libro-common/src/mana-app/index.spec.ts b/packages/libro-common/src/app/index.spec.ts similarity index 100% rename from packages/libro-common/src/mana-app/index.spec.ts rename to packages/libro-common/src/app/index.spec.ts diff --git a/packages/libro-common/src/app/index.ts b/packages/libro-common/src/app/index.ts new file mode 100644 index 00000000..a5888ab5 --- /dev/null +++ b/packages/libro-common/src/app/index.ts @@ -0,0 +1,37 @@ +import { ManaModule, ManaPreset } from '../core/index.js'; + +import { ManaApplication } from './app.js'; +import { FileTreeModule } from './file-tree/index.js'; +import { LabelModule } from './label/index.js'; +import { MenuModule } from './menu/index.js'; +import { ModalModule } from './modal/index.js'; +import { NotificationModule } from './notification/index.js'; +import { ToolbarModule } from './toolbar/index.js'; +import { DefaultViewModule } from './view/index.js'; +import './style/index.less'; + +export * from './label/index.js'; +export * from './tree/index.js'; +export * from './file-tree/index.js'; +export * from './view/index.js'; +export * from './toolbar/index.js'; +export * from './menu/index.js'; +export * from './modal/index.js'; + +export const ManaAppPreset = ManaModule.create() + .register(ManaApplication) + .dependOn( + ManaPreset, + ToolbarModule, + MenuModule, + LabelModule, + FileTreeModule, + DefaultViewModule, + ModalModule, + NotificationModule, + ); + +export * from '../ioc/index.js'; +export * from '../observable/index.js'; +export * from '../common/index.js'; +export * from '../core/index.js'; diff --git a/packages/libro-common/src/mana-app/label/index.ts b/packages/libro-common/src/app/label/index.ts similarity index 81% rename from packages/libro-common/src/mana-app/label/index.ts rename to packages/libro-common/src/app/label/index.ts index 3cfa10a7..01214112 100644 --- a/packages/libro-common/src/mana-app/label/index.ts +++ b/packages/libro-common/src/app/label/index.ts @@ -4,9 +4,9 @@ import { DefaultUriLabelProviderContribution, LabelProvider, LabelProviderContribution, -} from './label-provider'; +} from './label-provider.js'; -export * from './label-provider'; +export * from './label-provider.js'; export const LabelModule = ManaModule.create() .contribution(LabelProviderContribution) .register(LabelProvider, DefaultUriLabelProviderContribution); diff --git a/packages/libro-common/src/mana-app/label/label-provider.tsx b/packages/libro-common/src/app/label/label-provider.tsx similarity index 100% rename from packages/libro-common/src/mana-app/label/label-provider.tsx rename to packages/libro-common/src/app/label/label-provider.tsx diff --git a/packages/libro-common/src/mana-app/menu/index.ts b/packages/libro-common/src/app/menu/index.ts similarity index 66% rename from packages/libro-common/src/mana-app/menu/index.ts rename to packages/libro-common/src/app/menu/index.ts index 8cb343d0..12685414 100644 --- a/packages/libro-common/src/mana-app/menu/index.ts +++ b/packages/libro-common/src/app/menu/index.ts @@ -1,9 +1,9 @@ import type { MenuPath } from '../../core/index.js'; import { ManaModule } from '../../core/index.js'; -import { Menu, MenuFactory, MenuPathSymbol } from './menu'; +import { Menu, MenuFactory, MenuPathSymbol } from './menu.js'; import 'rc-tooltip/assets/bootstrap.css'; -import { MenuColorRegistry } from './menu-color-registry'; +import { MenuColorRegistry } from './menu-color-registry.js'; export const MenuModule = ManaModule.create() .register(Menu, MenuColorRegistry) @@ -18,7 +18,7 @@ export const MenuModule = ManaModule.create() }, }); -export * from './menu'; -export * from './menu-render'; -export * from './menu-bar-render'; -export * from './menu-protocol'; +export * from './menu.js'; +export * from './menu-render.js'; +export * from './menu-bar-render.js'; +export * from './menu-protocol.js'; diff --git a/packages/libro-common/src/mana-app/menu/menu-bar-render.tsx b/packages/libro-common/src/app/menu/menu-bar-render.tsx similarity index 81% rename from packages/libro-common/src/mana-app/menu/menu-bar-render.tsx rename to packages/libro-common/src/app/menu/menu-bar-render.tsx index 968a9591..b40ef4f2 100644 --- a/packages/libro-common/src/mana-app/menu/menu-bar-render.tsx +++ b/packages/libro-common/src/app/menu/menu-bar-render.tsx @@ -5,12 +5,12 @@ import { MenuItem } from '../../core/index.js'; import { useInject } from '../../observable/index.js'; import { Menubar } from '../../react/index.js'; -import type { Menu } from './menu'; -import type { MenuFactory } from './menu'; -import { MenuItemRender } from './menu-item-render'; -import type { MenuItemRenderProps } from './menu-protocol'; -import { MenuInstance } from './menu-protocol'; -import { MenuRender } from './menu-render'; +import type { Menu } from './menu.js'; +import type { MenuFactory } from './menu.js'; +import { MenuItemRender } from './menu-item-render.js'; +import type { MenuItemRenderProps } from './menu-protocol.js'; +import { MenuInstance } from './menu-protocol.js'; +import { MenuRender } from './menu-render.js'; const MenuBarItemRender: FC = (props: MenuItemRenderProps) => { const { item, root } = props; diff --git a/packages/libro-common/src/mana-app/menu/menu-color-registry.ts b/packages/libro-common/src/app/menu/menu-color-registry.ts similarity index 100% rename from packages/libro-common/src/mana-app/menu/menu-color-registry.ts rename to packages/libro-common/src/app/menu/menu-color-registry.ts diff --git a/packages/libro-common/src/mana-app/menu/menu-context.tsx b/packages/libro-common/src/app/menu/menu-context.tsx similarity index 100% rename from packages/libro-common/src/mana-app/menu/menu-context.tsx rename to packages/libro-common/src/app/menu/menu-context.tsx diff --git a/packages/libro-common/src/mana-app/menu/menu-item-keeper.tsx b/packages/libro-common/src/app/menu/menu-item-keeper.tsx similarity index 94% rename from packages/libro-common/src/mana-app/menu/menu-item-keeper.tsx rename to packages/libro-common/src/app/menu/menu-item-keeper.tsx index 94805876..e2f4d361 100644 --- a/packages/libro-common/src/mana-app/menu/menu-item-keeper.tsx +++ b/packages/libro-common/src/app/menu/menu-item-keeper.tsx @@ -3,8 +3,8 @@ import { observable, useObserve } from '../../observable/index.js'; import { useInject } from '../../observable/index.js'; import { memo } from 'react'; -import type { Menu } from './menu'; -import type { MenuData, MenuItemState } from './menu-protocol'; +import type { Menu } from './menu.js'; +import type { MenuData, MenuItemState } from './menu-protocol.js'; interface ToolbarItemKeeperProps { data: MenuData; diff --git a/packages/libro-common/src/mana-app/menu/menu-item-render.tsx b/packages/libro-common/src/app/menu/menu-item-render.tsx similarity index 70% rename from packages/libro-common/src/mana-app/menu/menu-item-render.tsx rename to packages/libro-common/src/app/menu/menu-item-render.tsx index 208a6561..74701f7e 100644 --- a/packages/libro-common/src/mana-app/menu/menu-item-render.tsx +++ b/packages/libro-common/src/app/menu/menu-item-render.tsx @@ -1,9 +1,9 @@ import { useObserve, useInject } from '../../observable/index.js'; import React from 'react'; -import type { Menu } from './menu'; -import type { MenuItemRenderProps } from './menu-protocol'; -import { MenuInstance } from './menu-protocol'; +import type { Menu } from './menu.js'; +import type { MenuItemRenderProps } from './menu-protocol.js'; +import { MenuInstance } from './menu-protocol.js'; export const MenuItemRender = React.memo(function MenuItemRender( props: MenuItemRenderProps, diff --git a/packages/libro-common/src/mana-app/menu/menu-protocol.ts b/packages/libro-common/src/app/menu/menu-protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/menu/menu-protocol.ts rename to packages/libro-common/src/app/menu/menu-protocol.ts diff --git a/packages/libro-common/src/mana-app/menu/menu-render.tsx b/packages/libro-common/src/app/menu/menu-render.tsx similarity index 89% rename from packages/libro-common/src/mana-app/menu/menu-render.tsx rename to packages/libro-common/src/app/menu/menu-render.tsx index 8f26e834..a8fd61e8 100644 --- a/packages/libro-common/src/mana-app/menu/menu-render.tsx +++ b/packages/libro-common/src/app/menu/menu-render.tsx @@ -4,13 +4,13 @@ import type { Syringe } from '../../ioc/index.js'; import type { FC } from 'react'; import { memo, useEffect, useState, useContext, useMemo } from 'react'; -import { MenuFactory } from './menu'; -import type { Menu } from './menu'; -import { MenuContext } from './menu-context'; -import { MenuItemKeeper } from './menu-item-keeper'; -import { MenuItemRender } from './menu-item-render'; -import { MenuInstance } from './menu-protocol'; -import type { MenuItemRenderProps, MenuData } from './menu-protocol'; +import { MenuFactory } from './menu.js'; +import type { Menu } from './menu.js'; +import { MenuContext } from './menu-context.js'; +import { MenuItemKeeper } from './menu-item-keeper.js'; +import { MenuItemRender } from './menu-item-render.js'; +import { MenuInstance } from './menu-protocol.js'; +import type { MenuItemRenderProps, MenuData } from './menu-protocol.js'; export interface MenuRenderProps { /** diff --git a/packages/libro-common/src/mana-app/menu/menu.tsx b/packages/libro-common/src/app/menu/menu.tsx similarity index 97% rename from packages/libro-common/src/mana-app/menu/menu.tsx rename to packages/libro-common/src/app/menu/menu.tsx index 21003f2f..72d994ad 100644 --- a/packages/libro-common/src/mana-app/menu/menu.tsx +++ b/packages/libro-common/src/app/menu/menu.tsx @@ -7,8 +7,8 @@ import { prop } from '../../observable/index.js'; import { Menu as MenuComponent } from '../../react/index.js'; import { inject, transient } from '../../ioc/index.js'; -import { MenuItemRender } from './menu-item-render'; -import type { MenuData, MenuItemState } from './menu-protocol'; +import { MenuItemRender } from './menu-item-render.js'; +import type { MenuData, MenuItemState } from './menu-protocol.js'; export const MenuPathSymbol = Symbol('MenuPathSymbol'); diff --git a/packages/libro-common/src/mana-app/modal/index.ts b/packages/libro-common/src/app/modal/index.ts similarity index 63% rename from packages/libro-common/src/mana-app/modal/index.ts rename to packages/libro-common/src/app/modal/index.ts index a009ac47..c16bf2f9 100644 --- a/packages/libro-common/src/mana-app/modal/index.ts +++ b/packages/libro-common/src/app/modal/index.ts @@ -1,14 +1,14 @@ import { createViewPreference, ManaModule, PortalSlotId } from '../../core/index.js'; -import { ModalApplicationContribution } from './modal-contribution'; -import { ModalContribution } from './modal-protocol'; -import { ModalRenderView } from './modal-render'; -import { ModalService } from './modal-service'; +import { ModalApplicationContribution } from './modal-contribution.js'; +import { ModalContribution } from './modal-protocol.js'; +import { ModalRenderView } from './modal-render.js'; +import { ModalService } from './modal-service.js'; -export * from './modal-render'; -export * from './modal-service'; -export * from './modal-protocol'; -export * from './modal-contribution'; +export * from './modal-render.js'; +export * from './modal-service.js'; +export * from './modal-protocol.js'; +export * from './modal-contribution.js'; export const ModalModule = ManaModule.create() .register( diff --git a/packages/libro-common/src/mana-app/modal/modal-contribution.ts b/packages/libro-common/src/app/modal/modal-contribution.ts similarity index 88% rename from packages/libro-common/src/mana-app/modal/modal-contribution.ts rename to packages/libro-common/src/app/modal/modal-contribution.ts index cf27e403..a54ba751 100644 --- a/packages/libro-common/src/mana-app/modal/modal-contribution.ts +++ b/packages/libro-common/src/app/modal/modal-contribution.ts @@ -2,7 +2,7 @@ import { ApplicationContribution } from '../../core/index.js'; import { inject } from '../../ioc/index.js'; import { singleton } from '../../ioc/index.js'; -import { ModalService } from './modal-service'; +import { ModalService } from './modal-service.js'; @singleton({ contrib: [ApplicationContribution] }) export class ModalApplicationContribution implements ApplicationContribution { diff --git a/packages/libro-common/src/mana-app/modal/modal-protocol.tsx b/packages/libro-common/src/app/modal/modal-protocol.tsx similarity index 100% rename from packages/libro-common/src/mana-app/modal/modal-protocol.tsx rename to packages/libro-common/src/app/modal/modal-protocol.tsx diff --git a/packages/libro-common/src/mana-app/modal/modal-render.tsx b/packages/libro-common/src/app/modal/modal-render.tsx similarity index 91% rename from packages/libro-common/src/mana-app/modal/modal-render.tsx rename to packages/libro-common/src/app/modal/modal-render.tsx index b4d321cd..7a58a315 100644 --- a/packages/libro-common/src/mana-app/modal/modal-render.tsx +++ b/packages/libro-common/src/app/modal/modal-render.tsx @@ -3,7 +3,7 @@ import { useInject } from '../../observable/index.js'; import { singleton } from '../../ioc/index.js'; import React from 'react'; -import { ModalService } from './modal-service'; +import { ModalService } from './modal-service.js'; const ModalRender: React.FC = React.forwardRef(function ModalRender() { const modalService = useInject(ModalService); diff --git a/packages/libro-common/src/mana-app/modal/modal-service.ts b/packages/libro-common/src/app/modal/modal-service.ts similarity index 99% rename from packages/libro-common/src/mana-app/modal/modal-service.ts rename to packages/libro-common/src/app/modal/modal-service.ts index a2f2f2f6..85077558 100644 --- a/packages/libro-common/src/mana-app/modal/modal-service.ts +++ b/packages/libro-common/src/app/modal/modal-service.ts @@ -3,8 +3,8 @@ import { prop } from '../../observable/index.js'; import type { Contribution } from '../../ioc/index.js'; import { contrib, singleton } from '../../ioc/index.js'; -import type { ModalItem, ModalItemProps } from './modal-protocol'; -import { renderModal, ModalContribution } from './modal-protocol'; +import type { ModalItem, ModalItemProps } from './modal-protocol.js'; +import { renderModal, ModalContribution } from './modal-protocol.js'; export class ModalItemView implements Disposable { @prop() diff --git a/packages/libro-common/src/mana-app/notification/index.less b/packages/libro-common/src/app/notification/index.less similarity index 100% rename from packages/libro-common/src/mana-app/notification/index.less rename to packages/libro-common/src/app/notification/index.less diff --git a/packages/libro-common/src/mana-app/notification/index.ts b/packages/libro-common/src/app/notification/index.ts similarity index 54% rename from packages/libro-common/src/mana-app/notification/index.ts rename to packages/libro-common/src/app/notification/index.ts index ce8b6813..b8dcaaf3 100644 --- a/packages/libro-common/src/mana-app/notification/index.ts +++ b/packages/libro-common/src/app/notification/index.ts @@ -1,8 +1,8 @@ import { ManaModule } from '../../core/index.js'; -import { NotificationService } from './service'; +import { NotificationService } from './service.js'; export const NotificationModule = ManaModule.create().register(NotificationService); -export * from './protocol'; -export * from './service'; +export * from './protocol.js'; +export * from './service.js'; diff --git a/packages/libro-common/src/mana-app/notification/protocol.ts b/packages/libro-common/src/app/notification/protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/notification/protocol.ts rename to packages/libro-common/src/app/notification/protocol.ts diff --git a/packages/libro-common/src/mana-app/notification/service.tsx b/packages/libro-common/src/app/notification/service.tsx similarity index 99% rename from packages/libro-common/src/mana-app/notification/service.tsx rename to packages/libro-common/src/app/notification/service.tsx index a0fe2f44..0e22b08f 100644 --- a/packages/libro-common/src/mana-app/notification/service.tsx +++ b/packages/libro-common/src/app/notification/service.tsx @@ -4,7 +4,7 @@ import { v1 } from 'uuid'; import { Disposable } from '../../common/index.js'; import { singleton } from '../../ioc/index.js'; -import type { NotificationConfig, NotificationAction } from './protocol'; +import type { NotificationConfig, NotificationAction } from './protocol.js'; import './index.less'; diff --git a/packages/libro-common/src/mana-app/style/index.less b/packages/libro-common/src/app/style/index.less similarity index 99% rename from packages/libro-common/src/mana-app/style/index.less rename to packages/libro-common/src/app/style/index.less index 23b23520..583b1674 100644 --- a/packages/libro-common/src/mana-app/style/index.less +++ b/packages/libro-common/src/app/style/index.less @@ -1,7 +1,7 @@ /* stylelint-disable property-no-vendor-prefix */ /* stylelint-disable custom-property-pattern */ -.mana-app { +.app { padding: 0; margin: 0; font-family: var(--mana-ui-font-family); @@ -37,7 +37,7 @@ top: var(--mana-private-menubar-height) !important; } -.mana-ApplicationShell { +.applicationShell { position: absolute; top: 0; right: 0; diff --git a/packages/libro-common/src/mana-app/style/style-protocol.ts b/packages/libro-common/src/app/style/style-protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/style/style-protocol.ts rename to packages/libro-common/src/app/style/style-protocol.ts diff --git a/packages/libro-common/src/mana-app/toolbar/index.less b/packages/libro-common/src/app/toolbar/index.less similarity index 100% rename from packages/libro-common/src/mana-app/toolbar/index.less rename to packages/libro-common/src/app/toolbar/index.less diff --git a/packages/libro-common/src/mana-app/toolbar/index.ts b/packages/libro-common/src/app/toolbar/index.ts similarity index 75% rename from packages/libro-common/src/mana-app/toolbar/index.ts rename to packages/libro-common/src/app/toolbar/index.ts index f334fa11..f66858e4 100644 --- a/packages/libro-common/src/mana-app/toolbar/index.ts +++ b/packages/libro-common/src/app/toolbar/index.ts @@ -1,6 +1,6 @@ import { ManaModule } from '../../core/index.js'; -import { Toolbar, ToolbarFactory } from './toolbar'; +import { Toolbar, ToolbarFactory } from './toolbar.js'; import 'rc-tooltip/assets/bootstrap.css'; import './index.less'; @@ -16,5 +16,5 @@ export const ToolbarModule = ManaModule.create() }, }); -export * from './toolbar'; -export * from './toolbar-render'; +export * from './toolbar.js'; +export * from './toolbar-render.js'; diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar-item-keeper.tsx b/packages/libro-common/src/app/toolbar/toolbar-item-keeper.tsx similarity index 96% rename from packages/libro-common/src/mana-app/toolbar/toolbar-item-keeper.tsx rename to packages/libro-common/src/app/toolbar/toolbar-item-keeper.tsx index 1b6621ca..b5e9a4eb 100644 --- a/packages/libro-common/src/mana-app/toolbar/toolbar-item-keeper.tsx +++ b/packages/libro-common/src/app/toolbar/toolbar-item-keeper.tsx @@ -3,8 +3,8 @@ import { CommandRegistry } from '../../core/index.js'; import { observable, useObserve } from '../../observable/index.js'; import { useInject } from '../../observable/index.js'; import { memo } from 'react'; -import type { Toolbar } from './toolbar'; -import type { ToolbarItemData, ToolbarItemState } from './toolbar-protocol'; +import type { Toolbar } from './toolbar.js'; +import type { ToolbarItemData, ToolbarItemState } from './toolbar-protocol.js'; interface ToolbarItemKeeperProps { data: ToolbarItemData; diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar-item-render.tsx b/packages/libro-common/src/app/toolbar/toolbar-item-render.tsx similarity index 86% rename from packages/libro-common/src/mana-app/toolbar/toolbar-item-render.tsx rename to packages/libro-common/src/app/toolbar/toolbar-item-render.tsx index 9d583758..cc9b1cb4 100644 --- a/packages/libro-common/src/mana-app/toolbar/toolbar-item-render.tsx +++ b/packages/libro-common/src/app/toolbar/toolbar-item-render.tsx @@ -3,8 +3,8 @@ import { useObserve } from '../../observable/index.js'; import type { FC } from 'react'; import { memo } from 'react'; -import type { Toolbar } from './toolbar'; -import type { ToolbarItemState } from './toolbar-protocol'; +import type { Toolbar } from './toolbar.js'; +import type { ToolbarItemState } from './toolbar-protocol.js'; interface ToolbarItemRenderProps { data: any; diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar-protocol.ts b/packages/libro-common/src/app/toolbar/toolbar-protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/toolbar/toolbar-protocol.ts rename to packages/libro-common/src/app/toolbar/toolbar-protocol.ts diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx b/packages/libro-common/src/app/toolbar/toolbar-render.tsx similarity index 91% rename from packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx rename to packages/libro-common/src/app/toolbar/toolbar-render.tsx index 72ecc56d..57e20b3d 100644 --- a/packages/libro-common/src/mana-app/toolbar/toolbar-render.tsx +++ b/packages/libro-common/src/app/toolbar/toolbar-render.tsx @@ -4,11 +4,11 @@ import { useInject, ObservableContext } from '../../observable/index.js'; import type { Syringe } from '../../ioc/index.js'; import { useEffect, memo, useState, useContext, useMemo } from 'react'; -import type { Toolbar } from './toolbar'; -import { ToolbarFactory } from './toolbar'; -import { ToolbarItemKeeper } from './toolbar-item-keeper'; -import { ToolbarArgs } from './toolbar-protocol'; -import { ToolbarVisiblesRender } from './toolbar-visible-render'; +import type { Toolbar } from './toolbar.js'; +import { ToolbarFactory } from './toolbar.js'; +import { ToolbarItemKeeper } from './toolbar-item-keeper.js'; +import { ToolbarArgs } from './toolbar-protocol.js'; +import { ToolbarVisiblesRender } from './toolbar-visible-render.js'; export interface ToolbarRenderProps { /** diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar-visible-render.tsx b/packages/libro-common/src/app/toolbar/toolbar-visible-render.tsx similarity index 93% rename from packages/libro-common/src/mana-app/toolbar/toolbar-visible-render.tsx rename to packages/libro-common/src/app/toolbar/toolbar-visible-render.tsx index e50bd4d9..3eecf75e 100644 --- a/packages/libro-common/src/mana-app/toolbar/toolbar-visible-render.tsx +++ b/packages/libro-common/src/app/toolbar/toolbar-visible-render.tsx @@ -2,7 +2,7 @@ import type { ToolbarItem } from '../../core/index.js'; import { useObserve } from '../../observable/index.js'; import { memo } from 'react'; -import type { Toolbar } from './toolbar'; +import type { Toolbar } from './toolbar.js'; interface ToolbarVisiblesRenderProps { toolbar: Toolbar; diff --git a/packages/libro-common/src/mana-app/toolbar/toolbar.tsx b/packages/libro-common/src/app/toolbar/toolbar.tsx similarity index 98% rename from packages/libro-common/src/mana-app/toolbar/toolbar.tsx rename to packages/libro-common/src/app/toolbar/toolbar.tsx index cad056b1..7a316e2f 100644 --- a/packages/libro-common/src/mana-app/toolbar/toolbar.tsx +++ b/packages/libro-common/src/app/toolbar/toolbar.tsx @@ -15,8 +15,8 @@ import { l10n } from '../../l10n/index.js'; import { getOrigin, prop } from '../../observable/index.js'; import { inject, transient } from '../../ioc/index.js'; -import { ToolbarItemRender } from './toolbar-item-render'; -import type { ToolbarItemState } from './toolbar-protocol'; +import { ToolbarItemRender } from './toolbar-item-render.js'; +import type { ToolbarItemState } from './toolbar-protocol.js'; /** * Factory for instantiating toolbars. diff --git a/packages/libro-common/src/mana-app/tree/components/index.tsx b/packages/libro-common/src/app/tree/components/index.tsx similarity index 100% rename from packages/libro-common/src/mana-app/tree/components/index.tsx rename to packages/libro-common/src/app/tree/components/index.tsx diff --git a/packages/libro-common/src/mana-app/tree/components/tree-ident.tsx b/packages/libro-common/src/app/tree/components/tree-ident.tsx similarity index 91% rename from packages/libro-common/src/mana-app/tree/components/tree-ident.tsx rename to packages/libro-common/src/app/tree/components/tree-ident.tsx index ca70dbef..af0e06be 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-ident.tsx +++ b/packages/libro-common/src/app/tree/components/tree-ident.tsx @@ -2,9 +2,9 @@ import { ViewInstance } from '../../../core/index.js'; import { useInject } from '../../../observable/index.js'; import * as React from 'react'; -import type { TreeNode, TreeNodeProps } from '../tree'; -import { TreeProps, TREE_NODE_INDENT_GUIDE_CLASS } from '../tree-protocol'; -import type { TreeView } from '../view/tree-view'; +import type { TreeNode, TreeNodeProps } from '../tree.js'; +import { TreeProps, TREE_NODE_INDENT_GUIDE_CLASS } from '../tree-protocol.js'; +import type { TreeView } from '../view/tree-view.js'; type IndentGuides = 'onHover' | 'none' | 'always'; export const TreeIdent: React.FC = (props: TreeNodeProps) => { diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node-caption-affix.tsx b/packages/libro-common/src/app/tree/components/tree-node-caption-affix.tsx similarity index 87% rename from packages/libro-common/src/mana-app/tree/components/tree-node-caption-affix.tsx rename to packages/libro-common/src/app/tree/components/tree-node-caption-affix.tsx index 2c1149a2..52aebfe8 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-node-caption-affix.tsx +++ b/packages/libro-common/src/app/tree/components/tree-node-caption-affix.tsx @@ -3,14 +3,14 @@ import { useInject } from '../../../observable/index.js'; import * as React from 'react'; import { notEmpty } from '../../../common/index.js'; -import type { TreeNodeCaptionAffixesProps } from '../tree'; +import type { TreeNodeCaptionAffixesProps } from '../tree.js'; import { TREE_NODE_SEGMENT_CLASS, TREE_NODE_SEGMENT_GROW_CLASS, -} from '../tree-protocol'; -import { TreeViewDecorationStyles } from '../tree-view-decoration'; -import type { TreeView } from '../view/tree-view'; -import { TreeViewDecorator } from '../view/tree-view-decorator'; +} from '../tree-protocol.js'; +import { TreeViewDecorationStyles } from '../tree-view-decoration.js'; +import type { TreeView } from '../view/tree-view.js'; +import { TreeViewDecorator } from '../view/tree-view-decorator.js'; export const TreeNodeCaptionAffixes: React.FC = ( props: TreeNodeCaptionAffixesProps, diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node-caption.tsx b/packages/libro-common/src/app/tree/components/tree-node-caption.tsx similarity index 93% rename from packages/libro-common/src/mana-app/tree/components/tree-node-caption.tsx rename to packages/libro-common/src/app/tree/components/tree-node-caption.tsx index 99d7aff9..193dbe6e 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-node-caption.tsx +++ b/packages/libro-common/src/app/tree/components/tree-node-caption.tsx @@ -3,14 +3,14 @@ import { ViewInstance } from '../../../core/index.js'; import { useInject } from '../../../observable/index.js'; import * as React from 'react'; -import type { TreeNodeProps } from '../tree'; +import type { TreeNodeProps } from '../tree.js'; import { TREE_NODE_SEGMENT_CLASS, TREE_NODE_SEGMENT_GROW_CLASS, -} from '../tree-protocol'; -import { TreeViewDecorationStyles, CaptionHighlight } from '../tree-view-decoration'; -import type { TreeView } from '../view/tree-view'; -import { TreeViewDecorator } from '../view/tree-view-decorator'; +} from '../tree-protocol.js'; +import { TreeViewDecorationStyles, CaptionHighlight } from '../tree-view-decoration.js'; +import type { TreeView } from '../view/tree-view.js'; +import { TreeViewDecorator } from '../view/tree-view-decorator.js'; export function TreeNodeCaption(props: TreeNodeProps) { const { node } = props; diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node-expansion.tsx b/packages/libro-common/src/app/tree/components/tree-node-expansion.tsx similarity index 73% rename from packages/libro-common/src/mana-app/tree/components/tree-node-expansion.tsx rename to packages/libro-common/src/app/tree/components/tree-node-expansion.tsx index a16b40b9..f8f8ca4b 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-node-expansion.tsx +++ b/packages/libro-common/src/app/tree/components/tree-node-expansion.tsx @@ -5,12 +5,12 @@ import { BUSY_CLASS, COLLAPSED_CLASS, EXPANSION_TOGGLE_CLASS, -} from '../../style/style-protocol'; -import { TreeNodeComponents } from '../tree'; -import type { TreeNodeProps } from '../tree'; -import { ExpandableTreeNode } from '../tree-expansion'; -import { TREE_NODE_SEGMENT_CLASS } from '../tree-protocol'; -import type { TreeView } from '../view/tree-view'; +} from '../../style/style-protocol.js'; +import { TreeNodeComponents } from '../tree.js'; +import type { TreeNodeProps } from '../tree.js'; +import { ExpandableTreeNode } from '../tree-expansion.js'; +import { TREE_NODE_SEGMENT_CLASS } from '../tree-protocol.js'; +import type { TreeView } from '../view/tree-view.js'; export function TreeNodeExpansion(props: TreeNodeProps) { const treeNodeComponents = useInject(TreeNodeComponents); diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node-icon-decorator.tsx b/packages/libro-common/src/app/tree/components/tree-node-icon-decorator.tsx similarity index 87% rename from packages/libro-common/src/mana-app/tree/components/tree-node-icon-decorator.tsx rename to packages/libro-common/src/app/tree/components/tree-node-icon-decorator.tsx index 472f3e55..760259d0 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-node-icon-decorator.tsx +++ b/packages/libro-common/src/app/tree/components/tree-node-icon-decorator.tsx @@ -3,11 +3,14 @@ import { useInject } from '../../../observable/index.js'; import * as React from 'react'; import { notEmpty } from '../../../common/index.js'; -import type { TreeNodeIconDecoratorProps } from '../tree'; -import type { TreeViewDecoration } from '../tree-view-decoration'; -import { IconOverlayPosition, TreeViewDecorationStyles } from '../tree-view-decoration'; -import type { TreeView } from '../view/tree-view'; -import { TreeViewDecorator } from '../view/tree-view-decorator'; +import type { TreeNodeIconDecoratorProps } from '../tree.js'; +import type { TreeViewDecoration } from '../tree-view-decoration.js'; +import { + IconOverlayPosition, + TreeViewDecorationStyles, +} from '../tree-view-decoration.js'; +import type { TreeView } from '../view/tree-view.js'; +import { TreeViewDecorator } from '../view/tree-view-decorator.js'; export const TreeNodeIconDecorator: React.FC = ( props: TreeNodeIconDecoratorProps, diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node-icon.tsx b/packages/libro-common/src/app/tree/components/tree-node-icon.tsx similarity index 100% rename from packages/libro-common/src/mana-app/tree/components/tree-node-icon.tsx rename to packages/libro-common/src/app/tree/components/tree-node-icon.tsx diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node-tail-decoration.tsx b/packages/libro-common/src/app/tree/components/tree-node-tail-decoration.tsx similarity index 91% rename from packages/libro-common/src/mana-app/tree/components/tree-node-tail-decoration.tsx rename to packages/libro-common/src/app/tree/components/tree-node-tail-decoration.tsx index a0d64f56..c3853ebd 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-node-tail-decoration.tsx +++ b/packages/libro-common/src/app/tree/components/tree-node-tail-decoration.tsx @@ -3,11 +3,11 @@ import { useInject } from '../../../observable/index.js'; import * as React from 'react'; import { notEmpty } from '../../../common/index.js'; -import type { TreeNodeProps } from '../tree'; -import { TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS } from '../tree-protocol'; -import type { TreeViewDecoration } from '../tree-view-decoration'; -import type { TreeView } from '../view/tree-view'; -import { TreeViewDecorator } from '../view/tree-view-decorator'; +import type { TreeNodeProps } from '../tree.js'; +import { TREE_NODE_SEGMENT_CLASS, TREE_NODE_TAIL_CLASS } from '../tree-protocol.js'; +import type { TreeViewDecoration } from '../tree-view-decoration.js'; +import type { TreeView } from '../view/tree-view.js'; +import { TreeViewDecorator } from '../view/tree-view-decorator.js'; export function TreeNodeTailDecorations(props: TreeNodeProps) { const { node } = props; diff --git a/packages/libro-common/src/mana-app/tree/components/tree-node.tsx b/packages/libro-common/src/app/tree/components/tree-node.tsx similarity index 84% rename from packages/libro-common/src/mana-app/tree/components/tree-node.tsx rename to packages/libro-common/src/app/tree/components/tree-node.tsx index 2ebc4e74..348085a0 100644 --- a/packages/libro-common/src/mana-app/tree/components/tree-node.tsx +++ b/packages/libro-common/src/app/tree/components/tree-node.tsx @@ -1,10 +1,10 @@ import * as React from 'react'; import { ViewInstance } from '../../../core/index.js'; import { useInject } from '../../../observable/index.js'; -import type { TreeNodeProps } from '../tree'; -import { TreeNode, TreeNodeComponents } from '../tree'; -import { TREE_NODE_CONTENT_CLASS } from '../tree-protocol'; -import type { TreeView } from '../view/tree-view'; +import type { TreeNodeProps } from '../tree.js'; +import { TreeNode, TreeNodeComponents } from '../tree.js'; +import { TREE_NODE_CONTENT_CLASS } from '../tree-protocol.js'; +import type { TreeView } from '../view/tree-view.js'; export const TreeNodeComponent: React.FC = (props: TreeNodeProps) => { const treeNodeComponents = useInject(TreeNodeComponents); diff --git a/packages/libro-common/src/mana-app/tree/components/tree-switch-icon.tsx b/packages/libro-common/src/app/tree/components/tree-switch-icon.tsx similarity index 100% rename from packages/libro-common/src/mana-app/tree/components/tree-switch-icon.tsx rename to packages/libro-common/src/app/tree/components/tree-switch-icon.tsx diff --git a/packages/libro-common/src/mana-app/tree/index.ts b/packages/libro-common/src/app/tree/index.ts similarity index 100% rename from packages/libro-common/src/mana-app/tree/index.ts rename to packages/libro-common/src/app/tree/index.ts diff --git a/packages/libro-common/src/app/tree/module.ts b/packages/libro-common/src/app/tree/module.ts new file mode 100644 index 00000000..b5e995ab --- /dev/null +++ b/packages/libro-common/src/app/tree/module.ts @@ -0,0 +1,30 @@ +import { ManaModule } from '../../core/index.js'; + +import { DefaultTreeNodeComponents } from './components/index.js'; +import { DefaultTreeProps, TreeNodeComponents } from './tree.js'; +import { NoopTreeDecoratorService } from './tree-decorator.js'; +import { TreeExpansionServiceImpl } from './tree-expansion.js'; +import { TreeLabelProvider } from './tree-label-provider.js'; +import { TreeNavigationService } from './tree-navigation.js'; +import { TreeProps } from './tree-protocol.js'; +import { TreeSelectionServiceImpl } from './tree-selection-impl.js'; +import { TreeView } from './view/index.js'; +import './style/index.less'; +import './style/tree-decorator.less'; + +export const TreeModule = ManaModule.create().register( + TreeView, + TreeLabelProvider, + TreeSelectionServiceImpl, + TreeExpansionServiceImpl, + TreeNavigationService, + NoopTreeDecoratorService, + { + token: TreeProps, + useValue: DefaultTreeProps, + }, + { + token: TreeNodeComponents, + useValue: DefaultTreeNodeComponents, + }, +); diff --git a/packages/libro-common/src/mana-app/tree/style/index.less b/packages/libro-common/src/app/tree/style/index.less similarity index 100% rename from packages/libro-common/src/mana-app/tree/style/index.less rename to packages/libro-common/src/app/tree/style/index.less diff --git a/packages/libro-common/src/mana-app/tree/style/tree-decorator.less b/packages/libro-common/src/app/tree/style/tree-decorator.less similarity index 100% rename from packages/libro-common/src/mana-app/tree/style/tree-decorator.less rename to packages/libro-common/src/app/tree/style/tree-decorator.less diff --git a/packages/libro-common/src/mana-app/tree/tree-decorator.ts b/packages/libro-common/src/app/tree/tree-decorator.ts similarity index 99% rename from packages/libro-common/src/mana-app/tree/tree-decorator.ts rename to packages/libro-common/src/app/tree/tree-decorator.ts index 6de2c6fd..167a9ca5 100644 --- a/packages/libro-common/src/mana-app/tree/tree-decorator.ts +++ b/packages/libro-common/src/app/tree/tree-decorator.ts @@ -2,8 +2,8 @@ import type { Event, Disposable, MaybePromise } from '../../common/index.js'; import { Emitter, DisposableCollection } from '../../common/index.js'; import { singleton } from '../../ioc/index.js'; -import type { Tree, TreeNode } from './tree'; -import type { TreeViewDecorationData } from './tree-view-decoration'; +import type { Tree, TreeNode } from './tree.js'; +import type { TreeViewDecorationData } from './tree-view-decoration.js'; /** * The {@link TreeDecorator} allows adapting the look and the style of the tree items within a widget. Changes are reflected in diff --git a/packages/libro-common/src/mana-app/tree/tree-expansion.ts b/packages/libro-common/src/app/tree/tree-expansion.ts similarity index 97% rename from packages/libro-common/src/mana-app/tree/tree-expansion.ts rename to packages/libro-common/src/app/tree/tree-expansion.ts index 5b390b4e..8affaff2 100644 --- a/packages/libro-common/src/mana-app/tree/tree-expansion.ts +++ b/packages/libro-common/src/app/tree/tree-expansion.ts @@ -2,8 +2,8 @@ import type { Event, Disposable } from '../../common/index.js'; import { Emitter } from '../../common/index.js'; import { singleton, inject, postConstruct } from '../../ioc/index.js'; -import type { TreeNode } from './tree'; -import { CompositeTreeNode, Tree } from './tree'; +import type { TreeNode } from './tree.js'; +import { CompositeTreeNode, Tree } from './tree.js'; export const TreeExpansionService = Symbol('TreeExpansionService'); diff --git a/packages/libro-common/src/mana-app/tree/tree-impl.ts b/packages/libro-common/src/app/tree/tree-impl.ts similarity index 98% rename from packages/libro-common/src/mana-app/tree/tree-impl.ts rename to packages/libro-common/src/app/tree/tree-impl.ts index 2158969e..b5b34274 100644 --- a/packages/libro-common/src/mana-app/tree/tree-impl.ts +++ b/packages/libro-common/src/app/tree/tree-impl.ts @@ -7,8 +7,8 @@ import { DisposableCollection } from '../../common/index.js'; import { Emitter, WaitUntilEvent } from '../../common/index.js'; import { singleton } from '../../ioc/index.js'; -import type { TreeNode } from './tree'; -import { Tree, CompositeTreeNode } from './tree'; +import type { TreeNode } from './tree.js'; +import { Tree, CompositeTreeNode } from './tree.js'; /** * A default implementation of the tree. diff --git a/packages/libro-common/src/mana-app/tree/tree-iterator.ts b/packages/libro-common/src/app/tree/tree-iterator.ts similarity index 97% rename from packages/libro-common/src/mana-app/tree/tree-iterator.ts rename to packages/libro-common/src/app/tree/tree-iterator.ts index 9989a9a1..15adaf04 100644 --- a/packages/libro-common/src/mana-app/tree/tree-iterator.ts +++ b/packages/libro-common/src/app/tree/tree-iterator.ts @@ -1,8 +1,8 @@ import { equals } from '../../observable/index.js'; -import type { TreeNode } from './tree'; -import { CompositeTreeNode } from './tree'; -import { ExpandableTreeNode } from './tree-expansion'; +import type { TreeNode } from './tree.js'; +import { CompositeTreeNode } from './tree.js'; +import { ExpandableTreeNode } from './tree-expansion.js'; export type TreeIterator = { // diff --git a/packages/libro-common/src/mana-app/tree/tree-label-provider.ts b/packages/libro-common/src/app/tree/tree-label-provider.ts similarity index 92% rename from packages/libro-common/src/mana-app/tree/tree-label-provider.ts rename to packages/libro-common/src/app/tree/tree-label-provider.ts index d0044395..2460f634 100644 --- a/packages/libro-common/src/mana-app/tree/tree-label-provider.ts +++ b/packages/libro-common/src/app/tree/tree-label-provider.ts @@ -1,8 +1,8 @@ import { singleton } from '../../ioc/index.js'; -import { LabelProviderContribution } from '../label/label-provider'; +import { LabelProviderContribution } from '../label/label-provider.js'; -import { TreeNode } from './tree'; +import { TreeNode } from './tree.js'; @singleton({ contrib: LabelProviderContribution }) export class TreeLabelProvider implements LabelProviderContribution { diff --git a/packages/libro-common/src/mana-app/tree/tree-model.ts b/packages/libro-common/src/app/tree/tree-model.ts similarity index 98% rename from packages/libro-common/src/mana-app/tree/tree-model.ts rename to packages/libro-common/src/app/tree/tree-model.ts index 3aa6f6f1..3d1ccfdb 100644 --- a/packages/libro-common/src/mana-app/tree/tree-model.ts +++ b/packages/libro-common/src/app/tree/tree-model.ts @@ -4,16 +4,16 @@ import { Emitter, DisposableCollection } from '../../common/index.js'; import type { SelectionProvider } from '../../core/index.js'; import { inject, singleton, postConstruct } from '../../ioc/index.js'; -import type { TreeNode } from './tree'; -import { Tree, CompositeTreeNode } from './tree'; -import { TreeExpansionService, ExpandableTreeNode } from './tree-expansion'; -import type { TreeIterator } from './tree-iterator'; -import { TreeNavigationService } from './tree-navigation'; +import type { TreeNode } from './tree.js'; +import { Tree, CompositeTreeNode } from './tree.js'; +import { TreeExpansionService, ExpandableTreeNode } from './tree-expansion.js'; +import type { TreeIterator } from './tree-iterator.js'; +import { TreeNavigationService } from './tree-navigation.js'; import { TreeSelectionService, SelectableTreeNode, TreeSelection, -} from './tree-selection'; +} from './tree-selection.js'; // import { BottomUpTreeIterator, TopDownTreeIterator, Iterators } from './tree-iterator'; /** diff --git a/packages/libro-common/src/mana-app/tree/tree-navigation.ts b/packages/libro-common/src/app/tree/tree-navigation.ts similarity index 94% rename from packages/libro-common/src/mana-app/tree/tree-navigation.ts rename to packages/libro-common/src/app/tree/tree-navigation.ts index c736cf26..b38b3c9f 100644 --- a/packages/libro-common/src/mana-app/tree/tree-navigation.ts +++ b/packages/libro-common/src/app/tree/tree-navigation.ts @@ -1,6 +1,6 @@ import { singleton } from '../../ioc/index.js'; -import type { TreeNode } from './tree'; +import type { TreeNode } from './tree.js'; @singleton() export class TreeNavigationService { diff --git a/packages/libro-common/src/mana-app/tree/tree-protocol.ts b/packages/libro-common/src/app/tree/tree-protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/tree/tree-protocol.ts rename to packages/libro-common/src/app/tree/tree-protocol.ts diff --git a/packages/libro-common/src/mana-app/tree/tree-selection-impl.ts b/packages/libro-common/src/app/tree/tree-selection-impl.ts similarity index 96% rename from packages/libro-common/src/mana-app/tree/tree-selection-impl.ts rename to packages/libro-common/src/app/tree/tree-selection-impl.ts index 9f462b00..66423f5b 100644 --- a/packages/libro-common/src/mana-app/tree/tree-selection-impl.ts +++ b/packages/libro-common/src/app/tree/tree-selection-impl.ts @@ -2,15 +2,15 @@ import type { Event } from '../../common/index.js'; import { Emitter } from '../../common/index.js'; import { singleton, inject, postConstruct } from '../../ioc/index.js'; -import type { TreeNode } from './tree'; -import { Tree } from './tree'; +import type { TreeNode } from './tree.js'; +import { Tree } from './tree.js'; import { TreeSelectionService, SelectableTreeNode, TreeSelection, -} from './tree-selection'; -import type { FocusableTreeSelection } from './tree-selection-state'; -import { TreeSelectionState } from './tree-selection-state'; +} from './tree-selection.js'; +import type { FocusableTreeSelection } from './tree-selection-state.js'; +import { TreeSelectionState } from './tree-selection-state.js'; @singleton({ contrib: TreeSelectionService }) export class TreeSelectionServiceImpl implements TreeSelectionService { diff --git a/packages/libro-common/src/mana-app/tree/tree-selection-state.ts b/packages/libro-common/src/app/tree/tree-selection-state.ts similarity index 98% rename from packages/libro-common/src/mana-app/tree/tree-selection-state.ts rename to packages/libro-common/src/app/tree/tree-selection-state.ts index 647d550e..7c7e6f83 100644 --- a/packages/libro-common/src/mana-app/tree/tree-selection-state.ts +++ b/packages/libro-common/src/app/tree/tree-selection-state.ts @@ -1,8 +1,8 @@ import { equals } from '../../observable/index.js'; -import type { Tree, TreeNode } from './tree'; -import { DepthFirstTreeIterator } from './tree-iterator'; -import { TreeSelection, SelectableTreeNode } from './tree-selection'; +import type { Tree, TreeNode } from './tree.js'; +import { DepthFirstTreeIterator } from './tree-iterator.js'; +import { TreeSelection, SelectableTreeNode } from './tree-selection.js'; /** * A tree selection that might contain additional information about the tree node that has the focus. diff --git a/packages/libro-common/src/mana-app/tree/tree-selection.ts b/packages/libro-common/src/app/tree/tree-selection.ts similarity index 98% rename from packages/libro-common/src/mana-app/tree/tree-selection.ts rename to packages/libro-common/src/app/tree/tree-selection.ts index f7cd67e7..44a3c777 100644 --- a/packages/libro-common/src/mana-app/tree/tree-selection.ts +++ b/packages/libro-common/src/app/tree/tree-selection.ts @@ -2,7 +2,7 @@ import type { SelectionProvider } from '../../core/index.js'; import type { Event, Disposable } from '../../common/index.js'; -import { TreeNode } from './tree'; +import { TreeNode } from './tree.js'; /** * The tree selection service. diff --git a/packages/libro-common/src/mana-app/tree/tree-view-decoration.ts b/packages/libro-common/src/app/tree/tree-view-decoration.ts similarity index 100% rename from packages/libro-common/src/mana-app/tree/tree-view-decoration.ts rename to packages/libro-common/src/app/tree/tree-view-decoration.ts diff --git a/packages/libro-common/src/mana-app/tree/tree.ts b/packages/libro-common/src/app/tree/tree.ts similarity index 99% rename from packages/libro-common/src/mana-app/tree/tree.ts rename to packages/libro-common/src/app/tree/tree.ts index 37a04f95..33bf12dc 100644 --- a/packages/libro-common/src/mana-app/tree/tree.ts +++ b/packages/libro-common/src/app/tree/tree.ts @@ -5,7 +5,7 @@ import type { WaitUntilEvent, } from '../../common/index.js'; -import type { NodeProps, TreeProps } from './tree-protocol'; +import type { NodeProps, TreeProps } from './tree-protocol.js'; export const Tree = Symbol('Tree'); diff --git a/packages/libro-common/src/mana-app/tree/view/index.less b/packages/libro-common/src/app/tree/view/index.less similarity index 100% rename from packages/libro-common/src/mana-app/tree/view/index.less rename to packages/libro-common/src/app/tree/view/index.less diff --git a/packages/libro-common/src/mana-app/tree/view/index.ts b/packages/libro-common/src/app/tree/view/index.ts similarity index 100% rename from packages/libro-common/src/mana-app/tree/view/index.ts rename to packages/libro-common/src/app/tree/view/index.ts diff --git a/packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts b/packages/libro-common/src/app/tree/view/tree-view-decorator.ts similarity index 92% rename from packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts rename to packages/libro-common/src/app/tree/view/tree-view-decorator.ts index 471a5bfb..98fb3590 100644 --- a/packages/libro-common/src/mana-app/tree/view/tree-view-decorator.ts +++ b/packages/libro-common/src/app/tree/view/tree-view-decorator.ts @@ -6,11 +6,11 @@ import { notEmpty } from '../../../common/index.js'; import { ViewOption } from '../../../core/index.js'; import { inject, postConstruct, singleton } from '../../../ioc/index.js'; import { prop } from '../../../observable/index.js'; -import type { TreeNode } from '../tree'; -import { DecoratedTreeNode, TreeDecoratorService } from '../tree-decorator'; -import { TreeModel } from '../tree-model'; -import type { TreeProps } from '../tree-protocol'; -import { TreeViewDecorationData } from '../tree-view-decoration'; +import { DecoratedTreeNode, TreeDecoratorService } from '../tree-decorator.js'; +import { TreeModel } from '../tree-model.js'; +import type { TreeProps } from '../tree-protocol.js'; +import { TreeViewDecorationData } from '../tree-view-decoration.js'; +import type { TreeNode } from '../tree.js'; @singleton() export class TreeViewDecorator implements Disposable { diff --git a/packages/libro-common/src/mana-app/tree/view/tree-view-module.ts b/packages/libro-common/src/app/tree/view/tree-view-module.ts similarity index 51% rename from packages/libro-common/src/mana-app/tree/view/tree-view-module.ts rename to packages/libro-common/src/app/tree/view/tree-view-module.ts index 92777892..91133cc8 100644 --- a/packages/libro-common/src/mana-app/tree/view/tree-view-module.ts +++ b/packages/libro-common/src/app/tree/view/tree-view-module.ts @@ -1,10 +1,10 @@ import { ManaModule } from '../../../core/index.js'; -import { TreeExpansionServiceImpl } from '../tree-expansion'; -import { TreeImpl } from '../tree-impl'; -import { TreeModelImpl } from '../tree-model'; -import { TreeNavigationService } from '../tree-navigation'; -import { TreeSelectionServiceImpl } from '../tree-selection-impl'; -import { TreeViewDecorator } from './tree-view-decorator'; +import { TreeExpansionServiceImpl } from '../tree-expansion.js'; +import { TreeImpl } from '../tree-impl.js'; +import { TreeModelImpl } from '../tree-model.js'; +import { TreeNavigationService } from '../tree-navigation.js'; +import { TreeSelectionServiceImpl } from '../tree-selection-impl.js'; +import { TreeViewDecorator } from './tree-view-decorator.js'; export const TreeViewModule = ManaModule.create().register( TreeImpl, diff --git a/packages/libro-common/src/mana-app/tree/view/tree-view-selection.ts b/packages/libro-common/src/app/tree/view/tree-view-selection.ts similarity index 100% rename from packages/libro-common/src/mana-app/tree/view/tree-view-selection.ts rename to packages/libro-common/src/app/tree/view/tree-view-selection.ts diff --git a/packages/libro-common/src/mana-app/tree/view/tree-view.tsx b/packages/libro-common/src/app/tree/view/tree-view.tsx similarity index 97% rename from packages/libro-common/src/mana-app/tree/view/tree-view.tsx rename to packages/libro-common/src/app/tree/view/tree-view.tsx index 3903271c..f0d24ea3 100644 --- a/packages/libro-common/src/mana-app/tree/view/tree-view.tsx +++ b/packages/libro-common/src/app/tree/view/tree-view.tsx @@ -17,20 +17,20 @@ import { BaseView, SelectionService, view, ViewInstance } from '../../../core/in import { getOrigin, prop, useInject } from '../../../observable/index.js'; import { Dropdown } from '../../../react/index.js'; import { inject, postConstruct, singleton } from '../../../ioc/index.js'; -import { LabelProvider } from '../../label'; -import { MenuRender } from '../../menu'; +import { LabelProvider } from '../../label/index.js'; +import { MenuRender } from '../../menu/index.js'; import { DEFAULT_SCROLL_OPTIONS, FOCUS_CLASS, SELECTED_CLASS, -} from '../../style/style-protocol'; -import type { ModifierAwareEvent, NodeRow } from '../tree'; -import { CompositeTreeNode, TreeNode, TreeNodeComponents } from '../tree'; -import { TreeDecoratorService } from '../tree-decorator'; -import { ExpandableTreeNode } from '../tree-expansion'; -import { TopDownTreeIterator } from '../tree-iterator'; -import { TreeModel } from '../tree-model'; -import type { NodeProps } from '../tree-protocol'; +} from '../../style/style-protocol.js'; +import type { ModifierAwareEvent, NodeRow } from '../tree.js'; +import { CompositeTreeNode, TreeNode, TreeNodeComponents } from '../tree.js'; +import { TreeDecoratorService } from '../tree-decorator.js'; +import { ExpandableTreeNode } from '../tree-expansion.js'; +import { TopDownTreeIterator } from '../tree-iterator.js'; +import { TreeModel } from '../tree-model.js'; +import type { NodeProps } from '../tree-protocol.js'; import { COMPOSITE_TREE_NODE_CLASS, EXPANDABLE_TREE_NODE_CLASS, @@ -38,12 +38,12 @@ import { TREE_CLASS, TREE_CONTAINER_CLASS, TREE_NODE_CLASS, -} from '../tree-protocol'; -import { SelectableTreeNode, TreeSelection } from '../tree-selection'; -import type { TreeViewDecoration } from '../tree-view-decoration'; +} from '../tree-protocol.js'; +import { SelectableTreeNode, TreeSelection } from '../tree-selection.js'; +import type { TreeViewDecoration } from '../tree-view-decoration.js'; -import { TreeViewDecorator } from './tree-view-decorator'; -import { TreeViewModule } from './tree-view-module'; +import { TreeViewDecorator } from './tree-view-decorator.js'; +import { TreeViewModule } from './tree-view-module.js'; import './index.less'; /** diff --git a/packages/libro-common/src/mana-app/typings/index.d.ts b/packages/libro-common/src/app/typings/index.d.ts similarity index 100% rename from packages/libro-common/src/mana-app/typings/index.d.ts rename to packages/libro-common/src/app/typings/index.d.ts diff --git a/packages/libro-common/src/mana-app/view/box/index.tsx b/packages/libro-common/src/app/view/box/index.tsx similarity index 100% rename from packages/libro-common/src/mana-app/view/box/index.tsx rename to packages/libro-common/src/app/view/box/index.tsx diff --git a/packages/libro-common/src/mana-app/view/components/index.ts b/packages/libro-common/src/app/view/components/index.ts similarity index 100% rename from packages/libro-common/src/mana-app/view/components/index.ts rename to packages/libro-common/src/app/view/components/index.ts diff --git a/packages/libro-common/src/mana-app/view/components/loading/index.less b/packages/libro-common/src/app/view/components/loading/index.less similarity index 100% rename from packages/libro-common/src/mana-app/view/components/loading/index.less rename to packages/libro-common/src/app/view/components/loading/index.less diff --git a/packages/libro-common/src/mana-app/view/components/loading/index.tsx b/packages/libro-common/src/app/view/components/loading/index.tsx similarity index 100% rename from packages/libro-common/src/mana-app/view/components/loading/index.tsx rename to packages/libro-common/src/app/view/components/loading/index.tsx diff --git a/packages/libro-common/src/mana-app/view/flex/index.less b/packages/libro-common/src/app/view/flex/index.less similarity index 100% rename from packages/libro-common/src/mana-app/view/flex/index.less rename to packages/libro-common/src/app/view/flex/index.less diff --git a/packages/libro-common/src/mana-app/view/flex/index.tsx b/packages/libro-common/src/app/view/flex/index.tsx similarity index 100% rename from packages/libro-common/src/mana-app/view/flex/index.tsx rename to packages/libro-common/src/app/view/flex/index.tsx diff --git a/packages/libro-common/src/mana-app/view/header/header-view.tsx b/packages/libro-common/src/app/view/header/header-view.tsx similarity index 100% rename from packages/libro-common/src/mana-app/view/header/header-view.tsx rename to packages/libro-common/src/app/view/header/header-view.tsx diff --git a/packages/libro-common/src/mana-app/view/header/index.less b/packages/libro-common/src/app/view/header/index.less similarity index 100% rename from packages/libro-common/src/mana-app/view/header/index.less rename to packages/libro-common/src/app/view/header/index.less diff --git a/packages/libro-common/src/mana-app/view/header/index.ts b/packages/libro-common/src/app/view/header/index.ts similarity index 77% rename from packages/libro-common/src/mana-app/view/header/index.ts rename to packages/libro-common/src/app/view/header/index.ts index 5685c335..4007f1f5 100644 --- a/packages/libro-common/src/mana-app/view/header/index.ts +++ b/packages/libro-common/src/app/view/header/index.ts @@ -1,8 +1,8 @@ import { ManaModule, createSlotPreference } from '../../../core/index.js'; -import { HeaderView, HeaderArea } from './header-view'; -import { FlexSlotView } from '../flex'; +import { HeaderView, HeaderArea } from './header-view.js'; +import { FlexSlotView } from '../flex/index.js'; -export * from './header-view'; +export * from './header-view.js'; export const HeaderModule = ManaModule.create().register( HeaderView, diff --git a/packages/libro-common/src/mana-app/view/index.ts b/packages/libro-common/src/app/view/index.ts similarity index 100% rename from packages/libro-common/src/mana-app/view/index.ts rename to packages/libro-common/src/app/view/index.ts diff --git a/packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx b/packages/libro-common/src/app/view/tab/card-tab-view.tsx similarity index 90% rename from packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx rename to packages/libro-common/src/app/view/tab/card-tab-view.tsx index e4096af4..f27e6bc7 100644 --- a/packages/libro-common/src/mana-app/view/tab/card-tab-view.tsx +++ b/packages/libro-common/src/app/view/tab/card-tab-view.tsx @@ -3,8 +3,8 @@ import type { TabsProps } from '../../../react/index.js'; import { inject, transient } from '../../../ioc/index.js'; import cls from 'classnames'; -import type { TabOption } from './tab-view'; -import { TabSlotView } from './tab-view'; +import type { TabOption } from './tab-view.js'; +import { TabSlotView } from './tab-view.js'; export interface CardTabOption extends TabOption { tabPosition?: TabsProps['tabPosition']; diff --git a/packages/libro-common/src/mana-app/view/tab/index.less b/packages/libro-common/src/app/view/tab/index.less similarity index 100% rename from packages/libro-common/src/mana-app/view/tab/index.less rename to packages/libro-common/src/app/view/tab/index.less diff --git a/packages/libro-common/src/mana-app/view/tab/index.ts b/packages/libro-common/src/app/view/tab/index.ts similarity index 100% rename from packages/libro-common/src/mana-app/view/tab/index.ts rename to packages/libro-common/src/app/view/tab/index.ts diff --git a/packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx b/packages/libro-common/src/app/view/tab/side-tab-view.tsx similarity index 94% rename from packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx rename to packages/libro-common/src/app/view/tab/side-tab-view.tsx index a1da72d5..b74d8814 100644 --- a/packages/libro-common/src/mana-app/view/tab/side-tab-view.tsx +++ b/packages/libro-common/src/app/view/tab/side-tab-view.tsx @@ -7,10 +7,10 @@ import type { TabsProps } from '../../../react/index.js'; import { inject, transient } from '../../../ioc/index.js'; import cls from 'classnames'; -import { ToolbarRender } from '../../toolbar/toolbar-render'; +import { ToolbarRender } from '../../toolbar/toolbar-render.js'; -import type { TabOption } from './tab-view'; -import { TabSlotView } from './tab-view'; +import type { TabOption } from './tab-view.js'; +import { TabSlotView } from './tab-view.js'; export interface SideTabOption extends TabOption { tabPosition?: TabsProps['tabPosition']; diff --git a/packages/libro-common/src/mana-app/view/tab/tab-menu.ts b/packages/libro-common/src/app/view/tab/tab-menu.ts similarity index 100% rename from packages/libro-common/src/mana-app/view/tab/tab-menu.ts rename to packages/libro-common/src/app/view/tab/tab-menu.ts diff --git a/packages/libro-common/src/mana-app/view/tab/tab-protocol.ts b/packages/libro-common/src/app/view/tab/tab-protocol.ts similarity index 100% rename from packages/libro-common/src/mana-app/view/tab/tab-protocol.ts rename to packages/libro-common/src/app/view/tab/tab-protocol.ts diff --git a/packages/libro-common/src/mana-app/view/tab/tab-view.tsx b/packages/libro-common/src/app/view/tab/tab-view.tsx similarity index 95% rename from packages/libro-common/src/mana-app/view/tab/tab-view.tsx rename to packages/libro-common/src/app/view/tab/tab-view.tsx index 77f7aa9d..724de565 100644 --- a/packages/libro-common/src/mana-app/view/tab/tab-view.tsx +++ b/packages/libro-common/src/app/view/tab/tab-view.tsx @@ -20,10 +20,10 @@ import { Tabs, Dropdown } from '../../../react/index.js'; import type { TabPaneProps, TabsProps } from '../../../react/index.js'; import './index.less'; -import { MenuRender } from '../../menu/menu-render'; -import { ToolbarRender } from '../../toolbar/toolbar-render'; +import { MenuRender } from '../../menu/menu-render.js'; +import { ToolbarRender } from '../../toolbar/toolbar-render.js'; -import { TabBarContextMenu } from './tab-protocol'; +import { TabBarContextMenu } from './tab-protocol.js'; export const TabViewComponent = forwardRef( function TabViewComponent(_props, containerRef) { diff --git a/packages/libro-common/src/core/components/application.tsx b/packages/libro-common/src/core/components/application.tsx index 0f3e3e37..90077488 100644 --- a/packages/libro-common/src/core/components/application.tsx +++ b/packages/libro-common/src/core/components/application.tsx @@ -130,7 +130,7 @@ export const ApplicationComponent = (props: ApplicationProps) => { return loadingValue; }; return ( -
+
= { diff --git a/packages/libro-core/src/command/libro-command-contribution.ts b/packages/libro-core/src/command/libro-command-contribution.ts index 88620902..0b5a07c2 100644 --- a/packages/libro-core/src/command/libro-command-contribution.ts +++ b/packages/libro-core/src/command/libro-command-contribution.ts @@ -1,12 +1,12 @@ import { MIME } from '@difizen/libro-common'; -import type { CommandRegistry } from '@difizen/libro-common/mana-app'; +import type { CommandRegistry } from '@difizen/libro-common/app'; import { inject, ModalService, singleton, CommandContribution, -} from '@difizen/libro-common/mana-app'; -import { equals } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { equals } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import { LibroCellView, ExecutableCellModel, EditorCellView } from '../cell/index.js'; diff --git a/packages/libro-core/src/command/libro-command-register.ts b/packages/libro-core/src/command/libro-command-register.ts index 0ef55d14..59317c3d 100644 --- a/packages/libro-core/src/command/libro-command-register.ts +++ b/packages/libro-core/src/command/libro-command-register.ts @@ -4,8 +4,8 @@ import type { CommandHandlerWithContext, CommandRegistry, KeybindingRegistry, -} from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { CellView, NotebookView } from '../libro-protocol.js'; import { LibroContextKeys } from '../libro-protocol.js'; diff --git a/packages/libro-core/src/command/module.ts b/packages/libro-core/src/command/module.ts index 389a6718..52b988ad 100644 --- a/packages/libro-core/src/command/module.ts +++ b/packages/libro-core/src/command/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroCommandContribution } from './libro-command-contribution.js'; import { LibroCommandRegister } from './libro-command-register.js'; diff --git a/packages/libro-core/src/command/notebook-commands.ts b/packages/libro-core/src/command/notebook-commands.ts index ff69ee3e..32dd492e 100644 --- a/packages/libro-core/src/command/notebook-commands.ts +++ b/packages/libro-core/src/command/notebook-commands.ts @@ -9,7 +9,7 @@ import { // ReloadOutlined, PoweroffOutlined, } from '@ant-design/icons'; -import type { Command } from '@difizen/libro-common/mana-app'; +import type { Command } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { diff --git a/packages/libro-core/src/components/dnd-cell-item-render.tsx b/packages/libro-core/src/components/dnd-cell-item-render.tsx index 33ede8f9..771ad536 100644 --- a/packages/libro-core/src/components/dnd-cell-item-render.tsx +++ b/packages/libro-core/src/components/dnd-cell-item-render.tsx @@ -8,7 +8,7 @@ import { useObserve, ViewInstance, ViewRender, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Tooltip } from 'antd'; import classnames from 'classnames'; diff --git a/packages/libro-core/src/components/dnd-component/default-dnd-content.tsx b/packages/libro-core/src/components/dnd-component/default-dnd-content.tsx index 78c9498b..1b957136 100644 --- a/packages/libro-core/src/components/dnd-component/default-dnd-content.tsx +++ b/packages/libro-core/src/components/dnd-component/default-dnd-content.tsx @@ -1,6 +1,6 @@ /* eslint-disable react-hooks/exhaustive-deps */ -import { getOrigin, useInject, ViewInstance } from '@difizen/libro-common/mana-app'; -import { useConfigurationValue } from '@difizen/libro-common/mana-app'; +import { getOrigin, useInject, ViewInstance } from '@difizen/libro-common/app'; +import { useConfigurationValue } from '@difizen/libro-common/app'; import { Button } from 'antd'; import React, { useCallback, diff --git a/packages/libro-core/src/components/dnd-component/dnd-list.tsx b/packages/libro-core/src/components/dnd-component/dnd-list.tsx index 30c4a7e5..1f010d4d 100644 --- a/packages/libro-core/src/components/dnd-component/dnd-list.tsx +++ b/packages/libro-core/src/components/dnd-component/dnd-list.tsx @@ -3,7 +3,7 @@ import { useInject, useObserve, ViewInstance, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import classNames from 'classnames'; import { throttle } from 'lodash'; import type { FC, ReactNode } from 'react'; diff --git a/packages/libro-core/src/components/dnd-component/virtualized-manager.ts b/packages/libro-core/src/components/dnd-component/virtualized-manager.ts index 8768a76d..7eb5bf9e 100644 --- a/packages/libro-core/src/components/dnd-component/virtualized-manager.ts +++ b/packages/libro-core/src/components/dnd-component/virtualized-manager.ts @@ -1,4 +1,4 @@ -import { prop, singleton } from '@difizen/libro-common/mana-app'; +import { prop, singleton } from '@difizen/libro-common/app'; export interface IVirtualizedManager { openVirtualized: (length: number, size?: number) => Promise; diff --git a/packages/libro-core/src/components/libro-component.tsx b/packages/libro-core/src/components/libro-component.tsx index 609a50ed..12e89302 100644 --- a/packages/libro-core/src/components/libro-component.tsx +++ b/packages/libro-core/src/components/libro-component.tsx @@ -1,5 +1,5 @@ -import { ViewRender } from '@difizen/libro-common/mana-app'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { ViewRender } from '@difizen/libro-common/app'; +import { useInject } from '@difizen/libro-common/app'; import { useEffect, useState } from 'react'; import type { NotebookOption, NotebookView } from '../libro-protocol.js'; 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 613727d0..279f3346 100644 --- a/packages/libro-core/src/components/libro-side-toolbar-menu.tsx +++ b/packages/libro-core/src/components/libro-side-toolbar-menu.tsx @@ -1,11 +1,11 @@ import { Menu, MenuContext } from '@difizen/libro-common/react'; -import type { Toolbar } from '@difizen/libro-common/mana-app'; +import type { Toolbar } from '@difizen/libro-common/app'; import { CommandRegistry, getOrigin, ToolbarInstance, useInject, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { ReactNode } from 'react'; import type { LibroToolbarArags } from '../toolbar/index.js'; diff --git a/packages/libro-core/src/components/libro-view-header.tsx b/packages/libro-core/src/components/libro-view-header.tsx index f7ebb754..7da6f0fe 100644 --- a/packages/libro-core/src/components/libro-view-header.tsx +++ b/packages/libro-core/src/components/libro-view-header.tsx @@ -1,5 +1,5 @@ /* eslint-disable react-hooks/exhaustive-deps */ -import { ToolbarRender, useInject, ViewInstance } from '@difizen/libro-common/mana-app'; +import { ToolbarRender, useInject, ViewInstance } from '@difizen/libro-common/app'; import type { FC } from 'react'; import { useMemo } from 'react'; diff --git a/packages/libro-core/src/content/libro-content-contribution.ts b/packages/libro-core/src/content/libro-content-contribution.ts index e7ca6986..c35c6a6b 100644 --- a/packages/libro-core/src/content/libro-content-contribution.ts +++ b/packages/libro-core/src/content/libro-content-contribution.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { ContentContribution } from './libro-content-protocol.js'; diff --git a/packages/libro-core/src/content/libro-content-module.ts b/packages/libro-core/src/content/libro-content-module.ts index b7496908..705d25ea 100644 --- a/packages/libro-core/src/content/libro-content-module.ts +++ b/packages/libro-core/src/content/libro-content-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { DefaultContentContribution } from './libro-content-contribution.js'; import { diff --git a/packages/libro-core/src/content/libro-content-protocol.ts b/packages/libro-core/src/content/libro-content-protocol.ts index e38c007d..7819b2d1 100644 --- a/packages/libro-core/src/content/libro-content-protocol.ts +++ b/packages/libro-core/src/content/libro-content-protocol.ts @@ -1,5 +1,5 @@ import type { INotebookContent } from '@difizen/libro-common'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import { Syringe } from '@difizen/libro-common/app'; export const ContentContribution = Syringe.defineToken('ContentContribution'); export interface ContentContribution { diff --git a/packages/libro-core/src/content/libro-content-service.ts b/packages/libro-core/src/content/libro-content-service.ts index 76a175c8..6693ed4c 100644 --- a/packages/libro-core/src/content/libro-content-service.ts +++ b/packages/libro-core/src/content/libro-content-service.ts @@ -1,5 +1,5 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, Priority, singleton } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, Priority, singleton } from '@difizen/libro-common/app'; import { ContentContribution, diff --git a/packages/libro-core/src/content/libro-save-content-contribution.ts b/packages/libro-core/src/content/libro-save-content-contribution.ts index eaa8d509..3a24b378 100644 --- a/packages/libro-core/src/content/libro-save-content-contribution.ts +++ b/packages/libro-core/src/content/libro-save-content-contribution.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { ContentSaveContribution } from './libro-content-protocol.js'; diff --git a/packages/libro-core/src/formatter/libro-formatter-json-contribution.ts b/packages/libro-core/src/formatter/libro-formatter-json-contribution.ts index 637b57dc..3c88ea0e 100644 --- a/packages/libro-core/src/formatter/libro-formatter-json-contribution.ts +++ b/packages/libro-core/src/formatter/libro-formatter-json-contribution.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { concatMultilineString } from '@difizen/libro-common'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { DefaultDecodedFormatter, diff --git a/packages/libro-core/src/formatter/libro-formatter-manager.ts b/packages/libro-core/src/formatter/libro-formatter-manager.ts index b29a1696..a52aa5ef 100644 --- a/packages/libro-core/src/formatter/libro-formatter-manager.ts +++ b/packages/libro-core/src/formatter/libro-formatter-manager.ts @@ -1,5 +1,5 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, Priority, singleton } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, Priority, singleton } from '@difizen/libro-common/app'; import { CellModelContribution } from '../cell/index.js'; diff --git a/packages/libro-core/src/formatter/libro-formatter-module.ts b/packages/libro-core/src/formatter/libro-formatter-module.ts index 5a18f752..47596d6b 100644 --- a/packages/libro-core/src/formatter/libro-formatter-module.ts +++ b/packages/libro-core/src/formatter/libro-formatter-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { FormatterJsonContribution } from './libro-formatter-json-contribution.js'; import { LibroFormatterManager } from './libro-formatter-manager.js'; diff --git a/packages/libro-core/src/formatter/libro-formatter-protocol.ts b/packages/libro-core/src/formatter/libro-formatter-protocol.ts index 77dbd317..d01686bd 100644 --- a/packages/libro-core/src/formatter/libro-formatter-protocol.ts +++ b/packages/libro-core/src/formatter/libro-formatter-protocol.ts @@ -1,5 +1,5 @@ import type { MultilineString } from '@difizen/libro-common'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import { Syringe } from '@difizen/libro-common/app'; export const FormatterContribution = Syringe.defineToken('FormatterContribution'); diff --git a/packages/libro-core/src/formatter/libro-formatter-string-contribution.ts b/packages/libro-core/src/formatter/libro-formatter-string-contribution.ts index a0b0afd2..34acd1dd 100644 --- a/packages/libro-core/src/formatter/libro-formatter-string-contribution.ts +++ b/packages/libro-core/src/formatter/libro-formatter-string-contribution.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { concatMultilineString } from '@difizen/libro-common'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import type { DefaultEncodedFormatter } from './libro-formatter-protocol.js'; import { diff --git a/packages/libro-core/src/formatter/libro-formatter-trans-default-contribution.ts b/packages/libro-core/src/formatter/libro-formatter-trans-default-contribution.ts index b9eee322..f736adca 100644 --- a/packages/libro-core/src/formatter/libro-formatter-trans-default-contribution.ts +++ b/packages/libro-core/src/formatter/libro-formatter-trans-default-contribution.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import type { DefaultDecodedFormatter } from './libro-formatter-protocol.js'; import { FormatterTransContribution } from './libro-formatter-protocol.js'; diff --git a/packages/libro-core/src/libro-context-key.ts b/packages/libro-core/src/libro-context-key.ts index f5836dee..86fd3a1c 100644 --- a/packages/libro-core/src/libro-context-key.ts +++ b/packages/libro-core/src/libro-context-key.ts @@ -1,7 +1,7 @@ -import type { Disposable } from '@difizen/libro-common/mana-app'; -import type { IContextKey } from '@difizen/libro-common/mana-app'; -import { ContextKeyService } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import type { Disposable } from '@difizen/libro-common/app'; +import type { IContextKey } from '@difizen/libro-common/app'; +import { ContextKeyService } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { LibroContextKeys } from './libro-protocol.js'; import { LibroService } from './libro-service.js'; diff --git a/packages/libro-core/src/libro-keybind-registry.ts b/packages/libro-core/src/libro-keybind-registry.ts index 3b261baf..7eac7108 100644 --- a/packages/libro-core/src/libro-keybind-registry.ts +++ b/packages/libro-core/src/libro-keybind-registry.ts @@ -1,5 +1,5 @@ -import { KeybindingRegistry, KeyCode } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { KeybindingRegistry, KeyCode } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ token: KeybindingRegistry }) export class LibroKeybindRegistry extends KeybindingRegistry { diff --git a/packages/libro-core/src/libro-model.ts b/packages/libro-core/src/libro-model.ts index 1790dbeb..8ac75b14 100644 --- a/packages/libro-core/src/libro-model.ts +++ b/packages/libro-core/src/libro-model.ts @@ -10,10 +10,10 @@ import type { NotebookChange, } from '@difizen/libro-shared-model'; import { createMutex, YNotebook } from '@difizen/libro-shared-model'; -import { getOrigin, ConfigurationService } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { getOrigin, ConfigurationService } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import { LibroContentService } from './content/index.js'; diff --git a/packages/libro-core/src/libro-protocol.ts b/packages/libro-core/src/libro-protocol.ts index 95be5b36..1163f20a 100644 --- a/packages/libro-core/src/libro-protocol.ts +++ b/packages/libro-core/src/libro-protocol.ts @@ -8,8 +8,8 @@ import type { INotebookMetadata, } from '@difizen/libro-common'; import type { ISharedNotebook } from '@difizen/libro-shared-model'; -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; -import type { View } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; +import type { View } from '@difizen/libro-common/app'; import type { LibroCell } from './cell/index.js'; import type { LibroView } from './libro-view.js'; diff --git a/packages/libro-core/src/libro-service.ts b/packages/libro-core/src/libro-service.ts index 5137d81e..c8b10e83 100644 --- a/packages/libro-core/src/libro-service.ts +++ b/packages/libro-core/src/libro-service.ts @@ -1,8 +1,8 @@ -import type { Disposable } from '@difizen/libro-common/mana-app'; -import { DisposableCollection, Emitter } from '@difizen/libro-common/mana-app'; -import { ThemeService, ViewManager } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; +import type { Disposable } from '@difizen/libro-common/app'; +import { DisposableCollection, Emitter } from '@difizen/libro-common/app'; +import { ThemeService, ViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; import type { CellView, diff --git a/packages/libro-core/src/libro-setting-contribution.ts b/packages/libro-core/src/libro-setting-contribution.ts index 750ead67..d0997a9e 100644 --- a/packages/libro-core/src/libro-setting-contribution.ts +++ b/packages/libro-core/src/libro-setting-contribution.ts @@ -1,4 +1,4 @@ -import { singleton, ConfigurationContribution } from '@difizen/libro-common/mana-app'; +import { singleton, ConfigurationContribution } from '@difizen/libro-common/app'; import { AutoInsertWhenNoCell, diff --git a/packages/libro-core/src/libro-setting.ts b/packages/libro-core/src/libro-setting.ts index b26a9349..804bebc0 100644 --- a/packages/libro-core/src/libro-setting.ts +++ b/packages/libro-core/src/libro-setting.ts @@ -1,4 +1,4 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; export const HeaderToolbarVisible: ConfigurationNode = { diff --git a/packages/libro-core/src/libro-view-tracker.ts b/packages/libro-core/src/libro-view-tracker.ts index 4827c4c4..1bcb1c65 100644 --- a/packages/libro-core/src/libro-view-tracker.ts +++ b/packages/libro-core/src/libro-view-tracker.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import type { NotebookModel, NotebookView } from './libro-protocol.js'; diff --git a/packages/libro-core/src/libro-view.tsx b/packages/libro-core/src/libro-view.tsx index 35200df9..f2e517d7 100644 --- a/packages/libro-core/src/libro-view.tsx +++ b/packages/libro-core/src/libro-view.tsx @@ -25,7 +25,7 @@ import { watch, ConfigurationService, useConfigurationValue, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { FloatButton, Button, Spin } from 'antd'; import type { FC, ForwardRefExoticComponent, RefAttributes } from 'react'; import { forwardRef, memo, useCallback, useEffect, useRef } from 'react'; diff --git a/packages/libro-core/src/libro-workspace-service.ts b/packages/libro-core/src/libro-workspace-service.ts index 81e52352..694d1be1 100644 --- a/packages/libro-core/src/libro-workspace-service.ts +++ b/packages/libro-core/src/libro-workspace-service.ts @@ -1,5 +1,5 @@ -import { Deferred, URI } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { Deferred, URI } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import type { NotebookView } from './libro-protocol.js'; diff --git a/packages/libro-core/src/module.ts b/packages/libro-core/src/module.ts index 8c1c92a2..1ad691a6 100644 --- a/packages/libro-core/src/module.ts +++ b/packages/libro-core/src/module.ts @@ -1,6 +1,6 @@ import { CodeEditorModule } from '@difizen/libro-code-editor'; -import { ConfigurationModule, ManaAppPreset } from '@difizen/libro-common/mana-app'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ConfigurationModule, ManaAppPreset } from '@difizen/libro-common/app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroCellModule } from './cell/libro-cell-module.js'; import { diff --git a/packages/libro-core/src/output/output-area.tsx b/packages/libro-core/src/output/output-area.tsx index 69fa7812..571f39fc 100644 --- a/packages/libro-core/src/output/output-area.tsx +++ b/packages/libro-core/src/output/output-area.tsx @@ -1,6 +1,6 @@ import type { IOutput } from '@difizen/libro-common'; import { isError, isStream } from '@difizen/libro-common'; -import type { ViewComponent, Contribution } from '@difizen/libro-common/mana-app'; +import type { ViewComponent, Contribution } from '@difizen/libro-common/app'; import { ViewOption, getOrigin, @@ -10,14 +10,8 @@ import { useInject, view, ViewInstance, -} from '@difizen/libro-common/mana-app'; -import { - Emitter, - prop, - contrib, - inject, - transient, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { Emitter, prop, contrib, inject, transient } from '@difizen/libro-common/app'; import { useEffect, forwardRef } from 'react'; import { v4 } from 'uuid'; diff --git a/packages/libro-core/src/output/output-contribution.ts b/packages/libro-core/src/output/output-contribution.ts index d7386f51..cbea1d12 100644 --- a/packages/libro-core/src/output/output-contribution.ts +++ b/packages/libro-core/src/output/output-contribution.ts @@ -1,4 +1,4 @@ -import { inject, singleton, ViewManager } from '@difizen/libro-common/mana-app'; +import { inject, singleton, ViewManager } from '@difizen/libro-common/app'; import { LibroOutputView } from './output-model.js'; import type { IOutputOptions } from './output-protocol.js'; diff --git a/packages/libro-core/src/output/output-model.tsx b/packages/libro-core/src/output/output-model.tsx index 85b553ff..10a409b8 100644 --- a/packages/libro-core/src/output/output-model.tsx +++ b/packages/libro-core/src/output/output-model.tsx @@ -1,6 +1,6 @@ import type { IOutput, JSONObject, PartialJSONObject } from '@difizen/libro-common'; -import { BaseView, prop, view, ViewOption } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { BaseView, prop, view, ViewOption } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import type { FC } from 'react'; import { v4 } from 'uuid'; diff --git a/packages/libro-core/src/output/output-module.ts b/packages/libro-core/src/output/output-module.ts index cdaba083..39d6a488 100644 --- a/packages/libro-core/src/output/output-module.ts +++ b/packages/libro-core/src/output/output-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroOutputArea } from './output-area.js'; import { DefaultOutputContribution } from './output-contribution.js'; diff --git a/packages/libro-core/src/output/output-protocol.ts b/packages/libro-core/src/output/output-protocol.ts index 13e4376d..e83a8c29 100644 --- a/packages/libro-core/src/output/output-protocol.ts +++ b/packages/libro-core/src/output/output-protocol.ts @@ -3,9 +3,9 @@ import type { ReadonlyPartialJSONObject, JSONObject, } from '@difizen/libro-common'; -import type { Event } from '@difizen/libro-common/mana-app'; -import type { View } from '@difizen/libro-common/mana-app'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import type { View } from '@difizen/libro-common/app'; +import { Syringe } from '@difizen/libro-common/app'; import type { CellView } from '../libro-protocol.js'; diff --git a/packages/libro-core/src/settings/module.ts b/packages/libro-core/src/settings/module.ts index 8205f89f..ea6db3a0 100644 --- a/packages/libro-core/src/settings/module.ts +++ b/packages/libro-core/src/settings/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { SettingEditorModule } from './setting-editor/index.js'; import { SettingsContribution } from './settings-contribution.js'; diff --git a/packages/libro-core/src/settings/setting-editor/configuration-panel-view.tsx b/packages/libro-core/src/settings/setting-editor/configuration-panel-view.tsx index 824cce47..53960a3f 100644 --- a/packages/libro-core/src/settings/setting-editor/configuration-panel-view.tsx +++ b/packages/libro-core/src/settings/setting-editor/configuration-panel-view.tsx @@ -1,4 +1,4 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; import { BaseView, prop, @@ -9,7 +9,7 @@ import { ConfigurationRenderRegistry, useConfigurationValue, SchemaValidator, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Form } from 'antd'; import React from 'react'; diff --git a/packages/libro-core/src/settings/setting-editor/configuration-render-contribution.ts b/packages/libro-core/src/settings/setting-editor/configuration-render-contribution.ts index 7e96539c..c92c1e53 100644 --- a/packages/libro-core/src/settings/setting-editor/configuration-render-contribution.ts +++ b/packages/libro-core/src/settings/setting-editor/configuration-render-contribution.ts @@ -1,8 +1,5 @@ -import type { ConfigurationRender } from '@difizen/libro-common/mana-app'; -import { - singleton, - ConfigurationRenderContribution, -} from '@difizen/libro-common/mana-app'; +import type { ConfigurationRender } from '@difizen/libro-common/app'; +import { singleton, ConfigurationRenderContribution } from '@difizen/libro-common/app'; import { DefaultCheckbox, diff --git a/packages/libro-core/src/settings/setting-editor/default-node-render.tsx b/packages/libro-core/src/settings/setting-editor/default-node-render.tsx index c31e8550..199933da 100644 --- a/packages/libro-core/src/settings/setting-editor/default-node-render.tsx +++ b/packages/libro-core/src/settings/setting-editor/default-node-render.tsx @@ -1,4 +1,4 @@ -import type { RenderProps } from '@difizen/libro-common/mana-app'; +import type { RenderProps } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Checkbox, DatePicker, Input, InputNumber, Select, Switch } from 'antd'; import dayjs from 'dayjs'; diff --git a/packages/libro-core/src/settings/setting-editor/module.ts b/packages/libro-core/src/settings/setting-editor/module.ts index 8f1a2c9e..ab809b4b 100644 --- a/packages/libro-core/src/settings/setting-editor/module.ts +++ b/packages/libro-core/src/settings/setting-editor/module.ts @@ -1,4 +1,4 @@ -import { ManaModule, ConfigurationModule } from '@difizen/libro-common/mana-app'; +import { ManaModule, ConfigurationModule } from '@difizen/libro-common/app'; import { ConfigurationPanelView } from './configuration-panel-view.js'; import { DefaultConfigurationRenderContribution } from './configuration-render-contribution.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 5d1a191e..dbb0a6c1 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 @@ -11,7 +11,7 @@ import { prop, URI, ConfigurationRegistry, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { useEffect, useState } from 'react'; import { ConfigurationPanelView } from './configuration-panel-view.js'; diff --git a/packages/libro-core/src/settings/setting-editor/setting-tree-service.ts b/packages/libro-core/src/settings/setting-editor/setting-tree-service.ts index f692241c..f10296b1 100644 --- a/packages/libro-core/src/settings/setting-editor/setting-tree-service.ts +++ b/packages/libro-core/src/settings/setting-editor/setting-tree-service.ts @@ -1,6 +1,6 @@ -import { inject, ConfigurationRegistry, URI } from '@difizen/libro-common/mana-app'; -import { FileService, singleton } from '@difizen/libro-common/mana-app'; -import type { FileStatWithMetadata } from '@difizen/libro-common/mana-app'; +import { inject, ConfigurationRegistry, URI } from '@difizen/libro-common/app'; +import { FileService, singleton } from '@difizen/libro-common/app'; +import type { FileStatWithMetadata } from '@difizen/libro-common/app'; const defaultFileMeta = { mtime: 0, diff --git a/packages/libro-core/src/settings/setting-editor/setting-tree-view.tsx b/packages/libro-core/src/settings/setting-editor/setting-tree-view.tsx index 59ce9140..2f585b81 100644 --- a/packages/libro-core/src/settings/setting-editor/setting-tree-view.tsx +++ b/packages/libro-core/src/settings/setting-editor/setting-tree-view.tsx @@ -13,8 +13,8 @@ import { TreeViewComponent, TreeViewDecorator, view, -} from '@difizen/libro-common/mana-app'; -import type { TreeNode } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import type { TreeNode } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import React, { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-core/src/settings/settings-contribution.tsx b/packages/libro-core/src/settings/settings-contribution.tsx index 469e12a7..d6bd93c0 100644 --- a/packages/libro-core/src/settings/settings-contribution.tsx +++ b/packages/libro-core/src/settings/settings-contribution.tsx @@ -2,8 +2,8 @@ import { ModalContribution, singleton, ToolbarContribution, -} from '@difizen/libro-common/mana-app'; -import type { ToolbarRegistry } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import type { ToolbarRegistry } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { DocumentCommands } from '../command/document-commands.js'; diff --git a/packages/libro-core/src/settings/settings-modal.tsx b/packages/libro-core/src/settings/settings-modal.tsx index 08b310f7..2612737e 100644 --- a/packages/libro-core/src/settings/settings-modal.tsx +++ b/packages/libro-core/src/settings/settings-modal.tsx @@ -1,6 +1,6 @@ -import type { ModalItem, ModalItemProps } from '@difizen/libro-common/mana-app'; -import { ConfigurationRegistry } from '@difizen/libro-common/mana-app'; -import { useInject, ViewManager, ViewRender } from '@difizen/libro-common/mana-app'; +import type { ModalItem, ModalItemProps } from '@difizen/libro-common/app'; +import { ConfigurationRegistry } from '@difizen/libro-common/app'; +import { useInject, ViewManager, ViewRender } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Modal } from 'antd'; import { useEffect, useState } from 'react'; diff --git a/packages/libro-core/src/settings/settings-protocol.ts b/packages/libro-core/src/settings/settings-protocol.ts index a6f8e31c..2f020b2f 100644 --- a/packages/libro-core/src/settings/settings-protocol.ts +++ b/packages/libro-core/src/settings/settings-protocol.ts @@ -1,4 +1,4 @@ -import type { ConfigurationStorage } from '@difizen/libro-common/mana-app'; +import type { ConfigurationStorage } from '@difizen/libro-common/app'; export const LibroUserSettingsNamespace = 'libro.user'; export const LibroUserSettingStorage: ConfigurationStorage = { diff --git a/packages/libro-core/src/slot/libro-slot-manager.ts b/packages/libro-core/src/slot/libro-slot-manager.ts index 8df39e54..32a17af9 100644 --- a/packages/libro-core/src/slot/libro-slot-manager.ts +++ b/packages/libro-core/src/slot/libro-slot-manager.ts @@ -1,6 +1,6 @@ -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { SlotViewManager } from '@difizen/libro-common/mana-app'; -import { contrib, inject, singleton } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { SlotViewManager } from '@difizen/libro-common/app'; +import { contrib, inject, singleton } from '@difizen/libro-common/app'; import type { LibroView } from '../libro-view.js'; diff --git a/packages/libro-core/src/slot/libro-slot-protocol.ts b/packages/libro-core/src/slot/libro-slot-protocol.ts index 92bebe88..9357d5df 100644 --- a/packages/libro-core/src/slot/libro-slot-protocol.ts +++ b/packages/libro-core/src/slot/libro-slot-protocol.ts @@ -1,5 +1,5 @@ -import type { View } from '@difizen/libro-common/mana-app'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import type { View } from '@difizen/libro-common/app'; +import { Syringe } from '@difizen/libro-common/app'; import type { LibroView } from '../libro-view.js'; diff --git a/packages/libro-core/src/slot/libro-slot-view.tsx b/packages/libro-core/src/slot/libro-slot-view.tsx index 51f60fb1..fb9f4bbc 100644 --- a/packages/libro-core/src/slot/libro-slot-view.tsx +++ b/packages/libro-core/src/slot/libro-slot-view.tsx @@ -1,12 +1,12 @@ -import type { View, ViewOpenOption, Disposable } from '@difizen/libro-common/mana-app'; +import type { View, ViewOpenOption, Disposable } from '@difizen/libro-common/app'; import { DefaultSlotView, view, ViewRender, ViewInstance, -} from '@difizen/libro-common/mana-app'; -import { transient } from '@difizen/libro-common/mana-app'; -import { equals, prop, useInject } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { transient } from '@difizen/libro-common/app'; +import { equals, prop, useInject } from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import { isDisplayView } from './libro-slot-protocol.js'; diff --git a/packages/libro-core/src/slot/module.ts b/packages/libro-core/src/slot/module.ts index 8d96038f..64cfdbd9 100644 --- a/packages/libro-core/src/slot/module.ts +++ b/packages/libro-core/src/slot/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroSlotManager } from './libro-slot-manager.js'; import { LibroExtensionSlotContribution } from './libro-slot-protocol.js'; diff --git a/packages/libro-core/src/theme/libro-color-registry.ts b/packages/libro-core/src/theme/libro-color-registry.ts index b1971faa..d2f77971 100644 --- a/packages/libro-core/src/theme/libro-color-registry.ts +++ b/packages/libro-core/src/theme/libro-color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { ColorContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { ColorContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class LibroColorRegistry implements ColorContribution { diff --git a/packages/libro-core/src/toolbar/all-outputs-scroll-icon.tsx b/packages/libro-core/src/toolbar/all-outputs-scroll-icon.tsx index ab0d6ae9..527afa00 100644 --- a/packages/libro-core/src/toolbar/all-outputs-scroll-icon.tsx +++ b/packages/libro-core/src/toolbar/all-outputs-scroll-icon.tsx @@ -1,4 +1,4 @@ -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; import type { FC } from 'react'; import type { LibroView } from '../libro-view.js'; diff --git a/packages/libro-core/src/toolbar/change-cell-to-selector.tsx b/packages/libro-core/src/toolbar/change-cell-to-selector.tsx index 5765b31d..60902998 100644 --- a/packages/libro-core/src/toolbar/change-cell-to-selector.tsx +++ b/packages/libro-core/src/toolbar/change-cell-to-selector.tsx @@ -4,8 +4,8 @@ import { getOrigin, CommandRegistry, ThemeService, -} from '@difizen/libro-common/mana-app'; -import type { Toolbar } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import type { Toolbar } from '@difizen/libro-common/app'; import { ConfigProvider, Select, theme } from 'antd'; import { memo } from 'react'; diff --git a/packages/libro-core/src/toolbar/hide-all-selector.tsx b/packages/libro-core/src/toolbar/hide-all-selector.tsx index 91b4b76e..63049aa6 100644 --- a/packages/libro-core/src/toolbar/hide-all-selector.tsx +++ b/packages/libro-core/src/toolbar/hide-all-selector.tsx @@ -4,8 +4,8 @@ import { ToolbarInstance, getOrigin, CommandRegistry, -} from '@difizen/libro-common/mana-app'; -import type { Toolbar } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import type { Toolbar } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Menu, Dropdown } from 'antd'; import type { MenuProps } from 'antd'; diff --git a/packages/libro-core/src/toolbar/libro-toolbar.tsx b/packages/libro-core/src/toolbar/libro-toolbar.tsx index 425222a8..a8b04258 100644 --- a/packages/libro-core/src/toolbar/libro-toolbar.tsx +++ b/packages/libro-core/src/toolbar/libro-toolbar.tsx @@ -1,12 +1,12 @@ -import type { ToolbarRegistry } from '@difizen/libro-common/mana-app'; -import { isMacintosh } from '@difizen/libro-common/mana-app'; +import type { ToolbarRegistry } from '@difizen/libro-common/app'; +import { isMacintosh } from '@difizen/libro-common/app'; import { inject, ModalService, singleton, ToolbarContribution, useObserve, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { DocumentCommands, NotebookCommands } from '../command/index.js'; diff --git a/packages/libro-core/src/toolbar/module.ts b/packages/libro-core/src/toolbar/module.ts index f3e6d324..48432c01 100644 --- a/packages/libro-core/src/toolbar/module.ts +++ b/packages/libro-core/src/toolbar/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroToolbarContribution } from './libro-toolbar.js'; import { RestartClearOutputsContribution } from './restart-clear-outputs-contribution.js'; diff --git a/packages/libro-core/src/toolbar/restart-clear-outputs-contribution.tsx b/packages/libro-core/src/toolbar/restart-clear-outputs-contribution.tsx index 20c19e02..8b215ba7 100644 --- a/packages/libro-core/src/toolbar/restart-clear-outputs-contribution.tsx +++ b/packages/libro-core/src/toolbar/restart-clear-outputs-contribution.tsx @@ -1,4 +1,4 @@ -import { ModalContribution, singleton } from '@difizen/libro-common/mana-app'; +import { ModalContribution, singleton } from '@difizen/libro-common/app'; import { RestartClearOutputModal } from './restart-clear-outputs-modal.js'; diff --git a/packages/libro-core/src/toolbar/restart-clear-outputs-modal.tsx b/packages/libro-core/src/toolbar/restart-clear-outputs-modal.tsx index 5878fb79..ce041e63 100644 --- a/packages/libro-core/src/toolbar/restart-clear-outputs-modal.tsx +++ b/packages/libro-core/src/toolbar/restart-clear-outputs-modal.tsx @@ -1,4 +1,4 @@ -import type { ModalItemProps, ModalItem } from '@difizen/libro-common/mana-app'; +import type { ModalItemProps, ModalItem } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Modal } from 'antd'; import { useCallback } from 'react'; diff --git a/packages/libro-core/src/toolbar/save-icon.tsx b/packages/libro-core/src/toolbar/save-icon.tsx index 03c970cc..b26a57f5 100644 --- a/packages/libro-core/src/toolbar/save-icon.tsx +++ b/packages/libro-core/src/toolbar/save-icon.tsx @@ -4,8 +4,8 @@ import { CloseOutlined, LoadingOutlined, } from '@ant-design/icons'; -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; -import type { Disposable } from '@difizen/libro-common/mana-app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; +import type { Disposable } from '@difizen/libro-common/app'; import type { FC } from 'react'; import { useEffect, useCallback, useState } from 'react'; diff --git a/packages/libro-core/src/toolbar/shutdown-contribution.tsx b/packages/libro-core/src/toolbar/shutdown-contribution.tsx index 4c539784..4206dae8 100644 --- a/packages/libro-core/src/toolbar/shutdown-contribution.tsx +++ b/packages/libro-core/src/toolbar/shutdown-contribution.tsx @@ -1,4 +1,4 @@ -import { ModalContribution, singleton } from '@difizen/libro-common/mana-app'; +import { ModalContribution, singleton } from '@difizen/libro-common/app'; import { ShutdownModal } from './shutdown-modal.js'; diff --git a/packages/libro-core/src/toolbar/shutdown-modal.tsx b/packages/libro-core/src/toolbar/shutdown-modal.tsx index fc037c69..189f5ec7 100644 --- a/packages/libro-core/src/toolbar/shutdown-modal.tsx +++ b/packages/libro-core/src/toolbar/shutdown-modal.tsx @@ -1,4 +1,4 @@ -import type { ModalItemProps, ModalItem } from '@difizen/libro-common/mana-app'; +import type { ModalItemProps, ModalItem } from '@difizen/libro-common/app'; import { Modal } from 'antd'; import { useCallback } from 'react'; 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 63d9dd86..64d6245e 100644 --- a/packages/libro-core/src/toolbar/side-toolar-more-select.tsx +++ b/packages/libro-core/src/toolbar/side-toolar-more-select.tsx @@ -1,13 +1,13 @@ import { Menu, MenuContext } from '@difizen/libro-common/react'; -import type { Toolbar } from '@difizen/libro-common/mana-app'; -import { isMacintosh } from '@difizen/libro-common/mana-app'; +import type { Toolbar } from '@difizen/libro-common/app'; +import { isMacintosh } from '@difizen/libro-common/app'; import { CommandRegistry, getOrigin, ToolbarInstance, useInject, useObserve, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Popover } from 'antd'; diff --git a/packages/libro-core/src/utils/index.ts b/packages/libro-core/src/utils/index.ts index 0b74c0f6..6e1ff2a4 100644 --- a/packages/libro-core/src/utils/index.ts +++ b/packages/libro-core/src/utils/index.ts @@ -1,4 +1,4 @@ -import { useUnmount } from '@difizen/libro-common/mana-app'; +import { useUnmount } from '@difizen/libro-common/app'; import type { RefObject } from 'react'; import { useCallback, useLayoutEffect, useRef, useState } from 'react'; diff --git a/packages/libro-core/src/virtualized-manager-helper.ts b/packages/libro-core/src/virtualized-manager-helper.ts index 5eb31a2a..2b4c0bcf 100644 --- a/packages/libro-core/src/virtualized-manager-helper.ts +++ b/packages/libro-core/src/virtualized-manager-helper.ts @@ -1,4 +1,4 @@ -import { inject, prop, singleton } from '@difizen/libro-common/mana-app'; +import { inject, prop, singleton } from '@difizen/libro-common/app'; import type { NotebookModel } from './libro-protocol.js'; import { VirtualizedManagerOptionFactory } from './libro-protocol.js'; diff --git a/packages/libro-core/src/virtualized-manager.ts b/packages/libro-core/src/virtualized-manager.ts index 2fe2b731..35697d58 100644 --- a/packages/libro-core/src/virtualized-manager.ts +++ b/packages/libro-core/src/virtualized-manager.ts @@ -1,4 +1,4 @@ -import { transient, prop, inject } from '@difizen/libro-common/mana-app'; +import { transient, prop, inject } from '@difizen/libro-common/app'; import type { NotebookModel } from './libro-protocol.js'; import { VirtualizedManagerOption } from './libro-protocol.js'; diff --git a/packages/libro-jupyter/src/add-between-cell/add-between-cell-command-contribution.ts b/packages/libro-jupyter/src/add-between-cell/add-between-cell-command-contribution.ts index 685eb1a1..bb264c0e 100644 --- a/packages/libro-jupyter/src/add-between-cell/add-between-cell-command-contribution.ts +++ b/packages/libro-jupyter/src/add-between-cell/add-between-cell-command-contribution.ts @@ -1,6 +1,6 @@ import type { CellOptions } from '@difizen/libro-core'; -import type { CommandRegistry } from '@difizen/libro-common/mana-app'; -import { CommandContribution, singleton } from '@difizen/libro-common/mana-app'; +import type { CommandRegistry } from '@difizen/libro-common/app'; +import { CommandContribution, singleton } from '@difizen/libro-common/app'; export const LibroAddBetweenCellCommand = { AddBetweenCell: { diff --git a/packages/libro-jupyter/src/add-between-cell/add-between-cell.tsx b/packages/libro-jupyter/src/add-between-cell/add-between-cell.tsx index f10c1863..9b2d90f2 100644 --- a/packages/libro-jupyter/src/add-between-cell/add-between-cell.tsx +++ b/packages/libro-jupyter/src/add-between-cell/add-between-cell.tsx @@ -1,11 +1,7 @@ import { DisplayWrapComponent } from '@difizen/libro-common'; import type { BetweenCellProvider, CellOptions, LibroView } from '@difizen/libro-core'; import { CellService } from '@difizen/libro-core'; -import { - CommandRegistry, - useInject, - ViewInstance, -} from '@difizen/libro-common/mana-app'; +import { CommandRegistry, useInject, ViewInstance } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Tooltip, Popover, Menu } from 'antd'; import type { MenuProps } from 'antd'; diff --git a/packages/libro-jupyter/src/add-between-cell/module.ts b/packages/libro-jupyter/src/add-between-cell/module.ts index 6c9afd1b..33071bbf 100644 --- a/packages/libro-jupyter/src/add-between-cell/module.ts +++ b/packages/libro-jupyter/src/add-between-cell/module.ts @@ -1,5 +1,5 @@ import { BetweenCellProvider } from '@difizen/libro-core'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroAddBetweenCellCommandContribution } from './add-between-cell-command-contribution.js'; import { LibroWrappedBetweenCellContent } from './add-between-cell.js'; diff --git a/packages/libro-jupyter/src/cell/jupyter-code-cell-model.ts b/packages/libro-jupyter/src/cell/jupyter-code-cell-model.ts index 99a740cb..ce5fd40a 100644 --- a/packages/libro-jupyter/src/cell/jupyter-code-cell-model.ts +++ b/packages/libro-jupyter/src/cell/jupyter-code-cell-model.ts @@ -1,8 +1,8 @@ import { LibroCodeCellModel } from '@difizen/libro-code-cell'; import type { ICellMetadata } from '@difizen/libro-common'; import { CellOptions } from '@difizen/libro-core'; -import { inject, transient } from '@difizen/libro-common/mana-app'; -import { prop, ViewManager } from '@difizen/libro-common/mana-app'; +import { inject, transient } from '@difizen/libro-common/app'; +import { prop, ViewManager } from '@difizen/libro-common/app'; import type { CodeCellMetadata, diff --git a/packages/libro-jupyter/src/cell/jupyter-code-cell-view.tsx b/packages/libro-jupyter/src/cell/jupyter-code-cell-view.tsx index 7f5e797e..39f805a7 100644 --- a/packages/libro-jupyter/src/cell/jupyter-code-cell-view.tsx +++ b/packages/libro-jupyter/src/cell/jupyter-code-cell-view.tsx @@ -8,9 +8,9 @@ import type { } from '@difizen/libro-code-editor'; import type { KernelMessage } from '@difizen/libro-kernel'; import { KernelError } from '@difizen/libro-kernel'; -import { transient } from '@difizen/libro-common/mana-app'; -import { view, ViewInstance } from '@difizen/libro-common/mana-app'; -import { getOrigin, useInject } from '@difizen/libro-common/mana-app'; +import { transient } from '@difizen/libro-common/app'; +import { view, ViewInstance } from '@difizen/libro-common/app'; +import { getOrigin, useInject } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { forwardRef } from 'react'; diff --git a/packages/libro-jupyter/src/command/command-contribution.ts b/packages/libro-jupyter/src/command/command-contribution.ts index 8c0ecc6f..354ea482 100644 --- a/packages/libro-jupyter/src/command/command-contribution.ts +++ b/packages/libro-jupyter/src/command/command-contribution.ts @@ -8,13 +8,13 @@ import { NotebookCommands, ExecutableCellView, } from '@difizen/libro-core'; -import type { CommandRegistry } from '@difizen/libro-common/mana-app'; +import type { CommandRegistry } from '@difizen/libro-common/app'; import { CommandContribution, inject, ModalService, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LibroJupyterModel } from '../libro-jupyter-model.js'; import { ExecutedWithKernelCellModel } from '../libro-jupyter-protocol.js'; diff --git a/packages/libro-jupyter/src/command/keybinding-contribution.ts b/packages/libro-jupyter/src/command/keybinding-contribution.ts index 59a601d8..d49ee5f0 100644 --- a/packages/libro-jupyter/src/command/keybinding-contribution.ts +++ b/packages/libro-jupyter/src/command/keybinding-contribution.ts @@ -8,7 +8,7 @@ import { KeybindingRegistry, singleton, KeybindingContribution, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; @singleton({ contrib: KeybindingContribution }) export class LibroJupyterKeybindingContribution implements KeybindingContribution { diff --git a/packages/libro-jupyter/src/components/cell-execution-tip.tsx b/packages/libro-jupyter/src/components/cell-execution-tip.tsx index 04fb5384..c9646bf2 100644 --- a/packages/libro-jupyter/src/components/cell-execution-tip.tsx +++ b/packages/libro-jupyter/src/components/cell-execution-tip.tsx @@ -5,7 +5,7 @@ import { CheckCircleOutlined, ExecutableCellModel, } from '@difizen/libro-core'; -import { useObserve } from '@difizen/libro-common/mana-app'; +import { useObserve } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import classnames from 'classnames'; import moment from 'moment'; diff --git a/packages/libro-jupyter/src/components/cell-input-bottom-blank.tsx b/packages/libro-jupyter/src/components/cell-input-bottom-blank.tsx index 86f1df98..809f7d9e 100644 --- a/packages/libro-jupyter/src/components/cell-input-bottom-blank.tsx +++ b/packages/libro-jupyter/src/components/cell-input-bottom-blank.tsx @@ -1,6 +1,6 @@ import type { CellView } from '@difizen/libro-core'; import { LibroEditableExecutableCellView, LibroOutputArea } from '@difizen/libro-core'; -import { useObserve } from '@difizen/libro-common/mana-app'; +import { useObserve } from '@difizen/libro-common/app'; import { isWaitingExecute } from '../utils/index.js'; diff --git a/packages/libro-jupyter/src/components/cell-output-bottom-blank.tsx b/packages/libro-jupyter/src/components/cell-output-bottom-blank.tsx index 9a8f597d..a5d07451 100644 --- a/packages/libro-jupyter/src/components/cell-output-bottom-blank.tsx +++ b/packages/libro-jupyter/src/components/cell-output-bottom-blank.tsx @@ -1,6 +1,6 @@ import type { CellView } from '@difizen/libro-core'; import { LibroEditableExecutableCellView, LibroOutputArea } from '@difizen/libro-core'; -import { useObserve } from '@difizen/libro-common/mana-app'; +import { useObserve } from '@difizen/libro-common/app'; import { isWaitingExecute } from '../utils/index.js'; diff --git a/packages/libro-jupyter/src/config/config-contribution.ts b/packages/libro-jupyter/src/config/config-contribution.ts index 12a89981..180eb180 100644 --- a/packages/libro-jupyter/src/config/config-contribution.ts +++ b/packages/libro-jupyter/src/config/config-contribution.ts @@ -2,9 +2,9 @@ import { AutoInsertWhenNoCell, EnterEditModeWhenAddCell } from '@difizen/libro-c import { ConfigurationContribution, ConfigurationService, -} from '@difizen/libro-common/mana-app'; -import { ApplicationContribution } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { ApplicationContribution } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { LibroJupyterConfiguration } from './config.js'; diff --git a/packages/libro-jupyter/src/config/config.ts b/packages/libro-jupyter/src/config/config.ts index 8fa2ea39..ba28f04d 100644 --- a/packages/libro-jupyter/src/config/config.ts +++ b/packages/libro-jupyter/src/config/config.ts @@ -1,4 +1,4 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; export const LibroConfigAutoSave: ConfigurationNode = { diff --git a/packages/libro-jupyter/src/contents/content-contribution.ts b/packages/libro-jupyter/src/contents/content-contribution.ts index 0cca2dab..a3067adf 100644 --- a/packages/libro-jupyter/src/contents/content-contribution.ts +++ b/packages/libro-jupyter/src/contents/content-contribution.ts @@ -1,7 +1,7 @@ import type { NotebookModel, NotebookOption } from '@difizen/libro-core'; import { ContentContribution } from '@difizen/libro-core'; -import { URI } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { URI } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import type { LibroJupyterModel } from '../libro-jupyter-model.js'; diff --git a/packages/libro-jupyter/src/contents/save-content-contribution.ts b/packages/libro-jupyter/src/contents/save-content-contribution.ts index 409fd496..3122e879 100644 --- a/packages/libro-jupyter/src/contents/save-content-contribution.ts +++ b/packages/libro-jupyter/src/contents/save-content-contribution.ts @@ -1,7 +1,7 @@ import type { NotebookOption } from '@difizen/libro-core'; import { ContentSaveContribution } from '@difizen/libro-core'; import type { IContentsModel } from '@difizen/libro-kernel'; -import { ModalService, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ModalService, inject, singleton } from '@difizen/libro-common/app'; import type { LibroJupyterModel } from '../libro-jupyter-model.js'; import { SaveFileErrorModal } from '../toolbar/save-file-error.js'; diff --git a/packages/libro-jupyter/src/file/file-color-registry.ts b/packages/libro-jupyter/src/file/file-color-registry.ts index f1217cfd..86b0ff4a 100644 --- a/packages/libro-jupyter/src/file/file-color-registry.ts +++ b/packages/libro-jupyter/src/file/file-color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color, ColorContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color, ColorContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class FileColorContribution implements ColorContribution { diff --git a/packages/libro-jupyter/src/file/file-command.tsx b/packages/libro-jupyter/src/file/file-command.tsx index 412f5c07..36bf724e 100644 --- a/packages/libro-jupyter/src/file/file-command.tsx +++ b/packages/libro-jupyter/src/file/file-command.tsx @@ -7,8 +7,8 @@ import type { MenuPath, MenuRegistry, ToolbarRegistry, -} from '@difizen/libro-common/mana-app'; -import { ViewManager, ConfigurationService } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { ViewManager, ConfigurationService } from '@difizen/libro-common/app'; import { CommandContribution, FileStatNode, @@ -19,7 +19,7 @@ import { singleton, ToolbarContribution, URI, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { message, Modal } from 'antd'; diff --git a/packages/libro-jupyter/src/file/file-create-modal-contribution.ts b/packages/libro-jupyter/src/file/file-create-modal-contribution.ts index 25365fab..3766028e 100644 --- a/packages/libro-jupyter/src/file/file-create-modal-contribution.ts +++ b/packages/libro-jupyter/src/file/file-create-modal-contribution.ts @@ -1,4 +1,4 @@ -import { ModalContribution, singleton } from '@difizen/libro-common/mana-app'; +import { ModalContribution, singleton } from '@difizen/libro-common/app'; import { FileCreateModal } from './file-create-modal.js'; diff --git a/packages/libro-jupyter/src/file/file-create-modal.tsx b/packages/libro-jupyter/src/file/file-create-modal.tsx index 38d9320b..1c619928 100644 --- a/packages/libro-jupyter/src/file/file-create-modal.tsx +++ b/packages/libro-jupyter/src/file/file-create-modal.tsx @@ -1,7 +1,7 @@ -import type { ModalItemProps, ModalItem } from '@difizen/libro-common/mana-app'; -import { ThemeService } from '@difizen/libro-common/mana-app'; -import { CommandRegistry } from '@difizen/libro-common/mana-app'; -import { URI, useInject, ViewManager } from '@difizen/libro-common/mana-app'; +import type { ModalItemProps, ModalItem } from '@difizen/libro-common/app'; +import { ThemeService } from '@difizen/libro-common/app'; +import { CommandRegistry } from '@difizen/libro-common/app'; +import { URI, useInject, ViewManager } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Col, Form, message, Row, Input, Modal, ConfigProvider, theme } from 'antd'; import type { InputRef } from 'antd'; diff --git a/packages/libro-jupyter/src/file/file-createdir-modal-contribution.ts b/packages/libro-jupyter/src/file/file-createdir-modal-contribution.ts index 7e2097c8..267afc2f 100644 --- a/packages/libro-jupyter/src/file/file-createdir-modal-contribution.ts +++ b/packages/libro-jupyter/src/file/file-createdir-modal-contribution.ts @@ -1,4 +1,4 @@ -import { ModalContribution, singleton } from '@difizen/libro-common/mana-app'; +import { ModalContribution, singleton } from '@difizen/libro-common/app'; import { FileDirCreateModal } from './file-createdir-modal.js'; diff --git a/packages/libro-jupyter/src/file/file-createdir-modal.tsx b/packages/libro-jupyter/src/file/file-createdir-modal.tsx index e800d972..869ed015 100644 --- a/packages/libro-jupyter/src/file/file-createdir-modal.tsx +++ b/packages/libro-jupyter/src/file/file-createdir-modal.tsx @@ -1,8 +1,8 @@ -import type { ModalItem, ModalItemProps } from '@difizen/libro-common/mana-app'; -import { ThemeService } from '@difizen/libro-common/mana-app'; -import { URI } from '@difizen/libro-common/mana-app'; -import { ViewManager } from '@difizen/libro-common/mana-app'; -import { useInject } from '@difizen/libro-common/mana-app'; +import type { ModalItem, ModalItemProps } from '@difizen/libro-common/app'; +import { ThemeService } from '@difizen/libro-common/app'; +import { URI } from '@difizen/libro-common/app'; +import { ViewManager } from '@difizen/libro-common/app'; +import { useInject } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Form, message, Input, Modal, ConfigProvider, theme } from 'antd'; import type { InputRef } from 'antd'; diff --git a/packages/libro-jupyter/src/file/file-name-alias.ts b/packages/libro-jupyter/src/file/file-name-alias.ts index c26555f3..3ad5f3f1 100644 --- a/packages/libro-jupyter/src/file/file-name-alias.ts +++ b/packages/libro-jupyter/src/file/file-name-alias.ts @@ -1,5 +1,5 @@ -import type { URI } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { URI } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton() export class FileNameAlias { diff --git a/packages/libro-jupyter/src/file/file-rename-modal-contribution.ts b/packages/libro-jupyter/src/file/file-rename-modal-contribution.ts index 5ff7c5a4..b07a0eae 100644 --- a/packages/libro-jupyter/src/file/file-rename-modal-contribution.ts +++ b/packages/libro-jupyter/src/file/file-rename-modal-contribution.ts @@ -1,4 +1,4 @@ -import { ModalContribution, singleton } from '@difizen/libro-common/mana-app'; +import { ModalContribution, singleton } from '@difizen/libro-common/app'; import { FileRenameModal } from './file-rename-modal.js'; diff --git a/packages/libro-jupyter/src/file/file-rename-modal.tsx b/packages/libro-jupyter/src/file/file-rename-modal.tsx index be2ebcb7..c7b93801 100644 --- a/packages/libro-jupyter/src/file/file-rename-modal.tsx +++ b/packages/libro-jupyter/src/file/file-rename-modal.tsx @@ -1,5 +1,5 @@ -import { ThemeService, useInject, ViewManager } from '@difizen/libro-common/mana-app'; -import type { ModalItem, ModalItemProps, URI } from '@difizen/libro-common/mana-app'; +import { ThemeService, useInject, ViewManager } from '@difizen/libro-common/app'; +import type { ModalItem, ModalItemProps, URI } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Form, message, Input, Modal, theme, ConfigProvider } from 'antd'; import type { InputRef } from 'antd'; diff --git a/packages/libro-jupyter/src/file/file-service.ts b/packages/libro-jupyter/src/file/file-service.ts index ca89785f..e1e7aead 100644 --- a/packages/libro-jupyter/src/file/file-service.ts +++ b/packages/libro-jupyter/src/file/file-service.ts @@ -8,9 +8,9 @@ import type { MoveFileOptions, ResolveFileOptions, Event as ManaEvent, -} from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { FileService, URI, inject, singleton } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { FileService, URI, inject, singleton } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { message } from 'antd'; diff --git a/packages/libro-jupyter/src/file/file-tree-label-provider.ts b/packages/libro-jupyter/src/file/file-tree-label-provider.ts index f0848f55..95112256 100644 --- a/packages/libro-jupyter/src/file/file-tree-label-provider.ts +++ b/packages/libro-jupyter/src/file/file-tree-label-provider.ts @@ -1,8 +1,4 @@ -import type { - DidChangeLabelEvent, - FileStat, - URI, -} from '@difizen/libro-common/mana-app'; +import type { DidChangeLabelEvent, FileStat, URI } from '@difizen/libro-common/app'; import { FileStatNode, LabelProvider, @@ -11,7 +7,7 @@ import { URIIconReference, inject, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; @singleton({ contrib: LabelProviderContribution }) export class FileTreeLabelProvider implements LabelProviderContribution { diff --git a/packages/libro-jupyter/src/file/file-view/index.tsx b/packages/libro-jupyter/src/file/file-view/index.tsx index 7a668abb..7c6adcf7 100644 --- a/packages/libro-jupyter/src/file/file-view/index.tsx +++ b/packages/libro-jupyter/src/file/file-view/index.tsx @@ -1,8 +1,8 @@ import { ExclamationCircleFilled, FolderFilled } from '@ant-design/icons'; import { ContentsManager } from '@difizen/libro-kernel'; import type { IContentsModel } from '@difizen/libro-kernel'; -import type { TreeNode, ViewOpenHandler } from '@difizen/libro-common/mana-app'; -import { FileTreeViewFactory } from '@difizen/libro-common/mana-app'; +import type { TreeNode, ViewOpenHandler } from '@difizen/libro-common/app'; +import { FileTreeViewFactory } from '@difizen/libro-common/app'; import { FileStatNode, FileTree, @@ -21,7 +21,7 @@ import { view, inject, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Modal } from 'antd'; import React from 'react'; diff --git a/packages/libro-jupyter/src/file/module.ts b/packages/libro-jupyter/src/file/module.ts index 7fa93434..b1eaadf2 100644 --- a/packages/libro-jupyter/src/file/module.ts +++ b/packages/libro-jupyter/src/file/module.ts @@ -1,4 +1,4 @@ -import { FileTreeModule, ManaModule } from '@difizen/libro-common/mana-app'; +import { FileTreeModule, ManaModule } from '@difizen/libro-common/app'; import { FileColorContribution } from './file-color-registry.js'; import { FileCommandContribution } from './file-command.js'; diff --git a/packages/libro-jupyter/src/file/navigatable-view.tsx b/packages/libro-jupyter/src/file/navigatable-view.tsx index 1c526d4b..eea321ad 100644 --- a/packages/libro-jupyter/src/file/navigatable-view.tsx +++ b/packages/libro-jupyter/src/file/navigatable-view.tsx @@ -1,8 +1,8 @@ import type { LibroView } from '@difizen/libro-core'; import { LibroService, DocumentCommands } from '@difizen/libro-core'; -import type { NavigatableView, Saveable } from '@difizen/libro-common/mana-app'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; -import { Disposable, DisposableCollection } from '@difizen/libro-common/mana-app'; +import type { NavigatableView, Saveable } from '@difizen/libro-common/app'; +import { ConfigurationService } from '@difizen/libro-common/app'; +import { Disposable, DisposableCollection } from '@difizen/libro-common/app'; import { BaseView, inject, @@ -20,7 +20,7 @@ import { URI, CommandRegistry, Emitter, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { createRef, forwardRef } from 'react'; import { LibroConfigAutoSave } from '../config/config.js'; diff --git a/packages/libro-jupyter/src/file/open-handler-contribution.ts b/packages/libro-jupyter/src/file/open-handler-contribution.ts index e72d2e0c..8fe23177 100644 --- a/packages/libro-jupyter/src/file/open-handler-contribution.ts +++ b/packages/libro-jupyter/src/file/open-handler-contribution.ts @@ -1,11 +1,11 @@ -import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/mana-app'; -import { ConfigurationService, inject } from '@difizen/libro-common/mana-app'; +import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/app'; +import { ConfigurationService, inject } from '@difizen/libro-common/app'; import { NavigatableViewOpenHandler, OpenHandler, singleton, Priority, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LibroJupyterConfiguration } from '../config/index.js'; diff --git a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-contribution.tsx b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-contribution.tsx index 171acdac..582ebc6b 100644 --- a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-contribution.tsx +++ b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-contribution.tsx @@ -1,11 +1,8 @@ import { LibroCommandRegister, LibroToolbarArea, LibroView } from '@difizen/libro-core'; -import type { CommandRegistry, ToolbarRegistry } from '@difizen/libro-common/mana-app'; -import { ModalContribution } from '@difizen/libro-common/mana-app'; -import { - ToolbarContribution, - CommandContribution, -} from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import type { CommandRegistry, ToolbarRegistry } from '@difizen/libro-common/app'; +import { ModalContribution } from '@difizen/libro-common/app'; +import { ToolbarContribution, CommandContribution } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { KeybindInstructionsIcon } from './keybind-instructions-icon.js'; diff --git a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-icon.tsx b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-icon.tsx index 2e5c2c97..d36612d5 100644 --- a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-icon.tsx +++ b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-icon.tsx @@ -1,5 +1,5 @@ import { KeybindInstructionsOutlined } from '@difizen/libro-core'; -import { ModalService, useInject } from '@difizen/libro-common/mana-app'; +import { ModalService, useInject } from '@difizen/libro-common/app'; import type { FC } from 'react'; import { diff --git a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-items.tsx b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-items.tsx index 609fd929..73a35cef 100644 --- a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-items.tsx +++ b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-items.tsx @@ -1,4 +1,4 @@ -import { isMacintosh, singleton } from '@difizen/libro-common/mana-app'; +import { isMacintosh, singleton } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Tag } from 'antd'; import type { ColumnsType } from 'antd/es/table'; diff --git a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-view.tsx b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-view.tsx index 94d9f64a..c6f90018 100644 --- a/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-view.tsx +++ b/packages/libro-jupyter/src/keybind-instructions/keybind-instructions-view.tsx @@ -1,8 +1,8 @@ import { LibroContextKey } from '@difizen/libro-core'; -import { inject, singleton, ThemeService } from '@difizen/libro-common/mana-app'; -import { getOrigin, prop, useInject } from '@difizen/libro-common/mana-app'; -import type { ModalItem, ModalItemProps } from '@difizen/libro-common/mana-app'; -import type { Disposable } from '@difizen/libro-common/mana-app'; +import { inject, singleton, ThemeService } from '@difizen/libro-common/app'; +import { getOrigin, prop, useInject } from '@difizen/libro-common/app'; +import type { ModalItem, ModalItemProps } from '@difizen/libro-common/app'; +import type { Disposable } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Input, Drawer, Table, Segmented, ConfigProvider, theme } from 'antd'; import { forwardRef, useCallback, useState } from 'react'; diff --git a/packages/libro-jupyter/src/keybind-instructions/module.ts b/packages/libro-jupyter/src/keybind-instructions/module.ts index 147f6e1d..e800e3a8 100644 --- a/packages/libro-jupyter/src/keybind-instructions/module.ts +++ b/packages/libro-jupyter/src/keybind-instructions/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { KeybindInstructionsContribution } from './keybind-instructions-contribution.js'; import { LibroKeybindItems } from './keybind-instructions-items.js'; diff --git a/packages/libro-jupyter/src/libro-jupyter-file-service.ts b/packages/libro-jupyter/src/libro-jupyter-file-service.ts index 3b838406..139e0264 100644 --- a/packages/libro-jupyter/src/libro-jupyter-file-service.ts +++ b/packages/libro-jupyter/src/libro-jupyter-file-service.ts @@ -1,10 +1,10 @@ import type { INotebookContent } from '@difizen/libro-common'; import type { IContentsModel } from '@difizen/libro-kernel'; import { ServerManager, ContentsManager } from '@difizen/libro-kernel'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import type { URI } from '@difizen/libro-common/mana-app'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; +import { Emitter } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import type { URI } from '@difizen/libro-common/app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; import { LibroFileService } from './libro-jupyter-protocol.js'; diff --git a/packages/libro-jupyter/src/libro-jupyter-model.ts b/packages/libro-jupyter/src/libro-jupyter-model.ts index 1d9aef62..a446983c 100644 --- a/packages/libro-jupyter/src/libro-jupyter-model.ts +++ b/packages/libro-jupyter/src/libro-jupyter-model.ts @@ -10,9 +10,9 @@ import { } from '@difizen/libro-kernel'; import type { IKernelConnection, ExecutableNotebookModel } from '@difizen/libro-kernel'; import type { IContentsCheckpointModel, IContentsModel } from '@difizen/libro-kernel'; -import { getOrigin, ModalService, prop } from '@difizen/libro-common/mana-app'; -import { Deferred } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { getOrigin, ModalService, prop } from '@difizen/libro-common/app'; +import { Deferred } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { diff --git a/packages/libro-jupyter/src/libro-jupyter-protocol.ts b/packages/libro-jupyter/src/libro-jupyter-protocol.ts index 5f7f176d..c11594a2 100644 --- a/packages/libro-jupyter/src/libro-jupyter-protocol.ts +++ b/packages/libro-jupyter/src/libro-jupyter-protocol.ts @@ -7,7 +7,7 @@ import type { } from '@difizen/libro-common'; import { ExecutableCellModel } from '@difizen/libro-core'; import type { IContentsModel } from '@difizen/libro-kernel'; -import type { Event as ManaEvent, Emitter } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent, Emitter } from '@difizen/libro-common/app'; export interface ExecutionMeta extends PartialJSONObject { 'shell.execute_reply.started': string; // Kernel 开始执行任务时间在 metadata 中的 key diff --git a/packages/libro-jupyter/src/libro-jupyter-server-launch-manager.ts b/packages/libro-jupyter/src/libro-jupyter-server-launch-manager.ts index cb6f7b37..50c1fe5b 100644 --- a/packages/libro-jupyter/src/libro-jupyter-server-launch-manager.ts +++ b/packages/libro-jupyter/src/libro-jupyter-server-launch-manager.ts @@ -1,5 +1,5 @@ import { ServerManager, ServerConnection } from '@difizen/libro-kernel'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { ServerLaunchManager } from './libro-jupyter-protocol.js'; diff --git a/packages/libro-jupyter/src/libro-jupyter-view.tsx b/packages/libro-jupyter/src/libro-jupyter-view.tsx index e3067a99..5e15f89f 100644 --- a/packages/libro-jupyter/src/libro-jupyter-view.tsx +++ b/packages/libro-jupyter/src/libro-jupyter-view.tsx @@ -2,8 +2,8 @@ import type { NotebookOption } from '@difizen/libro-core'; import { VirtualizedManagerHelper } from '@difizen/libro-core'; import { CollapseServiceFactory, NotebookService } from '@difizen/libro-core'; import { LibroView, notebookViewFactoryId } from '@difizen/libro-core'; -import { URI, view, ViewOption } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { URI, view, ViewOption } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import type { LibroJupyterModel } from './libro-jupyter-model.js'; diff --git a/packages/libro-jupyter/src/libro-jupyter-workspace.ts b/packages/libro-jupyter/src/libro-jupyter-workspace.ts index 454c39d7..7cc994d2 100644 --- a/packages/libro-jupyter/src/libro-jupyter-workspace.ts +++ b/packages/libro-jupyter/src/libro-jupyter-workspace.ts @@ -1,9 +1,9 @@ import { URL } from '@difizen/libro-common'; import { BaseWorkspaceService, ILibroWorkspaceService } from '@difizen/libro-core'; import { ServerConnection, ServerManager } from '@difizen/libro-kernel'; -import { ApplicationContribution } from '@difizen/libro-common/mana-app'; -import { URI } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ApplicationContribution } from '@difizen/libro-common/app'; +import { URI } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; interface JupyterWorkspaceData { rootUri: string; diff --git a/packages/libro-jupyter/src/module-noeditor.ts b/packages/libro-jupyter/src/module-noeditor.ts index b08f9837..6f39cbc9 100644 --- a/packages/libro-jupyter/src/module-noeditor.ts +++ b/packages/libro-jupyter/src/module-noeditor.ts @@ -22,7 +22,7 @@ import { import { RawCellModule } from '@difizen/libro-raw-cell'; import { LibroSearchModule } from '@difizen/libro-search'; import { SearchCodeCellModule } from '@difizen/libro-search-code-cell'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroBetweenCellModule } from './add-between-cell/index.js'; import { JupyterCodeCellModel, JupyterCodeCellView } from './cell/index.js'; diff --git a/packages/libro-jupyter/src/module.ts b/packages/libro-jupyter/src/module.ts index c69c3afa..b22360bf 100644 --- a/packages/libro-jupyter/src/module.ts +++ b/packages/libro-jupyter/src/module.ts @@ -25,7 +25,7 @@ import { import { RawCellModule } from '@difizen/libro-raw-cell'; import { LibroSearchModule } from '@difizen/libro-search'; import { SearchCodeCellModule } from '@difizen/libro-search-code-cell'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroBetweenCellModule } from './add-between-cell/index.js'; import { JupyterCodeCellModel, JupyterCodeCellView } from './cell/index.js'; diff --git a/packages/libro-jupyter/src/output/libro-jupyter-outputarea.tsx b/packages/libro-jupyter/src/output/libro-jupyter-outputarea.tsx index 6ac824be..ea536963 100644 --- a/packages/libro-jupyter/src/output/libro-jupyter-outputarea.tsx +++ b/packages/libro-jupyter/src/output/libro-jupyter-outputarea.tsx @@ -15,7 +15,7 @@ import { isStreamMsg, isUpdateDisplayDataMsg, } from '@difizen/libro-kernel'; -import { inject, transient, view, ViewOption } from '@difizen/libro-common/mana-app'; +import { inject, transient, view, ViewOption } from '@difizen/libro-common/app'; @transient() @view('libro-output-area') diff --git a/packages/libro-jupyter/src/rendermime/module.ts b/packages/libro-jupyter/src/rendermime/module.ts index a802c698..176758e3 100644 --- a/packages/libro-jupyter/src/rendermime/module.ts +++ b/packages/libro-jupyter/src/rendermime/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroPlotlyMimeTypeContribution } from './plotly-rendermime-contribution.js'; diff --git a/packages/libro-jupyter/src/rendermime/plotly-render.tsx b/packages/libro-jupyter/src/rendermime/plotly-render.tsx index 93cf8c2f..9140bb84 100644 --- a/packages/libro-jupyter/src/rendermime/plotly-render.tsx +++ b/packages/libro-jupyter/src/rendermime/plotly-render.tsx @@ -1,7 +1,7 @@ import type { BaseOutputView } from '@difizen/libro-core'; import type { IRenderMimeRegistry } from '@difizen/libro-rendermime'; import { RenderMimeRegistry } from '@difizen/libro-rendermime'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import { useEffect, useRef } from 'react'; import type { FC } from 'react'; diff --git a/packages/libro-jupyter/src/rendermime/plotly-rendermime-contribution.ts b/packages/libro-jupyter/src/rendermime/plotly-rendermime-contribution.ts index dd7003bd..ddea059a 100644 --- a/packages/libro-jupyter/src/rendermime/plotly-rendermime-contribution.ts +++ b/packages/libro-jupyter/src/rendermime/plotly-rendermime-contribution.ts @@ -1,5 +1,5 @@ import { RenderMimeContribution } from '@difizen/libro-rendermime'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { PlotlyRender } from './plotly-render.js'; diff --git a/packages/libro-jupyter/src/theme/color-registry.ts b/packages/libro-jupyter/src/theme/color-registry.ts index 781ae066..18c232dc 100644 --- a/packages/libro-jupyter/src/theme/color-registry.ts +++ b/packages/libro-jupyter/src/theme/color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color, ColorContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color, ColorContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class LibroJupyterColorContribution implements ColorContribution { diff --git a/packages/libro-jupyter/src/toolbar/kernel-selector-dropdown.tsx b/packages/libro-jupyter/src/toolbar/kernel-selector-dropdown.tsx index c74e211a..82728700 100644 --- a/packages/libro-jupyter/src/toolbar/kernel-selector-dropdown.tsx +++ b/packages/libro-jupyter/src/toolbar/kernel-selector-dropdown.tsx @@ -5,7 +5,7 @@ import { ConfigurationService, useInject, ViewInstance, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Dropdown, Space } from 'antd'; import type { MenuProps } from 'antd'; diff --git a/packages/libro-jupyter/src/toolbar/kernel-status-and-selector.tsx b/packages/libro-jupyter/src/toolbar/kernel-status-and-selector.tsx index c1f8ba33..576851e9 100644 --- a/packages/libro-jupyter/src/toolbar/kernel-status-and-selector.tsx +++ b/packages/libro-jupyter/src/toolbar/kernel-status-and-selector.tsx @@ -1,7 +1,7 @@ import { LoadingOutlined, StopOutlined } from '@ant-design/icons'; import type { LibroView } from '@difizen/libro-core'; import { ServerManager } from '@difizen/libro-kernel'; -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Badge } from 'antd'; diff --git a/packages/libro-jupyter/src/toolbar/run-selector.tsx b/packages/libro-jupyter/src/toolbar/run-selector.tsx index ba194074..5be398b4 100644 --- a/packages/libro-jupyter/src/toolbar/run-selector.tsx +++ b/packages/libro-jupyter/src/toolbar/run-selector.tsx @@ -9,8 +9,8 @@ import { CommandRegistry, ViewInstance, ConfigurationService, -} from '@difizen/libro-common/mana-app'; -import type { Toolbar } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import type { Toolbar } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Menu, Dropdown, Tooltip } from 'antd'; import type { MenuProps } from 'antd'; diff --git a/packages/libro-jupyter/src/toolbar/save-file-error-contribution.ts b/packages/libro-jupyter/src/toolbar/save-file-error-contribution.ts index 574e8b42..63795823 100644 --- a/packages/libro-jupyter/src/toolbar/save-file-error-contribution.ts +++ b/packages/libro-jupyter/src/toolbar/save-file-error-contribution.ts @@ -1,4 +1,4 @@ -import { ModalContribution, singleton } from '@difizen/libro-common/mana-app'; +import { ModalContribution, singleton } from '@difizen/libro-common/app'; import { SaveFileErrorModal } from './save-file-error.js'; diff --git a/packages/libro-jupyter/src/toolbar/save-file-error.tsx b/packages/libro-jupyter/src/toolbar/save-file-error.tsx index 06850e06..dacb3e6a 100644 --- a/packages/libro-jupyter/src/toolbar/save-file-error.tsx +++ b/packages/libro-jupyter/src/toolbar/save-file-error.tsx @@ -1,7 +1,7 @@ import type { LibroView } from '@difizen/libro-core'; -import type { ModalItemProps, ModalItem } from '@difizen/libro-common/mana-app'; -import { ThemeService } from '@difizen/libro-common/mana-app'; -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; +import type { ModalItemProps, ModalItem } from '@difizen/libro-common/app'; +import { ThemeService } from '@difizen/libro-common/app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; import { ConfigProvider, Modal, theme } from 'antd'; import type { LibroJupyterModel } from '../libro-jupyter-model.js'; diff --git a/packages/libro-jupyter/src/toolbar/side-toolbar-run-selector.tsx b/packages/libro-jupyter/src/toolbar/side-toolbar-run-selector.tsx index 7ee94697..69eecaaf 100644 --- a/packages/libro-jupyter/src/toolbar/side-toolbar-run-selector.tsx +++ b/packages/libro-jupyter/src/toolbar/side-toolbar-run-selector.tsx @@ -6,7 +6,7 @@ import { ConfigurationService, useInject, ViewInstance, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Popover, Tooltip } from 'antd'; import { useEffect, useState } from 'react'; diff --git a/packages/libro-jupyter/src/toolbar/toolbar-contribution.tsx b/packages/libro-jupyter/src/toolbar/toolbar-contribution.tsx index 1b3d5587..135c54b8 100644 --- a/packages/libro-jupyter/src/toolbar/toolbar-contribution.tsx +++ b/packages/libro-jupyter/src/toolbar/toolbar-contribution.tsx @@ -1,6 +1,6 @@ import { KernelCommands, NotebookCommands } from '@difizen/libro-core'; -import type { ToolbarRegistry } from '@difizen/libro-common/mana-app'; -import { singleton, inject, ToolbarContribution } from '@difizen/libro-common/mana-app'; +import type { ToolbarRegistry } from '@difizen/libro-common/app'; +import { singleton, inject, ToolbarContribution } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { LocationIcon } from '../components/icons.js'; diff --git a/packages/libro-jupyter/src/widget/box/contribution.ts b/packages/libro-jupyter/src/widget/box/contribution.ts index 683cdec4..cc653116 100644 --- a/packages/libro-jupyter/src/widget/box/contribution.ts +++ b/packages/libro-jupyter/src/widget/box/contribution.ts @@ -1,4 +1,4 @@ -import { ViewManager, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager, inject, singleton } from '@difizen/libro-common/app'; import type { IWidgetViewProps } from '../protocol.js'; import { WidgetViewContribution } from '../protocol.js'; diff --git a/packages/libro-jupyter/src/widget/box/view.tsx b/packages/libro-jupyter/src/widget/box/view.tsx index 034cca2a..7a20ad90 100644 --- a/packages/libro-jupyter/src/widget/box/view.tsx +++ b/packages/libro-jupyter/src/widget/box/view.tsx @@ -10,7 +10,7 @@ import { ViewOption, ViewRender, getOrigin, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import type { IWidgets, IWidgetViewProps, WidgetState } from '../protocol.js'; diff --git a/packages/libro-jupyter/src/widget/comm.ts b/packages/libro-jupyter/src/widget/comm.ts index 9087e97d..a9655c21 100644 --- a/packages/libro-jupyter/src/widget/comm.ts +++ b/packages/libro-jupyter/src/widget/comm.ts @@ -1,6 +1,6 @@ import type { JSONObject } from '@difizen/libro-common'; import type { IComm, IKernelConnection, IShellFuture } from '@difizen/libro-kernel'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { inject, transient } from '@difizen/libro-common/app'; import type { ICallbacks, IClassicComm } from './protocol.js'; import { WidgetCommOption } from './protocol.js'; diff --git a/packages/libro-jupyter/src/widget/instance-progress/contribution.ts b/packages/libro-jupyter/src/widget/instance-progress/contribution.ts index 2c43d163..b507a5e8 100644 --- a/packages/libro-jupyter/src/widget/instance-progress/contribution.ts +++ b/packages/libro-jupyter/src/widget/instance-progress/contribution.ts @@ -1,4 +1,4 @@ -import { ViewManager, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager, inject, singleton } from '@difizen/libro-common/app'; import type { IWidgetViewProps } from '../protocol.js'; import { WidgetViewContribution } from '../protocol.js'; diff --git a/packages/libro-jupyter/src/widget/instance-progress/view.tsx b/packages/libro-jupyter/src/widget/instance-progress/view.tsx index be0b6600..a56ad21d 100644 --- a/packages/libro-jupyter/src/widget/instance-progress/view.tsx +++ b/packages/libro-jupyter/src/widget/instance-progress/view.tsx @@ -8,7 +8,7 @@ import { transient, inject, prop, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import type { IWidgetViewProps } from '../protocol.js'; diff --git a/packages/libro-jupyter/src/widget/libro-widgets.ts b/packages/libro-jupyter/src/widget/libro-widgets.ts index 51c05be5..c841deed 100644 --- a/packages/libro-jupyter/src/widget/libro-widgets.ts +++ b/packages/libro-jupyter/src/widget/libro-widgets.ts @@ -1,14 +1,8 @@ import type { JSONObject } from '@difizen/libro-common'; import type { IKernelConnection, KernelMessage } from '@difizen/libro-kernel'; -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { - contrib, - inject, - Priority, - prop, - transient, -} from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, inject, Priority, prop, transient } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; import type { Comm } from './comm.js'; import type { diff --git a/packages/libro-jupyter/src/widget/module.ts b/packages/libro-jupyter/src/widget/module.ts index 2c1f3253..9ef0a454 100644 --- a/packages/libro-jupyter/src/widget/module.ts +++ b/packages/libro-jupyter/src/widget/module.ts @@ -1,5 +1,5 @@ import { LibroKernelManageModule } from '@difizen/libro-kernel'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { VBoxWidget, VBoxWidgetContribution } from './box/index.js'; import { Comm } from './comm.js'; diff --git a/packages/libro-jupyter/src/widget/progress/contribution.ts b/packages/libro-jupyter/src/widget/progress/contribution.ts index 0a6f512a..553bbcf5 100644 --- a/packages/libro-jupyter/src/widget/progress/contribution.ts +++ b/packages/libro-jupyter/src/widget/progress/contribution.ts @@ -1,4 +1,4 @@ -import { ViewManager, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager, inject, singleton } from '@difizen/libro-common/app'; import type { IWidgetViewProps } from '../protocol.js'; import { WidgetViewContribution } from '../protocol.js'; diff --git a/packages/libro-jupyter/src/widget/progress/view.tsx b/packages/libro-jupyter/src/widget/progress/view.tsx index a188a332..d9158a8d 100644 --- a/packages/libro-jupyter/src/widget/progress/view.tsx +++ b/packages/libro-jupyter/src/widget/progress/view.tsx @@ -8,7 +8,7 @@ import { ViewInstance, inject, prop, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import type { IWidgetViewProps, WidgetState } from '../protocol.js'; diff --git a/packages/libro-jupyter/src/widget/protocol.ts b/packages/libro-jupyter/src/widget/protocol.ts index ea348b4c..b552bc22 100644 --- a/packages/libro-jupyter/src/widget/protocol.ts +++ b/packages/libro-jupyter/src/widget/protocol.ts @@ -1,6 +1,6 @@ import type { JSONObject, JSONValue } from '@difizen/libro-common'; import type { IComm, IKernelConnection, KernelMessage } from '@difizen/libro-kernel'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import { Syringe } from '@difizen/libro-common/app'; import type { WidgetView } from './widget-view.js'; diff --git a/packages/libro-jupyter/src/widget/widget-manager.ts b/packages/libro-jupyter/src/widget/widget-manager.ts index 35d45a39..666cdae0 100644 --- a/packages/libro-jupyter/src/widget/widget-manager.ts +++ b/packages/libro-jupyter/src/widget/widget-manager.ts @@ -6,7 +6,7 @@ import { prop, singleton, ApplicationContribution, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { LibroWidgets } from './libro-widgets.js'; import { LibroWidgetsFactory } from './protocol.js'; diff --git a/packages/libro-jupyter/src/widget/widget-render.tsx b/packages/libro-jupyter/src/widget/widget-render.tsx index 9b41a1ea..f680aad0 100644 --- a/packages/libro-jupyter/src/widget/widget-render.tsx +++ b/packages/libro-jupyter/src/widget/widget-render.tsx @@ -7,7 +7,7 @@ import { useObserve, ViewInstance, ViewRender, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import React from 'react'; import './index.less'; diff --git a/packages/libro-jupyter/src/widget/widget-rendermime-contribution.ts b/packages/libro-jupyter/src/widget/widget-rendermime-contribution.ts index b5281bcc..e680f512 100644 --- a/packages/libro-jupyter/src/widget/widget-rendermime-contribution.ts +++ b/packages/libro-jupyter/src/widget/widget-rendermime-contribution.ts @@ -1,6 +1,6 @@ import type { BaseOutputView } from '@difizen/libro-core'; import { RenderMimeContribution } from '@difizen/libro-rendermime'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { LibroJupyterModel } from '../libro-jupyter-model.js'; diff --git a/packages/libro-jupyter/src/widget/widget-view-contribution.ts b/packages/libro-jupyter/src/widget/widget-view-contribution.ts index 313490c7..67c2f199 100644 --- a/packages/libro-jupyter/src/widget/widget-view-contribution.ts +++ b/packages/libro-jupyter/src/widget/widget-view-contribution.ts @@ -1,4 +1,4 @@ -import { ViewManager, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager, inject, singleton } from '@difizen/libro-common/app'; import type { IWidgetViewProps } from './protocol.js'; import { WidgetViewContribution } from './protocol.js'; diff --git a/packages/libro-jupyter/src/widget/widget-view.tsx b/packages/libro-jupyter/src/widget/widget-view.tsx index 198c735c..76c067f5 100644 --- a/packages/libro-jupyter/src/widget/widget-view.tsx +++ b/packages/libro-jupyter/src/widget/widget-view.tsx @@ -11,8 +11,8 @@ import { BaseView, prop, watch, -} from '@difizen/libro-common/mana-app'; -import type { ViewComponent, Disposable } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import type { ViewComponent, Disposable } from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import { LibroJupyterModel } from '../libro-jupyter-model.js'; diff --git a/packages/libro-kernel/src/basemanager.ts b/packages/libro-kernel/src/basemanager.ts index b0aa9298..49a61788 100644 --- a/packages/libro-kernel/src/basemanager.ts +++ b/packages/libro-kernel/src/basemanager.ts @@ -1,6 +1,6 @@ -import type { Disposable, Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event as ManaEvent } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import type { ISettings, NetworkError } from './server/index.js'; /** diff --git a/packages/libro-kernel/src/contents/contents-drive.ts b/packages/libro-kernel/src/contents/contents-drive.ts index 4041c885..83734287 100644 --- a/packages/libro-kernel/src/contents/contents-drive.ts +++ b/packages/libro-kernel/src/contents/contents-drive.ts @@ -1,8 +1,8 @@ import type { PartialJSONObject } from '@difizen/libro-common'; import { URL as URLUtil } from '@difizen/libro-common'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; import qs from 'query-string'; import type { ISettings } from '../server/index.js'; diff --git a/packages/libro-kernel/src/contents/contents-manager.ts b/packages/libro-kernel/src/contents/contents-manager.ts index f75f5151..a26c201b 100644 --- a/packages/libro-kernel/src/contents/contents-manager.ts +++ b/packages/libro-kernel/src/contents/contents-manager.ts @@ -1,7 +1,7 @@ import { PathExt } from '@difizen/libro-common'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; import { Drive } from './contents-drive.js'; import type { IContentsDrive } from './contents-protocol.js'; diff --git a/packages/libro-kernel/src/contents/contents-module.ts b/packages/libro-kernel/src/contents/contents-module.ts index 41eb4779..05e3e185 100644 --- a/packages/libro-kernel/src/contents/contents-module.ts +++ b/packages/libro-kernel/src/contents/contents-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { Drive } from './contents-drive.js'; import { ContentsManager } from './contents-manager.js'; diff --git a/packages/libro-kernel/src/contents/contents-protocol.ts b/packages/libro-kernel/src/contents/contents-protocol.ts index 88b539ce..4412d090 100644 --- a/packages/libro-kernel/src/contents/contents-protocol.ts +++ b/packages/libro-kernel/src/contents/contents-protocol.ts @@ -1,4 +1,4 @@ -import type { Disposable, Event as ManaEvent } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event as ManaEvent } from '@difizen/libro-common/app'; import type { ISettings } from '../server/index.js'; diff --git a/packages/libro-kernel/src/kernel/future.ts b/packages/libro-kernel/src/kernel/future.ts index f1afca09..53438d8d 100644 --- a/packages/libro-kernel/src/kernel/future.ts +++ b/packages/libro-kernel/src/kernel/future.ts @@ -1,5 +1,5 @@ -import { Disposable } from '@difizen/libro-common/mana-app'; -import { Deferred } from '@difizen/libro-common/mana-app'; +import { Disposable } from '@difizen/libro-common/app'; +import { Deferred } from '@difizen/libro-common/app'; import type { IKernelConnection, diff --git a/packages/libro-kernel/src/kernel/kernel-connection.ts b/packages/libro-kernel/src/kernel/kernel-connection.ts index d5064157..6319c06c 100644 --- a/packages/libro-kernel/src/kernel/kernel-connection.ts +++ b/packages/libro-kernel/src/kernel/kernel-connection.ts @@ -1,10 +1,10 @@ import type { JSONObject } from '@difizen/libro-common'; import { deepCopy, URL } from '@difizen/libro-common'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { Disposable } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { Deferred, Emitter } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; +import { Disposable } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { Deferred, Emitter } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import type { ISpecModel } from '../kernelspec/index.js'; diff --git a/packages/libro-kernel/src/kernel/kernel-module.ts b/packages/libro-kernel/src/kernel/kernel-module.ts index 6dbc34c6..1b63d307 100644 --- a/packages/libro-kernel/src/kernel/kernel-module.ts +++ b/packages/libro-kernel/src/kernel/kernel-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroServerModule } from '../server/index.js'; diff --git a/packages/libro-kernel/src/kernel/libro-kernel-manager.ts b/packages/libro-kernel/src/kernel/libro-kernel-manager.ts index f99d48f4..d98b4d72 100644 --- a/packages/libro-kernel/src/kernel/libro-kernel-manager.ts +++ b/packages/libro-kernel/src/kernel/libro-kernel-manager.ts @@ -1,8 +1,8 @@ import { Poll } from '@difizen/libro-common'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { prop, getOrigin } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { prop, getOrigin } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; import { NetworkError, ServerManager } from '../server/index.js'; diff --git a/packages/libro-kernel/src/kernel/libro-kernel-protocol.ts b/packages/libro-kernel/src/kernel/libro-kernel-protocol.ts index fcbe624a..0779b22f 100644 --- a/packages/libro-kernel/src/kernel/libro-kernel-protocol.ts +++ b/packages/libro-kernel/src/kernel/libro-kernel-protocol.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-namespace */ import type { JSONObject } from '@difizen/libro-common'; -import type { Event, Disposable } from '@difizen/libro-common/mana-app'; +import type { Event, Disposable } from '@difizen/libro-common/app'; import type { ISpecModel } from '../kernelspec/index.js'; import type { ISettings } from '../server/index.js'; diff --git a/packages/libro-kernel/src/kernel/libro-kernel.ts b/packages/libro-kernel/src/kernel/libro-kernel.ts index 49e82492..c5aab2dc 100644 --- a/packages/libro-kernel/src/kernel/libro-kernel.ts +++ b/packages/libro-kernel/src/kernel/libro-kernel.ts @@ -1,5 +1,5 @@ -import { prop } from '@difizen/libro-common/mana-app'; -import { transient, inject } from '@difizen/libro-common/mana-app'; +import { prop } from '@difizen/libro-common/app'; +import { transient, inject } from '@difizen/libro-common/app'; import type { KernelConnection } from '../kernel/kernel-connection.js'; import type { SessionId } from '../session/libro-session-protocol.js'; diff --git a/packages/libro-kernel/src/kernel/restapi.ts b/packages/libro-kernel/src/kernel/restapi.ts index 6f6d8a18..f8f9dd49 100644 --- a/packages/libro-kernel/src/kernel/restapi.ts +++ b/packages/libro-kernel/src/kernel/restapi.ts @@ -1,5 +1,5 @@ import { URL } from '@difizen/libro-common'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { ISettings } from '../server/index.js'; import { createResponseError, ServerConnection } from '../server/index.js'; diff --git a/packages/libro-kernel/src/kernelspec/kernelspec-module.ts b/packages/libro-kernel/src/kernelspec/kernelspec-module.ts index 722a4b23..62c6c1e4 100644 --- a/packages/libro-kernel/src/kernelspec/kernelspec-module.ts +++ b/packages/libro-kernel/src/kernelspec/kernelspec-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { KernelSpecManager } from './manager.js'; import { KernelSpecRestAPI } from './restapi.js'; diff --git a/packages/libro-kernel/src/kernelspec/kernelspec.ts b/packages/libro-kernel/src/kernelspec/kernelspec.ts index 7341bd3c..579f62a5 100644 --- a/packages/libro-kernel/src/kernelspec/kernelspec.ts +++ b/packages/libro-kernel/src/kernelspec/kernelspec.ts @@ -1,4 +1,4 @@ -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; import type { IManager as IBaseManager } from '../basemanager.js'; diff --git a/packages/libro-kernel/src/kernelspec/manager.ts b/packages/libro-kernel/src/kernelspec/manager.ts index 85090bef..aa89f65e 100644 --- a/packages/libro-kernel/src/kernelspec/manager.ts +++ b/packages/libro-kernel/src/kernelspec/manager.ts @@ -1,9 +1,9 @@ import { deepEqual, Poll } from '@difizen/libro-common'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; -import { getOrigin } from '@difizen/libro-common/mana-app'; -import { Emitter, Deferred } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; +import { getOrigin } from '@difizen/libro-common/app'; +import { Emitter, Deferred } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; import { BaseManager } from '../basemanager.js'; import { ServerManager } from '../server/server-manager.js'; diff --git a/packages/libro-kernel/src/kernelspec/restapi.ts b/packages/libro-kernel/src/kernelspec/restapi.ts index eb114112..2bf48619 100644 --- a/packages/libro-kernel/src/kernelspec/restapi.ts +++ b/packages/libro-kernel/src/kernelspec/restapi.ts @@ -1,6 +1,6 @@ // import { URL } from '@difizen/libro-common'; import type { PartialJSONObject } from '@difizen/libro-common'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { createResponseError } from '../server/connection-error.js'; import type { ISettings } from '../server/server-connection-protocol.js'; diff --git a/packages/libro-kernel/src/libro-kernel-connection-manager.ts b/packages/libro-kernel/src/libro-kernel-connection-manager.ts index 31364e93..6e2bd098 100644 --- a/packages/libro-kernel/src/libro-kernel-connection-manager.ts +++ b/packages/libro-kernel/src/libro-kernel-connection-manager.ts @@ -1,5 +1,5 @@ -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; import type { IContentsModel } from './contents/index.js'; import { LibroKernelManager } from './kernel/libro-kernel-manager.js'; diff --git a/packages/libro-kernel/src/module.ts b/packages/libro-kernel/src/module.ts index 8563f29b..50e85d4a 100644 --- a/packages/libro-kernel/src/module.ts +++ b/packages/libro-kernel/src/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { BaseManager } from './basemanager.js'; import { LibroContentsModule } from './contents/contents-module.js'; diff --git a/packages/libro-kernel/src/page-config.ts b/packages/libro-kernel/src/page-config.ts index 1e7847f1..7f3b3878 100644 --- a/packages/libro-kernel/src/page-config.ts +++ b/packages/libro-kernel/src/page-config.ts @@ -1,5 +1,5 @@ import { isObject, URL } from '@difizen/libro-common'; -import { isWeb } from '@difizen/libro-common/mana-app'; +import { isWeb } from '@difizen/libro-common/app'; /** * page config data for the Jupyter application. diff --git a/packages/libro-kernel/src/server/server-connection.ts b/packages/libro-kernel/src/server/server-connection.ts index 89aa2c23..55a539ad 100644 --- a/packages/libro-kernel/src/server/server-connection.ts +++ b/packages/libro-kernel/src/server/server-connection.ts @@ -1,5 +1,5 @@ import { URL } from '@difizen/libro-common'; -import { isNative, isWeb, prop, singleton } from '@difizen/libro-common/mana-app'; +import { isNative, isWeb, prop, singleton } from '@difizen/libro-common/app'; import { PageConfig } from '../page-config.js'; diff --git a/packages/libro-kernel/src/server/server-manager.ts b/packages/libro-kernel/src/server/server-manager.ts index 07fb6f30..33dade01 100644 --- a/packages/libro-kernel/src/server/server-manager.ts +++ b/packages/libro-kernel/src/server/server-manager.ts @@ -1,6 +1,6 @@ -import { prop } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { timeout, Deferred } from '@difizen/libro-common/mana-app'; +import { prop } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { timeout, Deferred } from '@difizen/libro-common/app'; import type { ISpecModels } from '../kernelspec/restapi.js'; import { KernelSpecRestAPI } from '../kernelspec/restapi.js'; diff --git a/packages/libro-kernel/src/server/server-module.ts b/packages/libro-kernel/src/server/server-module.ts index 8526462d..230b3c3e 100644 --- a/packages/libro-kernel/src/server/server-module.ts +++ b/packages/libro-kernel/src/server/server-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { ServerConnection } from './server-connection.js'; import { ServerManager } from './server-manager.js'; diff --git a/packages/libro-kernel/src/session/libro-session-manager.ts b/packages/libro-kernel/src/session/libro-session-manager.ts index c856eea8..84701d4d 100644 --- a/packages/libro-kernel/src/session/libro-session-manager.ts +++ b/packages/libro-kernel/src/session/libro-session-manager.ts @@ -1,9 +1,9 @@ import { Poll } from '@difizen/libro-common'; -import type { Event } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { prop, getOrigin } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { StorageService } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { prop, getOrigin } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { StorageService } from '@difizen/libro-common/app'; import type { IContentsModel } from '../contents/index.js'; import { LibroKernelManager } from '../kernel/libro-kernel-manager.js'; diff --git a/packages/libro-kernel/src/session/libro-session.ts b/packages/libro-kernel/src/session/libro-session.ts index a080e1b0..74130f6a 100644 --- a/packages/libro-kernel/src/session/libro-session.ts +++ b/packages/libro-kernel/src/session/libro-session.ts @@ -1,4 +1,4 @@ -import { transient, inject } from '@difizen/libro-common/mana-app'; +import { transient, inject } from '@difizen/libro-common/app'; import type { LibroKernel } from '../kernel/libro-kernel.js'; diff --git a/packages/libro-kernel/src/session/restapi.ts b/packages/libro-kernel/src/session/restapi.ts index 4ab72d05..b8df1eae 100644 --- a/packages/libro-kernel/src/session/restapi.ts +++ b/packages/libro-kernel/src/session/restapi.ts @@ -1,6 +1,6 @@ // import { default as axios } from 'axios'; import { URL } from '@difizen/libro-common'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { ISettings } from '../server/index.js'; import { createResponseError } from '../server/index.js'; diff --git a/packages/libro-kernel/src/session/session-module.ts b/packages/libro-kernel/src/session/session-module.ts index b5f55f11..f6876693 100644 --- a/packages/libro-kernel/src/session/session-module.ts +++ b/packages/libro-kernel/src/session/session-module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroSessionManager } from './libro-session-manager.js'; import type { SessionMeta } from './libro-session-protocol.js'; diff --git a/packages/libro-lab/src/command/lab-menu-contribution.tsx b/packages/libro-lab/src/command/lab-menu-contribution.tsx index 0beb801b..f3d204a9 100644 --- a/packages/libro-lab/src/command/lab-menu-contribution.tsx +++ b/packages/libro-lab/src/command/lab-menu-contribution.tsx @@ -5,10 +5,10 @@ import { NotebookCommands, } from '@difizen/libro-jupyter'; import { TerminalCommands, TerminalManager } from '@difizen/libro-terminal'; -import type { KeybindingRegistry, MenuRegistry } from '@difizen/libro-common/mana-app'; -import { SlotViewManager } from '@difizen/libro-common/mana-app'; -import { KeybindingContribution } from '@difizen/libro-common/mana-app'; -import { Saveable } from '@difizen/libro-common/mana-app'; +import type { KeybindingRegistry, MenuRegistry } from '@difizen/libro-common/app'; +import { SlotViewManager } from '@difizen/libro-common/app'; +import { KeybindingContribution } from '@difizen/libro-common/app'; +import { Saveable } from '@difizen/libro-common/app'; import { CommandContribution, CommandRegistry, @@ -17,7 +17,7 @@ import { MenuContribution, singleton, ViewManager, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { GuideView } from '../guide/index.js'; diff --git a/packages/libro-lab/src/command/menu-bar-view.tsx b/packages/libro-lab/src/command/menu-bar-view.tsx index 872acfbd..ef3dd38b 100644 --- a/packages/libro-lab/src/command/menu-bar-view.tsx +++ b/packages/libro-lab/src/command/menu-bar-view.tsx @@ -6,7 +6,7 @@ import { prop, singleton, view, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { forwardRef } from 'react'; diff --git a/packages/libro-lab/src/command/module.ts b/packages/libro-lab/src/command/module.ts index dd11bfb5..85e7d2c5 100644 --- a/packages/libro-lab/src/command/module.ts +++ b/packages/libro-lab/src/command/module.ts @@ -2,7 +2,7 @@ import { createSlotPreference, HeaderArea, ManaModule, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LabMenu } from './lab-menu-contribution.js'; import { MenuBarView } from './menu-bar-view.js'; diff --git a/packages/libro-lab/src/config/config-contribution.ts b/packages/libro-lab/src/config/config-contribution.ts index 058890c4..476eb9e3 100644 --- a/packages/libro-lab/src/config/config-contribution.ts +++ b/packages/libro-lab/src/config/config-contribution.ts @@ -1,7 +1,7 @@ import { LibroConfigAutoSave } from '@difizen/libro-jupyter'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; -import { ApplicationContribution } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ConfigurationService } from '@difizen/libro-common/app'; +import { ApplicationContribution } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ApplicationContribution }) export class LabConfigAppContribution implements ApplicationContribution { diff --git a/packages/libro-lab/src/config/config.ts b/packages/libro-lab/src/config/config.ts index 4645cee5..0a2cccfd 100644 --- a/packages/libro-lab/src/config/config.ts +++ b/packages/libro-lab/src/config/config.ts @@ -1,4 +1,4 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; export const LibroLabKernelAndTerminalPanelEnabled: ConfigurationNode = { diff --git a/packages/libro-lab/src/editor-viewer/code-editor-open-handler.ts b/packages/libro-lab/src/editor-viewer/code-editor-open-handler.ts index 3160d213..afa88c90 100644 --- a/packages/libro-lab/src/editor-viewer/code-editor-open-handler.ts +++ b/packages/libro-lab/src/editor-viewer/code-editor-open-handler.ts @@ -1,12 +1,12 @@ import { LibroJupyterConfiguration } from '@difizen/libro-jupyter'; -import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/mana-app'; -import { ConfigurationService, inject } from '@difizen/libro-common/mana-app'; -import { Priority } from '@difizen/libro-common/mana-app'; +import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/app'; +import { ConfigurationService, inject } from '@difizen/libro-common/app'; +import { Priority } from '@difizen/libro-common/app'; import { NavigatableViewOpenHandler, OpenHandler, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { CodeEditorViewer } from './code-editor-viewer.js'; import { CodeEditorViewerFactory, textFileTypes } from './protocol.js'; diff --git a/packages/libro-lab/src/editor-viewer/code-editor-viewer.tsx b/packages/libro-lab/src/editor-viewer/code-editor-viewer.tsx index 420a398a..d35cc4c9 100644 --- a/packages/libro-lab/src/editor-viewer/code-editor-viewer.tsx +++ b/packages/libro-lab/src/editor-viewer/code-editor-viewer.tsx @@ -3,9 +3,9 @@ import type { LanguageSpec, MonacoEditorOptions } from '@difizen/libro-jupyter'; import { LibroConfigAutoSave } from '@difizen/libro-jupyter'; import { MonacoUri } from '@difizen/libro-jupyter'; import { JupyterFileService, LanguageSpecRegistry } from '@difizen/libro-jupyter'; -import type { NavigatableView, Saveable } from '@difizen/libro-common/mana-app'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; -import { Disposable } from '@difizen/libro-common/mana-app'; +import type { NavigatableView, Saveable } from '@difizen/libro-common/app'; +import { ConfigurationService } from '@difizen/libro-common/app'; +import { Disposable } from '@difizen/libro-common/app'; import { DisposableCollection, Emitter, @@ -16,14 +16,14 @@ import { URI, URIIconReference, ViewOption, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { BaseView, transient, useInject, view, ViewInstance, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import React from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/editor-viewer/json-langauge.ts b/packages/libro-lab/src/editor-viewer/json-langauge.ts index 10685d0b..6a8754cd 100644 --- a/packages/libro-lab/src/editor-viewer/json-langauge.ts +++ b/packages/libro-lab/src/editor-viewer/json-langauge.ts @@ -1,6 +1,6 @@ import type { LanguageSpecRegistry } from '@difizen/libro-jupyter'; import { LanguageSpecContribution } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: [LanguageSpecContribution] }) export class JSONLanguageSpecs implements LanguageSpecContribution { diff --git a/packages/libro-lab/src/editor-viewer/julia-language.ts b/packages/libro-lab/src/editor-viewer/julia-language.ts index 7acc08ac..fb8eced2 100644 --- a/packages/libro-lab/src/editor-viewer/julia-language.ts +++ b/packages/libro-lab/src/editor-viewer/julia-language.ts @@ -1,6 +1,6 @@ import type { LanguageSpecRegistry } from '@difizen/libro-jupyter'; import { LanguageSpecContribution } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: [LanguageSpecContribution] }) export class JuliaLanguageSpecs implements LanguageSpecContribution { diff --git a/packages/libro-lab/src/editor-viewer/libro-default-open-handler.ts b/packages/libro-lab/src/editor-viewer/libro-default-open-handler.ts index cee1f713..bbf9421b 100644 --- a/packages/libro-lab/src/editor-viewer/libro-default-open-handler.ts +++ b/packages/libro-lab/src/editor-viewer/libro-default-open-handler.ts @@ -1,11 +1,11 @@ import { LibroJupyterConfiguration } from '@difizen/libro-jupyter'; -import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/mana-app'; -import { ConfigurationService, inject } from '@difizen/libro-common/mana-app'; +import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/app'; +import { ConfigurationService, inject } from '@difizen/libro-common/app'; import { NavigatableViewOpenHandler, OpenHandler, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { LibroDefaultViewer } from './libro-default-viewer.js'; import { LibroDefaultViewerFactory } from './protocol.js'; diff --git a/packages/libro-lab/src/editor-viewer/libro-default-viewer.tsx b/packages/libro-lab/src/editor-viewer/libro-default-viewer.tsx index 3ca29b64..515b54ba 100644 --- a/packages/libro-lab/src/editor-viewer/libro-default-viewer.tsx +++ b/packages/libro-lab/src/editor-viewer/libro-default-viewer.tsx @@ -1,4 +1,4 @@ -import type { NavigatableView } from '@difizen/libro-common/mana-app'; +import type { NavigatableView } from '@difizen/libro-common/app'; import { inject, LabelProvider, @@ -6,8 +6,8 @@ import { URI, URIIconReference, ViewOption, -} from '@difizen/libro-common/mana-app'; -import { BaseView, transient, view } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { BaseView, transient, view } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import React from 'react'; diff --git a/packages/libro-lab/src/editor-viewer/module.ts b/packages/libro-lab/src/editor-viewer/module.ts index 9e42400d..e90963c9 100644 --- a/packages/libro-lab/src/editor-viewer/module.ts +++ b/packages/libro-lab/src/editor-viewer/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { CodeEditorViewerOpenHandler } from './code-editor-open-handler.js'; import { CodeEditorViewer } from './code-editor-viewer.js'; diff --git a/packages/libro-lab/src/editor-viewer/r-language.ts b/packages/libro-lab/src/editor-viewer/r-language.ts index dac4e3a7..fb88a44c 100644 --- a/packages/libro-lab/src/editor-viewer/r-language.ts +++ b/packages/libro-lab/src/editor-viewer/r-language.ts @@ -1,6 +1,6 @@ import type { LanguageSpecRegistry } from '@difizen/libro-jupyter'; import { LanguageSpecContribution } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: [LanguageSpecContribution] }) export class RLanguageSpecs implements LanguageSpecContribution { diff --git a/packages/libro-lab/src/github-link/index.tsx b/packages/libro-lab/src/github-link/index.tsx index 25b7f4d9..9a5150d0 100644 --- a/packages/libro-lab/src/github-link/index.tsx +++ b/packages/libro-lab/src/github-link/index.tsx @@ -1,6 +1,6 @@ import { GithubFilled } from '@ant-design/icons'; -import { singleton, view } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { singleton, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { forwardRef } from 'react'; export const GithubLinkComponent = forwardRef(function GithubLinkComponent() { diff --git a/packages/libro-lab/src/guide/content-contribution.ts b/packages/libro-lab/src/guide/content-contribution.ts index 72df5f56..a3310a53 100644 --- a/packages/libro-lab/src/guide/content-contribution.ts +++ b/packages/libro-lab/src/guide/content-contribution.ts @@ -5,8 +5,8 @@ import type { INotebookContent, LibroJupyterModel, } from '@difizen/libro-jupyter'; -import { URI } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { URI } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import { l10n, L10nLang } from '@difizen/libro-common/l10n'; import contentJson from './libro_guide_book.json'; diff --git a/packages/libro-lab/src/guide/guide-view.tsx b/packages/libro-lab/src/guide/guide-view.tsx index 03fcc150..96f3a74d 100644 --- a/packages/libro-lab/src/guide/guide-view.tsx +++ b/packages/libro-lab/src/guide/guide-view.tsx @@ -9,8 +9,8 @@ import { view, ViewInstance, ViewRender, -} from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { l10n, L10nLang } from '@difizen/libro-common/l10n'; import { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/image-viewer/module.ts b/packages/libro-lab/src/image-viewer/module.ts index 45895fde..b7b7a241 100644 --- a/packages/libro-lab/src/image-viewer/module.ts +++ b/packages/libro-lab/src/image-viewer/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { ImageViewerOpenHandler } from './open-handler.js'; import { NavigatableImageViewerView } from './viewer.js'; diff --git a/packages/libro-lab/src/image-viewer/open-handler.ts b/packages/libro-lab/src/image-viewer/open-handler.ts index 6f70ef3d..afa3da12 100644 --- a/packages/libro-lab/src/image-viewer/open-handler.ts +++ b/packages/libro-lab/src/image-viewer/open-handler.ts @@ -1,12 +1,12 @@ import { LibroJupyterConfiguration } from '@difizen/libro-jupyter'; -import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/mana-app'; -import { ConfigurationService, inject } from '@difizen/libro-common/mana-app'; +import type { URI, ViewOpenHandlerOptions } from '@difizen/libro-common/app'; +import { ConfigurationService, inject } from '@difizen/libro-common/app'; import { NavigatableViewOpenHandler, OpenHandler, singleton, Priority, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { imageExtToTypes } from './protocol.js'; import { NavigatableImageViewerViewFactoryId } from './viewer.js'; diff --git a/packages/libro-lab/src/image-viewer/viewer.tsx b/packages/libro-lab/src/image-viewer/viewer.tsx index 78061afa..f3e3edf2 100644 --- a/packages/libro-lab/src/image-viewer/viewer.tsx +++ b/packages/libro-lab/src/image-viewer/viewer.tsx @@ -1,6 +1,6 @@ import { ContentsManager } from '@difizen/libro-kernel'; -import type { NavigatableView } from '@difizen/libro-common/mana-app'; -import { DisposableCollection } from '@difizen/libro-common/mana-app'; +import type { NavigatableView } from '@difizen/libro-common/app'; +import { DisposableCollection } from '@difizen/libro-common/app'; import { BaseView, inject, @@ -16,7 +16,7 @@ import { Deferred, URI, CommandRegistry, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Spin } from 'antd'; import { createRef, forwardRef, useEffect, useRef } from 'react'; import Viewer from 'viewerjs'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/collapse-content.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/collapse-content.tsx index 146710cd..878ef9b5 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/collapse-content.tsx +++ b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/collapse-content.tsx @@ -1,6 +1,6 @@ import { CloseOutlined } from '@ant-design/icons'; import { TerminalCommands } from '@difizen/libro-terminal'; -import { CommandRegistry, useInject } from '@difizen/libro-common/mana-app'; +import { CommandRegistry, useInject } from '@difizen/libro-common/app'; import { message } from 'antd'; import React from 'react'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/index.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/index.tsx index cab2174e..1105fabf 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/index.tsx +++ b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/index.tsx @@ -1,5 +1,5 @@ import { CaretDownOutlined, CaretRightOutlined } from '@ant-design/icons'; -import { ViewContext } from '@difizen/libro-common/mana-app'; +import { ViewContext } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Empty, message, Popconfirm } from 'antd'; import React, { useState } from 'react'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/kernel-collapse-content-item.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/kernel-collapse-content-item.tsx index ed886447..3fb1fdd2 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/kernel-collapse-content-item.tsx +++ b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/kernel-collapse-content-item.tsx @@ -3,7 +3,7 @@ import { CaretRightOutlined, CloseOutlined, } from '@ant-design/icons'; -import { OpenerService, URI, useInject } from '@difizen/libro-common/mana-app'; +import { OpenerService, URI, useInject } from '@difizen/libro-common/app'; import React, { useState } from 'react'; import { fileUnderKernel, runningKernel } from '../../common/icon.js'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/page-collapse-content.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/page-collapse-content.tsx index 01a98a76..3aef0f8f 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/collapse/page-collapse-content.tsx +++ b/packages/libro-lab/src/kernel-and-terminal-panel/collapse/page-collapse-content.tsx @@ -4,7 +4,7 @@ import { useInject, ViewContext, ViewInstance, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { SaveableTabView } from '../../index.js'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx index 4b452f0a..9c66f5d9 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx +++ b/packages/libro-lab/src/kernel-and-terminal-panel/kernel-and-terminal-panel-view.tsx @@ -11,7 +11,7 @@ import { view, ViewInstance, ViewManager, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { ConfigProvider, theme } from 'antd'; import { useEffect, useState } from 'react'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/kernel-color-registry.ts b/packages/libro-lab/src/kernel-and-terminal-panel/kernel-color-registry.ts index 4eccc7a6..bd5a9a21 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/kernel-color-registry.ts +++ b/packages/libro-lab/src/kernel-and-terminal-panel/kernel-color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color, ColorContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color, ColorContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class KernelPanelColorContribution implements ColorContribution { diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/module.ts b/packages/libro-lab/src/kernel-and-terminal-panel/module.ts index 8b7e2c6c..a0210dfb 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/module.ts +++ b/packages/libro-lab/src/kernel-and-terminal-panel/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { KernelAndTerminalPanelView } from './kernel-and-terminal-panel-view.js'; import { KernelPanelColorContribution } from './kernel-color-registry.js'; diff --git a/packages/libro-lab/src/kernel-and-terminal-panel/panel-command.tsx b/packages/libro-lab/src/kernel-and-terminal-panel/panel-command.tsx index 41e2c91a..bd646cb1 100644 --- a/packages/libro-lab/src/kernel-and-terminal-panel/panel-command.tsx +++ b/packages/libro-lab/src/kernel-and-terminal-panel/panel-command.tsx @@ -1,12 +1,12 @@ import { ReloadOutlined } from '@ant-design/icons'; -import type { CommandRegistry, ToolbarRegistry } from '@difizen/libro-common/mana-app'; -import { ViewManager } from '@difizen/libro-common/mana-app'; +import type { CommandRegistry, ToolbarRegistry } from '@difizen/libro-common/app'; +import { ViewManager } from '@difizen/libro-common/app'; import { CommandContribution, inject, singleton, ToolbarContribution, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { KernelAndTerminalPanelView } from './kernel-and-terminal-panel-view.js'; diff --git a/packages/libro-lab/src/kernel-manager/index.tsx b/packages/libro-lab/src/kernel-manager/index.tsx index a1d0bee3..0e32a66b 100644 --- a/packages/libro-lab/src/kernel-manager/index.tsx +++ b/packages/libro-lab/src/kernel-manager/index.tsx @@ -1,6 +1,6 @@ import { CodeFilled } from '@ant-design/icons'; -import { singleton, view } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { singleton, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { forwardRef } from 'react'; diff --git a/packages/libro-lab/src/lab-app.ts b/packages/libro-lab/src/lab-app.ts index 1f40b6d1..be12ae6c 100644 --- a/packages/libro-lab/src/lab-app.ts +++ b/packages/libro-lab/src/lab-app.ts @@ -5,7 +5,7 @@ import { ServerManager, } from '@difizen/libro-jupyter'; import { terminalDefaultSlot } from '@difizen/libro-terminal'; -import type { FileTreeView } from '@difizen/libro-common/mana-app'; +import type { FileTreeView } from '@difizen/libro-common/app'; import { ConfigurationService, FileTreeViewFactory, @@ -15,7 +15,7 @@ import { ViewManager, inject, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LibroLabConfiguration, LibroLabGuideViewEnabled } from './config/index.js'; import { GuideView } from './guide/index.js'; diff --git a/packages/libro-lab/src/lab-color-registry.ts b/packages/libro-lab/src/lab-color-registry.ts index b11f3986..f9478344 100644 --- a/packages/libro-lab/src/lab-color-registry.ts +++ b/packages/libro-lab/src/lab-color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color, ColorContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color, ColorContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class LabColorContribution implements ColorContribution { diff --git a/packages/libro-lab/src/lang-switcher/index.tsx b/packages/libro-lab/src/lang-switcher/index.tsx index 1cbfe4fe..5712e5f2 100644 --- a/packages/libro-lab/src/lang-switcher/index.tsx +++ b/packages/libro-lab/src/lang-switcher/index.tsx @@ -1,5 +1,5 @@ -import { singleton, useInject, view } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { singleton, useInject, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { l10n, L10nLang } from '@difizen/libro-common/l10n'; import { Select } from 'antd'; import { forwardRef } from 'react'; diff --git a/packages/libro-lab/src/layout/brand/brand.tsx b/packages/libro-lab/src/layout/brand/brand.tsx index 67637d9c..29a7010e 100644 --- a/packages/libro-lab/src/layout/brand/brand.tsx +++ b/packages/libro-lab/src/layout/brand/brand.tsx @@ -1,4 +1,4 @@ -import { BaseView, view, singleton } from '@difizen/libro-common/mana-app'; +import { BaseView, view, singleton } from '@difizen/libro-common/app'; import * as React from 'react'; import { Logo } from '../../common/index.js'; diff --git a/packages/libro-lab/src/layout/container.tsx b/packages/libro-lab/src/layout/container.tsx index 99c35259..bb95b540 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/react'; -import { singleton, Slot, view } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { singleton, Slot, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/layout/content-bottom-tab-view.tsx b/packages/libro-lab/src/layout/content-bottom-tab-view.tsx index 1b134d1d..0f84ca76 100644 --- a/packages/libro-lab/src/layout/content-bottom-tab-view.tsx +++ b/packages/libro-lab/src/layout/content-bottom-tab-view.tsx @@ -1,5 +1,5 @@ -import type { View } from '@difizen/libro-common/mana-app'; -import { transient, view, CardTabView, inject } from '@difizen/libro-common/mana-app'; +import type { View } from '@difizen/libro-common/app'; +import { transient, view, CardTabView, inject } from '@difizen/libro-common/app'; import { LayoutService } from './layout-service.js'; import { LibroLabLayoutSlots } from './protocol.js'; diff --git a/packages/libro-lab/src/layout/footer/current-file-footer-view.tsx b/packages/libro-lab/src/layout/footer/current-file-footer-view.tsx index 03f90b71..9529271a 100644 --- a/packages/libro-lab/src/layout/footer/current-file-footer-view.tsx +++ b/packages/libro-lab/src/layout/footer/current-file-footer-view.tsx @@ -5,7 +5,7 @@ import { useInject, view, ViewInstance, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import * as React from 'react'; diff --git a/packages/libro-lab/src/layout/footer/footer-view.tsx b/packages/libro-lab/src/layout/footer/footer-view.tsx index c246bbbd..cab325b4 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/react'; -import { DefaultSlotView, singleton, Slot, view } from '@difizen/libro-common/mana-app'; +import { DefaultSlotView, singleton, Slot, view } from '@difizen/libro-common/app'; import * as React from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/layout/footer/status-footer-view.tsx b/packages/libro-lab/src/layout/footer/status-footer-view.tsx index a7a19e3a..034ca1f8 100644 --- a/packages/libro-lab/src/layout/footer/status-footer-view.tsx +++ b/packages/libro-lab/src/layout/footer/status-footer-view.tsx @@ -4,7 +4,7 @@ import { singleton, useInject, view, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import * as React from 'react'; diff --git a/packages/libro-lab/src/layout/layout-service.ts b/packages/libro-lab/src/layout/layout-service.ts index 56252b13..956e9ef4 100644 --- a/packages/libro-lab/src/layout/layout-service.ts +++ b/packages/libro-lab/src/layout/layout-service.ts @@ -4,16 +4,16 @@ import type { View, ViewOpenHandlerOptions, ViewOpenOption, -} from '@difizen/libro-common/mana-app'; -import { SideTabView } from '@difizen/libro-common/mana-app'; -import { observable } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { SideTabView } from '@difizen/libro-common/app'; +import { observable } from '@difizen/libro-common/app'; import { DefaultSlotView, inject, prop, singleton, SlotViewManager, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { LibroLabLayoutSlotsType, StatusType } from './protocol.js'; import { LibroLabLayoutSlots } from './protocol.js'; diff --git a/packages/libro-lab/src/layout/layout.tsx b/packages/libro-lab/src/layout/layout.tsx index 6301ca06..c4235bfd 100644 --- a/packages/libro-lab/src/layout/layout.tsx +++ b/packages/libro-lab/src/layout/layout.tsx @@ -1,12 +1,6 @@ import { BoxPanel } from '@difizen/libro-common/react'; -import { - inject, - singleton, - Slot, - useInject, - view, -} from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { inject, singleton, Slot, useInject, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; 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 e37083c1..fd3c8de3 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/react'; -import { singleton, Slot, useInject, view } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import { singleton, Slot, useInject, view } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import './index.less'; diff --git a/packages/libro-lab/src/layout/module.ts b/packages/libro-lab/src/layout/module.ts index 32fe92de..f68431d4 100644 --- a/packages/libro-lab/src/layout/module.ts +++ b/packages/libro-lab/src/layout/module.ts @@ -4,7 +4,7 @@ import { HeaderArea, HeaderView, ManaModule, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { BrandView } from './brand/brand.js'; import { LibroLabLayoutContainerView } from './container.js'; diff --git a/packages/libro-lab/src/layout/saveable-tab-view.tsx b/packages/libro-lab/src/layout/saveable-tab-view.tsx index 49e3fd0b..5c09ce85 100644 --- a/packages/libro-lab/src/layout/saveable-tab-view.tsx +++ b/packages/libro-lab/src/layout/saveable-tab-view.tsx @@ -1,10 +1,10 @@ import { CloseOutlined } from '@ant-design/icons'; import { Dropdown } from '@difizen/libro-common/react'; import { JupyterFileService } from '@difizen/libro-jupyter'; -import type { CardTabOption, View } from '@difizen/libro-common/mana-app'; -import { ViewManager, ViewOption } from '@difizen/libro-common/mana-app'; -import { NavigatableView } from '@difizen/libro-common/mana-app'; -import { inject } from '@difizen/libro-common/mana-app'; +import type { CardTabOption, View } from '@difizen/libro-common/app'; +import { ViewManager, ViewOption } from '@difizen/libro-common/app'; +import { NavigatableView } from '@difizen/libro-common/app'; +import { inject } from '@difizen/libro-common/app'; import { CardTabView, MenuRender, @@ -12,7 +12,7 @@ import { view, ViewContext, Saveable, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Badge } from 'antd'; import classnames from 'classnames'; diff --git a/packages/libro-lab/src/layout/side-tab-view.tsx b/packages/libro-lab/src/layout/side-tab-view.tsx index 97b0d4f6..72f60607 100644 --- a/packages/libro-lab/src/layout/side-tab-view.tsx +++ b/packages/libro-lab/src/layout/side-tab-view.tsx @@ -1,6 +1,6 @@ -import { SideTabView, ToolbarRender } from '@difizen/libro-common/mana-app'; -import { view } from '@difizen/libro-common/mana-app'; -import { transient } from '@difizen/libro-common/mana-app'; +import { SideTabView, ToolbarRender } from '@difizen/libro-common/app'; +import { view } from '@difizen/libro-common/app'; +import { transient } from '@difizen/libro-common/app'; @transient() @view('libro-lab-side-tab') diff --git a/packages/libro-lab/src/module.tsx b/packages/libro-lab/src/module.tsx index e9458a20..f53eb24b 100644 --- a/packages/libro-lab/src/module.tsx +++ b/packages/libro-lab/src/module.tsx @@ -12,7 +12,7 @@ import { RootSlotId, createViewPreference, HeaderArea, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { LibroLabHeaderMenuModule } from './command/module.js'; diff --git a/packages/libro-lab/src/toc/libro-toc-panel-view.tsx b/packages/libro-lab/src/toc/libro-toc-panel-view.tsx index 18a68d60..055d8bba 100644 --- a/packages/libro-lab/src/toc/libro-toc-panel-view.tsx +++ b/packages/libro-lab/src/toc/libro-toc-panel-view.tsx @@ -11,7 +11,7 @@ import { ViewInstance, ViewManager, ViewRender, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { ConfigProvider, Empty, theme } from 'antd'; diff --git a/packages/libro-lab/src/toc/module.ts b/packages/libro-lab/src/toc/module.ts index f2a43f2c..0e35455d 100644 --- a/packages/libro-lab/src/toc/module.ts +++ b/packages/libro-lab/src/toc/module.ts @@ -1,5 +1,5 @@ import { LibroTOCModule } from '@difizen/libro-toc'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { TocPanelView } from './libro-toc-panel-view.js'; diff --git a/packages/libro-lab/src/welcome/entry-point-view.tsx b/packages/libro-lab/src/welcome/entry-point-view.tsx index 954d900d..ef4eb8c1 100644 --- a/packages/libro-lab/src/welcome/entry-point-view.tsx +++ b/packages/libro-lab/src/welcome/entry-point-view.tsx @@ -14,8 +14,8 @@ import { useInject, view, ViewManager, -} from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Col, Row } from 'antd'; import { forwardRef, useEffect, useState } from 'react'; diff --git a/packages/libro-lab/src/welcome/welcome-view.tsx b/packages/libro-lab/src/welcome/welcome-view.tsx index 603a208a..7830a364 100644 --- a/packages/libro-lab/src/welcome/welcome-view.tsx +++ b/packages/libro-lab/src/welcome/welcome-view.tsx @@ -7,8 +7,8 @@ import { ViewInstance, ViewManager, ViewRender, -} from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { forwardRef } from 'react'; diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/fileWatcher.ts b/packages/libro-language-client/src/common/vscodeAdaptor/fileWatcher.ts index e586233d..82a22f50 100644 --- a/packages/libro-language-client/src/common/vscodeAdaptor/fileWatcher.ts +++ b/packages/libro-language-client/src/common/vscodeAdaptor/fileWatcher.ts @@ -1,5 +1,5 @@ import { LibroService } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { Event, FileSystemWatcher, GlobPattern, Uri } from 'vscode'; import { EventEmitter } from './vscodeAdaptor.js'; diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/libroWindow.ts b/packages/libro-language-client/src/common/vscodeAdaptor/libroWindow.ts index faf0ead6..eeffdeb0 100644 --- a/packages/libro-language-client/src/common/vscodeAdaptor/libroWindow.ts +++ b/packages/libro-language-client/src/common/vscodeAdaptor/libroWindow.ts @@ -1,5 +1,5 @@ /* eslint-disable no-console */ -import { noop, singleton } from '@difizen/libro-common/mana-app'; +import { noop, singleton } from '@difizen/libro-common/app'; import type { TabGroups, TextEditor, diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/libroWorkspace.ts b/packages/libro-language-client/src/common/vscodeAdaptor/libroWorkspace.ts index a0b14956..eeff083c 100644 --- a/packages/libro-language-client/src/common/vscodeAdaptor/libroWorkspace.ts +++ b/packages/libro-language-client/src/common/vscodeAdaptor/libroWorkspace.ts @@ -1,7 +1,7 @@ import type { LibroView } from '@difizen/libro-core'; import { LibroService, ILibroWorkspaceService } from '@difizen/libro-core'; import { ExecutableNotebookModel } from '@difizen/libro-kernel'; -import { inject, noop, singleton } from '@difizen/libro-common/mana-app'; +import { inject, noop, singleton } from '@difizen/libro-common/app'; import type { Uri, NotebookDocument, diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/lspEnv.ts b/packages/libro-language-client/src/common/vscodeAdaptor/lspEnv.ts index 48d3599c..4dd5ba5d 100644 --- a/packages/libro-language-client/src/common/vscodeAdaptor/lspEnv.ts +++ b/packages/libro-language-client/src/common/vscodeAdaptor/lspEnv.ts @@ -1,5 +1,5 @@ -import { ApplicationContribution, singleton } from '@difizen/libro-common/mana-app'; -import { Deferred } from '@difizen/libro-common/mana-app'; +import { ApplicationContribution, singleton } from '@difizen/libro-common/app'; +import { Deferred } from '@difizen/libro-common/app'; import { initLspEnv } from './vscodeAdaptor.js'; diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/monacoLanguages.ts b/packages/libro-language-client/src/common/vscodeAdaptor/monacoLanguages.ts index 80b6ead9..1851a5de 100644 --- a/packages/libro-language-client/src/common/vscodeAdaptor/monacoLanguages.ts +++ b/packages/libro-language-client/src/common/vscodeAdaptor/monacoLanguages.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; // import { score } from '@difizen/monaco-editor-core/esm/vs/editor/common/languageSelector.js'; import type { diff --git a/packages/libro-language-client/src/common/vscodeAdaptor/vscodeAdaptor.ts b/packages/libro-language-client/src/common/vscodeAdaptor/vscodeAdaptor.ts index e77b261f..bbd64af0 100644 --- a/packages/libro-language-client/src/common/vscodeAdaptor/vscodeAdaptor.ts +++ b/packages/libro-language-client/src/common/vscodeAdaptor/vscodeAdaptor.ts @@ -1,5 +1,5 @@ import { Emitter } from '@difizen/libro-common/common'; -import type { Syringe } from '@difizen/libro-common/mana-app'; +import type { Syringe } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import type { Disposable } from 'vscode'; import { URI } from 'vscode-uri'; diff --git a/packages/libro-language-client/src/libro-language-client-contribution.ts b/packages/libro-language-client/src/libro-language-client-contribution.ts index a4a737ad..bf576a70 100644 --- a/packages/libro-language-client/src/libro-language-client-contribution.ts +++ b/packages/libro-language-client/src/libro-language-client-contribution.ts @@ -5,11 +5,7 @@ import { LibroService, } from '@difizen/libro-core'; import { ExecutableNotebookModel } from '@difizen/libro-kernel'; -import { - ApplicationContribution, - inject, - singleton, -} from '@difizen/libro-common/mana-app'; +import { ApplicationContribution, inject, singleton } from '@difizen/libro-common/app'; import * as monaco from '@difizen/monaco-editor-core'; import { URI } from 'vscode-uri'; diff --git a/packages/libro-language-client/src/libro-language-client-manager.ts b/packages/libro-language-client/src/libro-language-client-manager.ts index 737afc02..e3dec5cb 100644 --- a/packages/libro-language-client/src/libro-language-client-manager.ts +++ b/packages/libro-language-client/src/libro-language-client-manager.ts @@ -2,12 +2,7 @@ import { URL } from '@difizen/libro-common'; import { PageConfig } from '@difizen/libro-kernel'; import type { ILanguageServerManager, TSessionMap } from '@difizen/libro-lsp'; import { ILanguageServerManagerFactory } from '@difizen/libro-lsp'; -import { - singleton, - inject, - postConstruct, - getOrigin, -} from '@difizen/libro-common/mana-app'; +import { singleton, inject, postConstruct, getOrigin } from '@difizen/libro-common/app'; import type { LibroLanguageClientOptions } from './libro-language-client.js'; import { LibroLanguageClient } from './libro-language-client.js'; diff --git a/packages/libro-language-client/src/module.ts b/packages/libro-language-client/src/module.ts index 9ea416f5..5ae28fe3 100644 --- a/packages/libro-language-client/src/module.ts +++ b/packages/libro-language-client/src/module.ts @@ -1,5 +1,5 @@ import { LibroLSPModule } from '@difizen/libro-lsp'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroWindow } from './common/vscodeAdaptor/libroWindow.js'; import { LibroWorkspace } from './common/vscodeAdaptor/libroWorkspace.js'; diff --git a/packages/libro-lsp/src/adapters/adapter.ts b/packages/libro-lsp/src/adapters/adapter.ts index 7f34e4f3..8de04976 100644 --- a/packages/libro-lsp/src/adapters/adapter.ts +++ b/packages/libro-lsp/src/adapters/adapter.ts @@ -2,9 +2,9 @@ // Distributed under the terms of the Modified BSD License. import type { NotebookView } from '@difizen/libro-core'; -import { Emitter, injectable } from '@difizen/libro-common/mana-app'; -import type { Disposable, Event, View } from '@difizen/libro-common/mana-app'; -import type {} from '@difizen/libro-common/mana-app'; +import { Emitter, injectable } from '@difizen/libro-common/app'; +import type { Disposable, Event, View } from '@difizen/libro-common/app'; +import type {} from '@difizen/libro-common/app'; import mergeWith from 'lodash.mergewith'; import type { LspClientCapabilities, LanguageIdentifier } from '../lsp.js'; diff --git a/packages/libro-lsp/src/adapters/notebook-adapter.ts b/packages/libro-lsp/src/adapters/notebook-adapter.ts index 67cc3ea1..4ca4b5d2 100644 --- a/packages/libro-lsp/src/adapters/notebook-adapter.ts +++ b/packages/libro-lsp/src/adapters/notebook-adapter.ts @@ -14,8 +14,8 @@ import type { } from '@difizen/libro-core'; import { EditorCellView } from '@difizen/libro-core'; import type { ExecutableNotebookModel } from '@difizen/libro-kernel'; -import {} from '@difizen/libro-common/mana-app'; -import { inject, transient, watch, Deferred } from '@difizen/libro-common/mana-app'; +import {} from '@difizen/libro-common/app'; +import { inject, transient, watch, Deferred } from '@difizen/libro-common/app'; import type { IVirtualPosition } from '../positioning.js'; import type { Document } from '../tokens.js'; diff --git a/packages/libro-lsp/src/adapters/status-message.ts b/packages/libro-lsp/src/adapters/status-message.ts index efc023f0..ed6efd07 100644 --- a/packages/libro-lsp/src/adapters/status-message.ts +++ b/packages/libro-lsp/src/adapters/status-message.ts @@ -1,8 +1,8 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -import { Emitter } from '@difizen/libro-common/mana-app'; -import type { Disposable } from '@difizen/libro-common/mana-app'; +import { Emitter } from '@difizen/libro-common/app'; +import type { Disposable } from '@difizen/libro-common/app'; export class StatusMessage implements Disposable { /** diff --git a/packages/libro-lsp/src/connection-manager.ts b/packages/libro-lsp/src/connection-manager.ts index 91b58b3a..86a4af59 100644 --- a/packages/libro-lsp/src/connection-manager.ts +++ b/packages/libro-lsp/src/connection-manager.ts @@ -10,8 +10,8 @@ import { URL } from '@difizen/libro-common'; import type { NotebookView } from '@difizen/libro-core'; import { PageConfig } from '@difizen/libro-kernel'; -import type { Event } from '@difizen/libro-common/mana-app'; -import { Emitter, inject, singleton } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { Emitter, inject, singleton } from '@difizen/libro-common/app'; import type * as protocol from 'vscode-languageserver-protocol'; import type { WidgetLSPAdapter } from './adapters/adapter.js'; diff --git a/packages/libro-lsp/src/connection.ts b/packages/libro-lsp/src/connection.ts index ca658ed0..95928edb 100644 --- a/packages/libro-lsp/src/connection.ts +++ b/packages/libro-lsp/src/connection.ts @@ -6,9 +6,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -import type { Event } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import type * as lsp from 'vscode-languageserver-protocol'; import type { MessageConnection } from 'vscode-ws-jsonrpc'; diff --git a/packages/libro-lsp/src/extractors/manager.ts b/packages/libro-lsp/src/extractors/manager.ts index 0865b336..38bc6cbf 100644 --- a/packages/libro-lsp/src/extractors/manager.ts +++ b/packages/libro-lsp/src/extractors/manager.ts @@ -1,7 +1,7 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { ILSPCodeExtractorsManager } from '../tokens.js'; diff --git a/packages/libro-lsp/src/feature.ts b/packages/libro-lsp/src/feature.ts index d7a1f610..7b22d88f 100644 --- a/packages/libro-lsp/src/feature.ts +++ b/packages/libro-lsp/src/feature.ts @@ -1,9 +1,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -import type { Event } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import mergeWith from 'lodash.mergewith'; import type { LspClientCapabilities } from './lsp.js'; diff --git a/packages/libro-lsp/src/lsp-app-contribution.ts b/packages/libro-lsp/src/lsp-app-contribution.ts index 7b5ef275..9f1ad57e 100644 --- a/packages/libro-lsp/src/lsp-app-contribution.ts +++ b/packages/libro-lsp/src/lsp-app-contribution.ts @@ -1,8 +1,8 @@ import type { LibroView } from '@difizen/libro-core'; import { LibroService } from '@difizen/libro-core'; import { ServerManager } from '@difizen/libro-kernel'; -import { ApplicationContribution } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ApplicationContribution } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { NotebookAdapterFactory } from './adapters/notebook-adapter.js'; import { diff --git a/packages/libro-lsp/src/manager.ts b/packages/libro-lsp/src/manager.ts index 46c8f5c1..44bb99f0 100644 --- a/packages/libro-lsp/src/manager.ts +++ b/packages/libro-lsp/src/manager.ts @@ -4,9 +4,9 @@ import { Poll, URL } from '@difizen/libro-common'; import type { ISettings } from '@difizen/libro-kernel'; import { PageConfig, ServerConnection, ServerManager } from '@difizen/libro-kernel'; -import type { Event } from '@difizen/libro-common/mana-app'; -import { Deferred, Emitter } from '@difizen/libro-common/mana-app'; -import { inject, postConstruct, transient } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { Deferred, Emitter } from '@difizen/libro-common/app'; +import { inject, postConstruct, transient } from '@difizen/libro-common/app'; import type { ServerSpecProperties } from './schema.js'; import { ILanguageServerManagerOptions, URL_NS } from './tokens.js'; diff --git a/packages/libro-lsp/src/module.ts b/packages/libro-lsp/src/module.ts index 7077e8c5..05dd7fe1 100644 --- a/packages/libro-lsp/src/module.ts +++ b/packages/libro-lsp/src/module.ts @@ -1,5 +1,5 @@ import { LibroServerModule } from '@difizen/libro-kernel'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { NotebookAdapter, diff --git a/packages/libro-lsp/src/monitor.ts b/packages/libro-lsp/src/monitor.ts index 30cf6f3b..876d652e 100644 --- a/packages/libro-lsp/src/monitor.ts +++ b/packages/libro-lsp/src/monitor.ts @@ -1,5 +1,5 @@ -import { Emitter } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { Emitter } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import type { IMessageLog, MessageKind } from './lsp-protocol.js'; diff --git a/packages/libro-lsp/src/tokens.ts b/packages/libro-lsp/src/tokens.ts index 72445435..9de2da8b 100644 --- a/packages/libro-lsp/src/tokens.ts +++ b/packages/libro-lsp/src/tokens.ts @@ -6,7 +6,7 @@ import type { IEditor as ICodeEditor } from '@difizen/libro-code-editor'; import type { NotebookView } from '@difizen/libro-core'; -import type { Disposable, Emitter, Event } from '@difizen/libro-common/mana-app'; +import type { Disposable, Emitter, Event } from '@difizen/libro-common/app'; import type * as rpc from 'vscode-jsonrpc'; import type * as lsp from 'vscode-languageserver-protocol'; diff --git a/packages/libro-lsp/src/virtual/document.ts b/packages/libro-lsp/src/virtual/document.ts index 7c55d09c..bbb3e5d9 100644 --- a/packages/libro-lsp/src/virtual/document.ts +++ b/packages/libro-lsp/src/virtual/document.ts @@ -6,9 +6,9 @@ import type { IPosition as CodeEditorPosition, IRange, } from '@difizen/libro-code-editor'; -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import type { IForeignCodeExtractor } from '../extractors/types.js'; import type { LanguageIdentifier } from '../lsp.js'; diff --git a/packages/libro-lsp/src/ws-connection/ws-connection.ts b/packages/libro-lsp/src/ws-connection/ws-connection.ts index 0f5e7db4..4a19087e 100644 --- a/packages/libro-lsp/src/ws-connection/ws-connection.ts +++ b/packages/libro-lsp/src/ws-connection/ws-connection.ts @@ -9,8 +9,8 @@ // but without language deemed unnecessary following the Berne Convention." (Wikipedia). // Introduced modifications are BSD licenced, copyright JupyterLab development team. -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; -import { Emitter, transient } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; +import { Emitter, transient } from '@difizen/libro-common/app'; import type * as protocol from 'vscode-languageserver-protocol'; //TODO: vscode-ws-jsonrpc has new version import type { MessageConnection } from 'vscode-ws-jsonrpc'; diff --git a/packages/libro-markdown-cell/src/markdown-cell-contribution.ts b/packages/libro-markdown-cell/src/markdown-cell-contribution.ts index b5afad42..d5cf63db 100644 --- a/packages/libro-markdown-cell/src/markdown-cell-contribution.ts +++ b/packages/libro-markdown-cell/src/markdown-cell-contribution.ts @@ -2,7 +2,7 @@ import type { LanguageSpecRegistry } from '@difizen/libro-code-editor'; import { LanguageSpecContribution } from '@difizen/libro-code-editor'; import type { CellMeta, CellOptions, CellModel } from '@difizen/libro-core'; import { CellModelContribution, CellViewContribution } from '@difizen/libro-core'; -import { singleton, inject } from '@difizen/libro-common/mana-app'; +import { singleton, inject } from '@difizen/libro-common/app'; import { MarkdownCellModelFactory } from './markdown-cell-protocol.js'; import { MarkdownCellView } from './markdown-cell-view.js'; diff --git a/packages/libro-markdown-cell/src/markdown-cell-model.ts b/packages/libro-markdown-cell/src/markdown-cell-model.ts index 9e7d4e11..c637dec4 100644 --- a/packages/libro-markdown-cell/src/markdown-cell-model.ts +++ b/packages/libro-markdown-cell/src/markdown-cell-model.ts @@ -2,8 +2,8 @@ import type { IMarkdownCell } from '@difizen/libro-common'; import { concatMultilineString } from '@difizen/libro-common'; import type { LibroMarkdownCellModel } from '@difizen/libro-core'; import { CellOptions, LibroCellModel } from '@difizen/libro-core'; -import { prop } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { prop } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; @transient() export class MarkdownCellModel diff --git a/packages/libro-markdown-cell/src/markdown-cell-module.ts b/packages/libro-markdown-cell/src/markdown-cell-module.ts index 104c8e11..ddf3c7f3 100644 --- a/packages/libro-markdown-cell/src/markdown-cell-module.ts +++ b/packages/libro-markdown-cell/src/markdown-cell-module.ts @@ -1,6 +1,6 @@ import { CellOptions } from '@difizen/libro-core'; import { MarkdownModule } from '@difizen/libro-markdown'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { MarkdownCellContribution } from './markdown-cell-contribution.js'; import { MarkdownCellModel } from './markdown-cell-model.js'; diff --git a/packages/libro-markdown-cell/src/markdown-cell-view.tsx b/packages/libro-markdown-cell/src/markdown-cell-view.tsx index 68e04f5a..b399f7f1 100644 --- a/packages/libro-markdown-cell/src/markdown-cell-view.tsx +++ b/packages/libro-markdown-cell/src/markdown-cell-view.tsx @@ -4,16 +4,16 @@ import { CellUri } from '@difizen/libro-common'; import type { CellCollapsible, CellViewOptions } from '@difizen/libro-core'; import { CellService, EditorStatus, LibroEditorCellView } from '@difizen/libro-core'; import { MarkdownParser } from '@difizen/libro-markdown'; -import type { ViewSize } from '@difizen/libro-common/mana-app'; -import { getOrigin, prop, useInject, watch } from '@difizen/libro-common/mana-app'; +import type { ViewSize } from '@difizen/libro-common/app'; +import { getOrigin, prop, useInject, watch } from '@difizen/libro-common/app'; import { view, ViewInstance, ViewManager, ViewOption, ViewRender, -} from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { forwardRef, useEffect } from 'react'; import './index.less'; diff --git a/packages/libro-markdown/src/config-contribution.ts b/packages/libro-markdown/src/config-contribution.ts index 20a180a3..1d65c40d 100644 --- a/packages/libro-markdown/src/config-contribution.ts +++ b/packages/libro-markdown/src/config-contribution.ts @@ -1,5 +1,5 @@ -import { ConfigurationContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { ConfigurationContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import { LibroMarkdownConfiguration } from './config.js'; diff --git a/packages/libro-markdown/src/config.ts b/packages/libro-markdown/src/config.ts index f52b8315..68f0d083 100644 --- a/packages/libro-markdown/src/config.ts +++ b/packages/libro-markdown/src/config.ts @@ -1,4 +1,4 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; export const LibroConfigLinkTargetToBlank: ConfigurationNode = { diff --git a/packages/libro-markdown/src/markdown-render.ts b/packages/libro-markdown/src/markdown-render.ts index 288128c8..4bd447f7 100644 --- a/packages/libro-markdown/src/markdown-render.ts +++ b/packages/libro-markdown/src/markdown-render.ts @@ -3,7 +3,7 @@ import { inject, postConstruct, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import latexPlugin from '@traptitech/markdown-it-katex'; import MarkdownIt from 'markdown-it'; diff --git a/packages/libro-markdown/src/module.ts b/packages/libro-markdown/src/module.ts index 584ddacb..2151c798 100644 --- a/packages/libro-markdown/src/module.ts +++ b/packages/libro-markdown/src/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroMarkdownSettingContribution } from './config-contribution.js'; import { MarkdownParser } from './markdown-protocol.js'; diff --git a/packages/libro-output/src/display-data-output/display-data-output-contribution.ts b/packages/libro-output/src/display-data-output/display-data-output-contribution.ts index 035cb08a..b2275b15 100644 --- a/packages/libro-output/src/display-data-output/display-data-output-contribution.ts +++ b/packages/libro-output/src/display-data-output/display-data-output-contribution.ts @@ -1,8 +1,8 @@ import type { IOutput } from '@difizen/libro-common'; import type { IOutputOptions } from '@difizen/libro-core'; import { OutputContribution } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { ViewManager } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { ViewManager } from '@difizen/libro-common/app'; import { DisplayDataOutputModel } from './display-data-output-model.js'; diff --git a/packages/libro-output/src/display-data-output/display-data-output-model.tsx b/packages/libro-output/src/display-data-output/display-data-output-model.tsx index a5c8bb0b..c042e657 100644 --- a/packages/libro-output/src/display-data-output/display-data-output-model.tsx +++ b/packages/libro-output/src/display-data-output/display-data-output-model.tsx @@ -9,8 +9,8 @@ import { view, ViewInstance, ViewOption, -} from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import { getBundleOptions } from '../output-utils.js'; diff --git a/packages/libro-output/src/display-data-output/display-data-output-module.ts b/packages/libro-output/src/display-data-output/display-data-output-module.ts index eb846908..90844fec 100644 --- a/packages/libro-output/src/display-data-output/display-data-output-module.ts +++ b/packages/libro-output/src/display-data-output/display-data-output-module.ts @@ -1,6 +1,6 @@ import { OutputModule } from '@difizen/libro-core'; import { LibroRenderMimeModule } from '@difizen/libro-rendermime'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { DisplayDataOutputContribution } from './display-data-output-contribution.js'; import { DisplayDataOutputModel } from './display-data-output-model.js'; diff --git a/packages/libro-output/src/error-output/error-output-contribution.ts b/packages/libro-output/src/error-output/error-output-contribution.ts index 79cfd3b7..cdd5e25e 100644 --- a/packages/libro-output/src/error-output/error-output-contribution.ts +++ b/packages/libro-output/src/error-output/error-output-contribution.ts @@ -1,8 +1,8 @@ import type { IOutput } from '@difizen/libro-common'; import type { IOutputOptions } from '@difizen/libro-core'; import { OutputContribution } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { ViewManager } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { ViewManager } from '@difizen/libro-common/app'; import { ErrorOutputModel } from './error-output-model.js'; diff --git a/packages/libro-output/src/error-output/error-output-model.tsx b/packages/libro-output/src/error-output/error-output-model.tsx index 16d3b046..63948961 100644 --- a/packages/libro-output/src/error-output/error-output-model.tsx +++ b/packages/libro-output/src/error-output/error-output-model.tsx @@ -4,7 +4,7 @@ import { LibroOutputView } from '@difizen/libro-core'; import type { BaseOutputView, IOutputOptions } from '@difizen/libro-core'; import { RenderMimeRegistry, renderText } from '@difizen/libro-rendermime'; import type { IRenderMimeRegistry } from '@difizen/libro-rendermime'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { inject, transient } from '@difizen/libro-common/app'; import { getOrigin, prop, @@ -12,7 +12,7 @@ import { view, ViewInstance, ViewOption, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Button } from 'antd'; import { forwardRef, createRef, useEffect } from 'react'; import '../index.less'; diff --git a/packages/libro-output/src/error-output/error-output-module.ts b/packages/libro-output/src/error-output/error-output-module.ts index 0b2d721e..293ddbd6 100644 --- a/packages/libro-output/src/error-output/error-output-module.ts +++ b/packages/libro-output/src/error-output/error-output-module.ts @@ -1,6 +1,6 @@ import { OutputModule } from '@difizen/libro-core'; import { LibroRenderMimeModule } from '@difizen/libro-rendermime'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { ErrorOutputContribution } from './error-output-contribution.js'; import { ErrorOutputModel } from './error-output-model.js'; diff --git a/packages/libro-output/src/stream-output/stream-output-contribution.ts b/packages/libro-output/src/stream-output/stream-output-contribution.ts index 76f1fadc..7f798338 100644 --- a/packages/libro-output/src/stream-output/stream-output-contribution.ts +++ b/packages/libro-output/src/stream-output/stream-output-contribution.ts @@ -1,8 +1,8 @@ import type { IOutput } from '@difizen/libro-common'; import type { IOutputOptions } from '@difizen/libro-core'; import { OutputContribution } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { ViewManager } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { ViewManager } from '@difizen/libro-common/app'; import { StreamOutputModel } from './stream-output-model.js'; diff --git a/packages/libro-output/src/stream-output/stream-output-model.tsx b/packages/libro-output/src/stream-output/stream-output-model.tsx index 7aa32a29..d3914a05 100644 --- a/packages/libro-output/src/stream-output/stream-output-model.tsx +++ b/packages/libro-output/src/stream-output/stream-output-model.tsx @@ -3,14 +3,14 @@ import { LibroOutputView } from '@difizen/libro-core'; import type { BaseOutputView, IOutputOptions } from '@difizen/libro-core'; import { RenderMimeRegistry } from '@difizen/libro-rendermime'; import type { IRenderMimeRegistry, IRendererFactory } from '@difizen/libro-rendermime'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { inject, transient } from '@difizen/libro-common/app'; import { getOrigin, useInject, view, ViewInstance, ViewOption, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { forwardRef } from 'react'; import '../index.less'; diff --git a/packages/libro-output/src/stream-output/stream-output-module.ts b/packages/libro-output/src/stream-output/stream-output-module.ts index 887cbbf0..8108dcd8 100644 --- a/packages/libro-output/src/stream-output/stream-output-module.ts +++ b/packages/libro-output/src/stream-output/stream-output-module.ts @@ -1,6 +1,6 @@ import { OutputModule } from '@difizen/libro-core'; import { LibroRenderMimeModule } from '@difizen/libro-rendermime'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { StreamOutputContribution } from './stream-output-contribution.js'; import { StreamOutputModel } from './stream-output-model.js'; diff --git a/packages/libro-prompt-cell/src/code-block.tsx b/packages/libro-prompt-cell/src/code-block.tsx index 0406b8a8..530ee43e 100644 --- a/packages/libro-prompt-cell/src/code-block.tsx +++ b/packages/libro-prompt-cell/src/code-block.tsx @@ -1,7 +1,7 @@ import { CopyOutlined, EditOutlined } from '@ant-design/icons'; import type { DisplayDataOutputModel } from '@difizen/libro-jupyter'; import { copy2clipboard } from '@difizen/libro-jupyter'; -import { useInject, ViewInstance } from '@difizen/libro-common/mana-app'; +import { useInject, ViewInstance } from '@difizen/libro-common/app'; import { Collapse } from 'antd'; import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter'; diff --git a/packages/libro-prompt-cell/src/input-handler/chat-record-input.tsx b/packages/libro-prompt-cell/src/input-handler/chat-record-input.tsx index bb257afd..7c4f6aed 100644 --- a/packages/libro-prompt-cell/src/input-handler/chat-record-input.tsx +++ b/packages/libro-prompt-cell/src/input-handler/chat-record-input.tsx @@ -1,6 +1,6 @@ import { EditFilled } from '@ant-design/icons'; import { LibroContextKey } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Select, Tag } from 'antd'; import classNames from 'classnames'; diff --git a/packages/libro-prompt-cell/src/input-handler/variable-name-input.tsx b/packages/libro-prompt-cell/src/input-handler/variable-name-input.tsx index 7a69cfa3..31226085 100644 --- a/packages/libro-prompt-cell/src/input-handler/variable-name-input.tsx +++ b/packages/libro-prompt-cell/src/input-handler/variable-name-input.tsx @@ -1,6 +1,6 @@ import { EditFilled } from '@ant-design/icons'; import { LibroContextKey } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Input, Popover } from 'antd'; import classNames from 'classnames'; diff --git a/packages/libro-prompt-cell/src/interpreter-code-output-rendermime-contribution.ts b/packages/libro-prompt-cell/src/interpreter-code-output-rendermime-contribution.ts index f96010c8..3b7c4ebe 100644 --- a/packages/libro-prompt-cell/src/interpreter-code-output-rendermime-contribution.ts +++ b/packages/libro-prompt-cell/src/interpreter-code-output-rendermime-contribution.ts @@ -1,6 +1,6 @@ import type { BaseOutputView } from '@difizen/libro-jupyter'; import { RenderMimeContribution } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { InterpreterCodeOutputRender } from './interpreter-code-output-render.js'; diff --git a/packages/libro-prompt-cell/src/libro-formatter-prompt-magic-contribution.ts b/packages/libro-prompt-cell/src/libro-formatter-prompt-magic-contribution.ts index b3102dd9..2899de8f 100644 --- a/packages/libro-prompt-cell/src/libro-formatter-prompt-magic-contribution.ts +++ b/packages/libro-prompt-cell/src/libro-formatter-prompt-magic-contribution.ts @@ -6,7 +6,7 @@ import { DefaultDecodedFormatter, FormatterContribution, } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; export interface PromptDecodedFormatter extends DefaultDecodedFormatter { modelType?: string; diff --git a/packages/libro-prompt-cell/src/module.ts b/packages/libro-prompt-cell/src/module.ts index 3f6aec6a..b11f05ca 100644 --- a/packages/libro-prompt-cell/src/module.ts +++ b/packages/libro-prompt-cell/src/module.ts @@ -1,6 +1,6 @@ import { CellOptions, LibroModule, OutputModule } from '@difizen/libro-core'; import { LibroRenderMimeModule } from '@difizen/libro-rendermime'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroInterpreterCodeOutputMimeTypeContribution } from './interpreter-code-output-rendermime-contribution.js'; import { FormatterPromptMagicContribution } from './libro-formatter-prompt-magic-contribution.js'; diff --git a/packages/libro-prompt-cell/src/prompt-cell-command-contribution.ts b/packages/libro-prompt-cell/src/prompt-cell-command-contribution.ts index 7231ba6c..51324e30 100644 --- a/packages/libro-prompt-cell/src/prompt-cell-command-contribution.ts +++ b/packages/libro-prompt-cell/src/prompt-cell-command-contribution.ts @@ -1,13 +1,13 @@ import type { CellView, NotebookView } from '@difizen/libro-core'; import { LibroCommandRegister, LibroCellView, LibroView } from '@difizen/libro-core'; -import type { CommandRegistry } from '@difizen/libro-common/mana-app'; +import type { CommandRegistry } from '@difizen/libro-common/app'; import { CommandContribution, inject, KeybindingContribution, KeybindingRegistry, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; export const LibroPromptCellCommands = { ChangeCellToPrompt: { diff --git a/packages/libro-prompt-cell/src/prompt-cell-contribution.ts b/packages/libro-prompt-cell/src/prompt-cell-contribution.ts index 7a2acf8d..10e8092f 100644 --- a/packages/libro-prompt-cell/src/prompt-cell-contribution.ts +++ b/packages/libro-prompt-cell/src/prompt-cell-contribution.ts @@ -3,8 +3,8 @@ import { LanguageSpecContribution } from '@difizen/libro-code-editor'; import type { CellModel } from '@difizen/libro-core'; import type { CellMeta, CellOptions } from '@difizen/libro-core'; import { CellViewContribution, CellModelContribution } from '@difizen/libro-core'; -import { inject } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { inject } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import { LibroPromptCellModelFactory } from './prompt-cell-protocol.js'; import { LibroPromptCellView } from './prompt-cell-view.js'; diff --git a/packages/libro-prompt-cell/src/prompt-cell-model.ts b/packages/libro-prompt-cell/src/prompt-cell-model.ts index c1892f4f..9151d551 100644 --- a/packages/libro-prompt-cell/src/prompt-cell-model.ts +++ b/packages/libro-prompt-cell/src/prompt-cell-model.ts @@ -7,12 +7,12 @@ import type { ExecutableCellModel } from '@difizen/libro-core'; import { LibroCellModel } from '@difizen/libro-core'; import { CellOptions } from '@difizen/libro-core'; import type { ExecutionMeta } from '@difizen/libro-jupyter'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { transient } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { ViewManager } from '@difizen/libro-common/mana-app'; -import { inject } from '@difizen/libro-common/mana-app'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; +import { Emitter } from '@difizen/libro-common/app'; +import { transient } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { ViewManager } from '@difizen/libro-common/app'; +import { inject } from '@difizen/libro-common/app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; import type { PromptDecodedFormatter } from './libro-formatter-prompt-magic-contribution.js'; import type { InterpreterMeta } from './prompt-cell-protocol.js'; diff --git a/packages/libro-prompt-cell/src/prompt-cell-script.ts b/packages/libro-prompt-cell/src/prompt-cell-script.ts index 979b5389..2790455e 100644 --- a/packages/libro-prompt-cell/src/prompt-cell-script.ts +++ b/packages/libro-prompt-cell/src/prompt-cell-script.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton() export class PromptScript { diff --git a/packages/libro-prompt-cell/src/prompt-cell-view.tsx b/packages/libro-prompt-cell/src/prompt-cell-view.tsx index 7f3be2a6..a600e3a9 100644 --- a/packages/libro-prompt-cell/src/prompt-cell-view.tsx +++ b/packages/libro-prompt-cell/src/prompt-cell-view.tsx @@ -31,7 +31,7 @@ import { ViewRender, watch, Deferred, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Select, Tag } from 'antd'; import type { DefaultOptionType } from 'antd/es/select/index.js'; diff --git a/packages/libro-prompt-cell/src/prompt-output-render.tsx b/packages/libro-prompt-cell/src/prompt-output-render.tsx index 79820f00..11485aa2 100644 --- a/packages/libro-prompt-cell/src/prompt-output-render.tsx +++ b/packages/libro-prompt-cell/src/prompt-output-render.tsx @@ -4,7 +4,7 @@ import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-jupyter'; import { NotebookCommands } from '@difizen/libro-jupyter'; import { ChatComponents } from '@difizen/magent-chat'; -import { CommandRegistry, useInject } from '@difizen/libro-common/mana-app'; +import { CommandRegistry, useInject } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import React, { useState } from 'react'; import breaks from 'remark-breaks'; diff --git a/packages/libro-prompt-cell/src/prompt-output-rendermime-contribution.ts b/packages/libro-prompt-cell/src/prompt-output-rendermime-contribution.ts index 9a05391a..75d1b246 100644 --- a/packages/libro-prompt-cell/src/prompt-output-rendermime-contribution.ts +++ b/packages/libro-prompt-cell/src/prompt-output-rendermime-contribution.ts @@ -1,6 +1,6 @@ import type { BaseOutputView } from '@difizen/libro-jupyter'; import { RenderMimeContribution } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import { PromptOutputRender } from './prompt-output-render.js'; diff --git a/packages/libro-raw-cell/src/module.ts b/packages/libro-raw-cell/src/module.ts index 058c1edd..cbb2c6eb 100644 --- a/packages/libro-raw-cell/src/module.ts +++ b/packages/libro-raw-cell/src/module.ts @@ -1,5 +1,5 @@ import { CellOptions } from '@difizen/libro-core'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { RawCellContribution } from './raw-cell-contribution.js'; import { LibroRawCellModel } from './raw-cell-model.js'; diff --git a/packages/libro-raw-cell/src/raw-cell-contribution.ts b/packages/libro-raw-cell/src/raw-cell-contribution.ts index 58d186e8..56ce98a9 100644 --- a/packages/libro-raw-cell/src/raw-cell-contribution.ts +++ b/packages/libro-raw-cell/src/raw-cell-contribution.ts @@ -2,7 +2,7 @@ import type { LanguageSpecRegistry } from '@difizen/libro-code-editor'; import { LanguageSpecContribution } from '@difizen/libro-code-editor'; import type { CellMeta, CellModel, CellOptions } from '@difizen/libro-core'; import { CellModelContribution, CellViewContribution } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { RawCellModelFactory } from './raw-cell-protocol.js'; import { LibroRawCellView } from './raw-cell-view.js'; diff --git a/packages/libro-raw-cell/src/raw-cell-model.ts b/packages/libro-raw-cell/src/raw-cell-model.ts index e549aa05..081d65cd 100644 --- a/packages/libro-raw-cell/src/raw-cell-model.ts +++ b/packages/libro-raw-cell/src/raw-cell-model.ts @@ -1,6 +1,6 @@ import type { IRawCell } from '@difizen/libro-common'; import { CellOptions, LibroCellModel } from '@difizen/libro-core'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { inject, transient } from '@difizen/libro-common/app'; @transient() export class LibroRawCellModel extends LibroCellModel { diff --git a/packages/libro-raw-cell/src/raw-cell-view.tsx b/packages/libro-raw-cell/src/raw-cell-view.tsx index 5e399ea1..29c5612f 100644 --- a/packages/libro-raw-cell/src/raw-cell-view.tsx +++ b/packages/libro-raw-cell/src/raw-cell-view.tsx @@ -4,15 +4,15 @@ import type { CodeEditorViewOptions } from '@difizen/libro-code-editor'; import { CellUri } from '@difizen/libro-common'; import type { CellViewOptions } from '@difizen/libro-core'; import { CellService, LibroEditorCellView } from '@difizen/libro-core'; -import { getOrigin, useInject } from '@difizen/libro-common/mana-app'; +import { getOrigin, useInject } from '@difizen/libro-common/app'; import { view, ViewInstance, ViewManager, ViewOption, ViewRender, -} from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import React, { useEffect } from 'react'; import type { LibroRawCellModel } from './raw-cell-model.js'; diff --git a/packages/libro-rendermime/src/components/html-render.tsx b/packages/libro-rendermime/src/components/html-render.tsx index a973109d..5dfa951c 100644 --- a/packages/libro-rendermime/src/components/html-render.tsx +++ b/packages/libro-rendermime/src/components/html-render.tsx @@ -1,6 +1,6 @@ import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import React, { useEffect, useRef } from 'react'; import { renderHTML } from '../renderers.js'; diff --git a/packages/libro-rendermime/src/components/image-render.tsx b/packages/libro-rendermime/src/components/image-render.tsx index 63512ff2..04643bdf 100644 --- a/packages/libro-rendermime/src/components/image-render.tsx +++ b/packages/libro-rendermime/src/components/image-render.tsx @@ -1,7 +1,7 @@ import type { JSONObject } from '@difizen/libro-common'; import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import React, { useEffect, useRef } from 'react'; import { renderImage } from '../renderers.js'; diff --git a/packages/libro-rendermime/src/components/latex-render.tsx b/packages/libro-rendermime/src/components/latex-render.tsx index 2c1cdc71..a4d23a58 100644 --- a/packages/libro-rendermime/src/components/latex-render.tsx +++ b/packages/libro-rendermime/src/components/latex-render.tsx @@ -1,6 +1,6 @@ import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import React from 'react'; import type { IRenderMimeRegistry } from '../rendermime-protocol.js'; diff --git a/packages/libro-rendermime/src/components/markdown-render.tsx b/packages/libro-rendermime/src/components/markdown-render.tsx index a191398b..99db710b 100644 --- a/packages/libro-rendermime/src/components/markdown-render.tsx +++ b/packages/libro-rendermime/src/components/markdown-render.tsx @@ -1,6 +1,6 @@ import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import React, { useEffect, useRef } from 'react'; import { renderMarkdown } from '../renderers.js'; diff --git a/packages/libro-rendermime/src/components/svg-render.tsx b/packages/libro-rendermime/src/components/svg-render.tsx index d487e962..72bd18e3 100644 --- a/packages/libro-rendermime/src/components/svg-render.tsx +++ b/packages/libro-rendermime/src/components/svg-render.tsx @@ -1,6 +1,6 @@ import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import React, { useEffect, useRef } from 'react'; import { renderSVG } from '../renderers.js'; diff --git a/packages/libro-rendermime/src/components/text-render.tsx b/packages/libro-rendermime/src/components/text-render.tsx index 309d8aca..d2d6f2c3 100644 --- a/packages/libro-rendermime/src/components/text-render.tsx +++ b/packages/libro-rendermime/src/components/text-render.tsx @@ -1,7 +1,7 @@ import type { JSONValue } from '@difizen/libro-common'; import { concatMultilineString } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; -import { useInject } from '@difizen/libro-common/mana-app'; +import { useInject } from '@difizen/libro-common/app'; import React, { useEffect, useRef } from 'react'; import { renderText } from '../renderers.js'; diff --git a/packages/libro-rendermime/src/rendermime-module.ts b/packages/libro-rendermime/src/rendermime-module.ts index 6cb8b279..d45eba4a 100644 --- a/packages/libro-rendermime/src/rendermime-module.ts +++ b/packages/libro-rendermime/src/rendermime-module.ts @@ -1,5 +1,5 @@ import { MarkdownModule } from '@difizen/libro-markdown'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { standardRendererFactories as initialFactories } from './rendermime-factory.js'; import { diff --git a/packages/libro-rendermime/src/rendermime-protocol.ts b/packages/libro-rendermime/src/rendermime-protocol.ts index ebdb32ef..ed637a03 100644 --- a/packages/libro-rendermime/src/rendermime-protocol.ts +++ b/packages/libro-rendermime/src/rendermime-protocol.ts @@ -1,7 +1,7 @@ import type { ISanitizer } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; import type { MarkdownParser } from '@difizen/libro-markdown'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import { Syringe } from '@difizen/libro-common/app'; export const DefaultRenderMimeRegistry = Symbol('RenderMimeRegistry'); export const IRenderMimeRegistryOptions = Symbol('IRenderMimeRegistryOptions'); diff --git a/packages/libro-rendermime/src/rendermime-registry.ts b/packages/libro-rendermime/src/rendermime-registry.ts index 272e3509..ce38d3b8 100644 --- a/packages/libro-rendermime/src/rendermime-registry.ts +++ b/packages/libro-rendermime/src/rendermime-registry.ts @@ -1,9 +1,9 @@ import { defaultSanitizer } from '@difizen/libro-common'; import type { BaseOutputView } from '@difizen/libro-core'; import { MarkdownParser } from '@difizen/libro-markdown'; -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { contrib, inject, singleton, Priority } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { contrib, inject, singleton, Priority } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; import { RenderMimeContribution, diff --git a/packages/libro-rendermime/src/rendermime-utils.ts b/packages/libro-rendermime/src/rendermime-utils.ts index 0a7c7512..5a887105 100644 --- a/packages/libro-rendermime/src/rendermime-utils.ts +++ b/packages/libro-rendermime/src/rendermime-utils.ts @@ -16,7 +16,7 @@ import { isStream, URL, } from '@difizen/libro-common'; -import { URI } from '@difizen/libro-common/mana-app'; +import { URI } from '@difizen/libro-common/app'; import escape from 'lodash.escape'; import type { ILinkHandler, IResolver, RankMap } from './rendermime-protocol.js'; diff --git a/packages/libro-search-code-cell/src/code-cell-search-provider-contribution.ts b/packages/libro-search-code-cell/src/code-cell-search-provider-contribution.ts index 0bef29b6..90527033 100644 --- a/packages/libro-search-code-cell/src/code-cell-search-provider-contribution.ts +++ b/packages/libro-search-code-cell/src/code-cell-search-provider-contribution.ts @@ -1,8 +1,8 @@ import { LibroCodeCellView } from '@difizen/libro-code-cell'; import type { CellView } from '@difizen/libro-core'; import { CellSearchProviderContribution } from '@difizen/libro-search'; -import { ViewManager } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { CodeCellSearchProviderFactory } from './code-cell-search-protocol.js'; diff --git a/packages/libro-search-code-cell/src/code-cell-search-provider.ts b/packages/libro-search-code-cell/src/code-cell-search-provider.ts index 3b5728df..79aca529 100644 --- a/packages/libro-search-code-cell/src/code-cell-search-provider.ts +++ b/packages/libro-search-code-cell/src/code-cell-search-provider.ts @@ -3,7 +3,7 @@ import type { SearchMatch } from '@difizen/libro-code-editor'; import type { GenericSearchProvider, SearchFilters } from '@difizen/libro-search'; import { GenericSearchProviderFactory } from '@difizen/libro-search'; -import { inject, prop, transient, watch } from '@difizen/libro-common/mana-app'; +import { inject, prop, transient, watch } from '@difizen/libro-common/app'; import { CodeCellSearchOption, diff --git a/packages/libro-search-code-cell/src/code-editor-cell-search-provider.ts b/packages/libro-search-code-cell/src/code-editor-cell-search-provider.ts index b013a6c5..a4e3035f 100644 --- a/packages/libro-search-code-cell/src/code-editor-cell-search-provider.ts +++ b/packages/libro-search-code-cell/src/code-editor-cell-search-provider.ts @@ -2,12 +2,12 @@ import type { LibroCodeCellView } from '@difizen/libro-code-cell'; import type { IPosition, SearchMatch } from '@difizen/libro-code-editor'; import type { BaseSearchProvider, SearchFilters } from '@difizen/libro-search'; import { searchText } from '@difizen/libro-search'; -import type { Event } from '@difizen/libro-common/mana-app'; -import { Disposable } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { DisposableCollection, Emitter } from '@difizen/libro-common/mana-app'; -import { watch } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { Disposable } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { DisposableCollection, Emitter } from '@difizen/libro-common/app'; +import { watch } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import type { CodeEditorSearchHighlighter } from './code-cell-search-protocol.js'; import { CodeEditorSearchHighlighterFactory } from './code-cell-search-protocol.js'; diff --git a/packages/libro-search-code-cell/src/module.ts b/packages/libro-search-code-cell/src/module.ts index 9258648a..845136d7 100644 --- a/packages/libro-search-code-cell/src/module.ts +++ b/packages/libro-search-code-cell/src/module.ts @@ -1,6 +1,6 @@ import type { IEditor } from '@difizen/libro-code-editor'; import { LibroSearchModule } from '@difizen/libro-search'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { CodeCellSearchOption, diff --git a/packages/libro-search-code-cell/src/search-highlighter.ts b/packages/libro-search-code-cell/src/search-highlighter.ts index 723e598a..d9d22a8c 100644 --- a/packages/libro-search-code-cell/src/search-highlighter.ts +++ b/packages/libro-search-code-cell/src/search-highlighter.ts @@ -2,8 +2,8 @@ import type { IEditor, SearchMatch } from '@difizen/libro-code-editor'; import { deepEqual } from '@difizen/libro-common'; import { LibroSearchUtils } from '@difizen/libro-search'; -import { prop } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { prop } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import type { CodeEditorSearchHighlighter } from './code-cell-search-protocol.js'; diff --git a/packages/libro-search/src/abstract-search-provider.ts b/packages/libro-search/src/abstract-search-provider.ts index 7ced3ebf..50f6e52b 100644 --- a/packages/libro-search/src/abstract-search-provider.ts +++ b/packages/libro-search/src/abstract-search-provider.ts @@ -1,8 +1,8 @@ import type { SearchMatch } from '@difizen/libro-code-editor'; -import type { Event } from '@difizen/libro-common/mana-app'; -import type { View } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { transient } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import type { View } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { transient } from '@difizen/libro-common/app'; import type { SearchFilter, diff --git a/packages/libro-search/src/libro-cell-search-provider.ts b/packages/libro-search/src/libro-cell-search-provider.ts index fce05450..687e39a3 100644 --- a/packages/libro-search/src/libro-cell-search-provider.ts +++ b/packages/libro-search/src/libro-cell-search-provider.ts @@ -1,7 +1,7 @@ import type { CellView } from '@difizen/libro-core'; -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { Priority } from '@difizen/libro-common/mana-app'; -import { contrib, transient } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { Priority } from '@difizen/libro-common/app'; +import { contrib, transient } from '@difizen/libro-common/app'; import { CellSearchProviderContribution } from './libro-search-protocol.js'; diff --git a/packages/libro-search/src/libro-search-generic-provider.ts b/packages/libro-search/src/libro-search-generic-provider.ts index cc92edf8..1e151d2a 100644 --- a/packages/libro-search/src/libro-search-generic-provider.ts +++ b/packages/libro-search/src/libro-search-generic-provider.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-loop-func */ /* eslint-disable @typescript-eslint/no-unused-vars */ -import type { View } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import type { View } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { AbstractSearchProvider } from './abstract-search-provider.js'; import { searchInHTML } from './libro-search-engine-html.js'; diff --git a/packages/libro-search/src/libro-search-manager.ts b/packages/libro-search/src/libro-search-manager.ts index 7695fcc6..7c813428 100644 --- a/packages/libro-search/src/libro-search-manager.ts +++ b/packages/libro-search/src/libro-search-manager.ts @@ -8,17 +8,14 @@ import type { LibroSlot, LibroView, } from '@difizen/libro-core'; -import type { - CommandRegistry, - KeybindingRegistry, -} from '@difizen/libro-common/mana-app'; +import type { CommandRegistry, KeybindingRegistry } from '@difizen/libro-common/app'; import { ViewManager, CommandContribution, KeybindingContribution, inject, singleton, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { LibroSearchView } from './libro-search-view.js'; diff --git a/packages/libro-search/src/libro-search-model.ts b/packages/libro-search/src/libro-search-model.ts index a559d4c3..423f2de0 100644 --- a/packages/libro-search/src/libro-search-model.ts +++ b/packages/libro-search/src/libro-search-model.ts @@ -2,9 +2,9 @@ // Copyright (c) Jupyter Development Team. // Distributed under the terms of the Modified BSD License. -import type { Disposable } from '@difizen/libro-common/mana-app'; -import { DisposableCollection, Emitter } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import type { Disposable } from '@difizen/libro-common/app'; +import { DisposableCollection, Emitter } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import debounce from 'lodash.debounce'; import type { SearchProvider } from './libro-search-protocol.js'; diff --git a/packages/libro-search/src/libro-search-protocol.ts b/packages/libro-search/src/libro-search-protocol.ts index a512390d..f83d759e 100644 --- a/packages/libro-search/src/libro-search-protocol.ts +++ b/packages/libro-search/src/libro-search-protocol.ts @@ -1,8 +1,8 @@ import type { SearchMatch } from '@difizen/libro-code-editor'; import type { CellView } from '@difizen/libro-core'; -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; -import type { View } from '@difizen/libro-common/mana-app'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; +import type { View } from '@difizen/libro-common/app'; +import { Syringe } from '@difizen/libro-common/app'; /** * HTML search match interface */ diff --git a/packages/libro-search/src/libro-search-provider.ts b/packages/libro-search/src/libro-search-provider.ts index bbc20bd6..532bda46 100644 --- a/packages/libro-search/src/libro-search-provider.ts +++ b/packages/libro-search/src/libro-search-provider.ts @@ -6,8 +6,8 @@ import { VirtualizedManagerHelper, LibroContextKey, } from '@difizen/libro-core'; -import { inject, prop, transient, equals } from '@difizen/libro-common/mana-app'; -import { Deferred, DisposableCollection } from '@difizen/libro-common/mana-app'; +import { inject, prop, transient, equals } from '@difizen/libro-common/app'; +import { Deferred, DisposableCollection } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { AbstractSearchProvider } from './abstract-search-provider.js'; diff --git a/packages/libro-search/src/libro-search-utils.ts b/packages/libro-search/src/libro-search-utils.ts index f8d6ab3a..16766471 100644 --- a/packages/libro-search/src/libro-search-utils.ts +++ b/packages/libro-search/src/libro-search-utils.ts @@ -1,5 +1,5 @@ import type { SearchMatch } from '@difizen/libro-code-editor'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; /** * Search Utils diff --git a/packages/libro-search/src/libro-search-view.tsx b/packages/libro-search/src/libro-search-view.tsx index 17cc1537..44bd6876 100644 --- a/packages/libro-search/src/libro-search-view.tsx +++ b/packages/libro-search/src/libro-search-view.tsx @@ -14,9 +14,9 @@ import { useInject, useObserve, watch, -} from '@difizen/libro-common/mana-app'; -import { BaseView, view, ViewInstance } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { BaseView, view, ViewInstance } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { Button, Checkbox, ConfigProvider, Input, Tag, theme } from 'antd'; import type { CheckboxChangeEvent } from 'antd/es/checkbox'; diff --git a/packages/libro-search/src/module.ts b/packages/libro-search/src/module.ts index 8297ee4f..53fc991b 100644 --- a/packages/libro-search/src/module.ts +++ b/packages/libro-search/src/module.ts @@ -1,4 +1,4 @@ -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import './index.less'; import { LibroCellSearchProvider } from './libro-cell-search-provider.js'; diff --git a/packages/libro-shared-model/src/api.ts b/packages/libro-shared-model/src/api.ts index 1847b848..f5a49171 100644 --- a/packages/libro-shared-model/src/api.ts +++ b/packages/libro-shared-model/src/api.ts @@ -23,7 +23,7 @@ import type { IAttachments, IUnrecognizedCell, } from '@difizen/libro-common'; -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; /** * Changes on Sequence-like data are expressed as Quill-inspired deltas. diff --git a/packages/libro-shared-model/src/ymodels.ts b/packages/libro-shared-model/src/ymodels.ts index ae87df93..039984a2 100644 --- a/packages/libro-shared-model/src/ymodels.ts +++ b/packages/libro-shared-model/src/ymodels.ts @@ -13,8 +13,8 @@ import type { CellType, } from '@difizen/libro-common'; import { deepCopy, deepEqual } from '@difizen/libro-common'; -import type { Event } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; +import type { Event } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import { Awareness } from 'y-protocols/awareness'; import * as Y from 'yjs'; diff --git a/packages/libro-sql-cell/src/libro-formatter-sql-magic-contribution.ts b/packages/libro-sql-cell/src/libro-formatter-sql-magic-contribution.ts index 3f61a379..5300ca1a 100644 --- a/packages/libro-sql-cell/src/libro-formatter-sql-magic-contribution.ts +++ b/packages/libro-sql-cell/src/libro-formatter-sql-magic-contribution.ts @@ -6,7 +6,7 @@ import type { DefaultEncodedFormatter, DefaultDecodedFormatter, } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; export interface SqlDecodedFormatter extends DefaultDecodedFormatter { result_variable?: string; diff --git a/packages/libro-sql-cell/src/libro-formatter-sql-trans-contribution.ts b/packages/libro-sql-cell/src/libro-formatter-sql-trans-contribution.ts index cc7a2314..30e3efe7 100644 --- a/packages/libro-sql-cell/src/libro-formatter-sql-trans-contribution.ts +++ b/packages/libro-sql-cell/src/libro-formatter-sql-trans-contribution.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { FormatterTransContribution } from '@difizen/libro-jupyter'; import type { DefaultDecodedFormatter } from '@difizen/libro-jupyter'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; import type { SqlDecodedFormatter } from './libro-formatter-sql-magic-contribution.js'; diff --git a/packages/libro-sql-cell/src/libro-sql-cell-color-registry.ts b/packages/libro-sql-cell/src/libro-sql-cell-color-registry.ts index 5c198845..13355a98 100644 --- a/packages/libro-sql-cell/src/libro-sql-cell-color-registry.ts +++ b/packages/libro-sql-cell/src/libro-sql-cell-color-registry.ts @@ -1,5 +1,5 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color, ColorContribution, singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color, ColorContribution, singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class LibroSQLCellColorRegistry implements ColorContribution { diff --git a/packages/libro-sql-cell/src/libro-sql-cell-contribution.ts b/packages/libro-sql-cell/src/libro-sql-cell-contribution.ts index 64d27c80..5602c565 100644 --- a/packages/libro-sql-cell/src/libro-sql-cell-contribution.ts +++ b/packages/libro-sql-cell/src/libro-sql-cell-contribution.ts @@ -2,8 +2,8 @@ import type { LanguageSpecRegistry } from '@difizen/libro-code-editor'; import { LanguageSpecContribution } from '@difizen/libro-code-editor'; import type { CellMeta, CellModel, CellOptions } from '@difizen/libro-jupyter'; import { CellModelContribution, CellViewContribution } from '@difizen/libro-jupyter'; -import { inject } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import { inject } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import { LibroSqlCellModelFactory } from './libro-sql-cell-protocol.js'; import { LibroSqlCellView } from './libro-sql-cell-view.js'; diff --git a/packages/libro-sql-cell/src/libro-sql-cell-model.ts b/packages/libro-sql-cell/src/libro-sql-cell-model.ts index ceb5a234..e4b0ecfb 100644 --- a/packages/libro-sql-cell/src/libro-sql-cell-model.ts +++ b/packages/libro-sql-cell/src/libro-sql-cell-model.ts @@ -6,14 +6,14 @@ import type { import type { ExecutionCount } from '@difizen/libro-common'; import { CellOptions, LibroCellModel } from '@difizen/libro-jupyter'; import type { ExecutableCellModel } from '@difizen/libro-jupyter'; -import type { Event as ManaEvent } from '@difizen/libro-common/mana-app'; +import type { Event as ManaEvent } from '@difizen/libro-common/app'; import { Emitter, inject, prop, transient, ViewManager, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import type { SqlDecodedFormatter } from './libro-formatter-sql-magic-contribution.js'; diff --git a/packages/libro-sql-cell/src/libro-sql-cell-script.ts b/packages/libro-sql-cell/src/libro-sql-cell-script.ts index be5b766e..99637665 100644 --- a/packages/libro-sql-cell/src/libro-sql-cell-script.ts +++ b/packages/libro-sql-cell/src/libro-sql-cell-script.ts @@ -1,4 +1,4 @@ -import { singleton } from '@difizen/libro-common/mana-app'; +import { singleton } from '@difizen/libro-common/app'; @singleton() export class SqlScript { diff --git a/packages/libro-sql-cell/src/libro-sql-cell-view.tsx b/packages/libro-sql-cell/src/libro-sql-cell-view.tsx index 6c072078..1d462029 100644 --- a/packages/libro-sql-cell/src/libro-sql-cell-view.tsx +++ b/packages/libro-sql-cell/src/libro-sql-cell-view.tsx @@ -20,7 +20,7 @@ import { LibroJupyterModel, LibroOutputArea, } from '@difizen/libro-jupyter'; -import type { ViewSize } from '@difizen/libro-common/mana-app'; +import type { ViewSize } from '@difizen/libro-common/app'; import { Deferred, getOrigin, @@ -33,7 +33,7 @@ import { ViewManager, ViewOption, ViewRender, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import type { InputRef } from 'antd'; import { Select } from 'antd'; diff --git a/packages/libro-sql-cell/src/module.ts b/packages/libro-sql-cell/src/module.ts index 762290be..842c4132 100644 --- a/packages/libro-sql-cell/src/module.ts +++ b/packages/libro-sql-cell/src/module.ts @@ -1,6 +1,6 @@ import { CellOptions, LibroModule } from '@difizen/libro-jupyter'; import { LibroRenderMimeModule } from '@difizen/libro-rendermime'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { FormatterSqlMagicContribution } from './libro-formatter-sql-magic-contribution.js'; import { FormatterStringTransSqlContribution } from './libro-formatter-sql-trans-contribution.js'; diff --git a/packages/libro-terminal/src/command.ts b/packages/libro-terminal/src/command.ts index 670ba5a4..172d0869 100644 --- a/packages/libro-terminal/src/command.ts +++ b/packages/libro-terminal/src/command.ts @@ -2,15 +2,15 @@ import type { Command, CommandRegistry, KeybindingRegistry, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { ConfigurationService, KeybindingContribution, -} from '@difizen/libro-common/mana-app'; -import { SlotViewManager } from '@difizen/libro-common/mana-app'; -import { inject, ViewManager } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; -import { CommandContribution } from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; +import { SlotViewManager } from '@difizen/libro-common/app'; +import { inject, ViewManager } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; +import { CommandContribution } from '@difizen/libro-common/app'; import { terminalDefaultSlot } from './configuration.js'; import { TerminalManager } from './manager.js'; diff --git a/packages/libro-terminal/src/configuration.ts b/packages/libro-terminal/src/configuration.ts index 16590db0..8292f4e4 100644 --- a/packages/libro-terminal/src/configuration.ts +++ b/packages/libro-terminal/src/configuration.ts @@ -1,10 +1,10 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; import { isOSX, isWindows, singleton, ConfigurationContribution, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; export type TerminalRendererType = 'canvas' | 'dom'; export const DEFAULT_TERMINAL_RENDERER_TYPE = 'canvas'; diff --git a/packages/libro-terminal/src/connection.ts b/packages/libro-terminal/src/connection.ts index a83bd857..a99a04bb 100644 --- a/packages/libro-terminal/src/connection.ts +++ b/packages/libro-terminal/src/connection.ts @@ -1,11 +1,11 @@ import type { JSONPrimitive } from '@difizen/libro-common'; import { URL } from '@difizen/libro-common'; import { ServerConnection } from '@difizen/libro-kernel'; -import type { Disposable, Disposed, Event } from '@difizen/libro-common/mana-app'; -import { transient } from '@difizen/libro-common/mana-app'; -import { Deferred } from '@difizen/libro-common/mana-app'; -import { Emitter } from '@difizen/libro-common/mana-app'; -import { inject } from '@difizen/libro-common/mana-app'; +import type { Disposable, Disposed, Event } from '@difizen/libro-common/app'; +import { transient } from '@difizen/libro-common/app'; +import { Deferred } from '@difizen/libro-common/app'; +import { Emitter } from '@difizen/libro-common/app'; +import { inject } from '@difizen/libro-common/app'; import { TerminalOption } from './protocol.js'; import type { diff --git a/packages/libro-terminal/src/manager.ts b/packages/libro-terminal/src/manager.ts index 22acad30..e87f24c3 100644 --- a/packages/libro-terminal/src/manager.ts +++ b/packages/libro-terminal/src/manager.ts @@ -3,10 +3,10 @@ import { Poll } from '@difizen/libro-common'; import { NetworkError, ServerConnection } from '@difizen/libro-kernel'; -import type { Disposable, Disposed, Event } from '@difizen/libro-common/mana-app'; -import { prop } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; -import { Emitter, inject } from '@difizen/libro-common/mana-app'; +import type { Disposable, Disposed, Event } from '@difizen/libro-common/app'; +import { prop } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; +import { Emitter, inject } from '@difizen/libro-common/app'; import { v4 } from 'uuid'; import type { TerminalConnection } from './connection.js'; diff --git a/packages/libro-terminal/src/module.ts b/packages/libro-terminal/src/module.ts index 9aa3c6e9..4755bf78 100644 --- a/packages/libro-terminal/src/module.ts +++ b/packages/libro-terminal/src/module.ts @@ -3,7 +3,7 @@ import { ServerConnection, ServerManager, } from '@difizen/libro-kernel'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { TerminalCommandContribution } from './command.js'; import { TerminalConfiguration } from './configuration.js'; diff --git a/packages/libro-terminal/src/restapi.ts b/packages/libro-terminal/src/restapi.ts index c291a85c..60e0d5ed 100644 --- a/packages/libro-terminal/src/restapi.ts +++ b/packages/libro-terminal/src/restapi.ts @@ -2,7 +2,7 @@ import { URL } from '@difizen/libro-common'; import type { ISettings } from '@difizen/libro-kernel'; import { createResponseError } from '@difizen/libro-kernel'; import { ServerConnection } from '@difizen/libro-kernel'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { TerminalModel, TerminalOption } from './protocol.js'; diff --git a/packages/libro-terminal/src/stateful-view.ts b/packages/libro-terminal/src/stateful-view.ts index cb1e3912..caff92cc 100644 --- a/packages/libro-terminal/src/stateful-view.ts +++ b/packages/libro-terminal/src/stateful-view.ts @@ -1,5 +1,5 @@ -import type { StatefulView } from '@difizen/libro-common/mana-app'; -import { BaseView } from '@difizen/libro-common/mana-app'; +import type { StatefulView } from '@difizen/libro-common/app'; +import { BaseView } from '@difizen/libro-common/app'; export abstract class BaseStatefulView extends BaseView implements StatefulView { constructor() { diff --git a/packages/libro-terminal/src/theme-service.ts b/packages/libro-terminal/src/theme-service.ts index 0261f140..6348d5be 100644 --- a/packages/libro-terminal/src/theme-service.ts +++ b/packages/libro-terminal/src/theme-service.ts @@ -1,6 +1,6 @@ -import type { ThemeChangeEvent, Event } from '@difizen/libro-common/mana-app'; -import { ColorRegistry, ThemeService } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import type { ThemeChangeEvent, Event } from '@difizen/libro-common/app'; +import { ColorRegistry, ThemeService } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { ITheme } from 'xterm'; /** diff --git a/packages/libro-terminal/src/view.tsx b/packages/libro-terminal/src/view.tsx index 03cf1dfd..7f7d79cd 100644 --- a/packages/libro-terminal/src/view.tsx +++ b/packages/libro-terminal/src/view.tsx @@ -1,5 +1,5 @@ import { CodeOutlined } from '@ant-design/icons'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; +import { ConfigurationService } from '@difizen/libro-common/app'; import { Disposable, DisposableCollection, @@ -13,7 +13,7 @@ import { transient, useInject, view, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import { forwardRef } from 'react'; import type { FontWeight, ITerminalOptions } from 'xterm'; diff --git a/packages/libro-toc/src/cell-toc-provider.ts b/packages/libro-toc/src/cell-toc-provider.ts index 3b838fd5..31ea6f81 100644 --- a/packages/libro-toc/src/cell-toc-provider.ts +++ b/packages/libro-toc/src/cell-toc-provider.ts @@ -1,7 +1,7 @@ import type { CellView } from '@difizen/libro-core'; -import type { Contribution } from '@difizen/libro-common/mana-app'; -import { Priority } from '@difizen/libro-common/mana-app'; -import { contrib, singleton } from '@difizen/libro-common/mana-app'; +import type { Contribution } from '@difizen/libro-common/app'; +import { Priority } from '@difizen/libro-common/app'; +import { contrib, singleton } from '@difizen/libro-common/app'; import { CellTOCProviderContribution } from './toc-protocol.js'; diff --git a/packages/libro-toc/src/libro-toc-color-registry.ts b/packages/libro-toc/src/libro-toc-color-registry.ts index c25c606e..4bf16d15 100644 --- a/packages/libro-toc/src/libro-toc-color-registry.ts +++ b/packages/libro-toc/src/libro-toc-color-registry.ts @@ -1,6 +1,6 @@ -import type { ColorRegistry } from '@difizen/libro-common/mana-app'; -import { Color, ColorContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ColorRegistry } from '@difizen/libro-common/app'; +import { Color, ColorContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; @singleton({ contrib: ColorContribution }) export class LibroTocColorRegistry implements ColorContribution { diff --git a/packages/libro-toc/src/module.ts b/packages/libro-toc/src/module.ts index 70913b56..b80348c8 100644 --- a/packages/libro-toc/src/module.ts +++ b/packages/libro-toc/src/module.ts @@ -1,6 +1,6 @@ import { MarkdownModule } from '@difizen/libro-markdown'; import { LibroRenderMimeModule } from '@difizen/libro-rendermime'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { LibroCellTOCProvider } from './cell-toc-provider.js'; import { LibroTocColorRegistry } from './libro-toc-color-registry.js'; diff --git a/packages/libro-toc/src/provider/markdown-toc-provider.ts b/packages/libro-toc/src/provider/markdown-toc-provider.ts index cfbc09d1..eaeefc8a 100644 --- a/packages/libro-toc/src/provider/markdown-toc-provider.ts +++ b/packages/libro-toc/src/provider/markdown-toc-provider.ts @@ -1,7 +1,7 @@ import { LibroMarkdownCellModel } from '@difizen/libro-core'; import type { CellView } from '@difizen/libro-core'; import { MarkdownParser } from '@difizen/libro-markdown'; -import { inject, singleton, watch } from '@difizen/libro-common/mana-app'; +import { inject, singleton, watch } from '@difizen/libro-common/app'; import type { CellTOCProvider } from '../toc-protocol.js'; import { HeadingType, CellTOCProviderContribution } from '../toc-protocol.js'; diff --git a/packages/libro-toc/src/provider/output-toc-provider.ts b/packages/libro-toc/src/provider/output-toc-provider.ts index 8e6f44f5..298fe286 100644 --- a/packages/libro-toc/src/provider/output-toc-provider.ts +++ b/packages/libro-toc/src/provider/output-toc-provider.ts @@ -3,8 +3,8 @@ import { concatMultilineString } from '@difizen/libro-common'; import type { CellView } from '@difizen/libro-core'; import { ExecutableCellView } from '@difizen/libro-core'; import { RenderMimeRegistry } from '@difizen/libro-rendermime'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; -import { watch } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; +import { watch } from '@difizen/libro-common/app'; import type { CellTOCProvider } from '../toc-protocol.js'; import { CellTOCProviderContribution } from '../toc-protocol.js'; diff --git a/packages/libro-toc/src/toc-collapse-service.ts b/packages/libro-toc/src/toc-collapse-service.ts index 753d29c0..885e0694 100644 --- a/packages/libro-toc/src/toc-collapse-service.ts +++ b/packages/libro-toc/src/toc-collapse-service.ts @@ -4,8 +4,8 @@ import { DefaultCollapseService, CollapseService, } from '@difizen/libro-core'; -import { prop } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { prop } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { LibroTOCManager } from './toc-manager.js'; import { HeadingType } from './toc-protocol.js'; diff --git a/packages/libro-toc/src/toc-configuration.ts b/packages/libro-toc/src/toc-configuration.ts index e1f209ef..5a49d7c6 100644 --- a/packages/libro-toc/src/toc-configuration.ts +++ b/packages/libro-toc/src/toc-configuration.ts @@ -1,6 +1,6 @@ -import type { ConfigurationNode } from '@difizen/libro-common/mana-app'; -import { ConfigurationContribution } from '@difizen/libro-common/mana-app'; -import { singleton } from '@difizen/libro-common/mana-app'; +import type { ConfigurationNode } from '@difizen/libro-common/app'; +import { ConfigurationContribution } from '@difizen/libro-common/app'; +import { singleton } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; export const TOCVisible: ConfigurationNode = { diff --git a/packages/libro-toc/src/toc-contribution.ts b/packages/libro-toc/src/toc-contribution.ts index ed3a42d8..facc0c00 100644 --- a/packages/libro-toc/src/toc-contribution.ts +++ b/packages/libro-toc/src/toc-contribution.ts @@ -4,8 +4,8 @@ import type { LibroSlot, } from '@difizen/libro-core'; import { LibroExtensionSlotContribution } from '@difizen/libro-core'; -import { ViewManager } from '@difizen/libro-common/mana-app'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager } from '@difizen/libro-common/app'; +import { inject, singleton } from '@difizen/libro-common/app'; import { TOCView } from './toc-view.js'; diff --git a/packages/libro-toc/src/toc-manager.ts b/packages/libro-toc/src/toc-manager.ts index bfffa094..a695cc76 100644 --- a/packages/libro-toc/src/toc-manager.ts +++ b/packages/libro-toc/src/toc-manager.ts @@ -1,5 +1,5 @@ import type { LibroView } from '@difizen/libro-core'; -import { inject, singleton } from '@difizen/libro-common/mana-app'; +import { inject, singleton } from '@difizen/libro-common/app'; import type { LibroTOCProvider } from './toc-provider.js'; import { LibroTOCProviderFactory } from './toc-provider.js'; diff --git a/packages/libro-toc/src/toc-protocol.ts b/packages/libro-toc/src/toc-protocol.ts index fac5d817..e08ed270 100644 --- a/packages/libro-toc/src/toc-protocol.ts +++ b/packages/libro-toc/src/toc-protocol.ts @@ -1,7 +1,7 @@ import type { CellView } from '@difizen/libro-core'; -import type { View } from '@difizen/libro-common/mana-app'; -import type { Disposable } from '@difizen/libro-common/mana-app'; -import { Syringe } from '@difizen/libro-common/mana-app'; +import type { View } from '@difizen/libro-common/app'; +import type { Disposable } from '@difizen/libro-common/app'; +import { Syringe } from '@difizen/libro-common/app'; /** * Table of Contents configuration diff --git a/packages/libro-toc/src/toc-provider.ts b/packages/libro-toc/src/toc-provider.ts index 26652947..2b52acfe 100644 --- a/packages/libro-toc/src/toc-provider.ts +++ b/packages/libro-toc/src/toc-provider.ts @@ -1,13 +1,7 @@ import type { LibroView } from '@difizen/libro-core'; -import type { Disposable, Event } from '@difizen/libro-common/mana-app'; -import { - inject, - notEmpty, - prop, - transient, - watch, -} from '@difizen/libro-common/mana-app'; -import { Emitter, DisposableCollection } from '@difizen/libro-common/mana-app'; +import type { Disposable, Event } from '@difizen/libro-common/app'; +import { inject, notEmpty, prop, transient, watch } from '@difizen/libro-common/app'; +import { Emitter, DisposableCollection } from '@difizen/libro-common/app'; import { LibroCellTOCProvider } from './cell-toc-provider.js'; import type { CellTOCProvider, IHeading } from './toc-protocol.js'; diff --git a/packages/libro-toc/src/toc-view.tsx b/packages/libro-toc/src/toc-view.tsx index 11b79002..a71dc7ff 100644 --- a/packages/libro-toc/src/toc-view.tsx +++ b/packages/libro-toc/src/toc-view.tsx @@ -1,10 +1,10 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { ArrowDown, ArrowRight } from '@difizen/libro-core'; import type { DisplayView, LibroView } from '@difizen/libro-core'; -import { ConfigurationService } from '@difizen/libro-common/mana-app'; -import { getOrigin, prop, useInject } from '@difizen/libro-common/mana-app'; -import { BaseView, view, ViewInstance } from '@difizen/libro-common/mana-app'; -import { inject, transient } from '@difizen/libro-common/mana-app'; +import { ConfigurationService } from '@difizen/libro-common/app'; +import { getOrigin, prop, useInject } from '@difizen/libro-common/app'; +import { BaseView, view, ViewInstance } from '@difizen/libro-common/app'; +import { inject, transient } from '@difizen/libro-common/app'; import { l10n } from '@difizen/libro-common/l10n'; import React, { useRef } from 'react'; diff --git a/packages/libro-widget/src/module.ts b/packages/libro-widget/src/module.ts index e958ad82..c1c3e5f4 100644 --- a/packages/libro-widget/src/module.ts +++ b/packages/libro-widget/src/module.ts @@ -1,5 +1,5 @@ import { WidgetModule } from '@difizen/libro-jupyter'; -import { ManaModule } from '@difizen/libro-common/mana-app'; +import { ManaModule } from '@difizen/libro-common/app'; import { SilderWidgetContribution, SliderWidget } from './slider/index.js'; import { TextModelContribution, TextWidget } from './text/index.js'; diff --git a/packages/libro-widget/src/slider/contribution.ts b/packages/libro-widget/src/slider/contribution.ts index 2ed80904..7af13059 100644 --- a/packages/libro-widget/src/slider/contribution.ts +++ b/packages/libro-widget/src/slider/contribution.ts @@ -1,6 +1,6 @@ import type { IWidgetViewProps } from '@difizen/libro-jupyter'; import { WidgetViewContribution } from '@difizen/libro-jupyter'; -import { ViewManager, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager, inject, singleton } from '@difizen/libro-common/app'; import { SliderWidget } from './view.js'; diff --git a/packages/libro-widget/src/slider/view.tsx b/packages/libro-widget/src/slider/view.tsx index 4c4257cc..62ece548 100644 --- a/packages/libro-widget/src/slider/view.tsx +++ b/packages/libro-widget/src/slider/view.tsx @@ -12,7 +12,7 @@ import { prop, inject, ViewOption, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Slider } from 'antd'; import { forwardRef } from 'react'; diff --git a/packages/libro-widget/src/text/contribution.ts b/packages/libro-widget/src/text/contribution.ts index 156e3190..5a10388c 100644 --- a/packages/libro-widget/src/text/contribution.ts +++ b/packages/libro-widget/src/text/contribution.ts @@ -1,6 +1,6 @@ import type { IWidgetViewProps } from '@difizen/libro-jupyter'; import { WidgetViewContribution } from '@difizen/libro-jupyter'; -import { ViewManager, inject, singleton } from '@difizen/libro-common/mana-app'; +import { ViewManager, inject, singleton } from '@difizen/libro-common/app'; import { TextWidget } from './view.js'; diff --git a/packages/libro-widget/src/text/view.tsx b/packages/libro-widget/src/text/view.tsx index 2aea852c..690c7738 100644 --- a/packages/libro-widget/src/text/view.tsx +++ b/packages/libro-widget/src/text/view.tsx @@ -9,7 +9,7 @@ import { ViewInstance, inject, prop, -} from '@difizen/libro-common/mana-app'; +} from '@difizen/libro-common/app'; import { Input } from 'antd'; import { forwardRef } from 'react';