update monaco loading

Author: lazToum

src/__tests__/editor/waldiezEditor.spec.ts

@@ -11,6 +11,7 @@ import { JupyterLab } from "@jupyterlab/application";
 import { IEditorServices } from "@jupyterlab/codeeditor";
 import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
 import { IRenderMimeRegistry, RenderMimeRegistry } from "@jupyterlab/rendermime";
+import { ISettingRegistry, SettingRegistry } from "@jupyterlab/settingregistry";
 import { CommandRegistry } from "@lumino/commands";
 
 jest.mock("@jupyterlab/application", () => {
@@ -74,12 +75,16 @@ jest.mock("@jupyterlab/codeeditor");
 
 describe("WaldiezEditor", () => {
     let app: jest.Mocked<JupyterLab>;
+    let settingRegistry: ISettingRegistry;
     let rendermime: IRenderMimeRegistry;
     let editorServices: IEditorServices;
     let fileBrowserFactory: IFileBrowserFactory;
 
     beforeEach(() => {
         app = new JupyterLab() as jest.Mocked<JupyterLab>;
+        settingRegistry = new SettingRegistry({
+            connector: null as any,
+        }) as ISettingRegistry;
         rendermime = new RenderMimeRegistry();
         editorServices = {} as IEditorServices;
         fileBrowserFactory = {
@@ -103,6 +108,7 @@ describe("WaldiezEditor", () => {
             rendermime,
             fileBrowserFactory,
             editorServices,
+            settingRegistry,
             name: FACTORY_NAME,
             fileTypes: [WALDIEZ_FILE_TYPE],
         });

src/__tests__/factory.spec.ts

@@ -9,8 +9,10 @@ import { JupyterLab } from "@jupyterlab/application";
 import { IEditorServices } from "@jupyterlab/codeeditor";
 import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
 import { IRenderMimeRegistry, RenderMimeRegistry } from "@jupyterlab/rendermime";
+import { ISettingRegistry, SettingRegistry } from "@jupyterlab/settingregistry";
 import { CommandRegistry } from "@lumino/commands";
 
+jest.mock("@jupyterlab/settingregistry");
 jest.mock("@jupyterlab/codeeditor");
 jest.mock("@jupyterlab/application", () => {
     return {
@@ -31,12 +33,16 @@ jest.mock("../editor", () => {
 
 describe("WaldiezEditorFactory", () => {
     let app: jest.Mocked<JupyterLab>;
+    let settingRegistry: jest.Mocked<ISettingRegistry>;
     let editorServices: jest.Mocked<IEditorServices>;
     let rendermime: IRenderMimeRegistry;
     let fileBrowserFactory: IFileBrowserFactory;
 
     beforeEach(() => {
         app = new JupyterLab() as jest.Mocked<JupyterLab>;
+        settingRegistry = new SettingRegistry({
+            connector: null as any,
+        }) as any;
         editorServices = {} as jest.Mocked<IEditorServices>;
         fileBrowserFactory = {} as jest.Mocked<IFileBrowserFactory>;
         rendermime = new RenderMimeRegistry();
@@ -49,6 +55,7 @@ describe("WaldiezEditorFactory", () => {
             commands: app.commands,
             rendermime,
             editorServices,
+            settingRegistry,
             fileBrowserFactory,
             name: FACTORY_NAME,
             fileTypes: [WALDIEZ_FILE_TYPE],
@@ -61,6 +68,7 @@ describe("WaldiezEditorFactory", () => {
             commands: app.commands,
             rendermime,
             editorServices,
+            settingRegistry,
             fileBrowserFactory,
             name: FACTORY_NAME,
             fileTypes: [WALDIEZ_FILE_TYPE],

src/__tests__/plugin.spec.ts

@@ -9,6 +9,7 @@ import { JupyterLab } from "@jupyterlab/application";
 import { IEditorServices } from "@jupyterlab/codeeditor";
 import { IMainMenu, MainMenu } from "@jupyterlab/mainmenu";
 import { RenderMimeRegistry } from "@jupyterlab/rendermime";
+import { ISettingRegistry, SettingRegistry } from "@jupyterlab/settingregistry";
 
 jest.mock("../commands", () => ({
     ...jest.requireActual("../commands"),
@@ -18,6 +19,7 @@ jest.mock("../commands", () => ({
 describe("Waldiez Plugin", () => {
     let app: jest.Mocked<JupyterLab>;
     let rendermime: RenderMimeRegistry;
+    let settingRegistry: jest.Mocked<ISettingRegistry>;
     let editorServices: jest.Mocked<IEditorServices>;
     let mainMenu: IMainMenu;
 
@@ -36,6 +38,9 @@ describe("Waldiez Plugin", () => {
             addWidgetFactory: jest.fn(),
         } as any;
         rendermime = new RenderMimeRegistry();
+        settingRegistry = new SettingRegistry({
+            connector: null as any,
+        }) as any;
         editorServices = {} as jest.Mocked<IEditorServices>;
         mainMenu = new MainMenu(app.commands);
     });
@@ -67,6 +72,7 @@ describe("Waldiez Plugin", () => {
             rendermime,
             editorServices,
             mockFileBrowserFactory,
+            settingRegistry,
             mockRestorer,
             mockLauncher,
             mockPalette,
@@ -81,7 +87,13 @@ describe("Waldiez Plugin", () => {
 
         const mockFileBrowserFactory = {};
 
-        const result = await plugin.activate(app, rendermime, editorServices, mockFileBrowserFactory);
+        const result = await plugin.activate(
+            app,
+            rendermime,
+            editorServices,
+            mockFileBrowserFactory,
+            settingRegistry,
+        );
 
         expect(result).toBeDefined();
         expect(consoleLogSpy).toHaveBeenCalledWith("JupyterLab extension waldiez is activated!");
@@ -93,7 +105,7 @@ describe("Waldiez Plugin", () => {
     it("should register file type correctly", async () => {
         const mockFileBrowserFactory = {};
 
-        await plugin.activate(app, rendermime, editorServices, mockFileBrowserFactory);
+        await plugin.activate(app, rendermime, editorServices, mockFileBrowserFactory, settingRegistry);
 
         expect(app.docRegistry.addFileType).toHaveBeenCalledWith({
             name: WALDIEZ_FILE_TYPE,
@@ -116,6 +128,7 @@ describe("Waldiez Plugin", () => {
             rendermime,
             editorServices,
             mockFileBrowserFactory,
+            settingRegistry,
             undefined, // restorer
             undefined, // launcher
             undefined, // palette
@@ -155,6 +168,7 @@ describe("Waldiez Plugin", () => {
             rendermime,
             editorServices,
             mockFileBrowserFactory,
+            settingRegistry,
             mockRestorer,
             mockLauncher,
             mockPalette,

src/editor/waldiezEditor.ts

@@ -16,6 +16,7 @@ import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
 import type { ILogPayload } from "@jupyterlab/logconsole";
 import { IRenderMimeRegistry } from "@jupyterlab/rendermime";
 import { ServerConnection } from "@jupyterlab/services";
+import { ISettingRegistry } from "@jupyterlab/settingregistry";
 import { CommandRegistry } from "@lumino/commands";
 import { Signal } from "@lumino/signaling";
 import { SplitPanel } from "@lumino/widgets";
@@ -110,7 +111,13 @@ export class WaldiezEditor extends DocumentWidget<SplitPanel, DocumentModel> {
 
     private async _onContextReady(): Promise<void> {
         try {
-            const waldiezWidget = this._getWaldiezWidget();
+            const url = new URL(this._serverSettings.baseUrl);
+            let basePath = url.pathname;
+            if (!basePath.endsWith("/")) {
+                basePath += "/";
+            }
+            const vsPath = `${basePath}static/vs`;
+            const waldiezWidget = this._getWaldiezWidget(vsPath);
             this.content.addWidget(waldiezWidget);
 
             const payload: ILogPayload = {
@@ -179,7 +186,7 @@ export class WaldiezEditor extends DocumentWidget<SplitPanel, DocumentModel> {
         return `${err}`;
     }
 
-    private _getWaldiezWidget(): EditorWidget {
+    private _getWaldiezWidget(vsPath?: string): EditorWidget {
         const fileContents = this.context.model.toString();
         let jsonData = {};
         try {
@@ -191,7 +198,7 @@ export class WaldiezEditor extends DocumentWidget<SplitPanel, DocumentModel> {
         return new EditorWidget({
             flowId: this.id,
             jsonData,
-            vsPath: undefined,
+            vsPath,
             signal: this._signal,
             onChange: this._onContentChanged.bind(this),
             onRun: this._onRun.bind(this),
@@ -372,6 +379,7 @@ export namespace WaldiezEditor {
     export interface IOptions extends DocumentWidget.IOptions<SplitPanel, DocumentModel> {
         rendermime: IRenderMimeRegistry;
         editorServices: IEditorServices;
+        settingRegistry: ISettingRegistry;
         commands: CommandRegistry;
         fileBrowserFactory: IFileBrowserFactory;
     }

src/factory.ts

@@ -8,6 +8,7 @@ import { IEditorServices } from "@jupyterlab/codeeditor";
 import { ABCWidgetFactory, DocumentModel, DocumentRegistry } from "@jupyterlab/docregistry";
 import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
 import { IRenderMimeRegistry } from "@jupyterlab/rendermime";
+import { ISettingRegistry } from "@jupyterlab/settingregistry";
 import { ITranslator } from "@jupyterlab/translation";
 import { CommandRegistry } from "@lumino/commands";
 import { SplitPanel } from "@lumino/widgets";
@@ -25,6 +26,7 @@ export class WaldiezEditorFactory extends ABCWidgetFactory<WaldiezEditor, Docume
     private readonly _commands: CommandRegistry;
     private readonly _rendermime: IRenderMimeRegistry;
     private readonly _editorServices: IEditorServices;
+    private readonly _settingRegistry: ISettingRegistry;
     private readonly _fileBrowserFactory: IFileBrowserFactory;
 
     /**
@@ -39,6 +41,7 @@ export class WaldiezEditorFactory extends ABCWidgetFactory<WaldiezEditor, Docume
         this._commands = options.commands;
         this._rendermime = options.rendermime;
         this._editorServices = options.editorServices;
+        this._settingRegistry = options.settingRegistry;
         this._fileBrowserFactory = options.fileBrowserFactory;
     }
 
@@ -73,6 +76,7 @@ export class WaldiezEditorFactory extends ABCWidgetFactory<WaldiezEditor, Docume
             context,
             rendermime: this._rendermime,
             editorServices: this._editorServices,
+            settingRegistry: this._settingRegistry,
             content: panel,
             commands: this._commands,
             fileBrowserFactory: this._fileBrowserFactory,
@@ -91,6 +95,7 @@ export namespace WaldiezEditorFactory {
         translator?: ITranslator;
         rendermime: IRenderMimeRegistry;
         editorServices: IEditorServices;
+        settingRegistry: ISettingRegistry;
         fileBrowserFactory: IFileBrowserFactory;
         commands: CommandRegistry;
     }

src/plugin.ts

@@ -14,6 +14,7 @@ import { IFileBrowserFactory } from "@jupyterlab/filebrowser";
 import { ILauncher } from "@jupyterlab/launcher";
 import { IMainMenu } from "@jupyterlab/mainmenu";
 import { IRenderMimeRegistry } from "@jupyterlab/rendermime";
+import { ISettingRegistry } from "@jupyterlab/settingregistry";
 import { ITranslator } from "@jupyterlab/translation";
 
 /**
@@ -33,13 +34,14 @@ const plugin: JupyterFrontEndPlugin<WaldiezEditorFactory> = {
     id: PLUGIN_ID,
     description: WALDIEZ_STRINGS.PLUGIN_DESCRIPTION,
     autoStart: true,
-    requires: [IRenderMimeRegistry, IEditorServices, IFileBrowserFactory],
+    requires: [IRenderMimeRegistry, IEditorServices, IFileBrowserFactory, ISettingRegistry],
     optional: [ILayoutRestorer, ILauncher, ICommandPalette, IMainMenu, ITranslator],
     activate: async (
         app: JupyterFrontEnd,
         rendermime: IRenderMimeRegistry,
         editorServices: IEditorServices,
         fileBrowserFactory: IFileBrowserFactory,
+        settingRegistry: ISettingRegistry,
         restorer?: ILayoutRestorer,
         launcher?: ILauncher,
         palette?: ICommandPalette,
@@ -61,6 +63,7 @@ const plugin: JupyterFrontEndPlugin<WaldiezEditorFactory> = {
             translator,
             rendermime,
             editorServices,
+            settingRegistry,
             fileBrowserFactory,
         });
         if (launcher) {

waldiez_jupyter/handlers/extra_static_files.py

@@ -26,9 +26,7 @@
 REGISTRY_BASE_URL = "https://registry.npmjs.org"
 PACKAGE_NAME = "monaco-editor"
 DETAILS_JSON = "monaco_details.json"
-# 0.53.0 does not seem to play well with @monaco-editor/react
-# let's check periodically and change it to None when we are good.
-PINNED_VERSION: str | None = "0.54.0"
+PINNED_VERSION: str | None = "0.55.1"
 
 LOG = logging.getLogger(__name__)
 

yarn.lock

@@ -5909,7 +5909,7 @@ __metadata:
 
 "@waldiez/react@git+https://github.com/waldiez/waldiez.git#dev":
   version: 0.6.2
-  resolution: "@waldiez/react@https://github.com/waldiez/waldiez.git#commit=d3f2ed59f0d8672f7a2512a539ec13dba304a040"
+  resolution: "@waldiez/react@https://github.com/waldiez/waldiez.git#commit=ab82ea8eb6573dab6c629c50c234f98e8ee3c758"
   dependencies:
     "@emotion/is-prop-valid": "npm:^1.4.0"
     "@fontsource/fredoka": "npm:^5.2.10"
@@ -5927,7 +5927,6 @@ __metadata:
     marked: "npm:^17.0.1"
     marked-highlight: "npm:^2.2.3"
     microdiff: "npm:^1.5.0"
-    monaco-editor: "npm:^0.55.1"
     nanoid: "npm:^5.1.6"
     react-error-boundary: "npm:^6.0.0"
     react-fast-compare: "npm:^3.2.2"
@@ -5941,7 +5940,7 @@ __metadata:
   peerDependencies:
     react: ^18.3.1 || ^19
     react-dom: ^18.3.1 || ^19
-  checksum: 10/d05156fde22e9357e55c97ad9d541b13f60bc1bb65a5998b47b4b1990d0097fd7b06349274bc5d8ef005d9d265e8d92cb1d5ef2e310588680823e51fe2e2fb31
+  checksum: 10/9fa84de6de1eb48f7b7735f25c9517a0e4ab3b2c01bc900290bf15ca9a8e58708b6ffdb5fad174567c484e6552e137fc4803694afab4e96092494195400783bf
   languageName: node
   linkType: hard
 
@@ -8129,18 +8128,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:3.2.7":
-  version: 3.2.7
-  resolution: "dompurify@npm:3.2.7"
-  dependencies:
-    "@types/trusted-types": "npm:^2.0.7"
-  dependenciesMeta:
-    "@types/trusted-types":
-      optional: true
-  checksum: 10/51b7866fb834ee62d6c415f41ece5ce11db7b463f60a822932a1f832573a40b98be7715550298690e7647988fbe086db1098bda9b10548b3166fc975eb9bd849
-  languageName: node
-  linkType: hard
-
 "dompurify@npm:^3.2.5, dompurify@npm:^3.3.0":
   version: 3.3.0
   resolution: "dompurify@npm:3.3.0"
@@ -11908,15 +11895,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"marked@npm:14.0.0":
-  version: 14.0.0
-  resolution: "marked@npm:14.0.0"
-  bin:
-    marked: bin/marked.js
-  checksum: 10/5f69e58e177bde75fb6145127c939c096d05494c5dff92d73af8a550097d6631c82e919f8a375e3743379a2623418151086b925a902a2be123590b887716f2bb
-  languageName: node
-  linkType: hard
-
 "marked@npm:^16.2.1":
   version: 16.4.2
   resolution: "marked@npm:16.4.2"
@@ -12227,16 +12205,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"monaco-editor@npm:^0.55.1":
-  version: 0.55.1
-  resolution: "monaco-editor@npm:0.55.1"
-  dependencies:
-    dompurify: "npm:3.2.7"
-    marked: "npm:14.0.0"
-  checksum: 10/73836b612a923342001b8cbb459aad0de486c94672fb7cf9d28bdafed9f3b7523d5aba510d9f8e7d24476a5aacf0d3a5c0cdc520ed4764f6f89f8cf5ba8d9329
-  languageName: node
-  linkType: hard
-
 "motion-dom@npm:^12.23.23":
   version: 12.23.23
   resolution: "motion-dom@npm:12.23.23"