@difizen/libro-jupyter 0.3.4 → 1.0.0

package/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/mana-app';
-import { inject, singleton } from '@difizen/mana-app';
-import type { URI } from '@difizen/mana-app';
-import type { Event as ManaEvent } from '@difizen/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';
 

package/src/libro-jupyter-model.ts

@@ -10,10 +10,10 @@ 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/mana-app';
-import { Deferred } from '@difizen/mana-app';
-import { inject, transient } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+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 {
   ExecutedWithKernelCellModel,

package/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/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

package/src/libro-jupyter-server-launch-manager.ts

@@ -1,5 +1,5 @@
 import { ServerManager, ServerConnection } from '@difizen/libro-kernel';
-import { inject, singleton } from '@difizen/mana-app';
+import { inject, singleton } from '@difizen/libro-common/app';
 
 import { ServerLaunchManager } from './libro-jupyter-protocol.js';
 

package/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/mana-app';
-import { inject, transient } from '@difizen/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';
 

package/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/mana-app';
-import { URI } from '@difizen/mana-app';
-import { inject, singleton } from '@difizen/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;

package/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/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroBetweenCellModule } from './add-between-cell/index.js';
 import { JupyterCodeCellModel, JupyterCodeCellView } from './cell/index.js';

package/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/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroBetweenCellModule } from './add-between-cell/index.js';
 import { JupyterCodeCellModel, JupyterCodeCellView } from './cell/index.js';

package/src/output/libro-jupyter-outputarea.tsx

@@ -15,7 +15,7 @@ import {
   isStreamMsg,
   isUpdateDisplayDataMsg,
 } from '@difizen/libro-kernel';
-import { inject, transient, view, ViewOption } from '@difizen/mana-app';
+import { inject, transient, view, ViewOption } from '@difizen/libro-common/app';
 
 @transient()
 @view('libro-output-area')

package/src/rendermime/module.ts

@@ -1,4 +1,4 @@
-import { ManaModule } from '@difizen/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroPlotlyMimeTypeContribution } from './plotly-rendermime-contribution.js';
 

package/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/mana-app';
+import { useInject } from '@difizen/libro-common/app';
 import { useEffect, useRef } from 'react';
 import type { FC } from 'react';
 

package/src/rendermime/plotly-rendermime-contribution.ts

@@ -1,5 +1,5 @@
 import { RenderMimeContribution } from '@difizen/libro-rendermime';
-import { singleton } from '@difizen/mana-app';
+import { singleton } from '@difizen/libro-common/app';
 
 import { PlotlyRender } from './plotly-render.js';
 

package/src/theme/color-registry.ts

@@ -1,6 +1,6 @@
-import type { ColorRegistry } from '@difizen/mana-app';
-import { Color, ColorContribution } from '@difizen/mana-app';
-import { singleton } from '@difizen/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 {

package/src/toolbar/kernel-selector-dropdown.tsx

@@ -1,8 +1,12 @@
 import { CaretDownOutlined } from '@ant-design/icons';
 import type { LibroView } from '@difizen/libro-core';
 import { LibroKernelConnectionManager, KernelSpecManager } from '@difizen/libro-kernel';
-import { ConfigurationService, useInject, ViewInstance } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+import {
+  ConfigurationService,
+  useInject,
+  ViewInstance,
+} from '@difizen/libro-common/app';
+import { l10n } from '@difizen/libro-common/l10n';
 import { Dropdown, Space } from 'antd';
 import type { MenuProps } from 'antd';
 import { useCallback, useEffect, useState } from 'react';

package/src/toolbar/kernel-status-and-selector.tsx

@@ -1,8 +1,8 @@
 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/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+import { useInject, ViewInstance } from '@difizen/libro-common/app';
+import { l10n } from '@difizen/libro-common/l10n';
 import { Badge } from 'antd';
 
 import type { LibroJupyterModel } from '../libro-jupyter-model.js';

package/src/toolbar/run-selector.tsx

@@ -9,9 +9,9 @@ import {
   CommandRegistry,
   ViewInstance,
   ConfigurationService,
-} from '@difizen/mana-app';
-import type { Toolbar } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+} 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';
 import { useEffect, useState } from 'react';

package/src/toolbar/save-file-error-contribution.ts

@@ -1,4 +1,4 @@
-import { ModalContribution, singleton } from '@difizen/mana-app';
+import { ModalContribution, singleton } from '@difizen/libro-common/app';
 
 import { SaveFileErrorModal } from './save-file-error.js';
 

package/src/toolbar/save-file-error.tsx

@@ -1,7 +1,7 @@
 import type { LibroView } from '@difizen/libro-core';
-import type { ModalItemProps, ModalItem } from '@difizen/mana-app';
-import { ThemeService } from '@difizen/mana-app';
-import { useInject, ViewInstance } from '@difizen/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';

package/src/toolbar/side-toolbar-run-selector.tsx

@@ -2,8 +2,12 @@ import { PlayCircleOutlined } from '@ant-design/icons';
 import type { LibroSideToolbarMenuItemType, LibroView } from '@difizen/libro-core';
 import { NotebookCommands, LibroSideToolbarMenu } from '@difizen/libro-core';
 import { ServerManager } from '@difizen/libro-kernel';
-import { ConfigurationService, useInject, ViewInstance } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+import {
+  ConfigurationService,
+  useInject,
+  ViewInstance,
+} from '@difizen/libro-common/app';
+import { l10n } from '@difizen/libro-common/l10n';
 import { Popover, Tooltip } from 'antd';
 import { useEffect, useState } from 'react';
 

package/src/toolbar/toolbar-contribution.tsx

@@ -1,9 +1,9 @@
 import { KernelCommands, NotebookCommands } from '@difizen/libro-core';
