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..c802dbda --- /dev/null +++ b/packages/collaborativedrive/package.json @@ -0,0 +1,62 @@ +{ + "name": "@jupyter/collaborativedrive", + "version": "3.0.0-beta.3", + "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", + "test": "jest", + "test:cov": "jest --collect-coverage", + "test:debug": "node --inspect-brk node_modules/.bin/jest --runInBand", + "test:debug:watch": "node --inspect-brk node_modules/.bin/jest --runInBand --watch", + "watch": "tsc -b --watch" + }, + "dependencies": { + "@jupyter/ydoc": "^2.0.0 || ^3.0.0-a3", + "@jupyterlab/coreutils": "^6.2.0" + }, + "devDependencies": { + "@jupyterlab/testing": "^4.0.0", + "@types/jest": "^29.2.0", + "jest": "^29.5.0", + "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 100% rename from packages/docprovider/src/tokens.ts rename to packages/collaborativedrive/src/tokens.ts 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/src/filebrowser.ts b/packages/docprovider-extension/src/filebrowser.ts index 743a337d..d9508c7a 100644 --- a/packages/docprovider-extension/src/filebrowser.ts +++ b/packages/docprovider-extension/src/filebrowser.ts @@ -29,13 +29,13 @@ import { CommandRegistry } from '@lumino/commands'; import { YFile, YNotebook } from '@jupyter/ydoc'; +import { IGlobalAwareness } from '@jupyter/collaborativedrive'; import { - ICollaborativeDrive, IForkProvider, - IGlobalAwareness, 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/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 28242662..e225e391 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 = diff --git a/yarn.lock b/yarn.lock index 424b6364..786391cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2122,6 +2122,20 @@ __metadata: languageName: unknown linkType: soft +"@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 + "@jupyterlab/testing": ^4.0.0 + "@types/jest": ^29.2.0 + jest: ^29.5.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"