From 32a3e5aa1f578414036b2622d0030d9ee96a0709 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Mon, 16 Sep 2024 22:24:45 +0200 Subject: [PATCH 01/11] Extract out ICollaborativeDrive to @jupyter/collaborativedrive --- .github/workflows/test.yml | 7 ++- packages/collaboration-extension/package.json | 5 ++ .../src/collaboration.ts | 6 +- packages/collaborativedrive/package.json | 55 +++++++++++++++++++ packages/collaborativedrive/src/index.ts | 10 ++++ .../src/tokens.ts | 16 +++++- packages/collaborativedrive/tsconfig.json | 9 +++ packages/docprovider-extension/package.json | 5 ++ .../docprovider-extension/src/filebrowser.ts | 12 ++-- packages/docprovider/package.json | 1 + packages/docprovider/src/index.ts | 1 - packages/docprovider/src/ydrive.ts | 14 ++--- packages/docprovider/src/yprovider.ts | 12 +--- yarn.lock | 14 +++++ 14 files changed, 131 insertions(+), 36 deletions(-) create mode 100644 packages/collaborativedrive/package.json create mode 100644 packages/collaborativedrive/src/index.ts rename packages/{docprovider => collaborativedrive}/src/tokens.ts (77%) create mode 100644 packages/collaborativedrive/tsconfig.json diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b57998ef..ad6aa92d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,12 +56,12 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.11' + python-version: '3.12' - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 @@ -71,6 +71,7 @@ jobs: pip install "jupyterlab>=4.0.0,<5" pip install -e . jlpm + jlpm build - name: Run Tests run: | diff --git a/packages/collaboration-extension/package.json b/packages/collaboration-extension/package.json index a7ebed51..988c5220 100644 --- a/packages/collaboration-extension/package.json +++ b/packages/collaboration-extension/package.json @@ -54,6 +54,7 @@ }, "dependencies": { "@jupyter/collaboration": "^3.0.0-beta.6", + "@jupyter/collaborativedrive": "^3.0.0-beta.6", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", @@ -102,6 +103,10 @@ "bundled": true, "singleton": true }, + "@jupyter/collaborativedrive": { + "bundled": true, + "singleton": true + }, "@jupyter/docprovider": { "bundled": true, "singleton": true diff --git a/packages/collaboration-extension/src/collaboration.ts b/packages/collaboration-extension/src/collaboration.ts index cb45671b..deff16e1 100644 --- a/packages/collaboration-extension/src/collaboration.ts +++ b/packages/collaboration-extension/src/collaboration.ts @@ -14,10 +14,8 @@ import { EditorExtensionRegistry, IEditorExtensionRegistry } from '@jupyterlab/codemirror'; -import { - IGlobalAwareness, - WebSocketAwarenessProvider -} from '@jupyter/docprovider'; +import { IGlobalAwareness } from '@jupyter/collaborativedrive'; +import { WebSocketAwarenessProvider } from '@jupyter/docprovider'; import { SidePanel, usersIcon } from '@jupyterlab/ui-components'; import { URLExt } from '@jupyterlab/coreutils'; import { ServerConnection } from '@jupyterlab/services'; diff --git a/packages/collaborativedrive/package.json b/packages/collaborativedrive/package.json new file mode 100644 index 00000000..f84f096b --- /dev/null +++ b/packages/collaborativedrive/package.json @@ -0,0 +1,55 @@ +{ + "name": "@jupyter/collaborativedrive", + "version": "3.0.0-beta.6", + "description": "JupyterLab - Collaborative Drive", + "homepage": "https://github.com/jupyterlab/jupyter-collaboration", + "bugs": { + "url": "https://github.com/jupyterlab/jupyter-collaboration/issues" + }, + "repository": { + "type": "git", + "url": "https://github.com/jupyterlab/jupyter-collaboration.git" + }, + "license": "BSD-3-Clause", + "author": "Project Jupyter", + "sideEffects": [ + "style/**/*" + ], + "main": "lib/index.js", + "types": "lib/index.d.ts", + "directories": { + "lib": "lib/" + }, + "files": [ + "lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}", + "schema/*.json", + "style/**/*.{css,eot,gif,html,jpg,json,png,svg,woff2,ttf}", + "style/index.js" + ], + "scripts": { + "build": "tsc -b", + "build:prod": "jlpm run build", + "build:test": "tsc --build tsconfig.test.json", + "clean": "rimraf lib tsconfig.tsbuildinfo", + "clean:lib": "jlpm run clean:all", + "clean:all": "rimraf lib tsconfig.tsbuildinfo node_modules", + "install:extension": "jlpm run build", + "watch": "tsc -b --watch" + }, + "dependencies": { + "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", + "@jupyterlab/coreutils": "^6.2.0" + }, + "devDependencies": { + "rimraf": "^4.1.2", + "typescript": "~5.0.4" + }, + "publishConfig": { + "access": "public" + }, + "typedoc": { + "entryPoint": "./src/index.ts", + "displayName": "@jupyter/collaborativedrive", + "tsconfig": "./tsconfig.json" + } +} diff --git a/packages/collaborativedrive/src/index.ts b/packages/collaborativedrive/src/index.ts new file mode 100644 index 00000000..8b915cdd --- /dev/null +++ b/packages/collaborativedrive/src/index.ts @@ -0,0 +1,10 @@ +/* ----------------------------------------------------------------------------- +| Copyright (c) Jupyter Development Team. +| Distributed under the terms of the Modified BSD License. +|----------------------------------------------------------------------------*/ +/** + * @packageDocumentation + * @module collaborativedrive + */ + +export * from './tokens'; diff --git a/packages/docprovider/src/tokens.ts b/packages/collaborativedrive/src/tokens.ts similarity index 77% rename from packages/docprovider/src/tokens.ts rename to packages/collaborativedrive/src/tokens.ts index 5784057d..6db3d76e 100644 --- a/packages/docprovider/src/tokens.ts +++ b/packages/collaborativedrive/src/tokens.ts @@ -3,9 +3,9 @@ import { DocumentChange, IAwareness, YDocument } from '@jupyter/ydoc'; import { Contents } from '@jupyterlab/services'; +import { IDisposable } from '@lumino/disposable'; import { Token } from '@lumino/coreutils'; -import { WebSocketProvider } from './yprovider'; /** * The collaborative drive. @@ -38,7 +38,7 @@ export interface ICollaborativeDrive extends Contents.IDrive { */ readonly sharedModelFactory: ISharedModelFactory; - readonly providers: Map; + readonly providers: Map; } /** @@ -55,4 +55,16 @@ export interface ISharedModelFactory extends Contents.ISharedFactory { type: Contents.ContentType, factory: SharedDocumentFactory ): void; + + documentFactories: Map; +} + +/** + * An interface for a document provider. + */ +export interface IDocumentProvider extends IDisposable { + /** + * Returns a Promise that resolves when the document provider is ready. + */ + readonly ready: Promise; } diff --git a/packages/collaborativedrive/tsconfig.json b/packages/collaborativedrive/tsconfig.json new file mode 100644 index 00000000..50493532 --- /dev/null +++ b/packages/collaborativedrive/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "lib", + "rootDir": "src" + }, + "include": ["src/*"], + "exclude": ["src/__tests__/*"] +} diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json index bc561077..6f3ae2c0 100644 --- a/packages/docprovider-extension/package.json +++ b/packages/docprovider-extension/package.json @@ -53,6 +53,7 @@ "watch:labextension": "jupyter labextension watch ." }, "dependencies": { + "@jupyter/collaborativedrive": "^3.0.0-beta.6", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", @@ -105,6 +106,10 @@ "bundled": false, "singleton": true }, + "@jupyter/collaborativedrive": { + "bundled": true, + "singleton": true + }, "@jupyter/docprovider": { "bundled": true, "singleton": true diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index e6549daf..cc01764a 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -29,13 +29,9 @@ import { CommandRegistry } from '@lumino/commands'; import { YFile, YNotebook } from '@jupyter/ydoc'; -import { - ICollaborativeDrive, - IForkProvider, - IGlobalAwareness, - TimelineWidget, - YDrive -} from '@jupyter/docprovider'; +import { IGlobalAwareness } from '@jupyter/collaborativedrive'; +import { IForkProvider, TimelineWidget, YDrive } from '@jupyter/docprovider'; +import { ICollaborativeDrive } from '@jupyter/collaborativedrive'; import { Awareness } from 'y-protocols/awareness'; import { URLExt } from '@jupyterlab/coreutils'; @@ -167,7 +163,7 @@ export const statusBarTimeline: JupyterFrontEndPlugin = { const [format, type] = documentId.split(':'); const provider = drive.providers.get( `${format}:${type}:${documentPath}` - ) as IForkProvider; + ) as unknown as IForkProvider; const fullPath = URLExt.join( app.serviceManager.serverSettings.baseUrl, DOCUMENT_TIMELINE_URL, diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json index 64749e30..ac69faa5 100644 --- a/packages/docprovider/package.json +++ b/packages/docprovider/package.json @@ -41,6 +41,7 @@ "watch": "tsc -b --watch" }, "dependencies": { + "@jupyter/collaborativedrive": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/cells": "^4.2.0", diff --git a/packages/docprovider/src/index.ts b/packages/docprovider/src/index.ts index 2ab2924c..b3cd6572 100644 --- a/packages/docprovider/src/index.ts +++ b/packages/docprovider/src/index.ts @@ -12,5 +12,4 @@ export * from './notebookCellExecutor'; export * from './requests'; export * from './ydrive'; export * from './yprovider'; -export * from './tokens'; export * from './TimelineSlider'; diff --git a/packages/docprovider/src/ydrive.ts b/packages/docprovider/src/ydrive.ts index a501d9fa..3b96fe5f 100644 --- a/packages/docprovider/src/ydrive.ts +++ b/packages/docprovider/src/ydrive.ts @@ -13,7 +13,7 @@ import { ICollaborativeDrive, ISharedModelFactory, SharedDocumentFactory -} from './tokens'; +} from '@jupyter/collaborativedrive'; import { Awareness } from 'y-protocols/awareness'; const DISABLE_RTC = @@ -251,7 +251,7 @@ export class YDrive extends Drive implements ICollaborativeDrive { * Yjs sharedModel factory for real-time collaboration. */ class SharedModelFactory implements ISharedModelFactory { - private _documentFactories: Map; + documentFactories: Map; /** * Shared model factory constructor @@ -264,7 +264,7 @@ class SharedModelFactory implements ISharedModelFactory { sharedModel: YDocument ) => void ) { - this._documentFactories = new Map(); + this.documentFactories = new Map(); } /** @@ -282,10 +282,10 @@ class SharedModelFactory implements ISharedModelFactory { type: Contents.ContentType, factory: SharedDocumentFactory ) { - if (this._documentFactories.has(type)) { + if (this.documentFactories.has(type)) { throw new Error(`The content type ${type} already exists`); } - this._documentFactories.set(type, factory); + this.documentFactories.set(type, factory); } /** @@ -307,8 +307,8 @@ class SharedModelFactory implements ISharedModelFactory { return; } - if (this._documentFactories.has(options.contentType)) { - const factory = this._documentFactories.get(options.contentType)!; + if (this.documentFactories.has(options.contentType)) { + const factory = this.documentFactories.get(options.contentType)!; const sharedModel = factory(options); this._onCreate(options, sharedModel); return sharedModel; diff --git a/packages/docprovider/src/yprovider.ts b/packages/docprovider/src/yprovider.ts index 341187dc..bfdb9b34 100644 --- a/packages/docprovider/src/yprovider.ts +++ b/packages/docprovider/src/yprovider.ts @@ -3,12 +3,12 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ +import { IDocumentProvider } from '@jupyter/collaborativedrive'; import { showErrorMessage, Dialog } from '@jupyterlab/apputils'; import { User } from '@jupyterlab/services'; import { TranslationBundle } from '@jupyterlab/translation'; import { PromiseDelegate } from '@lumino/coreutils'; -import { IDisposable } from '@lumino/disposable'; import { Signal } from '@lumino/signaling'; import { DocumentChange, YDocument } from '@jupyter/ydoc'; @@ -19,16 +19,6 @@ import { WebsocketProvider as YWebsocketProvider } from 'y-websocket'; import { requestDocSession } from './requests'; import { IForkProvider } from './ydrive'; -/** - * An interface for a document provider. - */ -export interface IDocumentProvider extends IDisposable { - /** - * Returns a Promise that resolves when the document provider is ready. - */ - readonly ready: Promise; -} - /** * A class to provide Yjs synchronization over WebSocket. * diff --git a/yarn.lock b/yarn.lock index fcbee350..06d2ac63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2076,6 +2076,7 @@ __metadata: resolution: "@jupyter/collaboration-extension@workspace:packages/collaboration-extension" dependencies: "@jupyter/collaboration": ^3.0.0-beta.6 + "@jupyter/collaborativedrive": ^3.0.0-beta.6 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2122,10 +2123,22 @@ __metadata: languageName: unknown linkType: soft +"@jupyter/collaborativedrive@^3.0.0-beta.6, @jupyter/collaborativedrive@workspace:packages/collaborativedrive": + version: 0.0.0-use.local + resolution: "@jupyter/collaborativedrive@workspace:packages/collaborativedrive" + dependencies: + "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 + "@jupyterlab/coreutils": ^6.2.0 + rimraf: ^4.1.2 + typescript: ~5.0.4 + languageName: unknown + linkType: soft + "@jupyter/docprovider-extension@workspace:packages/docprovider-extension": version: 0.0.0-use.local resolution: "@jupyter/docprovider-extension@workspace:packages/docprovider-extension" dependencies: + "@jupyter/collaborativedrive": ^3.0.0-beta.6 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2153,6 +2166,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider@workspace:packages/docprovider" dependencies: + "@jupyter/collaborativedrive": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/cells": ^4.2.0 From 6cd68c2c3e87aed44c183e0b076cbd2a33511442 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Mon, 7 Oct 2024 17:59:25 +0200 Subject: [PATCH 02/11] Rename @jupyter/collaborativedrive to @jupyter/collaborative-drive --- packages/collaboration-extension/package.json | 4 ++-- packages/collaboration-extension/src/collaboration.ts | 2 +- packages/collaborativedrive/package.json | 4 ++-- packages/collaborativedrive/src/index.ts | 2 +- packages/docprovider-extension/package.json | 4 ++-- packages/docprovider-extension/src/filebrowser.ts | 6 ++++-- packages/docprovider/package.json | 2 +- packages/docprovider/src/ydrive.ts | 2 +- packages/docprovider/src/yprovider.ts | 2 +- yarn.lock | 10 +++++----- 10 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/collaboration-extension/package.json b/packages/collaboration-extension/package.json index 988c5220..35bc24ad 100644 --- a/packages/collaboration-extension/package.json +++ b/packages/collaboration-extension/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@jupyter/collaboration": "^3.0.0-beta.6", - "@jupyter/collaborativedrive": "^3.0.0-beta.6", + "@jupyter/collaborative-drive": "^3.0.0-beta.6", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", @@ -103,7 +103,7 @@ "bundled": true, "singleton": true }, - "@jupyter/collaborativedrive": { + "@jupyter/collaborative-drive": { "bundled": true, "singleton": true }, diff --git a/packages/collaboration-extension/src/collaboration.ts b/packages/collaboration-extension/src/collaboration.ts index deff16e1..429cc36a 100644 --- a/packages/collaboration-extension/src/collaboration.ts +++ b/packages/collaboration-extension/src/collaboration.ts @@ -14,7 +14,7 @@ import { EditorExtensionRegistry, IEditorExtensionRegistry } from '@jupyterlab/codemirror'; -import { IGlobalAwareness } from '@jupyter/collaborativedrive'; +import { IGlobalAwareness } from '@jupyter/collaborative-drive'; import { WebSocketAwarenessProvider } from '@jupyter/docprovider'; import { SidePanel, usersIcon } from '@jupyterlab/ui-components'; import { URLExt } from '@jupyterlab/coreutils'; diff --git a/packages/collaborativedrive/package.json b/packages/collaborativedrive/package.json index f84f096b..43e3d67f 100644 --- a/packages/collaborativedrive/package.json +++ b/packages/collaborativedrive/package.json @@ -1,5 +1,5 @@ { - "name": "@jupyter/collaborativedrive", + "name": "@jupyter/collaborative-drive", "version": "3.0.0-beta.6", "description": "JupyterLab - Collaborative Drive", "homepage": "https://github.com/jupyterlab/jupyter-collaboration", @@ -49,7 +49,7 @@ }, "typedoc": { "entryPoint": "./src/index.ts", - "displayName": "@jupyter/collaborativedrive", + "displayName": "@jupyter/collaborative-drive", "tsconfig": "./tsconfig.json" } } diff --git a/packages/collaborativedrive/src/index.ts b/packages/collaborativedrive/src/index.ts index 8b915cdd..1bf51feb 100644 --- a/packages/collaborativedrive/src/index.ts +++ b/packages/collaborativedrive/src/index.ts @@ -4,7 +4,7 @@ |----------------------------------------------------------------------------*/ /** * @packageDocumentation - * @module collaborativedrive + * @module collaborative-drive */ export * from './tokens'; diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json index 6f3ae2c0..74bd3894 100644 --- a/packages/docprovider-extension/package.json +++ b/packages/docprovider-extension/package.json @@ -53,7 +53,7 @@ "watch:labextension": "jupyter labextension watch ." }, "dependencies": { - "@jupyter/collaborativedrive": "^3.0.0-beta.6", + "@jupyter/collaborative-drive": "^3.0.0-beta.6", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", @@ -106,7 +106,7 @@ "bundled": false, "singleton": true }, - "@jupyter/collaborativedrive": { + "@jupyter/collaborative-drive": { "bundled": true, "singleton": true }, diff --git a/packages/docprovider-extension/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index cc01764a..ed9e9f74 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -29,9 +29,11 @@ import { CommandRegistry } from '@lumino/commands'; import { YFile, YNotebook } from '@jupyter/ydoc'; -import { IGlobalAwareness } from '@jupyter/collaborativedrive'; +import { + ICollaborativeDrive, + IGlobalAwareness +} from '@jupyter/collaborative-drive'; import { IForkProvider, TimelineWidget, YDrive } from '@jupyter/docprovider'; -import { ICollaborativeDrive } from '@jupyter/collaborativedrive'; import { Awareness } from 'y-protocols/awareness'; import { URLExt } from '@jupyterlab/coreutils'; diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json index ac69faa5..b36ff58e 100644 --- a/packages/docprovider/package.json +++ b/packages/docprovider/package.json @@ -41,7 +41,7 @@ "watch": "tsc -b --watch" }, "dependencies": { - "@jupyter/collaborativedrive": "^3.0.0-beta.6", + "@jupyter/collaborative-drive": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/cells": "^4.2.0", diff --git a/packages/docprovider/src/ydrive.ts b/packages/docprovider/src/ydrive.ts index 3b96fe5f..745c857e 100644 --- a/packages/docprovider/src/ydrive.ts +++ b/packages/docprovider/src/ydrive.ts @@ -13,7 +13,7 @@ import { ICollaborativeDrive, ISharedModelFactory, SharedDocumentFactory -} from '@jupyter/collaborativedrive'; +} from '@jupyter/collaborative-drive'; import { Awareness } from 'y-protocols/awareness'; const DISABLE_RTC = diff --git a/packages/docprovider/src/yprovider.ts b/packages/docprovider/src/yprovider.ts index bfdb9b34..e02a3463 100644 --- a/packages/docprovider/src/yprovider.ts +++ b/packages/docprovider/src/yprovider.ts @@ -3,7 +3,7 @@ | Distributed under the terms of the Modified BSD License. |----------------------------------------------------------------------------*/ -import { IDocumentProvider } from '@jupyter/collaborativedrive'; +import { IDocumentProvider } from '@jupyter/collaborative-drive'; import { showErrorMessage, Dialog } from '@jupyterlab/apputils'; import { User } from '@jupyterlab/services'; import { TranslationBundle } from '@jupyterlab/translation'; diff --git a/yarn.lock b/yarn.lock index 06d2ac63..5c117de8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2076,7 +2076,7 @@ __metadata: resolution: "@jupyter/collaboration-extension@workspace:packages/collaboration-extension" dependencies: "@jupyter/collaboration": ^3.0.0-beta.6 - "@jupyter/collaborativedrive": ^3.0.0-beta.6 + "@jupyter/collaborative-drive": ^3.0.0-beta.6 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2123,9 +2123,9 @@ __metadata: languageName: unknown linkType: soft -"@jupyter/collaborativedrive@^3.0.0-beta.6, @jupyter/collaborativedrive@workspace:packages/collaborativedrive": +"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborativedrive": version: 0.0.0-use.local - resolution: "@jupyter/collaborativedrive@workspace:packages/collaborativedrive" + resolution: "@jupyter/collaborative-drive@workspace:packages/collaborativedrive" dependencies: "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/coreutils": ^6.2.0 @@ -2138,7 +2138,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider-extension@workspace:packages/docprovider-extension" dependencies: - "@jupyter/collaborativedrive": ^3.0.0-beta.6 + "@jupyter/collaborative-drive": ^3.0.0-beta.6 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2166,7 +2166,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider@workspace:packages/docprovider" dependencies: - "@jupyter/collaborativedrive": ^3.0.0-beta.6 + "@jupyter/collaborative-drive": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/cells": ^4.2.0 From b670b40a84c4460dee4eda8b81138d199f1496b7 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Wed, 9 Oct 2024 22:52:01 +0200 Subject: [PATCH 03/11] Remove jlpm build --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ad6aa92d..89955c34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,7 +71,6 @@ jobs: pip install "jupyterlab>=4.0.0,<5" pip install -e . jlpm - jlpm build - name: Run Tests run: | From b1f410d22b60ac26a69e43bf25a103693c98e572 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 10 Oct 2024 09:22:34 +0200 Subject: [PATCH 04/11] Move packages/collaborativedrive -> packages/collaborative-drive --- .../{collaborativedrive => collaborative-drive}/package.json | 0 .../{collaborativedrive => collaborative-drive}/src/index.ts | 0 .../{collaborativedrive => collaborative-drive}/src/tokens.ts | 0 .../{collaborativedrive => collaborative-drive}/tsconfig.json | 0 yarn.lock | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename packages/{collaborativedrive => collaborative-drive}/package.json (100%) rename packages/{collaborativedrive => collaborative-drive}/src/index.ts (100%) rename packages/{collaborativedrive => collaborative-drive}/src/tokens.ts (100%) rename packages/{collaborativedrive => collaborative-drive}/tsconfig.json (100%) diff --git a/packages/collaborativedrive/package.json b/packages/collaborative-drive/package.json similarity index 100% rename from packages/collaborativedrive/package.json rename to packages/collaborative-drive/package.json diff --git a/packages/collaborativedrive/src/index.ts b/packages/collaborative-drive/src/index.ts similarity index 100% rename from packages/collaborativedrive/src/index.ts rename to packages/collaborative-drive/src/index.ts diff --git a/packages/collaborativedrive/src/tokens.ts b/packages/collaborative-drive/src/tokens.ts similarity index 100% rename from packages/collaborativedrive/src/tokens.ts rename to packages/collaborative-drive/src/tokens.ts diff --git a/packages/collaborativedrive/tsconfig.json b/packages/collaborative-drive/tsconfig.json similarity index 100% rename from packages/collaborativedrive/tsconfig.json rename to packages/collaborative-drive/tsconfig.json diff --git a/yarn.lock b/yarn.lock index 5c117de8..eb062238 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2123,9 +2123,9 @@ __metadata: languageName: unknown linkType: soft -"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborativedrive": +"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": version: 0.0.0-use.local - resolution: "@jupyter/collaborative-drive@workspace:packages/collaborativedrive" + resolution: "@jupyter/collaborative-drive@workspace:packages/collaborative-drive" dependencies: "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/coreutils": ^6.2.0 From dbf2e1bcfa387828354884f5ed951525b42c5166 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 10 Oct 2024 09:30:20 +0200 Subject: [PATCH 05/11] Add back jlpm build --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89955c34..ad6aa92d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,6 +71,7 @@ jobs: pip install "jupyterlab>=4.0.0,<5" pip install -e . jlpm + jlpm build - name: Run Tests run: | From a31f286bb637659502b498704b0aa0475345db4f Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 10 Oct 2024 18:00:06 +0200 Subject: [PATCH 06/11] - --- .github/workflows/test.yml | 1 - yarn.lock | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ad6aa92d..89955c34 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,7 +71,6 @@ jobs: pip install "jupyterlab>=4.0.0,<5" pip install -e . jlpm - jlpm build - name: Run Tests run: | diff --git a/yarn.lock b/yarn.lock index eb062238..88cdd9b9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2123,7 +2123,7 @@ __metadata: languageName: unknown linkType: soft -"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": +"@jupyter/collaborative-drive@workspace:packages/collaborative-drive": version: 0.0.0-use.local resolution: "@jupyter/collaborative-drive@workspace:packages/collaborative-drive" dependencies: From c83948e6f92aa41b4d7645df2de8f22d13930408 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Thu, 10 Oct 2024 19:15:29 +0000 Subject: [PATCH 07/11] update yarn.lock --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 88cdd9b9..eb062238 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2123,7 +2123,7 @@ __metadata: languageName: unknown linkType: soft -"@jupyter/collaborative-drive@workspace:packages/collaborative-drive": +"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": version: 0.0.0-use.local resolution: "@jupyter/collaborative-drive@workspace:packages/collaborative-drive" dependencies: From dc8f7a1ed729920817ff37a983737f149d5c9cd0 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 10 Oct 2024 22:18:59 +0200 Subject: [PATCH 08/11] Update collaborative-drive dependencies --- packages/collaborative-drive/package.json | 4 +++- yarn.lock | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/collaborative-drive/package.json b/packages/collaborative-drive/package.json index 43e3d67f..60ff0b9a 100644 --- a/packages/collaborative-drive/package.json +++ b/packages/collaborative-drive/package.json @@ -38,7 +38,9 @@ }, "dependencies": { "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", - "@jupyterlab/coreutils": "^6.2.0" + "@jupyterlab/services": "^7.2.0", + "@lumino/coreutils": "^2.1.0", + "@lumino/disposable": "^2.1.0" }, "devDependencies": { "rimraf": "^4.1.2", diff --git a/yarn.lock b/yarn.lock index eb062238..c4340d6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2128,7 +2128,9 @@ __metadata: resolution: "@jupyter/collaborative-drive@workspace:packages/collaborative-drive" dependencies: "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 - "@jupyterlab/coreutils": ^6.2.0 + "@jupyterlab/services": ^7.2.0 + "@lumino/coreutils": ^2.1.0 + "@lumino/disposable": ^2.1.0 rimraf: ^4.1.2 typescript: ~5.0.4 languageName: unknown From 4798ee314cd98c46fc832dda7d595737fc606699 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Thu, 10 Oct 2024 22:22:59 +0200 Subject: [PATCH 09/11] Add collaborative-drive as shared package --- packages/docprovider/package.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json index b36ff58e..b32349c1 100644 --- a/packages/docprovider/package.json +++ b/packages/docprovider/package.json @@ -71,5 +71,13 @@ "entryPoint": "./src/index.ts", "displayName": "@jupyter/docprovider", "tsconfig": "./tsconfig.json" + }, + "jupyterlab": { + "sharedPackages": { + "@jupyter/collaborative-drive": { + "bundled": true, + "singleton": true + } + } } } From 4c685cab15d845911e0f6f608322cd3351bca0fc Mon Sep 17 00:00:00 2001 From: David Brochart Date: Fri, 11 Oct 2024 09:53:04 +0200 Subject: [PATCH 10/11] - --- packages/collaboration-extension/package.json | 2 +- packages/collaborative-drive/package.json | 2 +- packages/docprovider-extension/package.json | 2 +- packages/docprovider/package.json | 2 +- yarn.lock | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/collaboration-extension/package.json b/packages/collaboration-extension/package.json index 35bc24ad..c477b24a 100644 --- a/packages/collaboration-extension/package.json +++ b/packages/collaboration-extension/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@jupyter/collaboration": "^3.0.0-beta.6", - "@jupyter/collaborative-drive": "^3.0.0-beta.6", + "@jupyter/collaborative-drive": "^3.0.0-beta.7", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", diff --git a/packages/collaborative-drive/package.json b/packages/collaborative-drive/package.json index 60ff0b9a..4a8bc011 100644 --- a/packages/collaborative-drive/package.json +++ b/packages/collaborative-drive/package.json @@ -1,6 +1,6 @@ { "name": "@jupyter/collaborative-drive", - "version": "3.0.0-beta.6", + "version": "3.0.0-beta.7", "description": "JupyterLab - Collaborative Drive", "homepage": "https://github.com/jupyterlab/jupyter-collaboration", "bugs": { diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json index 74bd3894..d85b8a29 100644 --- a/packages/docprovider-extension/package.json +++ b/packages/docprovider-extension/package.json @@ -53,7 +53,7 @@ "watch:labextension": "jupyter labextension watch ." }, "dependencies": { - "@jupyter/collaborative-drive": "^3.0.0-beta.6", + "@jupyter/collaborative-drive": "^3.0.0-beta.7", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json index b32349c1..7ad1db0a 100644 --- a/packages/docprovider/package.json +++ b/packages/docprovider/package.json @@ -41,7 +41,7 @@ "watch": "tsc -b --watch" }, "dependencies": { - "@jupyter/collaborative-drive": "^3.0.0-beta.6", + "@jupyter/collaborative-drive": "^3.0.0-beta.7", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/cells": "^4.2.0", diff --git a/yarn.lock b/yarn.lock index c4340d6c..ba29a290 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2076,7 +2076,7 @@ __metadata: resolution: "@jupyter/collaboration-extension@workspace:packages/collaboration-extension" dependencies: "@jupyter/collaboration": ^3.0.0-beta.6 - "@jupyter/collaborative-drive": ^3.0.0-beta.6 + "@jupyter/collaborative-drive": ^3.0.0-beta.7 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2123,7 +2123,7 @@ __metadata: languageName: unknown linkType: soft -"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": +"@jupyter/collaborative-drive@^3.0.0-beta.7, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": version: 0.0.0-use.local resolution: "@jupyter/collaborative-drive@workspace:packages/collaborative-drive" dependencies: @@ -2140,7 +2140,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider-extension@workspace:packages/docprovider-extension" dependencies: - "@jupyter/collaborative-drive": ^3.0.0-beta.6 + "@jupyter/collaborative-drive": ^3.0.0-beta.7 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2168,7 +2168,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider@workspace:packages/docprovider" dependencies: - "@jupyter/collaborative-drive": ^3.0.0-beta.6 + "@jupyter/collaborative-drive": ^3.0.0-beta.7 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/cells": ^4.2.0 From 3e85e56da7e9e72a74382192813b01e0c20eae75 Mon Sep 17 00:00:00 2001 From: David Brochart Date: Fri, 11 Oct 2024 15:49:27 +0200 Subject: [PATCH 11/11] - --- .github/workflows/test.yml | 1 + packages/collaboration-extension/package.json | 2 +- packages/collaborative-drive/package.json | 2 +- packages/docprovider-extension/package.json | 2 +- packages/docprovider/package.json | 2 +- yarn.lock | 8 ++++---- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89955c34..ad6aa92d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -71,6 +71,7 @@ jobs: pip install "jupyterlab>=4.0.0,<5" pip install -e . jlpm + jlpm build - name: Run Tests run: | diff --git a/packages/collaboration-extension/package.json b/packages/collaboration-extension/package.json index c477b24a..35bc24ad 100644 --- a/packages/collaboration-extension/package.json +++ b/packages/collaboration-extension/package.json @@ -54,7 +54,7 @@ }, "dependencies": { "@jupyter/collaboration": "^3.0.0-beta.6", - "@jupyter/collaborative-drive": "^3.0.0-beta.7", + "@jupyter/collaborative-drive": "^3.0.0-beta.6", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", diff --git a/packages/collaborative-drive/package.json b/packages/collaborative-drive/package.json index 4a8bc011..60ff0b9a 100644 --- a/packages/collaborative-drive/package.json +++ b/packages/collaborative-drive/package.json @@ -1,6 +1,6 @@ { "name": "@jupyter/collaborative-drive", - "version": "3.0.0-beta.7", + "version": "3.0.0-beta.6", "description": "JupyterLab - Collaborative Drive", "homepage": "https://github.com/jupyterlab/jupyter-collaboration", "bugs": { diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json index d85b8a29..74bd3894 100644 --- a/packages/docprovider-extension/package.json +++ b/packages/docprovider-extension/package.json @@ -53,7 +53,7 @@ "watch:labextension": "jupyter labextension watch ." }, "dependencies": { - "@jupyter/collaborative-drive": "^3.0.0-beta.7", + "@jupyter/collaborative-drive": "^3.0.0-beta.6", "@jupyter/docprovider": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/application": "^4.2.0", diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json index 7ad1db0a..b32349c1 100644 --- a/packages/docprovider/package.json +++ b/packages/docprovider/package.json @@ -41,7 +41,7 @@ "watch": "tsc -b --watch" }, "dependencies": { - "@jupyter/collaborative-drive": "^3.0.0-beta.7", + "@jupyter/collaborative-drive": "^3.0.0-beta.6", "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", "@jupyterlab/apputils": "^4.2.0", "@jupyterlab/cells": "^4.2.0", diff --git a/yarn.lock b/yarn.lock index ba29a290..c4340d6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2076,7 +2076,7 @@ __metadata: resolution: "@jupyter/collaboration-extension@workspace:packages/collaboration-extension" dependencies: "@jupyter/collaboration": ^3.0.0-beta.6 - "@jupyter/collaborative-drive": ^3.0.0-beta.7 + "@jupyter/collaborative-drive": ^3.0.0-beta.6 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2123,7 +2123,7 @@ __metadata: languageName: unknown linkType: soft -"@jupyter/collaborative-drive@^3.0.0-beta.7, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": +"@jupyter/collaborative-drive@^3.0.0-beta.6, @jupyter/collaborative-drive@workspace:packages/collaborative-drive": version: 0.0.0-use.local resolution: "@jupyter/collaborative-drive@workspace:packages/collaborative-drive" dependencies: @@ -2140,7 +2140,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider-extension@workspace:packages/docprovider-extension" dependencies: - "@jupyter/collaborative-drive": ^3.0.0-beta.7 + "@jupyter/collaborative-drive": ^3.0.0-beta.6 "@jupyter/docprovider": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/application": ^4.2.0 @@ -2168,7 +2168,7 @@ __metadata: version: 0.0.0-use.local resolution: "@jupyter/docprovider@workspace:packages/docprovider" dependencies: - "@jupyter/collaborative-drive": ^3.0.0-beta.7 + "@jupyter/collaborative-drive": ^3.0.0-beta.6 "@jupyter/ydoc": ^2.0.0 || ^3.0.0-a3 "@jupyterlab/apputils": ^4.2.0 "@jupyterlab/cells": ^4.2.0