@opensumi/ide-notebook 3.8.3-next-1747014731.0 → 3.8.3-next-1747044228.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opensumi/ide-notebook",
-  "version": "3.8.3-next-1747014731.0",
+  "version": "3.8.3-next-1747044228.0",
   "license": "MIT",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -15,26 +15,25 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.6.4",
-    "@difizen/libro-code-editor": "0.2.45",
-    "@difizen/libro-common": "0.2.45",
-    "@difizen/libro-core": "0.2.45",
-    "@difizen/libro-jupyter": "0.2.45",
-    "@difizen/libro-kernel": "0.2.45",
-    "@difizen/libro-lsp": "0.2.45",
-    "@difizen/libro-toc": "0.2.45",
-    "@difizen/mana-app": "^0.1.27",
-    "@opensumi/ide-components": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-core-browser": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-core-common": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-editor": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-explorer": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-file-service": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-main-layout": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-monaco": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-outline": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-overlay": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-theme": "3.8.3-next-1747014731.0",
-    "@opensumi/ide-utils": "3.8.3-next-1747014731.0",
+    "@difizen/libro-code-editor": "1.0.2",
+    "@difizen/libro-common": "1.0.2",
+    "@difizen/libro-core": "1.0.2",
+    "@difizen/libro-jupyter": "1.0.2",
+    "@difizen/libro-kernel": "1.0.2",
+    "@difizen/libro-lsp": "1.0.2",
+    "@difizen/libro-toc": "1.0.2",
+    "@opensumi/ide-components": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-core-browser": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-core-common": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-editor": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-explorer": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-file-service": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-main-layout": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-monaco": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-outline": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-overlay": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-theme": "3.8.3-next-1747044228.0",
+    "@opensumi/ide-utils": "3.8.3-next-1747044228.0",
     "antd": "^5.21.4",
     "diff": "^7.0.0",
     "resize-observer-polyfill": "1.5.1"
@@ -42,5 +41,5 @@
   "devDependencies": {
     "@types/diff": "^7.0.0"
   },
-  "gitHead": "cd111f2e7e08b3374790aad5e51d9c101ff7b77c"
+  "gitHead": "65a76d8a1af06f01b0fdb9eda99a1143b246a49d"
 }

package/src/browser/kernel-panel/kernel-panel-view.tsx

@@ -1,7 +1,6 @@
+import { Container } from '@difizen/libro-common/app';
 import { LibroKernelManager, LibroSessionManager } from '@difizen/libro-kernel';
-import { Container } from '@difizen/mana-app';
-import { useEffect, useState } from 'react';
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { localize, useInjectable } from '@opensumi/ide-core-browser';
 import { IThemeService } from '@opensumi/ide-theme/lib/common';

package/src/browser/libro/diff-view/components/libro-diff-changed-cell-components.tsx

@@ -1,4 +1,4 @@
-import { useInject } from '@difizen/mana-app';
+import { useInject } from '@difizen/libro-common/app';
 import React, { memo, useEffect, useRef, useState } from 'react';
 
 import { IDiffEditor } from '@opensumi/ide-monaco';

package/src/browser/libro/diff-view/components/libro-diff-side-cell-components.tsx

@@ -1,4 +1,4 @@
-import { Container } from '@difizen/mana-app';
+import { Container } from '@difizen/libro-common/app';
 import React, { memo, useEffect, useRef, useState } from 'react';
 
 import { useInjectable } from '@opensumi/ide-core-browser';

package/src/browser/libro/diff-view/libro-diff-color-registry.ts

@@ -1,6 +1,6 @@
-import { Color, ColorContribution, singleton } from '@difizen/mana-app';
+import { Color, ColorContribution, singleton } from '@difizen/libro-common/app';
 
