fix: fix imports, fix demos, unpin y-prosemirror

* use @tiptap/pm * unpin y-prosemirror * fix lock file * fix IsolatingClear demo * fix OnUpdateRenderer demo * fix YouTube demo video * update demos * remove unneeded function call
ueberdosis · Jan 29, 2024 · 681aa57 · 681aa57
1 parent f3cba1e
commit 681aa57
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 130 deletions.
diff --git a/demos/package-lock.json b/demos/package-lock.json
diff --git a/demos/package.json b/demos/package.json
@@ -19,9 +19,9 @@
     "remixicon": "^2.5.0",
     "shiki": "^0.10.0",
     "simplify-js": "^1.2.4",
-    "y-prosemirror": "1.0.20",
-    "y-webrtc": "^10.2.5",
-    "yjs": "^13.5.39"
+    "y-prosemirror": "^1.2.2",
+    "y-webrtc": "^10.3.0",
+    "yjs": "^13.6.11"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",

diff --git a/demos/src/Experiments/CollaborationAnnotation/Vue/extension/AnnotationPlugin.ts b/demos/src/Experiments/CollaborationAnnotation/Vue/extension/AnnotationPlugin.ts
@@ -1,5 +1,5 @@
 import { Plugin, PluginKey } from '@tiptap/pm/state'
-import { DecorationSet } from 'prosemirror-view'
+import { DecorationSet } from '@tiptap/pm/view'
 import * as Y from 'yjs'
 
 import { AnnotationItem } from './AnnotationItem.js'

diff --git a/demos/src/Experiments/IsolatingClear/React/index.jsx b/demos/src/Experiments/IsolatingClear/React/index.jsx
@@ -4,6 +4,7 @@ import { Color } from '@tiptap/extension-color'
 import ListItem from '@tiptap/extension-list-item'
 import TextStyle from '@tiptap/extension-text-style'
 import { EditorContent, Node, useEditor } from '@tiptap/react'
+import StarterKit from '@tiptap/starter-kit'
 import React from 'react'
 
 import { content } from '../content.ts'
@@ -200,6 +201,7 @@ const MenuBar = ({ editor }) => {
 export default () => {
   const editor = useEditor({
     extensions: [
+      StarterKit,
       WrapperBlock,
       Color.configure({ types: [TextStyle.name, ListItem.name] }),
       TextStyle.configure({ types: [ListItem.name] }),

diff --git a/demos/src/Experiments/OnUpdateRerender/Vue/TiptapComponent.vue b/demos/src/Experiments/OnUpdateRerender/Vue/TiptapComponent.vue
@@ -6,7 +6,7 @@
 
 <script>
 import StarterKit from '@tiptap/starter-kit'
-import { Editor, EditorContent } from '@tiptap/vue-2'
+import { Editor, EditorContent } from '@tiptap/vue-3'
 
 export default {
   components: {

diff --git a/demos/src/Experiments/OnUpdateRerender/Vue/index.vue b/demos/src/Experiments/OnUpdateRerender/Vue/index.vue
@@ -23,5 +23,4 @@ export default {
     },
   },
 }
-
 </script>
diff --git a/demos/src/Nodes/Youtube/React/index.jsx b/demos/src/Nodes/Youtube/React/index.jsx
@@ -52,7 +52,7 @@ export default () => {
     content: `
       <p>Tiptap now supports YouTube embeds! Awesome!</p>
       <div data-youtube-video>
-        <iframe src="https://www.youtube.com/watch?v=cqHqLQgVCgY"></iframe>
+        <iframe src="https://www.youtube.com/watch?v=3lTUAWOgoHs"></iframe>
       </div>
       <p>Try adding your own video to this editor!</p>
     `,

diff --git a/demos/src/Nodes/Youtube/Vue/index.vue b/demos/src/Nodes/Youtube/Vue/index.vue
@@ -54,7 +54,7 @@ export default {
       content: `
         <p>Tiptap now supports YouTube embeds! Awesome!</p>
         <div data-youtube-video>
-          <iframe src="https://www.youtube.com/watch?v=cqHqLQgVCgY"></iframe>
+          <iframe src="https://www.youtube.com/watch?v=3lTUAWOgoHs"></iframe>
         </div>
         <p>Try adding your own video to this editor!</p>
       `,

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/src/utilities/elementFromString.ts b/packages/core/src/utilities/elementFromString.ts
@@ -20,7 +20,5 @@ export function elementFromString(value: string): HTMLElement {
 
   const html = new window.DOMParser().parseFromString(wrappedValue, 'text/html').body
 
-  removeWhitespaces(html)
-
   return removeWhitespaces(html)
 }
diff --git a/packages/extension-collaboration-cursor/src/collaboration-cursor.ts b/packages/extension-collaboration-cursor/src/collaboration-cursor.ts
@@ -1,5 +1,5 @@
 import { Extension } from '@tiptap/core'
-import { DecorationAttrs } from 'prosemirror-view'
+import { DecorationAttrs } from '@tiptap/pm/view'
 import { defaultSelectionBuilder, yCursorPlugin } from 'y-prosemirror'
 
 type CollaborationCursorStorage = {

diff --git a/packages/extension-table/src/table.ts b/packages/extension-table/src/table.ts
@@ -1,6 +1,7 @@
 import {
   callOrReturn, getExtensionField, mergeAttributes, Node, ParentConfig,
 } from '@tiptap/core'
+import { DOMOutputSpec } from '@tiptap/pm/model'
 import { TextSelection } from '@tiptap/pm/state'
 import {
   addColumnAfter,
@@ -22,7 +23,6 @@ import {
   toggleHeaderCell,
 } from '@tiptap/pm/tables'
 import { NodeView } from '@tiptap/pm/view'
-import { DOMOutputSpec } from 'prosemirror-model'
 
 import { TableView } from './TableView.js'
 import { createColGroup } from './utilities/createColGroup.js'

diff --git a/packages/extension-table/src/utilities/createColGroup.ts b/packages/extension-table/src/utilities/createColGroup.ts
@@ -1,5 +1,4 @@
-import { Node as ProseMirrorNode } from '@tiptap/pm/model'
-import { DOMOutputSpec } from 'prosemirror-model'
+import { DOMOutputSpec, Node as ProseMirrorNode } from '@tiptap/pm/model'
 
 /**
  * Creates a colgroup element for a table node in ProseMirror.