Merge pull request #4623 from nextcloud/backport/4621/stable26

[stable26] fix(editor): Don't load both Tiptap collaboration history extensions
nextcloud · Aug 2, 2023 · ba5798e · ba5798e
2 parents 654b216 + ec3311e
commit ba5798e
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 20 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/components/Editor/MarkdownContentEditor.vue b/src/components/Editor/MarkdownContentEditor.vue
@@ -35,6 +35,8 @@ import MainContainer from './MainContainer.vue'
 import MenuBar from '../Menu/MenuBar.vue'
 import { useOutlineActions, useOutlineStateMixin } from './Wrapper.provider.js'
 import { Editor } from '@tiptap/core'
+/* eslint-disable import/no-named-as-default */
+import History from '@tiptap/extension-history'
 import { EDITOR, IS_RICH_EDITOR, useLinkClickHook } from '../Editor.provider.js'
 import { createMarkdownSerializer } from '../../extensions/Markdown.js'
 import markdownit from '../../markdownit/index.js'
@@ -112,6 +114,9 @@ export default {
 							},
 						}
 						: undefined,
+					extensions: [
+						History,
+					],
 				}),
 			]
 		},

diff --git a/src/extensions/RichText.js b/src/extensions/RichText.js
@@ -24,7 +24,6 @@ import { Extension } from '@tiptap/core'
 import { lowlight } from 'lowlight'
 
 /* eslint-disable import/no-named-as-default */
-import History from '@tiptap/extension-history'
 import Blockquote from '@tiptap/extension-blockquote'
 import BulletList from './../nodes/BulletList.js'
 import Callout from './../nodes/Callouts.js'
@@ -105,7 +104,6 @@ export default Extension.create({
 			KeepSyntax,
 			FrontMatter,
 			Mention,
-			History,
 			Emoji.configure({
 				suggestion: EmojiSuggestion(),
 			}),