From 74a269c38d49fe5ff413322178508719c54790a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Mon, 12 Aug 2024 12:38:08 +0100 Subject: [PATCH] Allow jupyter-ydoc v3.0.0-a3 or higher (#334) --- packages/collaboration-extension/package.json | 2 +- packages/docprovider-extension/package.json | 2 +- packages/docprovider/package.json | 2 +- projects/jupyter-server-ydoc/pyproject.toml | 2 +- yarn.lock | 22 +++++++++++++++---- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/collaboration-extension/package.json b/packages/collaboration-extension/package.json index 6de8b52f..d2176234 100644 --- a/packages/collaboration-extension/package.json +++ b/packages/collaboration-extension/package.json @@ -55,7 +55,7 @@ "dependencies": { "@jupyter/collaboration": "^3.0.0-beta.1", "@jupyter/docprovider": "^3.0.0-beta.1", - "@jupyter/ydoc": "^2.0.0", + "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/codemirror": "^4.2.0", diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json index d308b75c..d0bf5a93 100644 --- a/packages/docprovider-extension/package.json +++ b/packages/docprovider-extension/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@jupyter/docprovider": "^3.0.0-beta.1", - "@jupyter/ydoc": "^2.0.0", + "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/docregistry": "^4.2.0", diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json index abd6d48b..752b6da7 100644 --- a/packages/docprovider/package.json +++ b/packages/docprovider/package.json @@ -41,7 +41,7 @@ "watch": "tsc -b --watch" }, "dependencies": { - "@jupyter/ydoc": "^2.0.0", + "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/cells": "^4.2.0", "@jupyterlab/coreutils": "^6.2.0", diff --git a/projects/jupyter-server-ydoc/pyproject.toml b/projects/jupyter-server-ydoc/pyproject.toml index b1dda41d..6cd6538a 100644 --- a/projects/jupyter-server-ydoc/pyproject.toml +++ b/projects/jupyter-server-ydoc/pyproject.toml @@ -29,7 +29,7 @@ authors = [ ] dependencies = [ "jupyter_server>=2.4.0,<3.0.0", - "jupyter_ydoc>=2.0.0,<3.0.0", + "jupyter_ydoc>=2.0.0,<4.0.0", "pycrdt", "pycrdt-websocket>=0.14.0,<0.15.0", "jupyter_events>=0.10.0", diff --git a/yarn.lock b/yarn.lock index 9d1a4016..249d111f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2089,7 +2089,7 @@ __metadata: dependencies: "@jupyter/collaboration": ^3.0.0-beta.1 "@jupyter/docprovider": ^3.0.0-beta.1 - "@jupyter/ydoc": ^2.0.0 + "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/builder": ^4.0.5 @@ -2139,7 +2139,7 @@ __metadata: resolution: "@jupyter/docprovider-extension@workspace:packages/docprovider-extension" dependencies: "@jupyter/docprovider": ^3.0.0-beta.1 - "@jupyter/ydoc": ^2.0.0 + "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/builder": ^4.0.0 @@ -2165,7 +2165,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider@workspace:packages/docprovider" dependencies: - "@jupyter/ydoc": ^2.0.0 + "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/cells": ^4.2.0 "@jupyterlab/coreutils": ^6.2.0 @@ -2233,7 +2233,21 @@ __metadata: languageName: node linkType: hard -"@jupyter/ydoc@npm:^2.0.0, @jupyter/ydoc@npm:^2.0.1": +"@jupyter/ydoc@npm:^2.0.0 || ^3.0.0-a3": + version: 3.0.0-a3 + resolution: "@jupyter/ydoc@npm:3.0.0-a3" + dependencies: + "@jupyterlab/nbformat": ^3.0.0 || ^4.0.0-alpha.21 || ^4.0.0 + "@lumino/coreutils": ^1.11.0 || ^2.0.0 + "@lumino/disposable": ^1.10.0 || ^2.0.0 + "@lumino/signaling": ^1.10.0 || ^2.0.0 + y-protocols: ^1.0.5 + yjs: ^13.5.40 + checksum: 6651b7433c73312f6caf24bcd066b999a55be695ec6850a48442fbe9f739343893b181532398bf5e0b6c10f3fe874c832c075c865f1adb902d859b306cc1d333 + languageName: node + linkType: hard + +"@jupyter/ydoc@npm:^2.0.1": version: 2.0.1 resolution: "@jupyter/ydoc@npm:2.0.1" dependencies: