Backport PR #13506: Depend on @jupyter/ydoc instead of `@jupyter-no…

…tebook/ydoc` (#13519)
jupyterlab · Dec 1, 2022 · 96d969b · 96d969b
1 parent 9e601d6
commit 96d969b
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 28 deletions.
diff --git a/dev_mode/package.json b/dev_mode/package.json
@@ -16,7 +16,7 @@
     "watch": "webpack --watch"
   },
   "resolutions": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/application": "~3.6.0-alpha.4",
     "@jupyterlab/application-extension": "~3.6.0-alpha.4",
     "@jupyterlab/apputils": "~3.6.0-alpha.4",
@@ -263,7 +263,7 @@
     "buildDir": "./static",
     "outputDir": ".",
     "singletonPackages": [
-      "@jupyter-notebook/ydoc",
+      "@jupyter/ydoc",
       "@jupyterlab/application",
       "@jupyterlab/apputils",
       "@jupyterlab/cell-toolbar",

diff --git a/jupyterlab/staging/package.json b/jupyterlab/staging/package.json
@@ -16,7 +16,7 @@
     "watch": "webpack --watch"
   },
   "resolutions": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/application": "~3.6.0-alpha.4",
     "@jupyterlab/application-extension": "~3.6.0-alpha.4",
     "@jupyterlab/apputils": "~3.6.0-alpha.4",
@@ -263,7 +263,7 @@
     "buildDir": "./build",
     "outputDir": "..",
     "singletonPackages": [
-      "@jupyter-notebook/ydoc",
+      "@jupyter/ydoc",
       "@jupyterlab/application",
       "@jupyterlab/apputils",
       "@jupyterlab/cell-toolbar",

diff --git a/packages/cells/package.json b/packages/cells/package.json
@@ -42,7 +42,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/apputils": "^3.6.0-alpha.4",
     "@jupyterlab/attachments": "^3.6.0-alpha.4",
     "@jupyterlab/codeeditor": "^3.6.0-alpha.4",

diff --git a/packages/cells/src/model.ts b/packages/cells/src/model.ts
@@ -15,7 +15,7 @@ import { IChangedArgs } from '@jupyterlab/coreutils';
 
 import * as nbformat from '@jupyterlab/nbformat';
 
-import * as models from '@jupyter-notebook/ydoc';
+import * as models from '@jupyter/ydoc';
 
 import { UUID } from '@lumino/coreutils';
 

diff --git a/packages/cells/test/model.spec.ts b/packages/cells/test/model.spec.ts
@@ -18,7 +18,7 @@ import { OutputAreaModel } from '@jupyterlab/outputarea';
 
 import { NBTestUtils } from '@jupyterlab/testutils';
 import { JSONObject } from '@lumino/coreutils';
-import { YCodeCell } from '@jupyter-notebook/ydoc';
+import { YCodeCell } from '@jupyter/ydoc';
 
 class TestModel extends CellModel {
   get type(): 'raw' {

diff --git a/packages/codeeditor/package.json b/packages/codeeditor/package.json
@@ -41,7 +41,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/coreutils": "^5.6.0-alpha.4",
     "@jupyterlab/nbformat": "^3.6.0-alpha.4",
     "@jupyterlab/observables": "^4.6.0-alpha.4",

diff --git a/packages/codeeditor/src/editor.ts b/packages/codeeditor/src/editor.ts
@@ -11,7 +11,7 @@ import {
   ModelDB,
   ObservableValue
 } from '@jupyterlab/observables';
-import * as models from '@jupyter-notebook/ydoc';
+import * as models from '@jupyter/ydoc';
 import { ITranslator } from '@jupyterlab/translation';
 import { JSONObject } from '@lumino/coreutils';
 import { IDisposable } from '@lumino/disposable';

diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json
@@ -39,7 +39,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/apputils": "^3.6.0-alpha.4",
     "@jupyterlab/codeeditor": "^3.6.0-alpha.4",
     "@jupyterlab/coreutils": "^5.6.0-alpha.4",

diff --git a/packages/codemirror/src/editor.ts b/packages/codemirror/src/editor.ts
@@ -10,7 +10,7 @@ import {
   IObservableMap,
   IObservableString
 } from '@jupyterlab/observables';
-import * as models from '@jupyter-notebook/ydoc';
+import * as models from '@jupyter/ydoc';
 import {
   ITranslator,
   nullTranslator,

diff --git a/packages/docprovider-extension/package.json b/packages/docprovider-extension/package.json
@@ -34,7 +34,7 @@
     "watch": "tsc -w --listEmittedFiles"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/application": "^3.6.0-alpha.4",
     "@jupyterlab/coreutils": "^5.6.0-alpha.4",
     "@jupyterlab/docprovider": "^3.6.0-alpha.4",

diff --git a/packages/docprovider-extension/src/index.ts b/packages/docprovider-extension/src/index.ts
@@ -17,7 +17,7 @@ import {
   WebSocketProvider
 } from '@jupyterlab/docprovider';
 import { ServerConnection } from '@jupyterlab/services';
-import { DocumentChange, YDocument } from '@jupyter-notebook/ydoc';
+import { DocumentChange, YDocument } from '@jupyter/ydoc';
 
 /**
  * The default document provider plugin

diff --git a/packages/docprovider/package.json b/packages/docprovider/package.json
@@ -38,7 +38,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/coreutils": "^5.6.0-alpha.4",
     "@jupyterlab/services": "^6.6.0-alpha.4",
     "@lumino/coreutils": "^1.11.0",

diff --git a/packages/docprovider/src/tokens.ts b/packages/docprovider/src/tokens.ts
@@ -3,7 +3,7 @@
  * Distributed under the terms of the Modified BSD License.
  */
 
-import { ISharedDocument } from '@jupyter-notebook/ydoc';
+import { ISharedDocument } from '@jupyter/ydoc';
 import { Token } from '@lumino/coreutils';
 import { IDisposable } from '@lumino/disposable';
 

diff --git a/packages/docprovider/src/yprovider.ts b/packages/docprovider/src/yprovider.ts
@@ -5,7 +5,7 @@
 
 import { URLExt } from '@jupyterlab/coreutils';
 import { ServerConnection, User } from '@jupyterlab/services';
-import { DocumentChange, YDocument } from '@jupyter-notebook/ydoc';
+import { DocumentChange, YDocument } from '@jupyter/ydoc';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Signal } from '@lumino/signaling';
 import { Awareness } from 'y-protocols/awareness';

diff --git a/packages/docregistry/package.json b/packages/docregistry/package.json
@@ -41,7 +41,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/apputils": "^3.6.0-alpha.4",
     "@jupyterlab/codeeditor": "^3.6.0-alpha.4",
     "@jupyterlab/codemirror": "^3.6.0-alpha.4",

diff --git a/packages/docregistry/src/context.ts b/packages/docregistry/src/context.ts
@@ -24,7 +24,7 @@ import {
   ServerConnection,
   ServiceManager
 } from '@jupyterlab/services';
-import { DocumentChange, ISharedDocument } from '@jupyter-notebook/ydoc';
+import { DocumentChange, ISharedDocument } from '@jupyter/ydoc';
 import {
   ITranslator,
   nullTranslator,

diff --git a/packages/docregistry/src/default.ts b/packages/docregistry/src/default.ts
@@ -7,7 +7,7 @@ import { Mode } from '@jupyterlab/codemirror';
 import { IChangedArgs, PathExt } from '@jupyterlab/coreutils';
 import { IModelDB, IObservableList } from '@jupyterlab/observables';
 import { Contents } from '@jupyterlab/services';
-import * as models from '@jupyter-notebook/ydoc';
+import * as models from '@jupyter/ydoc';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import { PartialJSONValue } from '@lumino/coreutils';
 import { ISignal, Signal } from '@lumino/signaling';

diff --git a/packages/docregistry/src/registry.ts b/packages/docregistry/src/registry.ts
@@ -14,7 +14,7 @@ import {
 import { IModelDB, IObservableList } from '@jupyterlab/observables';
 import { IRenderMime } from '@jupyterlab/rendermime-interfaces';
 import { Contents, Kernel } from '@jupyterlab/services';
-import { ISharedDocument, ISharedFile } from '@jupyter-notebook/ydoc';
+import { ISharedDocument, ISharedFile } from '@jupyter/ydoc';
 import { ITranslator, nullTranslator } from '@jupyterlab/translation';
 import {
   fileIcon,

diff --git a/packages/notebook/package.json b/packages/notebook/package.json
@@ -41,7 +41,7 @@
     "watch": "tsc -b --watch"
   },
   "dependencies": {
-    "@jupyter-notebook/ydoc": "~0.2.0",
+    "@jupyter/ydoc": "~0.2.0",
     "@jupyterlab/apputils": "^3.6.0-alpha.4",
     "@jupyterlab/cells": "^3.6.0-alpha.4",
     "@jupyterlab/codeeditor": "^3.6.0-alpha.4",

diff --git a/packages/notebook/src/celllist.ts b/packages/notebook/src/celllist.ts
@@ -9,7 +9,7 @@ import {
   IObservableUndoableList,
   ObservableMap
 } from '@jupyterlab/observables';
-import * as models from '@jupyter-notebook/ydoc';
+import * as models from '@jupyter/ydoc';
 import {
   ArrayExt,
   ArrayIterator,

diff --git a/packages/notebook/src/model.ts b/packages/notebook/src/model.ts
@@ -23,7 +23,7 @@ import {
   IObservableUndoableList,
   ModelDB
 } from '@jupyterlab/observables';
-import * as models from '@jupyter-notebook/ydoc';
+import * as models from '@jupyter/ydoc';
 import {
   ITranslator,
   nullTranslator,

diff --git a/testutils/src/jest-config.ts b/testutils/src/jest-config.ts
@@ -1,7 +1,7 @@
 import path from 'path';
 
 const esModules = [
-  '@jupyter-notebook/ydoc',
+  '@jupyter/ydoc',
   'lib0',
   'y-protocols',
   'y-websocket',

diff --git a/yarn.lock b/yarn.lock
@@ -1424,10 +1424,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
-"@jupyter-notebook/ydoc@~0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@jupyter-notebook/ydoc/-/ydoc-0.2.0.tgz#0febf91cd80dd2206f668c60e8ee20f4983cca99"
-  integrity sha512-R8iHKwU+8OvdYwtgNj9dh3vv0OrAyHLNDmXjaSu6CJ1w10OP7MuQasvD18DAgTjqlHEUgnPoSJA2j0UlflSC1Q==
+"@jupyter/ydoc@~0.2.0":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@jupyter/ydoc/-/ydoc-0.2.2.tgz#a2be83d2a0e076cef7ed77302e69153a0a4d6c16"
+  integrity sha512-UtU7ZxpL0k+QF9So4wtGxaS2C+nno58dig7sQUaBn48wlQDiuypzKgUmF7I37srpu6f/ywon3JBuEjxuL1CIBQ==
   dependencies:
     "@jupyterlab/nbformat" "^3.0.0 || ^4.0.0-alpha.15"
     "@lumino/coreutils" "^1.11.0 || ^2.0.0-alpha.6"