From d2848c90002ff1390b855e4ed08c0f02919120e5 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Thu, 3 Mar 2022 21:53:42 -0800
Subject: [PATCH] chore: Move to fork of y-prosemirror, new fixes and exposing
 updateYFragment method

---
 app/multiplayer/MultiplayerExtension.ts      |  4 ++--
 package.json                                 |  2 +-
 server/collaboration/utils/markdownToYDoc.ts |  2 +-
 server/commands/documentUpdater.ts           |  2 +-
 yarn.lock                                    | 16 ++++++++--------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/multiplayer/MultiplayerExtension.ts b/app/multiplayer/MultiplayerExtension.ts
index dda332ec6..52d60f995 100644
--- a/app/multiplayer/MultiplayerExtension.ts
+++ b/app/multiplayer/MultiplayerExtension.ts
@@ -1,11 +1,11 @@
-import { keymap } from "prosemirror-keymap";
 import {
   ySyncPlugin,
   yCursorPlugin,
   yUndoPlugin,
   undo,
   redo,
-} from "y-prosemirror";
+} from "@getoutline/y-prosemirror";
+import { keymap } from "prosemirror-keymap";
 import * as Y from "yjs";
 import { Extension } from "~/editor";
 
diff --git a/package.json b/package.json
index cedf3db6a..bd107010d 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@dnd-kit/core": "^4.0.3",
     "@dnd-kit/modifiers": "^4.0.0",
     "@dnd-kit/sortable": "^5.1.0",
+    "@getoutline/y-prosemirror": "^1.0.16",
     "@hocuspocus/provider": "^1.0.0-alpha.21",
     "@hocuspocus/server": "^1.0.0-alpha.78",
     "@outlinewiki/koa-passport": "^4.1.4",
@@ -198,7 +199,6 @@
     "winston": "^3.3.3",
     "ws": "^7.5.3",
     "y-indexeddb": "^9.0.6",
-    "y-prosemirror": "^1.0.9",
     "yjs": "^13.5.12"
   },
   "devDependencies": {
diff --git a/server/collaboration/utils/markdownToYDoc.ts b/server/collaboration/utils/markdownToYDoc.ts
index d14505599..7bbb6846c 100644
--- a/server/collaboration/utils/markdownToYDoc.ts
+++ b/server/collaboration/utils/markdownToYDoc.ts
@@ -1,5 +1,5 @@
+import { prosemirrorToYDoc } from "@getoutline/y-prosemirror";
 import { Node, Fragment } from "prosemirror-model";
-import { prosemirrorToYDoc } from "y-prosemirror";
 import * as Y from "yjs";
 import embeds from "@shared/editor/embeds";
 import { parser, schema } from "@server/editor";
diff --git a/server/commands/documentUpdater.ts b/server/commands/documentUpdater.ts
index 66fce9abb..0df3e6b93 100644
--- a/server/commands/documentUpdater.ts
+++ b/server/commands/documentUpdater.ts
@@ -1,7 +1,7 @@
+import { yDocToProsemirrorJSON } from "@getoutline/y-prosemirror";
 import invariant from "invariant";
 import { uniq } from "lodash";
 import { Node } from "prosemirror-model";
-import { yDocToProsemirrorJSON } from "y-prosemirror";
 import * as Y from "yjs";
 import { schema, serializer } from "@server/editor";
 import { Document, Event } from "@server/models";
diff --git a/yarn.lock b/yarn.lock
index 6ddcef888..2f661ff1a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1249,6 +1249,13 @@
   dependencies:
     tslib "^2.1.0"
 
+"@getoutline/y-prosemirror@^1.0.16":
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/@getoutline/y-prosemirror/-/y-prosemirror-1.0.16.tgz#34a29966208113bceb8c46bbf8417853e8885e09"
+  integrity sha512-rJ3NF3Qk9v1/dNKQ25k3aud7TcV8s5175U9stagCDdvwsI67JufgzaWhT0jBhX8tEaZPdQVmXoqe8bf6OC72Cg==
+  dependencies:
+    lib0 "^0.2.42"
+
 "@hocuspocus/provider@^1.0.0-alpha.21":
   version "1.0.0-alpha.21"
   resolved "https://registry.yarnpkg.com/@hocuspocus/provider/-/provider-1.0.0-alpha.21.tgz#369869e33a7c138041a03bbb80acd61dd77e3632"
@@ -9932,7 +9939,7 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lib0@^0.2.34, lib0@^0.2.35, lib0@^0.2.41, lib0@^0.2.42:
+lib0@^0.2.35, lib0@^0.2.41, lib0@^0.2.42:
   version "0.2.42"
   resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.42.tgz#6d8bf1fb8205dec37a953c521c5ee403fd8769b0"
   integrity sha512-8BNM4MiokEKzMvSxTOC3gnCBisJH+jL67CnSnqzHv3jli3pUvGC8wz+0DQ2YvGr4wVQdb2R2uNNPw9LEpVvJ4Q==
@@ -15449,13 +15456,6 @@ y-indexeddb@^9.0.6:
   dependencies:
     lib0 "^0.2.35"
 
-y-prosemirror@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/y-prosemirror/-/y-prosemirror-1.0.9.tgz#c0b5bf4e2c6620093ba0658c2aca52055346a683"
-  integrity sha512-OM12aPx04lwiIy1IOBidb6ONAof2KFxQE/Gww26SEsMQuA2dibrJkjaMwXwY1KnYY7yOpwbIFRdwecdNXLU9yQ==
-  dependencies:
-    lib0 "^0.2.34"
-
 y-protocols@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/y-protocols/-/y-protocols-1.0.5.tgz#91d574250060b29fcac8f8eb5e276fbad594245e"