From 4411fcfcf9e49f3f0f07d75260fba3017483325b Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 16 Nov 2020 16:01:00 +0100 Subject: [PATCH 1/2] update content, update yarn lock file --- docs/src/links.yaml | 1 - yarn.lock | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/src/links.yaml b/docs/src/links.yaml index 28277793..0fffe82d 100644 --- a/docs/src/links.yaml +++ b/docs/src/links.yaml @@ -32,7 +32,6 @@ link: /examples/export-html-or-json - title: Use v-model link: /examples/v-model - draft: true - title: Share feedback link: /overview/feedback diff --git a/yarn.lock b/yarn.lock index 6f3c307c..fbdb210c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2144,6 +2144,21 @@ dependencies: defer-to-connect "^1.0.1" +"@tiptap/core@2.x": + version "2.0.0-alpha.1" + dependencies: + "@types/prosemirror-schema-list" "^1.0.1" + prosemirror-commands "^1.1.3" + prosemirror-inputrules "^1.1.3" + prosemirror-keymap "^1.1.3" + prosemirror-model "^1.12.0" + prosemirror-schema-list "^1.1.4" + prosemirror-state "^1.3.3" + prosemirror-tables "^1.1.1" + prosemirror-transform "^1.2.8" + prosemirror-utils "^1.0.0-0" + prosemirror-view "^1.16.1" + "@types/babel-types@*", "@types/babel-types@^7.0.0": version "7.0.9" resolved "https://registry.yarnpkg.com/@types/babel-types/-/babel-types-7.0.9.tgz#01d7b86949f455402a94c788883fe4ba574cad41" From 1ed6db24c2199514a2c9571dccf779dbdb8ca8f8 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 16 Nov 2020 17:18:07 +0100 Subject: [PATCH 2/2] remove provider setting from collab extension --- docs/src/demos/Examples/CollaborativeEditing/index.vue | 1 - packages/extension-collaboration/src/index.ts | 2 -- 2 files changed, 3 deletions(-) diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue index 6566ba61..486fdcf7 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/index.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue @@ -136,7 +136,6 @@ export default { extensions: [ ...defaultExtensions(), Collaboration.configure({ - provider: this.provider, type: this.type, }), CollaborationCursor.configure({ diff --git a/packages/extension-collaboration/src/index.ts b/packages/extension-collaboration/src/index.ts index 729ef245..485b64f5 100644 --- a/packages/extension-collaboration/src/index.ts +++ b/packages/extension-collaboration/src/index.ts @@ -4,13 +4,11 @@ import { } from 'y-prosemirror' export interface CollaborationOptions { - provider: any, type: any, } const Collaboration = Extension.create({ defaultOptions: { - provider: null, type: null, },