-import type { ColorRegistry } from '@difizen/mana-app';
+import type { ColorRegistry } from '@difizen/libro-common/app';
 
 @singleton({ contrib: ColorContribution })
 export class LibroDiffColorRegistry implements ColorContribution {

package/src/browser/libro/diff-view/libro-diff-component.tsx

@@ -1,4 +1,4 @@
-import { ViewManager, ViewRender, useInject } from '@difizen/mana-app';
+import { ViewManager, ViewRender, useInject } from '@difizen/libro-common/app';
 import React, { useEffect, useState } from 'react';
 
 import { libroDiffViewFactoryId } from './libro-diff-protocol';

package/src/browser/libro/diff-view/libro-diff-protocol.ts

@@ -1,7 +1,7 @@
 import { concatMultilineString } from '@difizen/libro-common';
 
 import type { ICell, INotebookContent } from '@difizen/libro-common';
-import type { URI, View } from '@difizen/mana-app';
+import type { URI, View } from '@difizen/libro-common/app';
 
 export const libroDiffViewFactoryId = 'libro-diff-view-factory';
 

package/src/browser/libro/diff-view/libro-diff-view.tsx

@@ -1,5 +1,4 @@
 import { ColumnHeightOutlined } from '@ant-design/icons';
-import { LibroContentService } from '@difizen/libro-core';
 import {
   BaseView,
   ViewInstance,
@@ -10,7 +9,8 @@ import {
   transient,
   useInject,
   view,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
+import { LibroContentService } from '@difizen/libro-core';
 import { Spin } from 'antd';
 import { diffArrays } from 'diff';
 import React, { forwardRef, useEffect } from 'react';
@@ -25,7 +25,7 @@ import { DiffCellItem, DiffCellUnchangedItems, DiffOption, libroDiffViewFactoryI
 
 import type { DiffArrayItem, DiffCellItemResult, DiffView, IDiffNotebookContent } from './libro-diff-protocol';
 import type { ICell, MultilineString } from '@difizen/libro-common';
-import type { ViewComponent } from '@difizen/mana-app';
+import type { ViewComponent } from '@difizen/libro-common/app';
 
 function comparator(compareLeft: ICell, compareRight: ICell) {
   return compareLeft.id === compareRight.id;

package/src/browser/libro/diff-view/libro-version-manager.ts

@@ -1,5 +1,5 @@
+import { ViewManager, getOrigin, inject, singleton } from '@difizen/libro-common/app';
 import { LibroService } from '@difizen/libro-core';
-import { ViewManager, getOrigin, inject, singleton } from '@difizen/mana-app';
 
 import { Injector } from '@opensumi/di';
 import { Event, MonacoService } from '@opensumi/ide-core-browser';

package/src/browser/libro/diff-view/libro-version-view.tsx

@@ -1,4 +1,3 @@
-import { LibroView } from '@difizen/libro-core';
 import {
   BaseView,
   ViewInstance,
@@ -9,7 +8,8 @@ import {
   transient,
   useInject,
   view,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
+import { LibroView } from '@difizen/libro-core';
 import React, { forwardRef } from 'react';
 
 import type { LibroDiffView } from './';

package/src/browser/libro/diff-view/module.ts

@@ -1,5 +1,5 @@
+import { ManaModule } from '@difizen/libro-common/app';
 import { LibroJupyterNoEditorModule } from '@difizen/libro-jupyter/noeditor';
-import { ManaModule } from '@difizen/mana-app';
 
 import { LibroDiffColorRegistry } from './libro-diff-color-registry';
 import { LibroDiffView } from './libro-diff-view';

package/src/browser/libro/editor/editor-contribution.ts

@@ -1,6 +1,6 @@
 import { CodeEditorContribution, CodeEditorFactory, LanguageSpecRegistry } from '@difizen/libro-code-editor';
+import { inject, singleton } from '@difizen/libro-common/app';
 import { EditorStateFactory } from '@difizen/libro-jupyter/noeditor';
-import { inject, singleton } from '@difizen/mana-app';
 
 import { Injector } from '@opensumi/di';
 

package/src/browser/libro/editor/keybind-handler.ts

@@ -1,5 +1,5 @@
+import { ApplicationContribution, CommandRegistry, inject, singleton } from '@difizen/libro-common/app';
 import { LibroSearchToggleCommand, LibroService, LibroView, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
-import { ApplicationContribution, CommandRegistry, inject, singleton } from '@difizen/mana-app';
 
 import { Injector } from '@opensumi/di';
 import {

package/src/browser/libro/editor/module.ts

@@ -1,5 +1,5 @@
 import { CodeEditorModule } from '@difizen/libro-code-editor';
-import { ManaModule } from '@difizen/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroE2EditorContribution } from './editor-contribution';
 import {
@@ -15,16 +15,16 @@ export const LibroOpensumiEditorModule = ManaModule.create()
   .register(LibroE2EditorContribution, LibroOpensumiEditor, {
     token: LibroOpensumiEditorFactory,
     useFactory: (ctx) => (options: IEditorOptions, editorState: EditorState) => {
-        const child = ctx.container.createChild();
-        child.register({
-          token: LibroOpensumiEditorOptions,
-          useValue: options,
-        });
-        child.register({
-          token: LibroOpensumiEditorState,
-          useValue: editorState,
-        });
-        return child.get(LibroOpensumiEditor);
-      },
+      const child = ctx.container.createChild();
+      child.register({
+        token: LibroOpensumiEditorOptions,
+        useValue: options,
+      });
+      child.register({
+        token: LibroOpensumiEditorState,
+        useValue: editorState,
+      });
+      return child.get(LibroOpensumiEditor);
+    },
   })
   .dependOn(CodeEditorModule);

package/src/browser/libro/editor/opensumi-editor.ts

@@ -1,6 +1,5 @@
 import { defaultConfig } from '@difizen/libro-code-editor';
 import { MIME } from '@difizen/libro-common';
-import { EditorStateFactory, IEditorStateOptions } from '@difizen/libro-jupyter/noeditor';
 import {
   CommandRegistry,
   Deferred,
@@ -12,7 +11,8 @@ import {
   inject,
   transient,
   watch,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
+import { EditorStateFactory, IEditorStateOptions } from '@difizen/libro-jupyter/noeditor';
 
 import { Injector } from '@opensumi/di';
 import { IEventBus, URI, uuid } from '@opensumi/ide-core-common';

package/src/browser/libro/libro-opensumi-content-contribution.ts

@@ -1,6 +1,6 @@
+import { getOrigin, inject, singleton } from '@difizen/libro-common/app';
 import { ContentContribution } from '@difizen/libro-core';
 import { IContentsModel, INotebookContent, LibroJupyterModel, NotebookOption } from '@difizen/libro-jupyter/noeditor';
-import { getOrigin, inject, singleton } from '@difizen/mana-app';
 
 import { Injector } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-browser';

package/src/browser/libro/libro-opensumi-save-content-contribution.ts

@@ -1,10 +1,10 @@
+import { ModalService, URI, getOrigin, inject, singleton } from '@difizen/libro-common/app';
 import {
   ContentSaveContribution,
   LibroJupyterModel,
   NotebookOption,
   SaveFileErrorModal,
 } from '@difizen/libro-jupyter/noeditor';
-import { ModalService, URI, getOrigin, inject, singleton } from '@difizen/mana-app';
 
 import { Injector } from '@opensumi/di';
 import { IFileServiceClient } from '@opensumi/ide-file-service';
@@ -16,14 +16,16 @@ export class LibroOpensumiContentSaveContribution implements ContentSaveContribu
   @inject(ModalService) protected readonly modalService: ModalService;
   @inject(OpensumiInjector) injector: Injector;
 
-  canHandle = (options: NotebookOption) => options.loadType === ContentLoaderType ? 100 : 1;
+  canHandle = (options: NotebookOption) => (options.loadType === ContentLoaderType ? 100 : 1);
   saveContent = async (options: NotebookOption, model: LibroJupyterModel) => {
     const uri = new URI(options.resource.toString());
     const fileServiceClient: IFileServiceClient = getOrigin(this.injector.get(IFileServiceClient));
     const stat = await getOrigin(fileServiceClient).getFileStat(options.resource.toString());
     try {
       const notebookContent = model.toJSON();
-      if (!stat) {throw new Error('Get file stat error!');}
+      if (!stat) {
+        throw new Error('Get file stat error!');
+      }
       getOrigin(fileServiceClient).setContent(stat, JSON.stringify(notebookContent));
     } catch (e: any) {
       model.fileService.fileSaveErrorEmitter.fire({

package/src/browser/libro/mana-module.ts

@@ -1,4 +1,4 @@
-import { ManaModule } from '@difizen/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroOpensumiEditorModule } from './editor/module';
 import { LibroOpensumiContentContribution } from './libro-opensumi-content-contribution';

package/src/browser/libro-keybind-contribution.ts

@@ -1,5 +1,5 @@
+import { Container, CommandRegistry as LibroCommandRegistry } from '@difizen/libro-common/app';
 import { LibroSearchToggleCommand, LibroService, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
-import { Container, CommandRegistry as LibroCommandRegistry } from '@difizen/mana-app';
 
 import { Autowired } from '@opensumi/di';
 import {

package/src/browser/libro-preview.view.tsx

@@ -1,4 +1,4 @@
-import { Container, URI, ViewRender } from '@difizen/mana-app';
+import { Container, URI, ViewRender } from '@difizen/libro-common/app';
 import React, { useEffect, useState } from 'react';
 
 import { useInjectable } from '@opensumi/ide-core-browser';

package/src/browser/libro.command.ts

@@ -1,5 +1,5 @@
+import { Container } from '@difizen/libro-common/app';
 import { LibroSearchManager, LibroService } from '@difizen/libro-jupyter/noeditor';
-import { Container } from '@difizen/mana-app';
 
 import { Autowired } from '@opensumi/di';
 import { CommandContribution, CommandRegistry, Domain, EDITOR_COMMANDS } from '@opensumi/ide-core-browser';

package/src/browser/libro.contribution.tsx

@@ -1,3 +1,4 @@
+import { Container, ManaAppPreset, ManaComponents, ThemeService } from '@difizen/libro-common/app';
 import {
   ISettings,
   LibroJupyterNoEditorModule,
@@ -5,7 +6,6 @@ import {
   ServerManager,
 } from '@difizen/libro-jupyter/noeditor';
 import { LibroTOCModule } from '@difizen/libro-toc';
-import { Container, ManaAppPreset, ManaComponents, ThemeService } from '@difizen/mana-app';
 import React, { useState } from 'react';
 
 import { Autowired, Injector } from '@opensumi/di';

package/src/browser/libro.service.ts

@@ -1,5 +1,5 @@
+import { Container, URI as ManaURI, getOrigin } from '@difizen/libro-common/app';
 import { CellUri, CellView, LanguageSpecRegistry, LibroService, LibroView } from '@difizen/libro-jupyter/noeditor';
-import { Container, URI as ManaURI, getOrigin } from '@difizen/mana-app';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { URI, WithEventBus, path } from '@opensumi/ide-core-browser';

package/src/browser/libro.view.tsx

@@ -1,5 +1,5 @@
+import { CommandRegistry, Container, Disposable, ViewRender } from '@difizen/libro-common/app';
 import { DocumentCommands, LibroView } from '@difizen/libro-jupyter/noeditor';
-import { CommandRegistry, Container, Disposable, ViewRender } from '@difizen/mana-app';
 import * as React from 'react';
 
 import { message } from '@opensumi/ide-components';

package/src/browser/mana/index.ts

@@ -1,4 +1,4 @@
-import { GlobalContainer, Syringe } from '@difizen/mana-app';
+import { GlobalContainer, Syringe } from '@difizen/libro-common/app';
 
 import { Injector } from '@opensumi/di';
 

package/src/browser/notebook.service.ts

@@ -1,5 +1,5 @@
+import { Container, getOrigin } from '@difizen/libro-common/app';
 import { CellUri, CellView, LibroJupyterView, LibroService, LibroView, MIME } from '@difizen/libro-jupyter/noeditor';
-import { Container, getOrigin } from '@difizen/mana-app';
 
 import { Autowired, Injectable } from '@opensumi/di';
 import { URI } from '@opensumi/ide-core-browser';

package/src/browser/toc/toc.panel.tsx

@@ -1,5 +1,5 @@
+import { Container, ViewManager, ViewRender } from '@difizen/libro-common/app';
 import { TOCView } from '@difizen/libro-toc';
-import { Container, ViewManager, ViewRender } from '@difizen/mana-app';
 import React, { PropsWithChildren, useEffect, useState } from 'react';
 
 import { URI, ViewState, useInjectable } from '@opensumi/ide-core-browser';

package/src/browser/variables/libro-variable-color-registry.ts

@@ -1,6 +1,6 @@
-import { Color, ColorContribution, singleton } from '@difizen/mana-app';
+import { Color, ColorContribution, singleton } from '@difizen/libro-common/app';
 
-import type { ColorRegistry } from '@difizen/mana-app';
+import type { ColorRegistry } from '@difizen/libro-common/app';
 
 @singleton({ contrib: ColorContribution })
 export class LibroVariableColorRegistry implements ColorContribution {

package/src/browser/variables/libro-variable-module.ts

@@ -1,4 +1,4 @@
-import { ManaModule } from '@difizen/mana-app';
+import { ManaModule } from '@difizen/libro-common/app';
 
 import { LibroVariableColorRegistry } from './libro-variable-color-registry';
 import { LibroVariablePanelView } from './variable-view';

package/src/browser/variables/variable-panel.tsx

@@ -1,4 +1,4 @@
-import { Container, ViewManager, ViewRender } from '@difizen/mana-app';
+import { Container, ViewManager, ViewRender } from '@difizen/libro-common/app';
 import { Empty } from 'antd';
 import React, { PropsWithChildren, memo, useEffect, useState } from 'react';
 

package/src/browser/variables/variable-view.tsx

@@ -1,5 +1,4 @@
 import { SearchOutlined, SelectOutlined } from '@ant-design/icons';
-import { LibroContextKey, LibroJupyterModel, LibroView, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
 import {
   BaseView,
   CommandRegistry,
@@ -10,7 +9,8 @@ import {
   transient,
   useInject,
   view,
-} from '@difizen/mana-app';
+} from '@difizen/libro-common/app';
+import { LibroContextKey, LibroJupyterModel, LibroView, NotebookCommands } from '@difizen/libro-jupyter/noeditor';
 import { Input, List, Tag, Tooltip, message } from 'antd';
 import React, { forwardRef } from 'react';
 import './index.less';