Merge pull request #4638 from ueberdosis/feature/yProsemirror1.2.1

chore: upgrades y-prosemirror to ^1.2.1. It used to be locked to 1.0.…
ueberdosis · Nov 18, 2023 · 55377eb · 55377eb
2 parents 0f50b21 + 6e12777
commit 55377eb
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/extension-collaboration-cursor/package.json b/packages/extension-collaboration-cursor/package.json
@@ -30,11 +30,11 @@
   ],
   "devDependencies": {
     "@tiptap/core": "^2.2.0-rc.4",
-    "y-prosemirror": "1.0.20"
+    "y-prosemirror": "^1.2.1"
   },
   "peerDependencies": {
     "@tiptap/core": "^2.0.0",
-    "y-prosemirror": "1.0.20"
+    "y-prosemirror": "^1.2.1"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-collaboration/package.json b/packages/extension-collaboration/package.json
@@ -31,12 +31,12 @@
   "devDependencies": {
     "@tiptap/core": "^2.2.0-rc.4",
     "@tiptap/pm": "^2.2.0-rc.4",
-    "y-prosemirror": "1.0.20"
+    "y-prosemirror": "^1.2.1"
   },
   "peerDependencies": {
     "@tiptap/core": "^2.0.0",
     "@tiptap/pm": "^2.0.0",
-    "y-prosemirror": "1.0.20"
+    "y-prosemirror": "^1.2.1"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-collaboration/src/collaboration.ts b/packages/extension-collaboration/src/collaboration.ts
@@ -124,7 +124,7 @@ export const Collaboration = Extension.create<CollaborationOptions>({
         undoManager.restore = () => {}
       }
 
-      const viewRet = originalUndoPluginView(view)
+      const viewRet = originalUndoPluginView ? originalUndoPluginView(view) : undefined
 
       return {
         destroy: () => {
@@ -142,7 +142,9 @@ export const Collaboration = Extension.create<CollaborationOptions>({
             undoManager._observers = observers
           }
 
-          viewRet.destroy()
+          if (viewRet?.destroy) {
+            viewRet.destroy()
+          }
         },
       }
     }