Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@hbcarlos
hbcarlos committed Apr 26, 2023
1 parent dda665d commit 2f731c4
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 180 deletions.
2 changes: 1 addition & 1 deletion jupyter_collaboration/handlers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ def on_close(self) -> None:
self.log.info("Cleaning room: %s", self._room_id)
self.room.cleaner = asyncio.create_task(self._clean_room())

def _emit(self, level: LogLevel, action: str = None, msg: str = None) -> None:
def _emit(self, level: LogLevel, action: str | None = None, msg: str | None = None) -> None:
_, _, file_id = decode_file_path(self._room_id)
path = self._file_id_manager.get_path(file_id)

Expand Down
2 changes: 1 addition & 1 deletion jupyter_collaboration/rooms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ async def initialize(self) -> None:
self.ready = True
self._emit(LogLevel.INFO, "initialize", "Room initialized")

def _emit(self, level: LogLevel, action: str = None, msg: str = None) -> None:
def _emit(self, level: LogLevel, action: str | None = None, msg: str | None = None) -> None:
data = {"level": level.value, "room": self._room_id, "path": self._file.path}
if action:
data["action"] = action
Expand Down
120 changes: 119 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,124 @@
"test:debug:watch": "lerna run test:debug:watch",
"watch": "lerna run watch"
},
"resolutions": {
"@codemirror/language": "^6.0.0",
"@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.9.6",
"@jupyter/ydoc": "~1.0.2",
"@jupyterlab/application": "~4.0.0-beta.2",
"@jupyterlab/application-extension": "~4.0.0-beta.2",
"@jupyterlab/apputils": "~4.0.0-beta.2",
"@jupyterlab/apputils-extension": "~4.0.0-beta.2",
"@jupyterlab/attachments": "~4.0.0-beta.2",
"@jupyterlab/cell-toolbar": "~4.0.0-beta.2",
"@jupyterlab/cell-toolbar-extension": "~4.0.0-beta.2",
"@jupyterlab/cells": "~4.0.0-beta.2",
"@jupyterlab/celltags": "~4.0.0-alpha.20",
"@jupyterlab/celltags-extension": "~4.0.0-beta.2",
"@jupyterlab/codeeditor": "~4.0.0-beta.2",
"@jupyterlab/codemirror": "~4.0.0-beta.2",
"@jupyterlab/codemirror-extension": "~4.0.0-beta.2",
"@jupyterlab/completer": "~4.0.0-beta.2",
"@jupyterlab/completer-extension": "~4.0.0-beta.2",
"@jupyterlab/console": "~4.0.0-beta.2",
"@jupyterlab/console-extension": "~4.0.0-beta.2",
"@jupyterlab/coreutils": "~6.0.0-beta.2",
"@jupyterlab/csvviewer": "~4.0.0-beta.2",
"@jupyterlab/csvviewer-extension": "~4.0.0-beta.2",
"@jupyterlab/debugger": "~4.0.0-beta.2",
"@jupyterlab/debugger-extension": "~4.0.0-beta.2",
"@jupyterlab/docmanager": "~4.0.0-beta.2",
"@jupyterlab/docmanager-extension": "~4.0.0-beta.2",
"@jupyterlab/docregistry": "~4.0.0-beta.2",
"@jupyterlab/documentsearch": "~4.0.0-beta.2",
"@jupyterlab/documentsearch-extension": "~4.0.0-beta.2",
"@jupyterlab/extensionmanager": "~4.0.0-beta.2",
"@jupyterlab/extensionmanager-extension": "~4.0.0-beta.2",
"@jupyterlab/filebrowser": "~4.0.0-beta.2",
"@jupyterlab/filebrowser-extension": "~4.0.0-beta.2",
"@jupyterlab/fileeditor": "~4.0.0-beta.2",
"@jupyterlab/fileeditor-extension": "~4.0.0-beta.2",
"@jupyterlab/help-extension": "~4.0.0-beta.2",
"@jupyterlab/htmlviewer": "~4.0.0-beta.2",
"@jupyterlab/htmlviewer-extension": "~4.0.0-beta.2",
"@jupyterlab/hub-extension": "~4.0.0-beta.2",
"@jupyterlab/imageviewer": "~4.0.0-beta.2",
"@jupyterlab/imageviewer-extension": "~4.0.0-beta.2",
"@jupyterlab/inspector": "~4.0.0-beta.2",
"@jupyterlab/inspector-extension": "~4.0.0-beta.2",
"@jupyterlab/javascript-extension": "~4.0.0-beta.2",
"@jupyterlab/json-extension": "~4.0.0-beta.2",
"@jupyterlab/launcher": "~4.0.0-beta.2",
"@jupyterlab/launcher-extension": "~4.0.0-beta.2",
"@jupyterlab/logconsole": "~4.0.0-beta.2",
"@jupyterlab/logconsole-extension": "~4.0.0-beta.2",
"@jupyterlab/lsp": "~4.0.0-beta.2",
"@jupyterlab/lsp-extension": "~4.0.0-beta.2",
"@jupyterlab/mainmenu": "~4.0.0-beta.2",
"@jupyterlab/mainmenu-extension": "~4.0.0-beta.2",
"@jupyterlab/markdownviewer": "~4.0.0-beta.2",
"@jupyterlab/markdownviewer-extension": "~4.0.0-beta.2",
"@jupyterlab/markedparser-extension": "~4.0.0-beta.2",
"@jupyterlab/mathjax-extension": "~4.0.0-beta.2",
"@jupyterlab/metadataform": "~4.0.0-beta.2",
"@jupyterlab/metadataform-extension": "~4.0.0-beta.2",
"@jupyterlab/metapackage": "~4.0.0-beta.2",
"@jupyterlab/nbconvert-css": "~4.0.0-beta.2",
"@jupyterlab/nbformat": "~4.0.0-beta.2",
"@jupyterlab/notebook": "~4.0.0-beta.2",
"@jupyterlab/notebook-extension": "~4.0.0-beta.2",
"@jupyterlab/observables": "~5.0.0-beta.2",
"@jupyterlab/outputarea": "~4.0.0-beta.2",
"@jupyterlab/pdf-extension": "~4.0.0-beta.2",
"@jupyterlab/property-inspector": "~4.0.0-beta.2",
"@jupyterlab/rendermime": "~4.0.0-beta.2",
"@jupyterlab/rendermime-extension": "~4.0.0-beta.2",
"@jupyterlab/rendermime-interfaces": "~3.8.0-beta.2",
"@jupyterlab/running": "~4.0.0-beta.2",
"@jupyterlab/running-extension": "~4.0.0-beta.2",
"@jupyterlab/services": "~7.0.0-beta.2",
"@jupyterlab/settingeditor": "~4.0.0-beta.2",
"@jupyterlab/settingeditor-extension": "~4.0.0-beta.2",
"@jupyterlab/settingregistry": "~4.0.0-beta.2",
"@jupyterlab/shortcuts-extension": "~4.0.0-beta.2",
"@jupyterlab/statedb": "~4.0.0-beta.2",
"@jupyterlab/statusbar": "~4.0.0-beta.2",
"@jupyterlab/statusbar-extension": "~4.0.0-beta.2",
"@jupyterlab/terminal": "~4.0.0-beta.2",
"@jupyterlab/terminal-extension": "~4.0.0-beta.2",
"@jupyterlab/theme-dark-extension": "~4.0.0-beta.2",
"@jupyterlab/theme-light-extension": "~4.0.0-beta.2",
"@jupyterlab/toc": "~6.0.0-beta.2",
"@jupyterlab/toc-extension": "~6.0.0-beta.2",
"@jupyterlab/tooltip": "~4.0.0-beta.2",
"@jupyterlab/tooltip-extension": "~4.0.0-beta.2",
"@jupyterlab/translation": "~4.0.0-beta.2",
"@jupyterlab/translation-extension": "~4.0.0-beta.2",
"@jupyterlab/ui-components": "~4.0.0-beta.2",
"@jupyterlab/ui-components-extension": "~4.0.0-beta.2",
"@jupyterlab/vega5-extension": "~4.0.0-beta.2",
"@lezer/common": "^1.0.0",
"@lezer/highlight": "^1.0.0",
"@lumino/algorithm": "^2.0.0",
"@lumino/application": "^2.0.1",
"@lumino/commands": "^2.0.1",
"@lumino/coreutils": "^2.0.0",
"@lumino/datagrid": "^2.0.1",
"@lumino/disposable": "^2.0.0",
"@lumino/domutils": "^2.0.0",
"@lumino/dragdrop": "^2.0.0",
"@lumino/keyboard": "^2.0.0",
"@lumino/messaging": "^2.0.0",
"@lumino/polling": "^2.0.0",
"@lumino/properties": "^2.0.0",
"@lumino/signaling": "^2.0.0",
"@lumino/virtualdom": "^2.0.0",
"@lumino/widgets": "^2.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"yjs": "^13.5.40"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "~5.55.0",
"@typescript-eslint/parser": "~5.55.0",
Expand All @@ -66,7 +184,7 @@
"stylelint-config-standard": "^30.0.1",
"stylelint-prettier": "^3.0.0",
"typedoc": "~0.23.28",
"typescript": "~5.0.2"
"typescript": "~5.0.4"
},
"packageManager": "yarn@3.5.0"
}
33 changes: 16 additions & 17 deletions packages/collaboration-extension/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,30 @@
"dependencies": {
"@jupyter/collaboration": "^1.0.0-alpha.8",
"@jupyter/docprovider": "^1.0.0-alpha.8",
"@jupyterlab/application": "^4.0.0-beta.0",
"@jupyterlab/apputils": "^4.0.0-beta.0",
"@jupyterlab/codemirror": "^4.0.0-beta.0",
"@jupyterlab/coreutils": "^6.0.0-beta.0",
"@jupyterlab/filebrowser": "^4.0.0-beta.0",
"@jupyterlab/fileeditor": "^4.0.0-beta.0",
"@jupyterlab/logconsole": "^4.0.0-beta.0",
"@jupyterlab/notebook": "^4.0.0-beta.0",
"@jupyterlab/services": "^7.0.0-beta.0",
"@jupyterlab/settingregistry": "^4.0.0-beta.0",
"@jupyterlab/statedb": "^4.0.0-beta.0",
"@jupyterlab/translation": "^4.0.0-beta.0",
"@jupyterlab/ui-components": "^4.0.0-beta.0",
"@lumino/commands": "^2.0.0",
"@lumino/widgets": "^2.0.0",
"@jupyterlab/application": "^4.0.0-beta.2",
"@jupyterlab/apputils": "^4.0.0-beta.2",
"@jupyterlab/codemirror": "^4.0.0-beta.2",
"@jupyterlab/coreutils": "^6.0.0-beta.2",
"@jupyterlab/filebrowser": "^4.0.0-beta.2",
"@jupyterlab/logconsole": "^4.0.0-beta.2",
"@jupyterlab/notebook": "^4.0.0-beta.2",
"@jupyterlab/services": "^7.0.0-beta.2",
"@jupyterlab/settingregistry": "^4.0.0-beta.2",
"@jupyterlab/statedb": "^4.0.0-beta.2",
"@jupyterlab/translation": "^4.0.0-beta.2",
"@jupyterlab/ui-components": "^4.0.0-beta.2",
"@lumino/commands": "^2.1.0",
"@lumino/widgets": "^2.1.0",
"y-protocols": "^1.0.5",
"y-websocket": "^1.3.15",
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/builder": "^4.0.0-beta.0",
"@jupyterlab/builder": "^4.0.0-beta.2",
"@types/react": "^18.0.27",
"npm-run-all": "^4.1.5",
"rimraf": "^4.1.2",
"typescript": "~5.0.2"
"typescript": "~5.0.4"
},
"publishConfig": {
"access": "public"
Expand Down
15 changes: 1 addition & 14 deletions packages/collaboration-extension/src/filebrowser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { ITranslator, nullTranslator } from '@jupyterlab/translation';
import { ISettingRegistry } from '@jupyterlab/settingregistry';
import { ILogger, ILoggerRegistry } from '@jupyterlab/logconsole';
import { INotebookTracker } from '@jupyterlab/notebook';
import { IEditorTracker } from '@jupyterlab/fileeditor';

import { CommandRegistry } from '@lumino/commands';

Expand Down Expand Up @@ -171,12 +170,11 @@ export const logger: JupyterFrontEndPlugin<void> = {
id: '@jupyter/collaboration-extension:logger',
description: 'A logging plugin for debugging purposes.',
autoStart: true,
optional: [ILoggerRegistry, INotebookTracker, IEditorTracker, ITranslator],
optional: [ILoggerRegistry, INotebookTracker, ITranslator],
activate: (
app: JupyterFrontEnd,
loggerRegistry: ILoggerRegistry | null,
nbtracker: INotebookTracker | null,
editorTracker: IEditorTracker | null,
translator: ITranslator | null
): void => {
const trans = (translator ?? nullTranslator).load('jupyter_collaboration');
Expand Down Expand Up @@ -221,17 +219,6 @@ export const logger: JupyterFrontEndPlugin<void> = {
});
}

if (editorTracker) {
editorTracker.widgetAdded.connect((sender, editor) => {
const logger = loggerRegistry.getLogger(editor.context.path);
loggers.set(editor.context.localPath, logger);

editor.disposed.connect(editor => {
loggers.delete(editor.context.localPath);
});
});
}

void (async () => {
const { events } = app.serviceManager;
for await (const emission of events.stream) {
Expand Down
14 changes: 7 additions & 7 deletions packages/collaboration/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
"dependencies": {
"@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.7.0",
"@jupyterlab/apputils": "^4.0.0-beta.0",
"@jupyterlab/coreutils": "^6.0.0-beta.0",
"@jupyterlab/services": "^7.0.0-beta.0",
"@jupyterlab/ui-components": "^4.0.0-beta.0",
"@lumino/coreutils": "^2.0.0",
"@jupyterlab/apputils": "^4.0.0-beta.2",
"@jupyterlab/coreutils": "^6.0.0-beta.2",
"@jupyterlab/services": "^7.0.0-beta.2",
"@jupyterlab/ui-components": "^4.0.0-beta.2",
"@lumino/coreutils": "^2.1.0",
"@lumino/virtualdom": "^2.0.0",
"@lumino/widgets": "^2.0.0",
"@lumino/widgets": "^2.1.0",
"react": "^18.2.0",
"y-protocols": "^1.0.5",
"yjs": "^13.5.40"
},
"devDependencies": {
"@types/react": "^18.0.27",
"rimraf": "^4.1.2",
"typescript": "~5.0.2"
"typescript": "~5.0.4"
},
"publishConfig": {
"access": "public"
Expand Down
16 changes: 8 additions & 8 deletions packages/docprovider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
"watch": "tsc -b --watch"
},
"dependencies": {
"@jupyter/ydoc": "^1.0.0",
"@jupyterlab/coreutils": "^6.0.0-beta.0",
"@jupyterlab/services": "^7.0.0-beta.0",
"@lumino/coreutils": "^2.0.0",
"@lumino/disposable": "^2.0.0",
"@lumino/signaling": "^2.0.0",
"@jupyter/ydoc": "^1.0.2",
"@jupyterlab/coreutils": "^6.0.0-beta.2",
"@jupyterlab/services": "^7.0.0-beta.2",
"@lumino/coreutils": "^2.1.0",
"@lumino/disposable": "^2.1.0",
"@lumino/signaling": "^2.1.0",
"y-protocols": "^1.0.5",
"y-websocket": "^1.3.15",
"yjs": "^13.5.40"
},
"devDependencies": {
"@jupyterlab/testing": "^4.0.0-beta.0",
"@jupyterlab/testing": "^4.0.0-beta.2",
"@types/jest": "^29.2.0",
"rimraf": "^4.1.2",
"typescript": "~5.0.2"
"typescript": "~5.0.4"
},
"publishConfig": {
"access": "public"
Expand Down
Loading

0 comments on commit 2f731c4

Please sign in to comment.