@jupyter/docprovider-extension 3.0.0-alpha.2 → 3.0.0-beta.1

package/lib/executor.js

@@ -4,8 +4,8 @@
  * @packageDocumentation
  * @module docprovider-extension
  */
-import { PageConfig, URLExt } from '@jupyterlab/coreutils';
-import { ServerConnection } from '@jupyterlab/services';
+import { NotebookCellServerExecutor } from '@jupyter/docprovider';
+import { PageConfig } from '@jupyterlab/coreutils';
 import { INotebookCellExecutor, runCell } from '@jupyterlab/notebook';
 export const notebookCellExecutor = {
     id: '@jupyter/docprovider-extension:notebook-cell-executor',
@@ -14,40 +14,10 @@ export const notebookCellExecutor = {
     provides: INotebookCellExecutor,
     activate: (app) => {
         if (PageConfig.getOption('serverSideExecution') === 'true') {
-            return Object.freeze({ runCell: runCellServerSide });
+            return new NotebookCellServerExecutor({
+                serverSettings: app.serviceManager.serverSettings
+            });
         }
         return Object.freeze({ runCell });
     }
 };
-async function runCellServerSide({ cell, notebook, notebookConfig, onCellExecuted, onCellExecutionScheduled, sessionContext, sessionDialogs, translator }) {
-    var _a, _b;
-    switch (cell.model.type) {
-        case 'markdown':
-            cell.rendered = true;
-            cell.inputHidden = false;
-            onCellExecuted({ cell, success: true });
-            break;
-        case 'code': {
-            const kernelId = (_b = (_a = sessionContext === null || sessionContext === void 0 ? void 0 : sessionContext.session) === null || _a === void 0 ? void 0 : _a.kernel) === null || _b === void 0 ? void 0 : _b.id;
-            const settings = ServerConnection.makeSettings();
-            const apiURL = URLExt.join(settings.baseUrl, `api/kernels/${kernelId}/execute`);
-            const cellId = cell.model.sharedModel.getId();
-            const documentId = `json:notebook:${notebook.sharedModel.getState('file_id')}`;
-            const body = `{"cell_id":"${cellId}","document_id":"${documentId}"}`;
-            const init = {
-                method: 'POST',
-                body
-            };
-            try {
-                await ServerConnection.makeRequest(apiURL, init, settings);
-            }
-            catch (error) {
-                throw new ServerConnection.NetworkError(error);
-            }
-            break;
-        }
-        default:
-            break;
-    }
-    return Promise.resolve(true);
-}

package/lib/filebrowser.js

@@ -11,7 +11,7 @@ import { INotebookTracker } from '@jupyterlab/notebook';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { YFile, YNotebook } from '@jupyter/ydoc';
-import { ICollaborativeDrive, YDrive } from '@jupyter/docprovider';
+import { ICollaborativeDrive, IGlobalAwareness, YDrive } from '@jupyter/docprovider';
 /**
  * The command IDs used by the file browser plugin.
  */
@@ -27,10 +27,10 @@ export const drive = {
     description: 'The default collaborative drive provider',
     provides: ICollaborativeDrive,
     requires: [ITranslator],
-    optional: [],
-    activate: (app, translator) => {
+    optional: [IGlobalAwareness],
+    activate: (app, translator, globalAwareness) => {
         const trans = translator.load('jupyter_collaboration');
-        const drive = new YDrive(app.serviceManager.user, trans);
+        const drive = new YDrive(app.serviceManager.user, trans, globalAwareness);
         app.serviceManager.contents.addDrive(drive);
         return drive;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter/docprovider-extension",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-beta.1",
   "description": "JupyterLab - Collaborative Shared Models",
   "keywords": [
     "jupyter",
@@ -53,7 +53,7 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/docprovider": "^3.0.0-alpha.2",
+    "@jupyter/docprovider": "^3.0.0-beta.1",
     "@jupyter/ydoc": "^2.0.0",
     "@jupyterlab/application": "^4.2.0",
     "@jupyterlab/apputils": "^4.2.0",
@@ -70,8 +70,8 @@
     "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.5",
-    "@types/react": "~18.0.26",
+    "@jupyterlab/builder": "^4.0.0",
+    "@types/react": "~18.3.1",
     "npm-run-all": "^4.1.5",
     "rimraf": "^4.1.2",
     "typescript": "~5.0.4"
@@ -101,6 +101,10 @@
         "bundled": false,
         "singleton": true
       },
+      "@jupyter/collaboration": {
+        "bundled": false,
+        "singleton": true
+      },
       "@jupyter/docprovider": {
         "bundled": true,
         "singleton": true