Skip to content

Commit 365971d

Browse files
hbcarlosfcollonval
andauthored
Move RTC packages to an extension (jupyterlab#13907)
* Removes packages * Removes collaborative flag * Use collaborative flag to check whether the RTC extension is installed * Fixes IDrives * Removes jupyter_server_ydoc as dependency * Restore staging * Adds rtc extension import and restores staging * Review * Rebase and fix yarn.lock * Improves the collaborative flag per document --------- Co-authored-by: Frédéric Collonval <[email protected]>
1 parent 38c1785 commit 365971d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+45
-2046
lines changed

.github/labeler.yml

-10
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,6 @@ pkg:codeeditor:
6666
- packages/codeeditor/**/*
6767
- packages/codeeditor/*
6868

69-
pkg:collaboration:
70-
- packages/collaboration/**/*
71-
- packages/collaboration/*
72-
- packages/collaboration-extension/**/*
73-
- packages/collaboration-extension/*
74-
7569
pkg:codemirror:
7670
- packages/codemirror/**/*
7771
- packages/codemirror/*
@@ -112,10 +106,6 @@ pkg:docmanager:
112106
- packages/docmanager-extension/**/*
113107
- packages/docmanager-extension/*
114108

115-
pkg:docprovider:
116-
- packages/docprovider/**/*
117-
- packages/docprovider/*
118-
119109
pkg:docregistry:
120110
- packages/docregistry/**/*
121111
- packages/docregistry/*

.github/workflows/linuxjs-tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
js-csvviewer,
3232
js-debugger,
3333
js-docmanager,
34-
js-docprovider,
3534
js-docregistry,
3635
js-documentsearch,
3736
js-filebrowser,

buildutils/src/ensure-repo.ts

-3
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ const SKIP_CSS: Dict<string[]> = {
203203
'@jupyterlab/console-extension',
204204
'@jupyterlab/csvviewer',
205205
'@jupyterlab/documentsearch',
206-
'@jupyterlab/docprovider',
207206
'@jupyterlab/csvviewer-extension',
208207
'@jupyterlab/debugger',
209208
'@jupyterlab/debugger-extension',
@@ -256,8 +255,6 @@ const SKIP_CSS: Dict<string[]> = {
256255
'@jupyterlab/tooltip-extension',
257256
'@jupyterlab/translation-extension',
258257
'@jupyterlab/ui-components-extension',
259-
'@jupyterlab/collaboration',
260-
'@jupyterlab/collaboration-extension',
261258
'@jupyterlab/vega5-extension'
262259
],
263260
'@jupyterlab/notebook': ['@jupyterlab/application'],

dev_mode/package.json

-10
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
"@jupyterlab/codeeditor": "~4.0.0-alpha.18",
3131
"@jupyterlab/codemirror": "~4.0.0-alpha.18",
3232
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.18",
33-
"@jupyterlab/collaboration": "~4.0.0-alpha.18",
34-
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.18",
3533
"@jupyterlab/completer": "~4.0.0-alpha.18",
3634
"@jupyterlab/completer-extension": "~4.0.0-alpha.18",
3735
"@jupyterlab/console": "~4.0.0-alpha.18",
@@ -43,7 +41,6 @@
4341
"@jupyterlab/debugger-extension": "~4.0.0-alpha.18",
4442
"@jupyterlab/docmanager": "~4.0.0-alpha.18",
4543
"@jupyterlab/docmanager-extension": "~4.0.0-alpha.18",
46-
"@jupyterlab/docprovider": "~4.0.0-alpha.18",
4744
"@jupyterlab/docregistry": "~4.0.0-alpha.18",
4845
"@jupyterlab/documentsearch": "~4.0.0-alpha.18",
4946
"@jupyterlab/documentsearch-extension": "~4.0.0-alpha.18",
@@ -136,7 +133,6 @@
136133
"@jupyterlab/cell-toolbar-extension": "~4.0.0-alpha.18",
137134
"@jupyterlab/celltags-extension": "~4.0.0-alpha.18",
138135
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.18",
139-
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.18",
140136
"@jupyterlab/completer-extension": "~4.0.0-alpha.18",
141137
"@jupyterlab/console-extension": "~4.0.0-alpha.18",
142138
"@jupyterlab/coreutils": "~6.0.0-alpha.18",
@@ -217,7 +213,6 @@
217213
"@jupyterlab/cell-toolbar-extension": "",
218214
"@jupyterlab/celltags-extension": "",
219215
"@jupyterlab/codemirror-extension": "",
220-
"@jupyterlab/collaboration-extension": "",
221216
"@jupyterlab/completer-extension": "",
222217
"@jupyterlab/console-extension": "",
223218
"@jupyterlab/csvviewer-extension": "",
@@ -269,13 +264,11 @@
269264
"@jupyterlab/cell-toolbar",
270265
"@jupyterlab/codeeditor",
271266
"@jupyterlab/codemirror",
272-
"@jupyterlab/collaboration",
273267
"@jupyterlab/completer",
274268
"@jupyterlab/console",
275269
"@jupyterlab/coreutils",
276270
"@jupyterlab/debugger",
277271
"@jupyterlab/docmanager",
278-
"@jupyterlab/docprovider",
279272
"@jupyterlab/documentsearch",
280273
"@jupyterlab/extensionmanager",
281274
"@jupyterlab/filebrowser",
@@ -331,8 +324,6 @@
331324
"@jupyterlab/codeeditor": "../packages/codeeditor",
332325
"@jupyterlab/codemirror": "../packages/codemirror",
333326
"@jupyterlab/codemirror-extension": "../packages/codemirror-extension",
334-
"@jupyterlab/collaboration": "../packages/collaboration",
335-
"@jupyterlab/collaboration-extension": "../packages/collaboration-extension",
336327
"@jupyterlab/completer": "../packages/completer",
337328
"@jupyterlab/completer-extension": "../packages/completer-extension",
338329
"@jupyterlab/console": "../packages/console",
@@ -344,7 +335,6 @@
344335
"@jupyterlab/debugger-extension": "../packages/debugger-extension",
345336
"@jupyterlab/docmanager": "../packages/docmanager",
346337
"@jupyterlab/docmanager-extension": "../packages/docmanager-extension",
347-
"@jupyterlab/docprovider": "../packages/docprovider",
348338
"@jupyterlab/docregistry": "../packages/docregistry",
349339
"@jupyterlab/documentsearch": "../packages/documentsearch",
350340
"@jupyterlab/documentsearch-extension": "../packages/documentsearch-extension",

dev_mode/style.js

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import '@jupyterlab/apputils-extension/style/index.js';
66
import '@jupyterlab/cell-toolbar-extension/style/index.js';
77
import '@jupyterlab/celltags-extension/style/index.js';
88
import '@jupyterlab/codemirror-extension/style/index.js';
9-
import '@jupyterlab/collaboration-extension/style/index.js';
109
import '@jupyterlab/completer-extension/style/index.js';
1110
import '@jupyterlab/console-extension/style/index.js';
1211
import '@jupyterlab/csvviewer-extension/style/index.js';

examples/federated/core_package/package.json

-3
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
"@jupyterlab/celltags-extension": "~4.0.0-alpha.18",
1919
"@jupyterlab/codeeditor": "^4.0.0-alpha.15",
2020
"@jupyterlab/codemirror-extension": "~4.0.0-alpha.18",
21-
"@jupyterlab/collaboration": "^4.0.0-alpha.11",
22-
"@jupyterlab/collaboration-extension": "~4.0.0-alpha.11",
2321
"@jupyterlab/completer": "^4.0.0-alpha.15",
2422
"@jupyterlab/completer-extension": "~4.0.0-alpha.18",
2523
"@jupyterlab/console": "^4.0.0-alpha.15",
@@ -164,7 +162,6 @@
164162
"@jupyterlab/apputils",
165163
"@jupyterlab/attachments",
166164
"@jupyterlab/codeeditor",
167-
"@jupyterlab/collaboration",
168165
"@jupyterlab/completer",
169166
"@jupyterlab/console",
170167
"@jupyterlab/coreutils",

jupyterlab/labapp.py

+14-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import dataclasses
77
import json
88
import os
9+
import sys
910

1011
from jupyter_core.application import JupyterApp, NoStart, base_aliases, base_flags
1112
from jupyter_server._version import version_info as jpserver_version_info
@@ -688,7 +689,6 @@ def initialize_handlers(self): # noqa
688689
page_config["token"] = self.serverapp.token
689690
page_config["exposeAppInBrowser"] = self.expose_app_in_browser
690691
page_config["quitButton"] = self.serverapp.quit_button
691-
page_config["collaborative"] = self.collaborative
692692
page_config["allow_hidden_files"] = self.serverapp.contents_manager.allow_hidden
693693

694694
# Client-side code assumes notebookVersion is a JSON-encoded string
@@ -840,6 +840,19 @@ def initialize_handlers(self): # noqa
840840
def initialize(self, argv=None):
841841
"""Subclass because the ExtensionApp.initialize() method does not take arguments"""
842842
super().initialize()
843+
if self.collaborative:
844+
try:
845+
import jupyterlab_rtc # noqa
846+
except ImportError:
847+
self.log.critical(
848+
"""
849+
To enable real-time collaboration, you must install the extension `jupyterlab_rtc`.
850+
You can install it using pip for example:
851+
852+
python -m pip install jupyterlab_rtc
853+
"""
854+
)
855+
sys.exit(1)
843856

844857

845858
# -----------------------------------------------------------------------------

packages/collaboration-extension/README.md

-3
This file was deleted.

packages/collaboration-extension/package.json

-66
This file was deleted.

packages/collaboration-extension/schema/user-menu-bar.json

-15
This file was deleted.

0 commit comments

Comments
 (0)