Skip to content

Commit

Permalink
Remove @jupyter/collaboration dependencie from @jupyter/docprovider
Browse files Browse the repository at this point in the history
  • Loading branch information
brichet committed Jul 19, 2024
1 parent bcc36e1 commit a5f704d
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 18 deletions.
6 changes: 4 additions & 2 deletions packages/collaboration-extension/src/collaboration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import {
EditorExtensionRegistry,
IEditorExtensionRegistry
} from '@jupyterlab/codemirror';
import { WebSocketAwarenessProvider } from '@jupyter/docprovider';
import {
IGlobalAwareness,
WebSocketAwarenessProvider
} from '@jupyter/docprovider';
import { SidePanel, usersIcon } from '@jupyterlab/ui-components';
import { URLExt } from '@jupyterlab/coreutils';
import { ServerConnection } from '@jupyterlab/services';
Expand All @@ -27,7 +30,6 @@ import { IAwareness } from '@jupyter/ydoc';

import {
CollaboratorsPanel,
IGlobalAwareness,
IUserMenu,
remoteUserCursors,
RendererUserMenu,
Expand Down
1 change: 0 additions & 1 deletion packages/collaboration/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
"dependencies": {
"@codemirror/state": "^6.2.0",
"@codemirror/view": "^6.7.0",
"@jupyter/docprovider": "^3.0.0-beta.0",
"@jupyterlab/apputils": "^4.0.5",
"@jupyterlab/coreutils": "^6.0.5",
"@jupyterlab/docregistry": "^4.0.5",
Expand Down
9 changes: 0 additions & 9 deletions packages/collaboration/src/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import type { Menu } from '@lumino/widgets';
import { Token } from '@lumino/coreutils';
import type { User } from '@jupyterlab/services';

import { IAwareness } from '@jupyter/ydoc';

/**
* The user menu token.
*
Expand All @@ -17,13 +15,6 @@ export const IUserMenu = new Token<IUserMenu>(
'@jupyter/collaboration:IUserMenu'
);

/**
* The global awareness token.
*/
export const IGlobalAwareness = new Token<IAwareness>(
'@jupyter/collaboration:IGlobalAwareness'
);

/**
* An interface describing the user menu.
*/
Expand Down
1 change: 0 additions & 1 deletion packages/docprovider-extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyter/collaboration": "^3.0.0-beta.0",
"@jupyter/docprovider": "^3.0.0-beta.0",
"@jupyter/ydoc": "^2.0.0",
"@jupyterlab/application": "^4.2.0",
Expand Down
7 changes: 5 additions & 2 deletions packages/docprovider-extension/src/filebrowser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ import { CommandRegistry } from '@lumino/commands';

import { YFile, YNotebook } from '@jupyter/ydoc';

import { IGlobalAwareness } from '@jupyter/collaboration';
import { ICollaborativeDrive, YDrive } from '@jupyter/docprovider';
import {
ICollaborativeDrive,
IGlobalAwareness,
YDrive
} from '@jupyter/docprovider';
import { Awareness } from 'y-protocols/awareness';

/**
Expand Down
9 changes: 8 additions & 1 deletion packages/docprovider/src/tokens.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Jupyter Development Team.
// Distributed under the terms of the Modified BSD License.

import { DocumentChange, YDocument } from '@jupyter/ydoc';
import { DocumentChange, IAwareness, YDocument } from '@jupyter/ydoc';
import { Contents } from '@jupyterlab/services';

import { Token } from '@lumino/coreutils';
Expand All @@ -16,6 +16,13 @@ export const ICollaborativeDrive = new Token<ICollaborativeDrive>(
'@jupyter/collaboration-extension:ICollaborativeDrive'
);

/**
* The global awareness token.
*/
export const IGlobalAwareness = new Token<IAwareness>(
'@jupyter/collaboration:IGlobalAwareness'
);

/**
* A document factory for registering shared models
*/
Expand Down
2 changes: 0 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,6 @@ __metadata:
dependencies:
"@codemirror/state": ^6.2.0
"@codemirror/view": ^6.7.0
"@jupyter/docprovider": ^3.0.0-beta.0
"@jupyterlab/apputils": ^4.0.5
"@jupyterlab/coreutils": ^6.0.5
"@jupyterlab/docregistry": ^4.0.5
Expand All @@ -2139,7 +2138,6 @@ __metadata:
version: 0.0.0-use.local
resolution: "@jupyter/docprovider-extension@workspace:packages/docprovider-extension"
dependencies:
"@jupyter/collaboration": ^3.0.0-beta.0
"@jupyter/docprovider": ^3.0.0-beta.0
"@jupyter/ydoc": ^2.0.0
"@jupyterlab/application": ^4.2.0
Expand Down

0 comments on commit a5f704d

Please sign in to comment.