diff --git a/.github/dependabot.yml b/.github/dependabot.yml index aa532974..9dc0a706 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -13,11 +13,3 @@ updates: reviewers: - 'hanspagel' - - package-ecosystem: 'npm' - directory: '/' - open-pull-requests-limit: 10 - schedule: - interval: 'weekly' - day: 'monday' - reviewers: - - 'philippkuehn' diff --git a/docs/package.json b/docs/package.json index 8a749069..1c3d3579 100644 --- a/docs/package.json +++ b/docs/package.json @@ -15,7 +15,7 @@ "canvas": "^2.8.0", "collect.js": "^4.28.6", "d3": "^6.6.1", - "globby": "^11.0.3", + "globby": "^11.0.4", "gridsome": "0.7.23", "iframe-resizer": "^4.3.2", "portal-vue": "^2.1.7", @@ -36,11 +36,11 @@ "yjs": "^13.5.10" }, "devDependencies": { - "@babel/plugin-proposal-class-properties": "^7.13.0", - "@babel/plugin-proposal-optional-chaining": "^7.14.2", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/plugin-proposal-optional-chaining": "^7.14.5", "@babel/plugin-syntax-class-properties": "^7.12.13", - "@babel/preset-env": "^7.14.4", - "@babel/preset-react": "^7.13.13", + "@babel/preset-env": "^7.14.5", + "@babel/preset-react": "^7.14.5", "html-loader": "^1.3.2", "node-sass": "^5.0.0", "sass-loader": "^10.1.1", diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue index dba1d5e7..699489f6 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/index.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue @@ -40,9 +40,9 @@ const getRandomElement = list => { const getRandomRoom = () => { return getRandomElement([ - 'room.1', - 'room.2', - 'room.3', + 'room.4', + 'room.5', + 'room.6', ]) } diff --git a/docs/src/demos/Examples/Community/React/index.jsx b/docs/src/demos/Examples/Community/React/index.jsx index baab3abf..f6ca7cce 100644 --- a/docs/src/demos/Examples/Community/React/index.jsx +++ b/docs/src/demos/Examples/Community/React/index.jsx @@ -72,7 +72,7 @@ export default () => { ], content: `

- What do you all think about the new movie? + What do you all think about the new movie?

`, }) diff --git a/docs/src/demos/Examples/Community/Vue/index.vue b/docs/src/demos/Examples/Community/Vue/index.vue index 824c4172..5f5d269b 100644 --- a/docs/src/demos/Examples/Community/Vue/index.vue +++ b/docs/src/demos/Examples/Community/Vue/index.vue @@ -123,7 +123,7 @@ export default { ], content: `

- What do you all think about the new movie? + What do you all think about the new movie?

`, }) diff --git a/docs/src/demos/Examples/Formatting/index.vue b/docs/src/demos/Examples/Formatting/index.vue index 8dd8f255..e9a35646 100644 --- a/docs/src/demos/Examples/Formatting/index.vue +++ b/docs/src/demos/Examples/Formatting/index.vue @@ -63,7 +63,9 @@ export default { this.editor = new Editor({ extensions: [ StarterKit, - TextAlign, + TextAlign.configure({ + types: ['heading', 'paragraph'], + }), Highlight, ], content: ` diff --git a/docs/src/demos/Experiments/Linter/extension/LinterPlugin.ts b/docs/src/demos/Experiments/Linter/extension/LinterPlugin.ts index 200b146b..ee940b8b 100644 --- a/docs/src/demos/Experiments/Linter/extension/LinterPlugin.ts +++ b/docs/src/demos/Experiments/Linter/extension/LinterPlugin.ts @@ -1,10 +1,8 @@ -import { Node as ProsemirrorNode } from 'prosemirror-model' - -export interface Result { +interface Result { message: string, from: number, to: number, - fix?: Function + fix?: null } export default class LinterPlugin { diff --git a/docs/src/demos/Experiments/Nested/CustomNode.js b/docs/src/demos/Experiments/Nested/CustomNode.js deleted file mode 100644 index 4b95abce..00000000 --- a/docs/src/demos/Experiments/Nested/CustomNode.js +++ /dev/null @@ -1,80 +0,0 @@ -import { Node, mergeAttributes } from '@tiptap/core' -import { VueNodeViewRenderer } from '@tiptap/vue-2' -import { Plugin } from 'prosemirror-state' - -import CustomNodeView from './CustomNode.vue' - -export default Node.create({ - name: 'customNode', - isBlock: true, - inline: false, - group: 'block', - draggable: true, - isolating: true, - defining: true, - selectable: true, - - addAttributes() { - return { - nest: { default: false }, - } - }, - - parseHTML() { - return [ - { - tag: 'custom-node', - }, - ] - }, - - renderHTML({ HTMLAttributes }) { - return ['custom-node', mergeAttributes(HTMLAttributes)] - }, - - addNodeView() { - return VueNodeViewRenderer(CustomNodeView) - }, - - addProseMirrorPlugins() { - return [ - new Plugin({ - props: { - handleKeyDown: (view, event) => { - // Prevent _any_ key from clearing block. As soon as you start typing, - // and a block is focused, it'll blast the block away. - view.state.typing = true - }, - - handlePaste: (view, event, slice) => { - // Prevent pasting overwriting block - view.state.pasting = true - }, - }, - - filterTransaction: (transaction, state) => { - let result = true - - // Check if our flags are set, and if the selected node is a custom node - if (state.typing || state.pasting) { - transaction.mapping.maps.forEach(map => { - map.forEach((oldStart, oldEnd, newStart, newEnd) => { - state.doc.nodesBetween( - oldStart, - oldEnd, - (node, number, pos, parent, index) => { - if (node.type.name === 'customNode') { - result = false - } - }, - ) - }) - }) - } - - return result - }, - }), - ] - }, -}) diff --git a/docs/src/demos/Experiments/Nested/CustomNode.vue b/docs/src/demos/Experiments/Nested/CustomNode.vue deleted file mode 100644 index bf299fab..00000000 --- a/docs/src/demos/Experiments/Nested/CustomNode.vue +++ /dev/null @@ -1,106 +0,0 @@ - - - - - diff --git a/docs/src/demos/Experiments/Nested/Nested.vue b/docs/src/demos/Experiments/Nested/Nested.vue deleted file mode 100644 index 0cd31e6a..00000000 --- a/docs/src/demos/Experiments/Nested/Nested.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - - - diff --git a/docs/src/demos/Experiments/Nested/index.vue b/docs/src/demos/Experiments/Nested/index.vue deleted file mode 100644 index 8aee6c13..00000000 --- a/docs/src/demos/Experiments/Nested/index.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/docs/src/demos/Extensions/TextAlign/index.vue b/docs/src/demos/Extensions/TextAlign/index.vue index a29c3498..f094b233 100644 --- a/docs/src/demos/Extensions/TextAlign/index.vue +++ b/docs/src/demos/Extensions/TextAlign/index.vue @@ -45,7 +45,9 @@ export default { Paragraph, Text, Heading, - TextAlign, + TextAlign.configure({ + types: ['heading', 'paragraph'], + }), ], content: `

Heading

diff --git a/docs/src/demos/Marks/Subscript/index.spec.js b/docs/src/demos/Marks/Subscript/index.spec.js index 58ebd939..70392d4c 100644 --- a/docs/src/demos/Marks/Subscript/index.spec.js +++ b/docs/src/demos/Marks/Subscript/index.spec.js @@ -12,7 +12,7 @@ context('/demos/Marks/Subscript', () => { it('should transform inline style to sub tags', () => { cy.get('.ProseMirror').then(([{ editor }]) => { - editor.commands.setContent('

Example Text

') + editor.commands.setContent('

Example Text

') expect(editor.getHTML()).to.eq('

Example Text

') }) }) diff --git a/docs/src/demos/Nodes/Mention/index.vue b/docs/src/demos/Nodes/Mention/index.vue index e5d9a19b..b22530c0 100644 --- a/docs/src/demos/Nodes/Mention/index.vue +++ b/docs/src/demos/Nodes/Mention/index.vue @@ -82,9 +82,9 @@ export default { ], content: `

Hi everyone! Don’t forget the daily stand up at 8 AM.

-

Would you mind to share what you’ve been working on lately? We fear not much happened since Dirty Dancing. -

Let’s go through your most important points quickly.

-

I have a meeting with and don’t want to come late.

+

Would you mind to share what you’ve been working on lately? We fear not much happened since Dirty Dancing. +

Let’s go through your most important points quickly.

+

I have a meeting with and don’t want to come late.

– Thanks, your big boss

`, }) diff --git a/docs/src/demos/Nodes/TaskItem/index.vue b/docs/src/demos/Nodes/TaskItem/index.vue index ba15b994..17b2f6bf 100644 --- a/docs/src/demos/Nodes/TaskItem/index.vue +++ b/docs/src/demos/Nodes/TaskItem/index.vue @@ -33,7 +33,7 @@ export default { TaskItem, ], content: ` -