-import type { ToolbarRegistry } from '@difizen/mana-app';
-import { singleton, inject, ToolbarContribution } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
+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 { Location } from '../components/icons.js';
+import { LocationIcon } from '../components/icons.js';
 import { KernelStatusAndSelectorProvider } from '../libro-jupyter-protocol.js';
 
 import { RunSelector } from './run-selector.js';
@@ -48,7 +48,7 @@ export class LibroJupyterToolbarContribution implements ToolbarContribution {
 
     registry.registerItem({
       id: NotebookCommands['SelectLastRunCell'].id,
-      icon: Location,
+      icon: LocationIcon,
       command: NotebookCommands['SelectLastRunCell'].id,
       group: ['group2'],
       order: 'b',

package/src/utils/index.ts

@@ -1,6 +1,6 @@
 import type { CellModel } from '@difizen/libro-core';
 import type { ServerManager } from '@difizen/libro-kernel';
-import { l10n } from '@difizen/mana-l10n';
+import { l10n } from '@difizen/libro-common/l10n';
 import { duration } from 'moment';
 
 import { LibroJupyterModel } from '../libro-jupyter-model.js';

package/src/widget/box/contribution.ts

@@ -1,4 +1,4 @@
-import { ViewManager, inject, singleton } from '@difizen/mana-app';
+import { ViewManager, inject, singleton } from '@difizen/libro-common/app';
 
 import type { IWidgetViewProps } from '../protocol.js';
 import { WidgetViewContribution } from '../protocol.js';

package/src/widget/box/view.tsx

@@ -10,7 +10,7 @@ import {
   ViewOption,
   ViewRender,
   getOrigin,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
 import { forwardRef } from 'react';
 
 import type { IWidgets, IWidgetViewProps, WidgetState } from '../protocol.js';

package/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/mana-app';
+import { inject, transient } from '@difizen/libro-common/app';
 
 import type { ICallbacks, IClassicComm } from './protocol.js';
 import { WidgetCommOption } from './protocol.js';

package/src/widget/instance-progress/contribution.ts

@@ -1,4 +1,4 @@
-import { ViewManager, inject, singleton } from '@difizen/mana-app';
+import { ViewManager, inject, singleton } from '@difizen/libro-common/app';
 
 import type { IWidgetViewProps } from '../protocol.js';
 import { WidgetViewContribution } from '../protocol.js';

package/src/widget/instance-progress/view.tsx

@@ -8,7 +8,7 @@ import {
   transient,
   inject,
   prop,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
 import { forwardRef } from 'react';
 
 import type { IWidgetViewProps } from '../protocol.js';

package/src/widget/libro-widgets.ts

@@ -1,8 +1,8 @@
 import type { JSONObject } from '@difizen/libro-common';
 import type { IKernelConnection, KernelMessage } from '@difizen/libro-kernel';
-import type { Contribution } from '@difizen/mana-app';
-import { contrib, inject, Priority, prop, transient } from '@difizen/mana-app';
-import { Emitter } from '@difizen/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 {

package/src/widget/module.ts

@@ -1,5 +1,5 @@
 import { LibroKernelManageModule } from '@difizen/libro-kernel';
-import { ManaModule } from '@difizen/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { VBoxWidget, VBoxWidgetContribution } from './box/index.js';
 import { Comm } from './comm.js';

package/src/widget/progress/contribution.ts

@@ -1,4 +1,4 @@
-import { ViewManager, inject, singleton } from '@difizen/mana-app';
+import { ViewManager, inject, singleton } from '@difizen/libro-common/app';
 
 import type { IWidgetViewProps } from '../protocol.js';
 import { WidgetViewContribution } from '../protocol.js';

package/src/widget/progress/view.tsx

@@ -8,7 +8,7 @@ import {
   ViewInstance,
   inject,
   prop,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
 import { forwardRef } from 'react';
 
 import type { IWidgetViewProps, WidgetState } from '../protocol.js';

package/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/mana-app';
+import { Syringe } from '@difizen/libro-common/app';
 
 import type { WidgetView } from './widget-view.js';
 

package/src/widget/widget-manager.ts

@@ -1,7 +1,12 @@
 import { LibroService } from '@difizen/libro-core';
 import type { IKernelConnection } from '@difizen/libro-kernel';
 import { KernelConnection, LibroKernelManager } from '@difizen/libro-kernel';
-import { inject, prop, singleton, ApplicationContribution } from '@difizen/mana-app';
+import {
+  inject,
+  prop,
+  singleton,
+  ApplicationContribution,
+} from '@difizen/libro-common/app';
 
 import type { LibroWidgets } from './libro-widgets.js';
 import { LibroWidgetsFactory } from './protocol.js';

package/src/widget/widget-render.tsx

@@ -7,7 +7,7 @@ import {
   useObserve,
   ViewInstance,
   ViewRender,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
 import React from 'react';
 
 import './index.less';

package/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/mana-app';
+import { inject, singleton } from '@difizen/libro-common/app';
 
 import { LibroJupyterModel } from '../libro-jupyter-model.js';
 

package/src/widget/widget-view-contribution.ts

@@ -1,4 +1,4 @@
-import { ViewManager, inject, singleton } from '@difizen/mana-app';
+import { ViewManager, inject, singleton } from '@difizen/libro-common/app';
 
 import type { IWidgetViewProps } from './protocol.js';
 import { WidgetViewContribution } from './protocol.js';

package/src/widget/widget-view.tsx

@@ -11,8 +11,8 @@ import {
   BaseView,
   prop,
   watch,
-} from '@difizen/mana-app';
-import type { ViewComponent, Disposable } from '@difizen/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';