@jupyter/collaboration-extension 1.0.0-alpha.0 → 1.0.0-alpha.2

package/lib/collaboration.js

@@ -4,9 +4,8 @@
  * @packageDocumentation
  * @module collaboration-extension
  */
-import { PageConfig } from '@jupyterlab/coreutils';
 import { DOMUtils } from '@jupyterlab/apputils';
-import { AwarenessMock, CollaboratorsPanel, IGlobalAwareness, IUserMenu, RendererUserMenu, UserInfoPanel, UserMenu } from '@jupyter/collaboration';
+import { CollaboratorsPanel, IGlobalAwareness, IUserMenu, RendererUserMenu, UserInfoPanel, UserMenu } from '@jupyter/collaboration';
 import { SidePanel, usersIcon } from '@jupyterlab/ui-components';
 import { MenuBar } from '@lumino/widgets';
 import { URLExt } from '@jupyterlab/coreutils';
@@ -40,9 +39,6 @@ export const menuBarPlugin = {
     activate: async (app, menu) => {
         const { shell } = app;
         const { user } = app.serviceManager;
-        if (PageConfig.getOption('collaborative') !== 'true') {
-            return;
-        }
         const menuBar = new MenuBar({
             forceItemsPosition: {
                 forceX: false,
@@ -67,9 +63,6 @@ export const rtcGlobalAwarenessPlugin = {
     activate: (app, state) => {
         const { user } = app.serviceManager;
         const ydoc = new Y.Doc();
-        if (PageConfig.getOption('collaborative') !== 'true') {
-            return new AwarenessMock(ydoc);
-        }
         const awareness = new Awareness(ydoc);
         const server = ServerConnection.makeSettings();
         const url = URLExt.join(server.wsUrl, 'api/yjs');
@@ -106,11 +99,8 @@ export const rtcPanelPlugin = {
     autoStart: true,
     requires: [IGlobalAwareness, ITranslator],
     activate: (app, awareness, translator) => {
-        if (PageConfig.getOption('collaborative') !== 'true') {
-            return;
-        }
         const { user } = app.serviceManager;
-        const trans = translator.load('jupyterlab');
+        const trans = translator.load('jupyter_collaboration');
         const userPanel = new SidePanel();
         userPanel.id = DOMUtils.createDomID();
         userPanel.title.icon = usersIcon;

package/lib/filebrowser.js

@@ -1,5 +1,6 @@
 import { ILabShell, IRouter, JupyterFrontEnd } from '@jupyterlab/application';
 import { IDefaultFileBrowser, IFileBrowserFactory } from '@jupyterlab/filebrowser';
+import { ITranslator } from '@jupyterlab/translation';
 import { YDrive } from '@jupyter/docprovider';
 /**
  * The command IDs used by the file browser plugin.
@@ -14,12 +15,13 @@ var CommandIDs;
 export const defaultFileBrowser = {
     id: '@jupyter/collaboration-extension:defaultFileBrowser',
     provides: IDefaultFileBrowser,
-    requires: [IFileBrowserFactory],
+    requires: [IFileBrowserFactory, ITranslator],
     optional: [IRouter, JupyterFrontEnd.ITreeResolver, ILabShell],
-    activate: async (app, fileBrowserFactory, router, tree, labShell) => {
+    activate: async (app, fileBrowserFactory, translator, router, tree, labShell) => {
         console.debug('@jupyter/collaboration-extension:defaultFileBrowser: activated');
         const { commands } = app;
-        const drive = new YDrive(app.serviceManager.user);
+        const trans = translator.load('jupyter_collaboration');
+        const drive = new YDrive(app.serviceManager.user, trans);
         app.serviceManager.contents.addDrive(drive);
         // Manually restore and load the default file browser.
         const defaultBrowser = fileBrowserFactory.createFileBrowser('filebrowser', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyter/collaboration-extension",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.2",
   "description": "JupyterLab - Real-Time Collaboration Extension",
   "keywords": [
     "jupyter",
@@ -52,27 +52,27 @@
     "watch:labextension": "jupyter labextension watch ."
   },
   "dependencies": {
-    "@jupyter/collaboration": "^1.0.0-alpha.0",
-    "@jupyter/docprovider": "^1.0.0-alpha.0",
-    "@jupyterlab/application": "^4.0.0-alpha.18",
-    "@jupyterlab/apputils": "^4.0.0-alpha.18",
-    "@jupyterlab/coreutils": "^6.0.0-alpha.18",
-    "@jupyterlab/filebrowser": "^4.0.0-alpha.18",
-    "@jupyterlab/services": "^7.0.0-alpha.18",
-    "@jupyterlab/statedb": "^4.0.0-alpha.18",
-    "@jupyterlab/translation": "^4.0.0-alpha.18",
-    "@jupyterlab/ui-components": "^4.0.0-alpha.33",
-    "@lumino/commands": "^2.0.0-alpha.6",
-    "@lumino/widgets": "^2.0.0-alpha.6",
+    "@jupyter/collaboration": "^1.0.0-alpha.2",
+    "@jupyter/docprovider": "^1.0.0-alpha.2",
+    "@jupyterlab/application": "^4.0.0-alpha.19",
+    "@jupyterlab/apputils": "^4.0.0-alpha.19",
+    "@jupyterlab/coreutils": "^6.0.0-alpha.19",
+    "@jupyterlab/filebrowser": "^4.0.0-alpha.19",
+    "@jupyterlab/services": "^7.0.0-alpha.19",
+    "@jupyterlab/statedb": "^4.0.0-alpha.19",
+    "@jupyterlab/translation": "^4.0.0-alpha.19",
+    "@jupyterlab/ui-components": "^4.0.0-alpha.34",
+    "@lumino/commands": "^2.0.0-beta.1",
+    "@lumino/widgets": "^2.0.0-beta.1",
     "y-protocols": "^1.0.5",
     "y-websocket": "^1.3.15",
     "yjs": "^13.5.40"
   },
   "devDependencies": {
-    "@jupyterlab/builder": "^4.0.0-alpha.18",
+    "@jupyterlab/builder": "^4.0.0-alpha.19",
     "@types/react": "^18.0.27",
     "npm-run-all": "^4.1.5",
-    "rimraf": "~3.0.0",
+    "rimraf": "^4.1.2",
     "typescript": "~4.7.3"
   },
   "publishConfig": {
@@ -99,6 +99,10 @@
       "@jupyter/docprovider": {
         "bundled": true,
         "singleton": true
+      },
+      "@jupyter/ydoc": {
+        "bundled": false,
+        "singleton": true
       }
     }
   }

package/style/index.css

@@ -3,4 +3,4 @@
 | Distributed under the terms of the Modified BSD License.
 |---------------------------------------------------------------------------- */
 
-@import url('./base.css');
+@import url('~@jupyter/collaboration/style/index.css');

package/style/index.js

@@ -3,4 +3,4 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-import './base.css';
+import '@jupyter/collaboration/style/index.js';

package/style/base.css

@@ -1,4 +0,0 @@
-/* -----------------------------------------------------------------------------
-| Copyright (c) Jupyter Development Team.
-| Distributed under the terms of the Modified BSD License.
-|---------------------------------------------------------------------------- */