From 62f6cb3f2a73175196eca80b28036d6382cb0e91 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Dec 2020 06:13:35 +0000 Subject: [PATCH 01/51] Bump actions/setup-node from v2.1.3 to v2.1.4 Bumps [actions/setup-node](https://github.com/actions/setup-node) from v2.1.3 to v2.1.4. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.1.3...c46424eee26de4078d34105d3de3cc4992202b1e) Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62301594..b319f455 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2.1.3 + uses: actions/setup-node@v2.1.4 with: node-version: ${{ matrix.node-version }} @@ -83,7 +83,7 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2.1.3 + uses: actions/setup-node@v2.1.4 with: node-version: ${{ matrix.node-version }} @@ -138,7 +138,7 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2.1.3 + uses: actions/setup-node@v2.1.4 with: node-version: ${{ matrix.node-version }} From 3246e0c568219ce8a411d20da15a05376db271e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Dec 2020 07:09:52 +0000 Subject: [PATCH 02/51] Bump prosemirror-model from 1.13.0 to 1.13.1 Bumps [prosemirror-model](https://github.com/prosemirror/prosemirror-model) from 1.13.0 to 1.13.1. - [Release notes](https://github.com/prosemirror/prosemirror-model/releases) - [Changelog](https://github.com/ProseMirror/prosemirror-model/blob/master/CHANGELOG.md) - [Commits](https://github.com/prosemirror/prosemirror-model/compare/1.13.0...1.13.1) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11df0d79..acf6285e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11767,9 +11767,9 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3: w3c-keyname "^2.2.0" prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.12.0, prosemirror-model@^1.8.1: - version "1.13.0" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.13.0.tgz#ce5574669489fb4acfd875f7bbfa11f3a88319a2" - integrity sha512-j5F0Wt5Me8a1qKI6xNRNET6l07tWTpXwxfcs7xTl5PWAxJGgAC+vHIuwenGZMWSE6kU2k4qr55pw5aFXlUfgVA== + version "1.13.1" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.13.1.tgz#fa3dc888cf6928bd3968620588ffe6458d201f9f" + integrity sha512-PNH+b5bilAJi1B5yJ8QzoNY3ZV+nlD0jKG3XCBk7PmE/YUTJomBkFBS005vfU+3M9yeVR8/6spAEDsfVFUhNeQ== dependencies: orderedmap "^1.1.0" From 8956449b034d182f8ac5404e2594778bd24b155a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Dec 2020 07:10:40 +0000 Subject: [PATCH 03/51] Bump eslint from 7.15.0 to 7.16.0 Bumps [eslint](https://github.com/eslint/eslint) from 7.15.0 to 7.16.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.15.0...v7.16.0) Signed-off-by: dependabot[bot] --- yarn.lock | 59 +++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/yarn.lock b/yarn.lock index 11df0d79..3116a8e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3153,7 +3153,7 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -3350,10 +3350,10 @@ ast-types@0.13.3: resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.3.tgz#50da3f28d17bdbc7969a3a2d83a0e4a72ae755a7" integrity sha512-XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA== -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== async-each@^1.0.1: version "1.0.3" @@ -6255,9 +6255,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.15.0: - version "7.15.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.15.0.tgz#eb155fb8ed0865fcf5d903f76be2e5b6cd7e0bc7" - integrity sha512-Vr64xFDT8w30wFll643e7cGrIkPEU50yIiI36OdSIDoSGguIeaLzBo0vpGvzo9RECUqq7htURfwEtKqwytkqzA== + version "7.16.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092" + integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.2.2" @@ -6293,7 +6293,7 @@ eslint@^7.15.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^5.2.3" + table "^6.0.4" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -6306,16 +6306,7 @@ espree@^6.2.1: acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" -espree@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348" - integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw== - dependencies: - acorn "^7.4.0" - acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.3.0" - -espree@^7.3.1: +espree@^7.3.0, espree@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== @@ -13219,14 +13210,14 @@ slice-ansi@0.0.4: resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ== +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" slide@^1.1.6: version "1.1.6" @@ -13876,15 +13867,15 @@ symbol-observable@^1.1.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -table@^5.2.3: - version "5.4.6" - resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" - integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug== +table@^6.0.4: + version "6.0.4" + resolved "https://registry.yarnpkg.com/table/-/table-6.0.4.tgz#c523dd182177e926c723eb20e1b341238188aa0d" + integrity sha512-sBT4xRLdALd+NFBvwOz8bw4b15htyythha+q+DVZqy2RS08PPC8O2sZFgJYEY7bJvbCFKccs+WIZ/cd+xxTWCw== dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^3.0.0" + ajv "^6.12.4" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" tapable@2.0.0-beta.5: version "2.0.0-beta.5" From c13aa5949233dbccb3c64baee630fa54ed6c980e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 21 Dec 2020 17:28:04 +0100 Subject: [PATCH 04/51] update dependencies --- packages/html/package.json | 2 +- yarn.lock | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/html/package.json b/packages/html/package.json index 0d0340d2..1f6ae635 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -23,7 +23,7 @@ ], "dependencies": { "@tiptap/core": "^2.0.0-alpha.9", - "hostic-dom": "^0.8.5", + "hostic-dom": "^0.8.6", "prosemirror-model": "^1.12.0" } } diff --git a/yarn.lock b/yarn.lock index 774ee337..102bdcc1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4968,11 +4968,16 @@ css-what@2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== -css-what@^3.2.1, css-what@^3.4.2: +css-what@^3.2.1: version "3.4.2" resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== +css-what@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-4.0.0.tgz#35e73761cab2eeb3d3661126b23d7aa0e8432233" + integrity sha512-teijzG7kwYfNVsUh2H/YN62xW3KK9YhXEgSlbxMlcyjPNvdKJqFx5lrwlJgoFP1ZHlB89iGDlo/JyshKeRhv5A== + css@^2.0.0: version "2.2.4" resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" @@ -7817,12 +7822,12 @@ hosted-git-info@^3.0.6: dependencies: lru-cache "^6.0.0" -hostic-dom@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/hostic-dom/-/hostic-dom-0.8.5.tgz#500de796842454a745ce160d9cb0483c82643e28" - integrity sha512-0H5DTaE2/u3pSM5bPf7CaS9SunFASc0zlmw1R6hk0i6ozalRl0ePnAhm4YUYRG6pDbg0BYqCbjgwuFWOc3SskA== +hostic-dom@^0.8.6: + version "0.8.6" + resolved "https://registry.yarnpkg.com/hostic-dom/-/hostic-dom-0.8.6.tgz#5a5e2a1270b12ff4d479acdb679ba16de3028b58" + integrity sha512-gostOugTHuFKhnO4YQpH21SBc8A4jQ1mB5sqUCYC4gXm2LLwQ85V9EFa4DPh6Z9M6sCUJ7TAs1/hqr8iraX7Rw== dependencies: - css-what "^3.4.2" + css-what "^4.0.0" he "^1.2.0" hsl-regex@^1.0.0: From ed4396da23c33073b9790f3bfd4c6bdb47649b93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 21 Dec 2020 17:43:29 +0100 Subject: [PATCH 05/51] add extension check --- packages/core/src/Editor.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts index afda2259..c1f0ba65 100644 --- a/packages/core/src/Editor.ts +++ b/packages/core/src/Editor.ts @@ -213,7 +213,9 @@ export class Editor extends EventEmitter { */ private createExtensionManager() { const coreExtensions = Object.entries(extensions).map(([, extension]) => extension) - const allExtensions = [...this.options.extensions, ...coreExtensions] + const allExtensions = [...this.options.extensions, ...coreExtensions].filter(extension => { + return ['extension', 'node', 'mark'].includes(extension?.type) + }) this.extensionManager = new ExtensionManager(allExtensions, this.proxy) } From 68b5939ea4b0e721a68bf3de9ff2d06ae9d84ea5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:07:27 +0100 Subject: [PATCH 06/51] Bump yjs from 13.4.7 to 13.4.9 (#64) Bumps [yjs](https://github.com/yjs/yjs) from 13.4.7 to 13.4.9. - [Release notes](https://github.com/yjs/yjs/releases) - [Commits](https://github.com/yjs/yjs/compare/v13.4.7...v13.4.9) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 102bdcc1..77993992 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15516,8 +15516,8 @@ yauzl@^2.10.0, yauzl@^2.4.2: fd-slicer "~1.1.0" yjs@^13.4.7: - version "13.4.7" - resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.4.7.tgz#6271f68d19ceae955e241fa2a136b312ec2347df" - integrity sha512-Vz8TbNudgTNSrM/5UxmAdUevNfFWSE44R134S5jW4odSF8KmlO8GhAOg05+Vy5if72B3ERq8qAh3Ws/eCEvVdw== + version "13.4.9" + resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.4.9.tgz#8416d47eed7b1baa5a999840f01a790794af45fb" + integrity sha512-TJ6C7PPyiVP9HnSx40hm47FfacXcvMNy/70msnhXaebIFDDsVX6AOFTzLktCB6vY/SoCfpkIKO/hzhulfDTsMA== dependencies: lib0 "^0.2.33" From fdf183b00b8c208a62cecbd5e76ba173826f42d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:07:37 +0100 Subject: [PATCH 07/51] Bump cypress from 6.1.0 to 6.2.0 (#68) Bumps [cypress](https://github.com/cypress-io/cypress) from 6.1.0 to 6.2.0. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v6.1.0...v6.2.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 77993992..47e38712 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5105,9 +5105,9 @@ cyclist@^1.0.1: integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= cypress@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.1.0.tgz#af2596cb110aa98eaf75fef3d8ab379ca0ff2413" - integrity sha512-uQnSxRcZ6hkf9R5cr8KpRBTzN88QZwLIImbf5DWa5RIxH6o5Gpff58EcjiYhAR8/8p9SGv7O6SRygq4H+k0Qpw== + version "6.2.0" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.2.0.tgz#1a8a7dd5bd08db3064551a9f12072963cc9337bf" + integrity sha512-m/rkcogYM9MTy8rbsZgyS5wT2L/J+B5V2bY2ztkDNMyqhk/oZgUF4KTWVLzkW2I+scg0iAddca95tLlt7XnAtw== dependencies: "@cypress/listr-verbose-renderer" "^0.4.1" "@cypress/request" "^2.88.5" From 9a2842b5757f234c1ca5be8a2f9a1191e13de011 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:07:47 +0100 Subject: [PATCH 08/51] Bump @typescript-eslint/eslint-plugin from 4.10.0 to 4.11.1 (#73) Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.10.0 to 4.11.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.11.1/packages/eslint-plugin) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/yarn.lock b/yarn.lock index 47e38712..3a56ec6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2524,27 +2524,27 @@ "@types/vfile-message" "*" "@typescript-eslint/eslint-plugin@^4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.10.0.tgz#19ed3baf4bc4232c5a7fcd32eaca75c3a5baf9f3" - integrity sha512-h6/V46o6aXpKRlarP1AiJEXuCJ7cMQdlpfMDrcllIgX3dFkLwEBTXAoNP98ZoOmqd1xvymMVRAI4e7yVvlzWEg== + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.11.1.tgz#7579c6d17ad862154c10bc14b40e5427b729e209" + integrity sha512-fABclAX2QIEDmTMk6Yd7Muv1CzFLwWM4505nETzRHpP3br6jfahD9UUJkhnJ/g2m7lwfz8IlswcwGGPGiq9exw== dependencies: - "@typescript-eslint/experimental-utils" "4.10.0" - "@typescript-eslint/scope-manager" "4.10.0" + "@typescript-eslint/experimental-utils" "4.11.1" + "@typescript-eslint/scope-manager" "4.11.1" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.10.0.tgz#dbf5d0f89802d5feaf7d11e5b32df29bbc2f3a0e" - integrity sha512-opX+7ai1sdWBOIoBgpVJrH5e89ra1KoLrJTz0UtWAa4IekkKmqDosk5r6xqRaNJfCXEfteW4HXQAwMdx+jjEmw== +"@typescript-eslint/experimental-utils@4.11.1": + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.11.1.tgz#2dad3535b878c25c7424e40bfa79d899f3f485bc" + integrity sha512-mAlWowT4A6h0TC9F+J5pdbEhjNiEMO+kqPKQ4sc3fVieKL71dEqfkKgtcFVSX3cjSBwYwhImaQ/mXQF0oaI38g== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.10.0" - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/typescript-estree" "4.10.0" + "@typescript-eslint/scope-manager" "4.11.1" + "@typescript-eslint/types" "4.11.1" + "@typescript-eslint/typescript-estree" "4.11.1" eslint-scope "^5.0.0" eslint-utils "^2.0.0" @@ -2566,11 +2566,24 @@ "@typescript-eslint/types" "4.10.0" "@typescript-eslint/visitor-keys" "4.10.0" +"@typescript-eslint/scope-manager@4.11.1": + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.11.1.tgz#72dc2b60b0029ab0888479b12bf83034920b4b69" + integrity sha512-Al2P394dx+kXCl61fhrrZ1FTI7qsRDIUiVSuN6rTwss6lUn8uVO2+nnF4AvO0ug8vMsy3ShkbxLu/uWZdTtJMQ== + dependencies: + "@typescript-eslint/types" "4.11.1" + "@typescript-eslint/visitor-keys" "4.11.1" + "@typescript-eslint/types@4.10.0": version "4.10.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789" integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g== +"@typescript-eslint/types@4.11.1": + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05" + integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA== + "@typescript-eslint/typescript-estree@4.10.0": version "4.10.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75" @@ -2585,6 +2598,20 @@ semver "^7.3.2" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@4.11.1": + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.1.tgz#a4416b4a65872a48773b9e47afabdf7519eb10bc" + integrity sha512-tC7MKZIMRTYxQhrVAFoJq/DlRwv1bnqA4/S2r3+HuHibqvbrPcyf858lNzU7bFmy4mLeIHFYr34ar/1KumwyRw== + dependencies: + "@typescript-eslint/types" "4.11.1" + "@typescript-eslint/visitor-keys" "4.11.1" + debug "^4.1.1" + globby "^11.0.1" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^7.3.2" + tsutils "^3.17.1" + "@typescript-eslint/visitor-keys@4.10.0": version "4.10.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451" @@ -2593,6 +2620,14 @@ "@typescript-eslint/types" "4.10.0" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@4.11.1": + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.1.tgz#4c050a4c1f7239786e2dd4e69691436143024e05" + integrity sha512-IrlBhD9bm4bdYcS8xpWarazkKXlE7iYb1HzRuyBP114mIaj5DJPo11Us1HgH60dTt41TCZXMaTCAW+OILIYPOg== + dependencies: + "@typescript-eslint/types" "4.11.1" + eslint-visitor-keys "^2.0.0" + "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" From 6aa2629658b9c4ae68ac447d81d5332679851dcf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:07:51 +0100 Subject: [PATCH 09/51] Bump @typescript-eslint/parser from 4.10.0 to 4.11.1 (#74) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.10.0 to 4.11.1. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.11.1/packages/parser) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3a56ec6d..8879ff44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2549,13 +2549,13 @@ eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.10.0.tgz#1a622b0847b765b2d8f0ede6f0cdd85f03d76031" - integrity sha512-amBvUUGBMadzCW6c/qaZmfr3t9PyevcSWw7hY2FuevdZVp5QPw/K76VSQ5Sw3BxlgYCHZcK6DjIhSZK0PQNsQg== + version "4.11.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.11.1.tgz#981e18de2e019d6ca312596615f92e8f6f6598ed" + integrity sha512-BJ3jwPQu1jeynJ5BrjLuGfK/UJu6uwHxJ/di7sanqmUmxzmyIcd3vz58PMR7wpi8k3iWq2Q11KMYgZbUpRoIPw== dependencies: - "@typescript-eslint/scope-manager" "4.10.0" - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/typescript-estree" "4.10.0" + "@typescript-eslint/scope-manager" "4.11.1" + "@typescript-eslint/types" "4.11.1" + "@typescript-eslint/typescript-estree" "4.11.1" debug "^4.1.1" "@typescript-eslint/scope-manager@4.10.0": From 4b98af8ed9d4e2f82c24be9b00f84706579fee75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:07:55 +0100 Subject: [PATCH 10/51] Bump typedoc from 0.19.2 to 0.20.10 (#75) Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.19.2 to 0.20.10. - [Release notes](https://github.com/TypeStrong/TypeDoc/releases) - [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.19.2...v0.20.10) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 78 ++++++++++++++++++++++++++++++++++++---------------- 2 files changed, 56 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index b437307f..ea66f5f3 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.29.0", "rollup-plugin-vue": "5", - "typedoc": "^0.19.2", + "typedoc": "^0.20.10", "typescript": "^4.1.3", "vue": "^2.6.12" } diff --git a/yarn.lock b/yarn.lock index 8879ff44..4f8cfb8b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4490,7 +4490,7 @@ colorette@^1.2.1: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b" integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw== -colors@^1.1.2: +colors@^1.1.2, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== @@ -7826,11 +7826,6 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -highlight.js@^10.2.0: - version "10.4.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.0.tgz#ef3ce475e5dfa7a48484260b49ea242ddab823a0" - integrity sha512-EfrUGcQ63oLJbj0J0RI9ebX6TAITbsDBLbsjr881L/X5fMO9+oadKzEF21C7R3ULKG6Gv3uoab2HiqVJa/4+oA== - hirestime@^3.2.1: version "3.2.2" resolved "https://registry.yarnpkg.com/hirestime/-/hirestime-3.2.2.tgz#1b5ff4c796b6b70586fa6efa4850952c6e1be484" @@ -8955,7 +8950,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.0, json5@^2.1.2: version "2.1.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA== @@ -9645,10 +9640,10 @@ markdown-escapes@^1.0.0: resolved "https://registry.yarnpkg.com/markdown-escapes/-/markdown-escapes-1.0.4.tgz#c95415ef451499d7602b91095f3c8e8975f78535" integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg== -marked@^1.1.1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.5.tgz#a44b31f2a0b8b5bfd610f00d55d1952d1ac1dfdb" - integrity sha512-2AlqgYnVPOc9WDyWu7S5DJaEZsfk6dNh/neatQ3IHUW4QLutM/VPSH9lG7bif+XjFWc9K9XR3QvR+fXuECmfdA== +marked@^1.2.5: + version "1.2.7" + resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.7.tgz#6e14b595581d2319cdcf033a24caaf41455a01fb" + integrity sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA== md5-file@^4.0.0: version "4.0.0" @@ -10652,6 +10647,13 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" +onigasm@^2.2.5: + version "2.2.5" + resolved "https://registry.yarnpkg.com/onigasm/-/onigasm-2.2.5.tgz#cc4d2a79a0fa0b64caec1f4c7ea367585a676892" + integrity sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA== + dependencies: + lru-cache "^5.1.1" + optimize-css-assets-webpack-plugin@^5.0.1: version "5.0.4" resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90" @@ -13165,6 +13167,31 @@ shelljs@^0.8.4: interpret "^1.0.0" rechoir "^0.6.2" +shiki-languages@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/shiki-languages/-/shiki-languages-0.2.7.tgz#7230b675b96d37a36ac1bf995525375ce69f3924" + integrity sha512-REmakh7pn2jCn9GDMRSK36oDgqhh+rSvJPo77sdWTOmk44C5b0XlYPwJZcFOMJWUZJE0c7FCbKclw4FLwUKLRw== + dependencies: + vscode-textmate "^5.2.0" + +shiki-themes@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/shiki-themes/-/shiki-themes-0.2.7.tgz#6e04451d832152e0fc969876a7bd926b3963c1f2" + integrity sha512-ZMmboDYw5+SEpugM8KGUq3tkZ0vXg+k60XX6NngDK7gc1Sv6YLUlanpvG3evm57uKJvfXsky/S5MzSOTtYKLjA== + dependencies: + json5 "^2.1.0" + vscode-textmate "^5.2.0" + +shiki@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/shiki/-/shiki-0.2.7.tgz#d2547548ed8742673730e1e4bbe792a77c445540" + integrity sha512-bwVc7cdtYYHEO9O+XJ8aNOskKRfaQd5Y4ovLRfbQkmiLSUaR+bdlssbZUUhbQ0JAFMYcTcJ5tjG5KtnufttDHQ== + dependencies: + onigasm "^2.2.5" + shiki-languages "^0.2.7" + shiki-themes "^0.2.7" + vscode-textmate "^5.2.0" + signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -14390,27 +14417,27 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typedoc-default-themes@^0.11.4: - version "0.11.4" - resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.11.4.tgz#1bc55b7c8d1132844616ff6f570e1e2cd0eb7343" - integrity sha512-Y4Lf+qIb9NTydrexlazAM46SSLrmrQRqWiD52593g53SsmUFioAsMWt8m834J6qsp+7wHRjxCXSZeiiW5cMUdw== +typedoc-default-themes@0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.12.0.tgz#42451948e55a148c1350eb2aa68829be5c2b06b3" + integrity sha512-0hHBxwmfxE0rkIslOiO39fJyYwaScQEhUIxcpqx3uS1BL3zhFW5oQfUaPx2cv2XLL/GXhYFxhdFLoVmNptbxEQ== -typedoc@^0.19.2: - version "0.19.2" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.19.2.tgz#842a63a581f4920f76b0346bb80eb2a49afc2c28" - integrity sha512-oDEg1BLEzi1qvgdQXc658EYgJ5qJLVSeZ0hQ57Eq4JXy6Vj2VX4RVo18qYxRWz75ifAaYuYNBUCnbhjd37TfOg== +typedoc@^0.20.10: + version "0.20.10" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.20.10.tgz#013eac8ece7b7f6201a06a83d4ddf3d93e89d7f9" + integrity sha512-1Bqbmf/1pwRiUkd1j1tvL7GIlBOFANFcjC+W5cZ02R0CKgUN+fIIl2Z2OhuaM7MVytKq6snF1KYVIwBvplO37g== dependencies: + colors "^1.4.0" fs-extra "^9.0.1" handlebars "^4.7.6" - highlight.js "^10.2.0" lodash "^4.17.20" lunr "^2.3.9" - marked "^1.1.1" + marked "^1.2.5" minimatch "^3.0.0" progress "^2.0.3" - semver "^7.3.2" shelljs "^0.8.4" - typedoc-default-themes "^0.11.4" + shiki "^0.2.7" + typedoc-default-themes "0.12.0" typescript@^4.1.3: version "4.1.3" @@ -14932,6 +14959,11 @@ void-elements@^2.0.1: resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= +vscode-textmate@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-5.2.0.tgz#01f01760a391e8222fe4f33fbccbd1ad71aed74e" + integrity sha512-Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ== + vue-eslint-parser@^7.3.0: version "7.3.0" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-7.3.0.tgz#894085839d99d81296fa081d19643733f23d7559" From 2f8dd7ed5f21ff4570df8edb22927c687c3e526b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:07:59 +0100 Subject: [PATCH 11/51] Bump ts-loader from 8.0.12 to 8.0.13 (#76) Bumps [ts-loader](https://github.com/TypeStrong/ts-loader) from 8.0.12 to 8.0.13. - [Release notes](https://github.com/TypeStrong/ts-loader/releases) - [Changelog](https://github.com/TypeStrong/ts-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/TypeStrong/ts-loader/compare/v8.0.12...v8.0.13) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4f8cfb8b..c138436a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14311,9 +14311,9 @@ trough@^1.0.0: glob "^7.1.2" ts-loader@^8.0.11: - version "8.0.12" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.12.tgz#1de9f1de65176318c1e6d187bfc496182f8dc2a0" - integrity sha512-UIivVfGVJDdwwjgSrbtcL9Nf10c1BWnL1mxAQUVcnhNIn/P9W3nP5v60Z0aBMtc7ZrE11lMmU6+5jSgAXmGaYw== + version "8.0.13" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.13.tgz#2bebeb833570ca46bb9338322a9a29900e988535" + integrity sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA== dependencies: chalk "^2.3.0" enhanced-resolve "^4.0.0" From 07f3c256c69cd50c944db723d3a32eacdd6ad37e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:08:06 +0100 Subject: [PATCH 12/51] Bump eslint from 7.16.0 to 7.17.0 (#77) Bumps [eslint](https://github.com/eslint/eslint) from 7.16.0 to 7.17.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v7.16.0...v7.17.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c138436a..d53ede50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6295,9 +6295,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.15.0: - version "7.16.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.16.0.tgz#a761605bf9a7b32d24bb7cde59aeb0fd76f06092" - integrity sha512-iVWPS785RuDA4dWuhhgXTNrGxHHK3a8HLSMBgbbU59ruJDubUraXN8N5rn7kb8tG6sjg74eE0RA3YWT51eusEw== + version "7.17.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.17.0.tgz#4ccda5bf12572ad3bf760e6f195886f50569adb0" + integrity sha512-zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ== dependencies: "@babel/code-frame" "^7.0.0" "@eslint/eslintrc" "^0.2.2" From 8ee0a03666cff5805be492095948b23f8bf6e6a1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Jan 2021 13:08:15 +0100 Subject: [PATCH 13/51] Bump eslint-plugin-vue from 7.3.0 to 7.4.0 (#67) Bumps [eslint-plugin-vue](https://github.com/vuejs/eslint-plugin-vue) from 7.3.0 to 7.4.0. - [Release notes](https://github.com/vuejs/eslint-plugin-vue/releases) - [Commits](https://github.com/vuejs/eslint-plugin-vue/compare/v7.3.0...v7.4.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index d53ede50..a9bc95b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6252,9 +6252,9 @@ eslint-plugin-import@^2.22.1: tsconfig-paths "^3.9.0" eslint-plugin-vue@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.3.0.tgz#0faf0fcf0e1b1052bf800d4dee42d64f50679cb0" - integrity sha512-4rc9xrZgwT4aLz3XE6lrHu+FZtDLWennYvtzVvvS81kW9c65U4DUzQQWAFjDCgCFvN6HYWxi7ueEtxZVSB+f0g== + version "7.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.0.tgz#27324cbe8f00705708c9fa9e8c0401d8f0742c20" + integrity sha512-bYJV3nHSGV5IL40Ti1231vlY8I2DzjDHYyDjRv9Z1koEI7qyV2RR3+uKMafHdOioXYH9W3e1+iwe4wy7FIBNCQ== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" From 0fe46fc2c181b5b6d8f770a5cb7dcd7228858ed8 Mon Sep 17 00:00:00 2001 From: philippkuehn Date: Mon, 4 Jan 2021 12:10:00 +0000 Subject: [PATCH 14/51] ci: fix code style linting errors --- yarn.lock | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/yarn.lock b/yarn.lock index a9bc95b3..24d6f2b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2558,14 +2558,6 @@ "@typescript-eslint/typescript-estree" "4.11.1" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.10.0.tgz#dbd7e1fc63d7363e3aaff742a6f2b8afdbac9d27" - integrity sha512-WAPVw35P+fcnOa8DEic0tQUhoJJsgt+g6DEcz257G7vHFMwmag58EfowdVbiNcdfcV27EFR0tUBVXkDoIvfisQ== - dependencies: - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/visitor-keys" "4.10.0" - "@typescript-eslint/scope-manager@4.11.1": version "4.11.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.11.1.tgz#72dc2b60b0029ab0888479b12bf83034920b4b69" @@ -2574,30 +2566,11 @@ "@typescript-eslint/types" "4.11.1" "@typescript-eslint/visitor-keys" "4.11.1" -"@typescript-eslint/types@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.10.0.tgz#12f983750ebad867f0c806e705c1953cd6415789" - integrity sha512-+dt5w1+Lqyd7wIPMa4XhJxUuE8+YF+vxQ6zxHyhLGHJjHiunPf0wSV8LtQwkpmAsRi1lEOoOIR30FG5S2HS33g== - "@typescript-eslint/types@4.11.1": version "4.11.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05" integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA== -"@typescript-eslint/typescript-estree@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.10.0.tgz#1e62e45fd57866afd42daf5e9fb6bd4e8dbcfa75" - integrity sha512-mGK0YRp9TOk6ZqZ98F++bW6X5kMTzCRROJkGXH62d2azhghmq+1LNLylkGe6uGUOQzD452NOAEth5VAF6PDo5g== - dependencies: - "@typescript-eslint/types" "4.10.0" - "@typescript-eslint/visitor-keys" "4.10.0" - debug "^4.1.1" - globby "^11.0.1" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" - "@typescript-eslint/typescript-estree@4.11.1": version "4.11.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.1.tgz#a4416b4a65872a48773b9e47afabdf7519eb10bc" @@ -2612,14 +2585,6 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.10.0.tgz#9478822329a9bc8ebcc80623d7f79a01da5ee451" - integrity sha512-hPyz5qmDMuZWFtHZkjcCpkAKHX8vdu1G3YsCLEd25ryZgnJfj6FQuJ5/O7R+dB1ueszilJmAFMtlU4CA6se3Jg== - dependencies: - "@typescript-eslint/types" "4.10.0" - eslint-visitor-keys "^2.0.0" - "@typescript-eslint/visitor-keys@4.11.1": version "4.11.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.1.tgz#4c050a4c1f7239786e2dd4e69691436143024e05" From ed3a34d5d764589f3cadbdeeb9941cc720048b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 4 Jan 2021 14:57:24 +0100 Subject: [PATCH 15/51] fix reactive contenteditable for node views, fix #63 --- packages/vue/src/VueRenderer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vue/src/VueRenderer.ts b/packages/vue/src/VueRenderer.ts index f5cd34ba..a5fd4788 100644 --- a/packages/vue/src/VueRenderer.ts +++ b/packages/vue/src/VueRenderer.ts @@ -115,7 +115,7 @@ class VueNodeView implements NodeView { style: { whiteSpace: 'pre-wrap', }, - attrs: { + domProps: { id, contenteditable: isEditable, }, From d90510156b9158c49329fc5cf7547c0cfa2f4ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 6 Jan 2021 09:30:19 +0100 Subject: [PATCH 16/51] update dependencies --- docs/package.json | 4 +- package.json | 12 ++-- yarn.lock | 151 ++++++++++++++++++++++++---------------------- 3 files changed, 87 insertions(+), 80 deletions(-) diff --git a/docs/package.json b/docs/package.json index 2a23dc1f..f6b452d6 100644 --- a/docs/package.json +++ b/docs/package.json @@ -27,7 +27,7 @@ "simplify-js": "^1.2.4", "vue-github-button": "^1.1.2", "vue-live": "^1.16.0", - "y-indexeddb": "^9.0.5", + "y-indexeddb": "^9.0.6", "y-webrtc": "^10.1.7", "y-websocket": "^1.3.8", "yjs": "^13.4.7" @@ -40,6 +40,6 @@ "node-sass": "^5.0.0", "sass-loader": "^10.0.3", "style-resources-loader": "^1.4.1", - "ts-loader": "^8.0.11" + "ts-loader": "^8.0.14" } } diff --git a/package.json b/package.json index ea66f5f3..67feff46 100644 --- a/package.json +++ b/package.json @@ -35,24 +35,24 @@ "@rollup/plugin-babel": "^5.2.1", "@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-node-resolve": "^11.0.1", - "@typescript-eslint/eslint-plugin": "^4.10.0", - "@typescript-eslint/parser": "^4.10.0", - "cypress": "^6.1.0", + "@typescript-eslint/eslint-plugin": "^4.12.0", + "@typescript-eslint/parser": "^4.12.0", + "cypress": "^6.2.1", "eslint": "^7.15.0", "eslint-config-airbnb-base": "^14.2.0", "eslint-plugin-cypress": "^2.11.2", "eslint-plugin-html": "^6.1.0", "eslint-plugin-import": "^2.22.1", - "eslint-plugin-vue": "^7.3.0", + "eslint-plugin-vue": "^7.4.1", "lerna": "^3.22.1", "minimist": "^1.2.5", - "rollup": "^2.35.1", + "rollup": "^2.36.0", "rollup-plugin-auto-external": "^2.0.0", "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.29.0", "rollup-plugin-vue": "5", - "typedoc": "^0.20.10", + "typedoc": "^0.20.13", "typescript": "^4.1.3", "vue": "^2.6.12" } diff --git a/yarn.lock b/yarn.lock index 24d6f2b0..4b2c4f9e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2523,61 +2523,61 @@ "@types/unist" "*" "@types/vfile-message" "*" -"@typescript-eslint/eslint-plugin@^4.10.0": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.11.1.tgz#7579c6d17ad862154c10bc14b40e5427b729e209" - integrity sha512-fABclAX2QIEDmTMk6Yd7Muv1CzFLwWM4505nETzRHpP3br6jfahD9UUJkhnJ/g2m7lwfz8IlswcwGGPGiq9exw== +"@typescript-eslint/eslint-plugin@^4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.12.0.tgz#00d1b23b40b58031e6d7c04a5bc6c1a30a2e834a" + integrity sha512-wHKj6q8s70sO5i39H2g1gtpCXCvjVszzj6FFygneNFyIAxRvNSVz9GML7XpqrB9t7hNutXw+MHnLN/Ih6uyB8Q== dependencies: - "@typescript-eslint/experimental-utils" "4.11.1" - "@typescript-eslint/scope-manager" "4.11.1" + "@typescript-eslint/experimental-utils" "4.12.0" + "@typescript-eslint/scope-manager" "4.12.0" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.11.1": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.11.1.tgz#2dad3535b878c25c7424e40bfa79d899f3f485bc" - integrity sha512-mAlWowT4A6h0TC9F+J5pdbEhjNiEMO+kqPKQ4sc3fVieKL71dEqfkKgtcFVSX3cjSBwYwhImaQ/mXQF0oaI38g== +"@typescript-eslint/experimental-utils@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.12.0.tgz#372838e76db76c9a56959217b768a19f7129546b" + integrity sha512-MpXZXUAvHt99c9ScXijx7i061o5HEjXltO+sbYfZAAHxv3XankQkPaNi5myy0Yh0Tyea3Hdq1pi7Vsh0GJb0fA== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.11.1" - "@typescript-eslint/types" "4.11.1" - "@typescript-eslint/typescript-estree" "4.11.1" + "@typescript-eslint/scope-manager" "4.12.0" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/typescript-estree" "4.12.0" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^4.10.0": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.11.1.tgz#981e18de2e019d6ca312596615f92e8f6f6598ed" - integrity sha512-BJ3jwPQu1jeynJ5BrjLuGfK/UJu6uwHxJ/di7sanqmUmxzmyIcd3vz58PMR7wpi8k3iWq2Q11KMYgZbUpRoIPw== +"@typescript-eslint/parser@^4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.12.0.tgz#e1cf30436e4f916c31fcc962158917bd9e9d460a" + integrity sha512-9XxVADAo9vlfjfoxnjboBTxYOiNY93/QuvcPgsiKvHxW6tOZx1W4TvkIQ2jB3k5M0pbFP5FlXihLK49TjZXhuQ== dependencies: - "@typescript-eslint/scope-manager" "4.11.1" - "@typescript-eslint/types" "4.11.1" - "@typescript-eslint/typescript-estree" "4.11.1" + "@typescript-eslint/scope-manager" "4.12.0" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/typescript-estree" "4.12.0" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.11.1": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.11.1.tgz#72dc2b60b0029ab0888479b12bf83034920b4b69" - integrity sha512-Al2P394dx+kXCl61fhrrZ1FTI7qsRDIUiVSuN6rTwss6lUn8uVO2+nnF4AvO0ug8vMsy3ShkbxLu/uWZdTtJMQ== +"@typescript-eslint/scope-manager@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.12.0.tgz#beeb8beca895a07b10c593185a5612f1085ef279" + integrity sha512-QVf9oCSVLte/8jvOsxmgBdOaoe2J0wtEmBr13Yz0rkBNkl5D8bfnf6G4Vhox9qqMIoG7QQoVwd2eG9DM/ge4Qg== dependencies: - "@typescript-eslint/types" "4.11.1" - "@typescript-eslint/visitor-keys" "4.11.1" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/visitor-keys" "4.12.0" -"@typescript-eslint/types@4.11.1": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.11.1.tgz#3ba30c965963ef9f8ced5a29938dd0c465bd3e05" - integrity sha512-5kvd38wZpqGY4yP/6W3qhYX6Hz0NwUbijVsX2rxczpY6OXaMxh0+5E5uLJKVFwaBM7PJe1wnMym85NfKYIh6CA== +"@typescript-eslint/types@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.12.0.tgz#fb891fe7ccc9ea8b2bbd2780e36da45d0dc055e5" + integrity sha512-N2RhGeheVLGtyy+CxRmxdsniB7sMSCfsnbh8K/+RUIXYYq3Ub5+sukRCjVE80QerrUBvuEvs4fDhz5AW/pcL6g== -"@typescript-eslint/typescript-estree@4.11.1": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.11.1.tgz#a4416b4a65872a48773b9e47afabdf7519eb10bc" - integrity sha512-tC7MKZIMRTYxQhrVAFoJq/DlRwv1bnqA4/S2r3+HuHibqvbrPcyf858lNzU7bFmy4mLeIHFYr34ar/1KumwyRw== +"@typescript-eslint/typescript-estree@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.12.0.tgz#3963418c850f564bdab3882ae23795d115d6d32e" + integrity sha512-gZkFcmmp/CnzqD2RKMich2/FjBTsYopjiwJCroxqHZIY11IIoN0l5lKqcgoAPKHt33H2mAkSfvzj8i44Jm7F4w== dependencies: - "@typescript-eslint/types" "4.11.1" - "@typescript-eslint/visitor-keys" "4.11.1" + "@typescript-eslint/types" "4.12.0" + "@typescript-eslint/visitor-keys" "4.12.0" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" @@ -2585,12 +2585,12 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.11.1": - version "4.11.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.11.1.tgz#4c050a4c1f7239786e2dd4e69691436143024e05" - integrity sha512-IrlBhD9bm4bdYcS8xpWarazkKXlE7iYb1HzRuyBP114mIaj5DJPo11Us1HgH60dTt41TCZXMaTCAW+OILIYPOg== +"@typescript-eslint/visitor-keys@4.12.0": + version "4.12.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.12.0.tgz#a470a79be6958075fa91c725371a83baf428a67a" + integrity sha512-hVpsLARbDh4B9TKYz5cLbcdMIOAoBYgFPCSP9FFS/liSF+b33gVNq8JHY3QGhHNVz85hObvL7BEYLlgx553WCw== dependencies: - "@typescript-eslint/types" "4.11.1" + "@typescript-eslint/types" "4.12.0" eslint-visitor-keys "^2.0.0" "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": @@ -4145,7 +4145,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -5104,10 +5104,10 @@ cyclist@^1.0.1: resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= -cypress@^6.1.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.2.0.tgz#1a8a7dd5bd08db3064551a9f12072963cc9337bf" - integrity sha512-m/rkcogYM9MTy8rbsZgyS5wT2L/J+B5V2bY2ztkDNMyqhk/oZgUF4KTWVLzkW2I+scg0iAddca95tLlt7XnAtw== +cypress@^6.2.1: + version "6.2.1" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-6.2.1.tgz#27d5fbcf008c698c390fdb0c03441804176d06c4" + integrity sha512-OYkSgzA4J4Q7eMjZvNf5qWpBLR4RXrkqjL3UZ1UzGGLAskO0nFTi/RomNTG6TKvL3Zp4tw4zFY1gp5MtmkCZrA== dependencies: "@cypress/listr-verbose-renderer" "^0.4.1" "@cypress/request" "^2.88.5" @@ -6216,10 +6216,10 @@ eslint-plugin-import@^2.22.1: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-vue@^7.3.0: - version "7.4.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.0.tgz#27324cbe8f00705708c9fa9e8c0401d8f0742c20" - integrity sha512-bYJV3nHSGV5IL40Ti1231vlY8I2DzjDHYyDjRv9Z1koEI7qyV2RR3+uKMafHdOioXYH9W3e1+iwe4wy7FIBNCQ== +eslint-plugin-vue@^7.4.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-7.4.1.tgz#2526ef0c010c218824a89423dbe6ddbe76f04fd6" + integrity sha512-W/xPNHYIkGJphLUM2UIYYGKbRw3BcDoMIPY9lu1TTa2YLiZoxurddfnmOP+UOVywxb5vi438ejzwvKdZqydtIw== dependencies: eslint-utils "^2.1.0" natural-compare "^1.4.0" @@ -9163,13 +9163,20 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lib0@^0.2.12, lib0@^0.2.28, lib0@^0.2.31, lib0@^0.2.33, lib0@^0.2.34: +lib0@^0.2.28, lib0@^0.2.31, lib0@^0.2.33, lib0@^0.2.34: version "0.2.34" resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.34.tgz#c4479f5f2083894687fcfa9d0b9d9935e35ea008" integrity sha512-cqsVIMPgFlDtgQcpkt7HOY6W3sbYPIe3qxMnbRSwHTgiQancgm+TRDPx28mC6GUZ6lG6Nr0bIWf4Nog6dWUNUg== dependencies: isomorphic.js "^0.1.3" +lib0@^0.2.35: + version "0.2.35" + resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.35.tgz#1d62adb3feefce70c84f3eb664c5e50286de41ca" + integrity sha512-drVD3EscB3TIxiFzceuZg7oF5Z6I8a0KX+7FowNcAXOEsTej/hlHB+ElJ8Pa/Ge73Gy3fklSJtPxpNd2PajdWg== + dependencies: + isomorphic.js "^0.1.3" + lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -12790,10 +12797,10 @@ rollup-pluginutils@^2.8.2: dependencies: estree-walker "^0.6.1" -rollup@^2.35.1: - version "2.35.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.35.1.tgz#e6bc8d10893556a638066f89e8c97f422d03968c" - integrity sha512-q5KxEyWpprAIcainhVy6HfRttD9kutQpHbeqDTWnqAFNJotiojetK6uqmcydNMymBEtC4I8bCYR+J3mTMqeaUA== +rollup@^2.36.0: + version "2.36.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.36.0.tgz#af2cdea36f70fa3de586840c2604882dfb4d0aac" + integrity sha512-L38QyQK77bkJy9nPyeydnHFK6xMofqumh4scTV2d4RG4EFq6pGdxnn67dVHFUDJ9J0PSEQx8zn1FiVS5TydsKg== optionalDependencies: fsevents "~2.1.2" @@ -12989,7 +12996,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2: +semver@^7.2.1, semver@^7.3.2, semver@^7.3.4: version "7.3.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== @@ -14275,16 +14282,16 @@ trough@^1.0.0: dependencies: glob "^7.1.2" -ts-loader@^8.0.11: - version "8.0.13" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.13.tgz#2bebeb833570ca46bb9338322a9a29900e988535" - integrity sha512-1o1nO6aqouA23d2nlcMSEyPMAWRhnYUU0EQUJSc60E0TUyBNX792RHFYUN1ZM29vhMUNayrsbj2UVdZwKhXCDA== +ts-loader@^8.0.14: + version "8.0.14" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.14.tgz#e46ac1f8dcb88808d0b1335d2eae65b74bd78fe8" + integrity sha512-Jt/hHlUnApOZjnSjTmZ+AbD5BGlQFx3f1D0nYuNKwz0JJnuDGHJas6az+FlWKwwRTu+26GXpv249A8UAnYUpqA== dependencies: - chalk "^2.3.0" + chalk "^4.1.0" enhanced-resolve "^4.0.0" - loader-utils "^1.0.2" + loader-utils "^2.0.0" micromatch "^4.0.0" - semver "^6.0.0" + semver "^7.3.4" tsconfig-paths@^3.9.0: version "3.9.0" @@ -14387,10 +14394,10 @@ typedoc-default-themes@0.12.0: resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.12.0.tgz#42451948e55a148c1350eb2aa68829be5c2b06b3" integrity sha512-0hHBxwmfxE0rkIslOiO39fJyYwaScQEhUIxcpqx3uS1BL3zhFW5oQfUaPx2cv2XLL/GXhYFxhdFLoVmNptbxEQ== -typedoc@^0.20.10: - version "0.20.10" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.20.10.tgz#013eac8ece7b7f6201a06a83d4ddf3d93e89d7f9" - integrity sha512-1Bqbmf/1pwRiUkd1j1tvL7GIlBOFANFcjC+W5cZ02R0CKgUN+fIIl2Z2OhuaM7MVytKq6snF1KYVIwBvplO37g== +typedoc@^0.20.13: + version "0.20.13" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.20.13.tgz#9d56df76d0b421a71a33336dc64b1a466dc8f2fd" + integrity sha512-SJVFn6NJd5bWJHMPgEkDUrKIEfMbja6ftIJv/tgd0xQZp5cWxGTdEnmRr56+egIQZkAJFB39eDvmNV4Lqqy4Gw== dependencies: colors "^1.4.0" fs-extra "^9.0.1" @@ -15396,12 +15403,12 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -y-indexeddb@^9.0.5: - version "9.0.5" - resolved "https://registry.yarnpkg.com/y-indexeddb/-/y-indexeddb-9.0.5.tgz#a162526add738a456b7185a6a5626534609ee132" - integrity sha512-40VxkqPoK2VxE1vMosS5MfwlHQOvaeLEN89dIkjh7URjZny6bDQOl4yKldaDv9ZosZgYEPyWuWTF3Z92RZ1y+A== +y-indexeddb@^9.0.6: + version "9.0.6" + resolved "https://registry.yarnpkg.com/y-indexeddb/-/y-indexeddb-9.0.6.tgz#49aecac11bc229571fb134e0ec0717c0330b731f" + integrity sha512-8mdCYdzZDWS2lGiB9Reaz67ZqvnV6EXH/F7L+TmBC+3mWjIBrPw4UcI79nOhEOh+y9lHXzNpSda4YJ06M13F1A== dependencies: - lib0 "^0.2.12" + lib0 "^0.2.35" y-leveldb@^0.1.0: version "0.1.0" From 5e29cc1481b6ac137d784d7234aef3a293635f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 6 Jan 2021 13:02:30 +0100 Subject: [PATCH 17/51] add more core commands --- docs/src/docPages/api/commands.md | 25 +++++++---- .../core/src/commands/createParagraphNear.ts | 9 ++++ packages/core/src/commands/exitCode.ts | 9 ++++ packages/core/src/commands/joinBackward.ts | 9 ++++ packages/core/src/commands/joinForward.ts | 9 ++++ packages/core/src/commands/liftEmptyBlock.ts | 9 ++++ packages/core/src/commands/newlineInCode.ts | 9 ++++ .../core/src/commands/selectNodeBackward.ts | 9 ++++ .../core/src/commands/selectNodeForward.ts | 9 ++++ packages/core/src/commands/undoInputRule.ts | 9 ++++ packages/core/src/extensions/commands.ts | 22 +++++++++- packages/core/src/extensions/keymap.ts | 42 +++++++------------ 12 files changed, 134 insertions(+), 36 deletions(-) create mode 100644 packages/core/src/commands/createParagraphNear.ts create mode 100644 packages/core/src/commands/exitCode.ts create mode 100644 packages/core/src/commands/joinBackward.ts create mode 100644 packages/core/src/commands/joinForward.ts create mode 100644 packages/core/src/commands/liftEmptyBlock.ts create mode 100644 packages/core/src/commands/newlineInCode.ts create mode 100644 packages/core/src/commands/selectNodeBackward.ts create mode 100644 packages/core/src/commands/selectNodeForward.ts create mode 100644 packages/core/src/commands/undoInputRule.ts diff --git a/docs/src/docPages/api/commands.md b/docs/src/docPages/api/commands.md index ca02b800..9f4a1a51 100644 --- a/docs/src/docPages/api/commands.md +++ b/docs/src/docPages/api/commands.md @@ -107,7 +107,14 @@ Have a look at all of the core commands listed below. They should give you a goo | Command | Description | | ----------------------- | --------------------------------------------------------- | | .clearNodes() | Normalize nodes to a simple paragraph. | +| .createParagraphNear() | Create a paragraph nearby. | +| .exitCode() | Exit from a code block. | | .extendMarkRange() | Extends the text selection to the current mark. | +| .joinBackward() | Join two nodes backward. | +| .joinForward() | Join two nodes forward. | +| .lift() | Removes an existing wrap. | +| .liftEmptyBlock() | Lift block if empty. | +| .newlineInCode() | Add a newline character in code. | | .resetNodeAttributes() | Resets all node attributes to the default value. | | .selectParentNode() | Select the parent node. | | .setMark() | Add a mark with new attributes. | @@ -116,6 +123,7 @@ Have a look at all of the core commands listed below. They should give you a goo | .toggleMark() | Toggle a mark on and off. | | .toggleNode() | Toggle a node with another node. | | .toggleWrap() | Wraps nodes in another node, or removes an existing wrap. | +| .undoInputRule() | Undo an input rule. | | .unsetAllMarks() | Remove all marks in the current selection. | | .unsetMark() | Remove a mark in the current selection. | | .updateNodeAttributes() | Update attributes of a node. | @@ -130,13 +138,16 @@ Have a look at all of the core commands listed below. They should give you a goo | .wrapInList() | Wrap a node in a list. | ### Selection -| Command | Description | -| ------------------ | --------------------------------------- | -| .blur() | Removes focus from the editor. | -| .deleteSelection() | Delete the selection, if there is one. | -| .focus() | Focus the editor at the given position. | -| .scrollIntoView() | Scroll the selection into view. | -| .selectAll() | Select the whole document. | +| Command | Description | +| --------------------- | --------------------------------------- | +| .blur() | Removes focus from the editor. | +| .deleteSelection() | Delete the selection, if there is one. | +| .focus() | Focus the editor at the given position. | +| .scrollIntoView() | Scroll the selection into view. | +| .selectAll() | Select the whole document. | +| .selectNodeBackward() | Select a node backward. | +| .selectNodeForward() | Select a node forward. | +| .selectParentNode() | Select the parent node. | ## Add your own commands All extensions can add additional commands (and most do), check out the specific [documentation for the provided nodes](/api/nodes), [marks](/api/marks), and [extensions](/api/extensions) to learn more about those. diff --git a/packages/core/src/commands/createParagraphNear.ts b/packages/core/src/commands/createParagraphNear.ts new file mode 100644 index 00000000..f37269b7 --- /dev/null +++ b/packages/core/src/commands/createParagraphNear.ts @@ -0,0 +1,9 @@ +import { createParagraphNear as originalCreateParagraphNear } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Create a paragraph nearby. + */ +export const createParagraphNear = (): Command => ({ state, dispatch }) => { + return originalCreateParagraphNear(state, dispatch) +} diff --git a/packages/core/src/commands/exitCode.ts b/packages/core/src/commands/exitCode.ts new file mode 100644 index 00000000..e1845757 --- /dev/null +++ b/packages/core/src/commands/exitCode.ts @@ -0,0 +1,9 @@ +import { exitCode as originalExitCode } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Exit from a code block. + */ +export const exitCode = (): Command => ({ state, dispatch }) => { + return originalExitCode(state, dispatch) +} diff --git a/packages/core/src/commands/joinBackward.ts b/packages/core/src/commands/joinBackward.ts new file mode 100644 index 00000000..5ab6d46d --- /dev/null +++ b/packages/core/src/commands/joinBackward.ts @@ -0,0 +1,9 @@ +import { joinBackward as originalJoinBackward } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Join two nodes backward. + */ +export const joinBackward = (): Command => ({ state, dispatch }) => { + return originalJoinBackward(state, dispatch) +} diff --git a/packages/core/src/commands/joinForward.ts b/packages/core/src/commands/joinForward.ts new file mode 100644 index 00000000..c964e332 --- /dev/null +++ b/packages/core/src/commands/joinForward.ts @@ -0,0 +1,9 @@ +import { joinForward as originalJoinForward } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Join two nodes forward. + */ +export const joinForward = (): Command => ({ state, dispatch }) => { + return originalJoinForward(state, dispatch) +} diff --git a/packages/core/src/commands/liftEmptyBlock.ts b/packages/core/src/commands/liftEmptyBlock.ts new file mode 100644 index 00000000..9b9337b5 --- /dev/null +++ b/packages/core/src/commands/liftEmptyBlock.ts @@ -0,0 +1,9 @@ +import { liftEmptyBlock as originalLiftEmptyBlock } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Lift block if empty. + */ +export const liftEmptyBlock = (): Command => ({ state, dispatch }) => { + return originalLiftEmptyBlock(state, dispatch) +} diff --git a/packages/core/src/commands/newlineInCode.ts b/packages/core/src/commands/newlineInCode.ts new file mode 100644 index 00000000..63343750 --- /dev/null +++ b/packages/core/src/commands/newlineInCode.ts @@ -0,0 +1,9 @@ +import { newlineInCode as originalNewlineInCode } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Add a newline character in code. + */ +export const newlineInCode = (): Command => ({ state, dispatch }) => { + return originalNewlineInCode(state, dispatch) +} diff --git a/packages/core/src/commands/selectNodeBackward.ts b/packages/core/src/commands/selectNodeBackward.ts new file mode 100644 index 00000000..d785dbf3 --- /dev/null +++ b/packages/core/src/commands/selectNodeBackward.ts @@ -0,0 +1,9 @@ +import { selectNodeBackward as originalSelectNodeBackward } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Select a node backward. + */ +export const selectNodeBackward = (): Command => ({ state, dispatch }) => { + return originalSelectNodeBackward(state, dispatch) +} diff --git a/packages/core/src/commands/selectNodeForward.ts b/packages/core/src/commands/selectNodeForward.ts new file mode 100644 index 00000000..a1ac7225 --- /dev/null +++ b/packages/core/src/commands/selectNodeForward.ts @@ -0,0 +1,9 @@ +import { selectNodeForward as originalSelectNodeForward } from 'prosemirror-commands' +import { Command } from '../types' + +/** + * Select a node forward. + */ +export const selectNodeForward = (): Command => ({ state, dispatch }) => { + return originalSelectNodeForward(state, dispatch) +} diff --git a/packages/core/src/commands/undoInputRule.ts b/packages/core/src/commands/undoInputRule.ts new file mode 100644 index 00000000..12acb4ae --- /dev/null +++ b/packages/core/src/commands/undoInputRule.ts @@ -0,0 +1,9 @@ +import { undoInputRule as originalUndoInputRule } from 'prosemirror-inputrules' +import { Command } from '../types' + +/** + * Undo an input rule. + */ +export const undoInputRule = (): Command => ({ state, dispatch }) => { + return originalUndoInputRule(state, dispatch) +} diff --git a/packages/core/src/extensions/commands.ts b/packages/core/src/extensions/commands.ts index 15ca07fd..a17a13ca 100644 --- a/packages/core/src/extensions/commands.ts +++ b/packages/core/src/extensions/commands.ts @@ -1,19 +1,27 @@ import { Extension } from '../Extension' import * as blur from '../commands/blur' import * as clearContent from '../commands/clearContent' -import * as command from '../commands/command' import * as clearNodes from '../commands/clearNodes' +import * as command from '../commands/command' +import * as createParagraphNear from '../commands/createParagraphNear' import * as deleteSelection from '../commands/deleteSelection' +import * as exitCode from '../commands/exitCode' import * as extendMarkRange from '../commands/extendMarkRange' import * as first from '../commands/first' import * as focus from '../commands/focus' import * as insertHTML from '../commands/insertHTML' import * as insertText from '../commands/insertText' +import * as joinBackward from '../commands/joinBackward' +import * as joinForward from '../commands/joinForward' import * as lift from '../commands/lift' +import * as liftEmptyBlock from '../commands/liftEmptyBlock' import * as liftListItem from '../commands/liftListItem' +import * as newlineInCode from '../commands/newlineInCode' import * as resetNodeAttributes from '../commands/resetNodeAttributes' import * as scrollIntoView from '../commands/scrollIntoView' import * as selectAll from '../commands/selectAll' +import * as selectNodeBackward from '../commands/selectNodeBackward' +import * as selectNodeForward from '../commands/selectNodeForward' import * as selectParentNode from '../commands/selectParentNode' import * as setContent from '../commands/setContent' import * as setMark from '../commands/setMark' @@ -25,6 +33,7 @@ import * as toggleList from '../commands/toggleList' import * as toggleMark from '../commands/toggleMark' import * as toggleNode from '../commands/toggleNode' import * as toggleWrap from '../commands/toggleWrap' +import * as undoInputRule from '../commands/undoInputRule' import * as unsetAllMarks from '../commands/unsetAllMarks' import * as unsetMark from '../commands/unsetMark' import * as updateNodeAttributes from '../commands/updateNodeAttributes' @@ -40,17 +49,25 @@ export const Commands = Extension.create({ ...clearContent, ...clearNodes, ...command, + ...createParagraphNear, ...deleteSelection, + ...exitCode, ...extendMarkRange, ...first, ...focus, ...insertHTML, ...insertText, + ...joinBackward, + ...joinForward, ...lift, + ...liftEmptyBlock, ...liftListItem, + ...newlineInCode, ...resetNodeAttributes, ...scrollIntoView, ...selectAll, + ...selectNodeBackward, + ...selectNodeForward, ...selectParentNode, ...setContent, ...setMark, @@ -62,8 +79,9 @@ export const Commands = Extension.create({ ...toggleMark, ...toggleNode, ...toggleWrap, - ...unsetMark, + ...undoInputRule, ...unsetAllMarks, + ...unsetMark, ...updateNodeAttributes, ...wrapIn, ...wrapInList, diff --git a/packages/core/src/extensions/keymap.ts b/packages/core/src/extensions/keymap.ts index 330f9a44..388c3e17 100644 --- a/packages/core/src/extensions/keymap.ts +++ b/packages/core/src/extensions/keymap.ts @@ -1,48 +1,36 @@ -import { - newlineInCode, - createParagraphNear, - liftEmptyBlock, - exitCode, - deleteSelection, - joinForward, - joinBackward, - selectNodeForward, - selectNodeBackward, -} from 'prosemirror-commands' -import { undoInputRule } from 'prosemirror-inputrules' import { Extension } from '../Extension' export const Keymap = Extension.create({ name: 'keymap', addKeyboardShortcuts() { - const handleBackspace = () => this.editor.commands.first(({ state, dispatch }) => [ - () => undoInputRule(state, dispatch), - () => deleteSelection(state, dispatch), - () => joinBackward(state, dispatch), - () => selectNodeBackward(state, dispatch), + const handleBackspace = () => this.editor.commands.first(({ commands }) => [ + () => commands.undoInputRule(), + () => commands.deleteSelection(), + () => commands.joinBackward(), + () => commands.selectNodeBackward(), ]) - const handleDelete = () => this.editor.commands.first(({ state, dispatch }) => [ - () => deleteSelection(state, dispatch), - () => joinForward(state, dispatch), - () => selectNodeForward(state, dispatch), + const handleDelete = () => this.editor.commands.first(({ commands }) => [ + () => commands.deleteSelection(), + () => commands.joinForward(), + () => commands.selectNodeForward(), ]) return { - Enter: () => this.editor.commands.first(({ commands, state, dispatch }) => [ - () => newlineInCode(state, dispatch), - () => createParagraphNear(state, dispatch), - () => liftEmptyBlock(state, dispatch), + Enter: () => this.editor.commands.first(({ commands }) => [ + () => commands.newlineInCode(), + () => commands.createParagraphNear(), + () => commands.liftEmptyBlock(), () => commands.splitBlock(), ]), - 'Mod-Enter': exitCode, + 'Mod-Enter': () => this.editor.commands.exitCode(), Backspace: () => handleBackspace(), 'Mod-Backspace': () => handleBackspace(), Delete: () => handleDelete(), 'Mod-Delete': () => handleDelete(), // we don’t need a custom `selectAll` for now - // 'Mod-a': () => this.editor.selectAll(), + // 'Mod-a': () => this.editor.commands.selectAll(), } }, }) From 43dc14b9fca194ad52b2421b628fe665845a13dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 6 Jan 2021 13:33:11 +0100 Subject: [PATCH 18/51] improve textAlign behavior within lists, see #72 --- packages/extension-text-align/src/text-align.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/extension-text-align/src/text-align.ts b/packages/extension-text-align/src/text-align.ts index 9387814d..7d766eba 100644 --- a/packages/extension-text-align/src/text-align.ts +++ b/packages/extension-text-align/src/text-align.ts @@ -59,10 +59,14 @@ export const TextAlign = Extension.create({ return { // TODO: re-use only 'textAlign' attribute // TODO: use custom splitBlock only for `this.options.types` - // TODO: use complete default enter handler (chainCommand) with custom splitBlock - Enter: () => this.editor.commands.splitBlock({ - withAttributes: true, - }), + Enter: () => this.editor.commands.first(({ commands }) => [ + () => commands.newlineInCode(), + () => commands.createParagraphNear(), + () => commands.liftEmptyBlock(), + () => commands.splitBlock({ + withAttributes: true, + }), + ]), 'Mod-Shift-l': () => this.editor.commands.setTextAlign('left'), 'Mod-Shift-e': () => this.editor.commands.setTextAlign('center'), 'Mod-Shift-r': () => this.editor.commands.setTextAlign('right'), From f0617771119effea972848c8a64693fc93a020d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 6 Jan 2021 13:46:52 +0100 Subject: [PATCH 19/51] Publish - @tiptap/core@2.0.0-alpha.10 - @tiptap/extension-text-align@2.0.0-alpha.6 - @tiptap/html@2.0.0-alpha.6 - @tiptap/vue-starter-kit@2.0.0-alpha.9 - @tiptap/vue@2.0.0-alpha.6 --- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/extension-text-align/CHANGELOG.md | 8 ++++++++ packages/extension-text-align/package.json | 2 +- packages/html/CHANGELOG.md | 8 ++++++++ packages/html/package.json | 4 ++-- packages/vue-starter-kit/CHANGELOG.md | 8 ++++++++ packages/vue-starter-kit/package.json | 4 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 2 +- 10 files changed, 47 insertions(+), 7 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 1922157e..1cd51082 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-alpha.10](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-alpha.9...@tiptap/core@2.0.0-alpha.10) (2021-01-06) + +**Note:** Version bump only for package @tiptap/core + + + + + # [2.0.0-alpha.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-alpha.8...@tiptap/core@2.0.0-alpha.9) (2020-12-18) **Note:** Version bump only for package @tiptap/core diff --git a/packages/core/package.json b/packages/core/package.json index 92ca32c9..ccd51895 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/core", "description": "headless rich text editor", - "version": "2.0.0-alpha.9", + "version": "2.0.0-alpha.10", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-text-align/CHANGELOG.md b/packages/extension-text-align/CHANGELOG.md index ad885a16..8c6613ba 100644 --- a/packages/extension-text-align/CHANGELOG.md +++ b/packages/extension-text-align/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-alpha.6](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-text-align@2.0.0-alpha.5...@tiptap/extension-text-align@2.0.0-alpha.6) (2021-01-06) + +**Note:** Version bump only for package @tiptap/extension-text-align + + + + + # [2.0.0-alpha.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-text-align@2.0.0-alpha.4...@tiptap/extension-text-align@2.0.0-alpha.5) (2020-12-18) **Note:** Version bump only for package @tiptap/extension-text-align diff --git a/packages/extension-text-align/package.json b/packages/extension-text-align/package.json index 6115caae..0f2dc2f3 100644 --- a/packages/extension-text-align/package.json +++ b/packages/extension-text-align/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-text-align", "description": "text align extension for tiptap", - "version": "2.0.0-alpha.5", + "version": "2.0.0-alpha.6", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/html/CHANGELOG.md b/packages/html/CHANGELOG.md index e5a158e0..82b6cfe6 100644 --- a/packages/html/CHANGELOG.md +++ b/packages/html/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-alpha.6](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-alpha.5...@tiptap/html@2.0.0-alpha.6) (2021-01-06) + +**Note:** Version bump only for package @tiptap/html + + + + + # [2.0.0-alpha.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-alpha.4...@tiptap/html@2.0.0-alpha.5) (2020-12-18) **Note:** Version bump only for package @tiptap/html diff --git a/packages/html/package.json b/packages/html/package.json index 1f6ae635..e37ec5e1 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/html", "description": "utility package to render tiptap JSON as HTML", - "version": "2.0.0-alpha.5", + "version": "2.0.0-alpha.6", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-alpha.9", + "@tiptap/core": "^2.0.0-alpha.10", "hostic-dom": "^0.8.6", "prosemirror-model": "^1.12.0" } diff --git a/packages/vue-starter-kit/CHANGELOG.md b/packages/vue-starter-kit/CHANGELOG.md index f3bbcedc..53f466e3 100644 --- a/packages/vue-starter-kit/CHANGELOG.md +++ b/packages/vue-starter-kit/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-alpha.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.8...@tiptap/vue-starter-kit@2.0.0-alpha.9) (2021-01-06) + +**Note:** Version bump only for package @tiptap/vue-starter-kit + + + + + # [2.0.0-alpha.8](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.7...@tiptap/vue-starter-kit@2.0.0-alpha.8) (2020-12-18) **Note:** Version bump only for package @tiptap/vue-starter-kit diff --git a/packages/vue-starter-kit/package.json b/packages/vue-starter-kit/package.json index 387d0a4e..d47dda7e 100644 --- a/packages/vue-starter-kit/package.json +++ b/packages/vue-starter-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue-starter-kit", "description": "Vue starter kit for tiptap", - "version": "2.0.0-alpha.8", + "version": "2.0.0-alpha.9", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -23,6 +23,6 @@ ], "dependencies": { "@tiptap/starter-kit": "^2.0.0-alpha.7", - "@tiptap/vue": "^2.0.0-alpha.5" + "@tiptap/vue": "^2.0.0-alpha.6" } } diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index 0fef8052..dc5fa2bc 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-alpha.6](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.5...@tiptap/vue@2.0.0-alpha.6) (2021-01-06) + +**Note:** Version bump only for package @tiptap/vue + + + + + # [2.0.0-alpha.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.4...@tiptap/vue@2.0.0-alpha.5) (2020-12-18) **Note:** Version bump only for package @tiptap/vue diff --git a/packages/vue/package.json b/packages/vue/package.json index 573308db..95df6712 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue", "description": "Vue components for tiptap", - "version": "2.0.0-alpha.5", + "version": "2.0.0-alpha.6", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", From d3729e97cf53b3c39c6276b2e18187d32538551f Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Thu, 7 Jan 2021 02:07:16 +0100 Subject: [PATCH 20/51] fix path to icons --- docs/src/demos/Examples/CollaborativeEditing/MenuItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/demos/Examples/CollaborativeEditing/MenuItem.vue b/docs/src/demos/Examples/CollaborativeEditing/MenuItem.vue index 672a6e91..fd29940b 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/MenuItem.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/MenuItem.vue @@ -6,7 +6,7 @@ :title="title" > - + From a1edb3c98da24782faf242ef3c4f98f88cfb7f38 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Thu, 7 Jan 2021 02:07:24 +0100 Subject: [PATCH 21/51] docs: make the book example a draft --- docs/src/links.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/src/links.yaml b/docs/src/links.yaml index 44c3b57d..865d3f90 100644 --- a/docs/src/links.yaml +++ b/docs/src/links.yaml @@ -28,6 +28,7 @@ link: /examples/todo-app - title: Write a book link: /examples/book + draft: true - title: For minimalists link: /examples/minimalist - title: Drawing From 45fccfeea4f398a11a2982c58980cb486a8884e1 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 00:16:15 +0100 Subject: [PATCH 22/51] simplify monthly reports --- docs/src/docPages/reports.md | 12 ++++++++++++ docs/src/docPages/updates/2020-08.md | 6 ------ docs/src/docPages/updates/2020-09.md | 5 ----- docs/src/docPages/updates/2020-10.md | 6 ------ docs/src/docPages/updates/2020-11.md | 5 ----- docs/src/links.yaml | 14 ++------------ 6 files changed, 14 insertions(+), 34 deletions(-) create mode 100644 docs/src/docPages/reports.md delete mode 100644 docs/src/docPages/updates/2020-08.md delete mode 100644 docs/src/docPages/updates/2020-09.md delete mode 100644 docs/src/docPages/updates/2020-10.md delete mode 100644 docs/src/docPages/updates/2020-11.md diff --git a/docs/src/docPages/reports.md b/docs/src/docPages/reports.md new file mode 100644 index 00000000..92151a90 --- /dev/null +++ b/docs/src/docPages/reports.md @@ -0,0 +1,12 @@ +# Monthly reports + +| Month | Tasks | Sponsors | Funding | Worked | +| --------- | ---------------------------------------------------------------------- | -------- | ------- | ------------- | +| 01/2021 | Maintenance tiptap v1, … | … | … | … | +| 12/2020 | Invited all sponsors, gathered feedback | 60 | $1,035 | 60 h | +| 11/2020 | Wrote documentation, improved collaborative editing, advanced examples | 31 | $468 | 188 h | +| 10/2020 | Rewrote extensions for tiptap 2 | 25 | $423 | 102 h | +| 09/2020 | Developed the new API, wrote documentation | | | 125 h | +| 08/2020 | Set up tiptap 2 | | | 56 h | +| **Total** | | | | **531 h** | + diff --git a/docs/src/docPages/updates/2020-08.md b/docs/src/docPages/updates/2020-08.md deleted file mode 100644 index 6e6fa277..00000000 --- a/docs/src/docPages/updates/2020-08.md +++ /dev/null @@ -1,6 +0,0 @@ -# August 2020 -* Setting up tiptap 2 -* 56 hours, $3,920 development costs (at $70/hour) -* Sponsored @calebporzio with $99 -* **Total -$4,019** - diff --git a/docs/src/docPages/updates/2020-09.md b/docs/src/docPages/updates/2020-09.md deleted file mode 100644 index 86c06114..00000000 --- a/docs/src/docPages/updates/2020-09.md +++ /dev/null @@ -1,5 +0,0 @@ -# September 2020 -* Developing the API of tiptap 2, writing the documentation -* 125 hours, $8,750 development costs (at $70/hour) -* Sponsored @calebporzio with $99 -* **Total -$8,849** diff --git a/docs/src/docPages/updates/2020-10.md b/docs/src/docPages/updates/2020-10.md deleted file mode 100644 index 5eeb8f2e..00000000 --- a/docs/src/docPages/updates/2020-10.md +++ /dev/null @@ -1,6 +0,0 @@ -# October 2020 -* Writing extensions for tiptap 2 -* 25 sponsors, $423/month -* 102 hours, $7,140 development costs (at $70/hour) -* Sponsored @calebporzio with $99 -* **Total -$6,816** diff --git a/docs/src/docPages/updates/2020-11.md b/docs/src/docPages/updates/2020-11.md deleted file mode 100644 index efed6752..00000000 --- a/docs/src/docPages/updates/2020-11.md +++ /dev/null @@ -1,5 +0,0 @@ -# November 2020 -* Wrote the documentation, improved the collaborative editing experience, built advanced examples -* 31 sponsors, $468/month -* 188 hours, $13,160 development costs (at $70/hour) -* Sponsored @calebporzio with $99 diff --git a/docs/src/links.yaml b/docs/src/links.yaml index 865d3f90..72755b6f 100644 --- a/docs/src/links.yaml +++ b/docs/src/links.yaml @@ -171,20 +171,10 @@ - title: Sponsoring items: - - title: Monthly reports - link: /updates - redirect: /updates/2020-11 - items: - - title: November 2020 - link: /updates/2020-11 - - title: October 2020 - link: /updates/2020-10 - - title: September 2020 - link: /updates/2020-09 - - title: August 2020 - link: /updates/2020-08 - title: Become a sponsor link: /sponsor + - title: Monthly reports + link: /reports - title: Links items: From 6c20e92f7ec158b3efe21354d39c3e46c0be2b9a Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 00:21:07 +0100 Subject: [PATCH 23/51] add a notice to WIP extensions --- docs/src/docPages/api/extensions/suggestion.md | 4 ++++ docs/src/docPages/api/nodes/table-cell.md | 7 ++++++- docs/src/docPages/api/nodes/table-row.md | 6 +++++- docs/src/docPages/api/nodes/table.md | 6 +++++- docs/src/links.yaml | 4 ---- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/docs/src/docPages/api/extensions/suggestion.md b/docs/src/docPages/api/extensions/suggestion.md index 5428c0be..c8c92987 100644 --- a/docs/src/docPages/api/extensions/suggestion.md +++ b/docs/src/docPages/api/extensions/suggestion.md @@ -1,5 +1,9 @@ # Suggestion +:::pro Fund the development 💖 +We need your support to maintain, update, support and develop tiptap 2. If you’re waiting for this extension, [become a sponsor and fund the open-source](/sponsor). +::: + TODO - mentions (as text or as/with user ID) diff --git a/docs/src/docPages/api/nodes/table-cell.md b/docs/src/docPages/api/nodes/table-cell.md index 7aca16bf..17ee77ed 100644 --- a/docs/src/docPages/api/nodes/table-cell.md +++ b/docs/src/docPages/api/nodes/table-cell.md @@ -1,3 +1,8 @@ # TableCell - TODO +:::pro Fund the development 💖 +We need your support to maintain, update, support and develop tiptap 2. If you’re waiting for this extension, [become a sponsor and fund the open-source](/sponsor). +::: + +TODO + diff --git a/docs/src/docPages/api/nodes/table-row.md b/docs/src/docPages/api/nodes/table-row.md index e234309f..cb997243 100644 --- a/docs/src/docPages/api/nodes/table-row.md +++ b/docs/src/docPages/api/nodes/table-row.md @@ -1,3 +1,7 @@ # TableRow - TODO +:::pro Fund the development 💖 +We need your support to maintain, update, support and develop tiptap 2. If you’re waiting for this extension, [become a sponsor and fund the open-source](/sponsor). +::: + +TODO diff --git a/docs/src/docPages/api/nodes/table.md b/docs/src/docPages/api/nodes/table.md index e29c9d18..5e874697 100644 --- a/docs/src/docPages/api/nodes/table.md +++ b/docs/src/docPages/api/nodes/table.md @@ -1,3 +1,7 @@ # Table - TODO +:::pro Fund the development 💖 +We need your support to maintain, update, support and develop tiptap 2. If you’re waiting for this extension, [become a sponsor and fund the open-source](/sponsor). +::: + +TODO diff --git a/docs/src/links.yaml b/docs/src/links.yaml index 72755b6f..09b8c2d6 100644 --- a/docs/src/links.yaml +++ b/docs/src/links.yaml @@ -99,15 +99,12 @@ - title: Table link: /api/nodes/table draft: true - pro: true - title: TableRow link: /api/nodes/table-row draft: true - pro: true - title: TableCell link: /api/nodes/table-cell draft: true - pro: true - title: TaskList link: /api/nodes/task-list - title: TaskItem @@ -155,7 +152,6 @@ - title: Suggestion link: /api/extensions/suggestion draft: true - pro: true - title: TextAlign link: /api/extensions/text-align - title: Typography From 3496718654a2213bb63d65aee12b1f38972cb7ed Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 18:02:06 +0100 Subject: [PATCH 24/51] make less assumptions about the Y.js provider, fix #70 --- .../Examples/CollaborativeEditing/index.vue | 10 ++++--- docs/src/demos/Examples/Drawing/index.vue | 2 +- .../demos/Extensions/Collaboration/index.vue | 6 +++-- .../Extensions/CollaborationCursor/index.vue | 8 +++--- .../api/extensions/collaboration-cursor.md | 5 +++- .../docPages/api/extensions/collaboration.md | 9 +++---- .../docPages/guide/collaborative-editing.md | 27 ++++++++++++++----- .../src/collaboration.ts | 13 +++++---- 8 files changed, 50 insertions(+), 30 deletions(-) diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue index a4def537..c3f880a6 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/index.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue @@ -67,6 +67,7 @@ export default { name: this.getRandomName(), color: this.getRandomColor(), }, + provider: null, indexdb: null, editor: null, users: [], @@ -76,8 +77,8 @@ export default { mounted() { const ydoc = new Y.Doc() - const provider = new WebsocketProvider('wss://websocket.tiptap.dev', 'tiptap-collaboration-example', ydoc) - provider.on('status', event => { + this.provider = new WebsocketProvider('wss://websocket.tiptap.dev', 'tiptap-collaboration-example', ydoc) + this.provider.on('status', event => { this.status = event.status }) @@ -90,10 +91,10 @@ export default { TaskList, CustomTaskItem, Collaboration.configure({ - provider, + document: ydoc, }), CollaborationCursor.configure({ - provider, + provider: this.provider, user: this.currentUser, onUpdate: users => { this.users = users @@ -146,6 +147,7 @@ export default { beforeDestroy() { this.editor.destroy() + this.provider.destroy() }, } diff --git a/docs/src/demos/Examples/Drawing/index.vue b/docs/src/demos/Examples/Drawing/index.vue index 0308bbb6..e6d6dc85 100644 --- a/docs/src/demos/Examples/Drawing/index.vue +++ b/docs/src/demos/Examples/Drawing/index.vue @@ -34,7 +34,7 @@ export default { content: 'paper', }), Collaboration.configure({ - provider, + document: ydoc, }), Text, Paper, diff --git a/docs/src/demos/Extensions/Collaboration/index.vue b/docs/src/demos/Extensions/Collaboration/index.vue index caddab84..9158e49e 100644 --- a/docs/src/demos/Extensions/Collaboration/index.vue +++ b/docs/src/demos/Extensions/Collaboration/index.vue @@ -19,12 +19,13 @@ export default { data() { return { editor: null, + provider: null, } }, mounted() { const ydoc = new Y.Doc() - const provider = new WebrtcProvider('tiptap-collaboration-extension', ydoc) + this.provider = new WebrtcProvider('tiptap-collaboration-extension', ydoc) this.editor = new Editor({ extensions: [ @@ -32,7 +33,7 @@ export default { Paragraph, Text, Collaboration.configure({ - provider, + document: ydoc, }), ], }) @@ -40,6 +41,7 @@ export default { beforeDestroy() { this.editor.destroy() + this.provider.destroy() }, } diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.vue b/docs/src/demos/Extensions/CollaborationCursor/index.vue index cc3f25f2..4bd200b9 100644 --- a/docs/src/demos/Extensions/CollaborationCursor/index.vue +++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue @@ -20,12 +20,13 @@ export default { data() { return { editor: null, + provider: null, } }, mounted() { const ydoc = new Y.Doc() - const provider = new WebrtcProvider('tiptap-collaboration-cursor-extension', ydoc) + this.provider = new WebrtcProvider('tiptap-collaboration-cursor-extension', ydoc) this.editor = new Editor({ extensions: [ @@ -33,10 +34,10 @@ export default { Paragraph, Text, Collaboration.configure({ - provider, + document: ydoc, }), CollaborationCursor.configure({ - provider, + provider: this.provider, user: { name: 'Cyndi Lauper', color: '#f783ac', @@ -48,6 +49,7 @@ export default { beforeDestroy() { this.editor.destroy() + this.provider.destroy() }, } diff --git a/docs/src/docPages/api/extensions/collaboration-cursor.md b/docs/src/docPages/api/extensions/collaboration-cursor.md index d0e2442b..5750ef31 100644 --- a/docs/src/docPages/api/extensions/collaboration-cursor.md +++ b/docs/src/docPages/api/extensions/collaboration-cursor.md @@ -1,4 +1,7 @@ # CollaborationCursor +[![Version](https://img.shields.io/npm/v/@tiptap/extension-collaboration-cursor.svg?label=version)](https://www.npmjs.com/package/@tiptap/extension-collaboration-cursor) +[![Downloads](https://img.shields.io/npm/dm/@tiptap/extension-collaboration-cursor.svg)](https://npmcharts.com/compare/@tiptap/extension-collaboration-cursor?minimal=true) + This extension adds information about all connected users (like their name and a specified color), their current cursor position and their text selection (if there’s one). Open this page in multiple browser windows to test it. @@ -39,4 +42,4 @@ yarn add @tiptap/extension-collaboration-cursor :::warning Public The content of this editor is shared with other users. ::: - + diff --git a/docs/src/docPages/api/extensions/collaboration.md b/docs/src/docPages/api/extensions/collaboration.md index 16d515c2..ac17e4ca 100644 --- a/docs/src/docPages/api/extensions/collaboration.md +++ b/docs/src/docPages/api/extensions/collaboration.md @@ -1,5 +1,4 @@ # Collaboration - [![Version](https://img.shields.io/npm/v/@tiptap/extension-collaboration.svg?label=version)](https://www.npmjs.com/package/@tiptap/extension-collaboration) [![Downloads](https://img.shields.io/npm/dm/@tiptap/extension-collaboration.svg)](https://npmcharts.com/compare/@tiptap/extension-collaboration?minimal=true) @@ -21,9 +20,9 @@ yarn add @tiptap/extension-collaboration yjs y-websocket ``` ## Settings -| Option | Type | Default | Description | -| -------- | -------- | ------- | ---------------------------------------------------------------------------------------------------- | -| provider | `Object` | `null` | A Y.js network connection, for example a [y-websocket](https://github.com/yjs/y-websocket) instance. | +| Option | Type | Default | Description | +| -------- | -------- | ------- | ----------------------------- | +| document | `Object` | `null` | An initialized Y.js document. | ## Commands | Command | Parameters | Description | @@ -47,4 +46,4 @@ yarn add @tiptap/extension-collaboration yjs y-websocket :::warning Public The content of this editor is shared with other users. ::: - + diff --git a/docs/src/docPages/guide/collaborative-editing.md b/docs/src/docPages/guide/collaborative-editing.md index 33fefe8c..19a10202 100644 --- a/docs/src/docPages/guide/collaborative-editing.md +++ b/docs/src/docPages/guide/collaborative-editing.md @@ -45,7 +45,7 @@ const editor = new Editor({ // … // Register the document with tiptap Collaboration.configure({ - provider + document: ydoc, }), ], }) @@ -90,7 +90,7 @@ const editor = new Editor({ // … // Register the document with tiptap Collaboration.configure({ - provider + document: ydoc, }), ], }) @@ -128,7 +128,19 @@ node ./index.js This should output something like “Listening on ws://127.0.0.1:1234”. If you go back to your tiptap editor and hit reload, it should connect to the WebSocket server and changes should sync with all other clients. Amazing, isn’t it? -### Add cursors +### Multiple network providers +You can even combine multiple providers. That’s not needed, but could keep clients connected, even if one connection - for example the websocket server - goes down for a while. Here is an example: + +```js +new WebrtcProvider('example-document', ydoc) +new WebsocketProvider('ws://127.0.0.1:1234', 'example-document', ydoc) +``` + +Yes, that’s all. + +Keep in mind that WebRTC needs a signaling server to connect clients. This signaling server doesn’t receive the synced data, but helps to let clients find each other. You can [run your own signaling server](https://github.com/yjs/y-webrtc#signaling), if you like. + +### Show other cursors If you want to enable users to see the cursor and text selections of each other, add the [`CollaborationCursor`](/api/extensions/collaboration-cursor) extension. ```js @@ -145,11 +157,11 @@ const editor = new Editor({ extensions: [ // … Collaboration.configure({ - provider + document: ydoc, }), // Register the collaboration cursor extension CollaborationCursor.configure({ - provider: this.provider, + provider: provider, name: 'Cyndi Lauper', color: '#f783ac', }), @@ -179,14 +191,15 @@ import * as Y from 'yjs' import { IndexeddbPersistence } from 'y-indexeddb' const ydoc = new Y.Doc() + // Store the Y document in the browser -const indexdb = new IndexeddbPersistence('example-document', ydoc) +new IndexeddbPersistence('example-document', ydoc) const editor = new Editor({ extensions: [ // … Collaboration.configure({ - provider + document: ydoc, }), ], }) diff --git a/packages/extension-collaboration/src/collaboration.ts b/packages/extension-collaboration/src/collaboration.ts index c4683b8a..c68191fd 100644 --- a/packages/extension-collaboration/src/collaboration.ts +++ b/packages/extension-collaboration/src/collaboration.ts @@ -7,14 +7,17 @@ import { } from 'y-prosemirror' export interface CollaborationOptions { - provider: any, + /** + * An initialized Y.js document. + */ + document: any, } export const Collaboration = Extension.create({ name: 'collaboration', defaultOptions: { - provider: null, + document: null, }, addCommands() { @@ -49,15 +52,11 @@ export const Collaboration = Extension.create({ addProseMirrorPlugins() { return [ ySyncPlugin( - this.options.provider.doc.getXmlFragment('prosemirror'), + this.options.document.getXmlFragment('prosemirror'), ), yUndoPlugin(), ] }, - - onDestroy() { - this.options.provider?.destroy() - }, }) declare module '@tiptap/core' { From 6ef4078ad501739694ac9c94094c584897ce7f08 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 18:02:12 +0100 Subject: [PATCH 25/51] clean up --- .../Examples/CollaborativeEditing/index.vue | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue index c3f880a6..a2b6cc21 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/index.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue @@ -21,17 +21,6 @@ - - @@ -255,30 +244,6 @@ export default { } } -// .collaboration-status { -// border-radius: 5px; -// margin-top: 1rem; -// color: #616161; - -// &::before { -// content: ' '; -// display: inline-block; -// width: 0.5rem; -// height: 0.5rem; -// background: #ccc; -// border-radius: 50%; -// margin-right: 0.5rem; -// } - -// &--connecting::before { -// background: #fd9170; -// } - -// &--connected::before { -// background: #9DEF8F; -// } -// } - /* Give a remote user a caret */ .collaboration-cursor__caret { position: relative; From 5320d8ff6663736bbd3902ae650d4137280000a4 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 18:20:28 +0100 Subject: [PATCH 26/51] add integration guide drafts for alpine & livewire --- .../guide/getting-started/alpinejs.md | 109 ++++++++++++++++++ .../guide/getting-started/livewire.md | 35 ++++++ docs/src/links.yaml | 8 ++ 3 files changed, 152 insertions(+) create mode 100644 docs/src/docPages/guide/getting-started/alpinejs.md create mode 100644 docs/src/docPages/guide/getting-started/livewire.md diff --git a/docs/src/docPages/guide/getting-started/alpinejs.md b/docs/src/docPages/guide/getting-started/alpinejs.md new file mode 100644 index 00000000..5a73adf2 --- /dev/null +++ b/docs/src/docPages/guide/getting-started/alpinejs.md @@ -0,0 +1,109 @@ +# Alpine.js + +## toc + +TODO + +https://codesandbox.io/s/alpine-tiptap-2ro5e?file=/index.html:0-1419 + +index.html + +```html + + + + Parcel Sandbox + + + + + + +
+ +
+ + (view console for editor output) +
+ + + + +``` + +index.js + +```js +import { Editor as TipTap } from "@tiptap/core"; +import { defaultExtensions } from "@tiptap/starter-kit"; + +window.setupEditor = function (content) { + return { + content: content, + inFocus: false, + // updatedAt is to force Alpine to + // rerender on selection change + updatedAt: Date.now(), + editor: null, + + init(el) { + let editor = new TipTap({ + element: el, + extensions: defaultExtensions(), + content: this.content, + editorProps: { + attributes: { + class: "prose-sm py-4 focus:outline-none" + } + } + }); + + editor.on("update", () => { + this.content = this.editor.getHTML(); + }); + + editor.on("focus", () => { + this.inFocus = true; + }); + + editor.on("selection", () => { + this.updatedAt = Date.now(); + }); + + this.editor = editor; + } + }; +}; +``` diff --git a/docs/src/docPages/guide/getting-started/livewire.md b/docs/src/docPages/guide/getting-started/livewire.md new file mode 100644 index 00000000..4085a9a8 --- /dev/null +++ b/docs/src/docPages/guide/getting-started/livewire.md @@ -0,0 +1,35 @@ +# Livewire + +## toc + +TODO + +editor.blade.php + +```html + + +``` + +my-livewire-component.blade.php + +```html +
whereDoesntStartWith('wire:model') }} +> +
+
+``` diff --git a/docs/src/links.yaml b/docs/src/links.yaml index 09b8c2d6..74ea37fa 100644 --- a/docs/src/links.yaml +++ b/docs/src/links.yaml @@ -46,6 +46,14 @@ - title: Nuxt.js link: /guide/getting-started/nuxtjs skip: true + - title: Alpine.js + link: /guide/getting-started/alpinejs + draft: true + skip: true + - title: Livewire + link: /guide/getting-started/livewire + draft: true + skip: true - title: Configure the editor link: /guide/configuration - title: Create a toolbar From e2a7f888e7c83b65ca787a06f4d462147c9242cb Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 18:20:48 +0100 Subject: [PATCH 27/51] fix drawing example --- docs/src/demos/Examples/Drawing/index.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/demos/Examples/Drawing/index.vue b/docs/src/demos/Examples/Drawing/index.vue index e6d6dc85..a5b3f506 100644 --- a/docs/src/demos/Examples/Drawing/index.vue +++ b/docs/src/demos/Examples/Drawing/index.vue @@ -21,12 +21,13 @@ export default { data() { return { editor: null, + provider: null, } }, mounted() { const ydoc = new Y.Doc() - const provider = new WebsocketProvider('wss://websocket.tiptap.dev', 'tiptap-draw-example', ydoc) + this.provider = new WebsocketProvider('wss://websocket.tiptap.dev', 'tiptap-draw-example', ydoc) this.editor = new Editor({ extensions: [ @@ -44,6 +45,7 @@ export default { beforeDestroy() { this.editor.destroy() + this.provider.destroy() }, } From 7cc6094125b19a218726be8313db3c279a98d0fb Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Fri, 8 Jan 2021 18:50:37 +0100 Subject: [PATCH 28/51] docs: update content --- docs/src/docPages/guide/node-views.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/src/docPages/guide/node-views.md b/docs/src/docPages/guide/node-views.md index 130cd64d..6638ac63 100644 --- a/docs/src/docPages/guide/node-views.md +++ b/docs/src/docPages/guide/node-views.md @@ -3,8 +3,7 @@ ## toc ## Introduction - -TODO +Node views are the best thing since sliced bread, at least if you’re a fan of customization (and bread). Node views enable you to add literally anything to a node. If you can write it in JavaScript, you can use it in your editor. ```js import { Node } from '@tiptap/core' @@ -48,8 +47,10 @@ export default Node.create({ ``` +#### Example: Table of contents +#### Example: Drawing in the editor ### Advanced node views with content @@ -69,6 +70,7 @@ export default Node.create({ ``` +#### Example: Drag handles ## Render Vue components From 26dc3ba283d67a39e74f70d4d6fa2ede9367855b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:19:14 +0100 Subject: [PATCH 29/51] Bump actions/upload-artifact from v2.2.1 to v2.2.2 (#79) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from v2.2.1 to v2.2.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2.2.1...e448a9b857ee2131e752b06002bf0e093c65e571) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b319f455..90c13249 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: browser: chrome - name: Export screenshots (on failure only) - uses: actions/upload-artifact@v2.2.1 + uses: actions/upload-artifact@v2.2.2 if: failure() with: name: cypress-screenshots @@ -106,7 +106,7 @@ jobs: retention-days: 7 - name: Export screen recordings (on failure only) - uses: actions/upload-artifact@v2.2.1 + uses: actions/upload-artifact@v2.2.2 if: failure() with: name: cypress-videos From adfa10a2d945fb33ac33fec0772878ad214011b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:19:21 +0100 Subject: [PATCH 30/51] Bump globby from 11.0.1 to 11.0.2 (#80) Bumps [globby](https://github.com/sindresorhus/globby) from 11.0.1 to 11.0.2. - [Release notes](https://github.com/sindresorhus/globby/releases) - [Commits](https://github.com/sindresorhus/globby/compare/v11.0.1...v11.0.2) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 4b2c4f9e..f87fd765 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7293,9 +7293,9 @@ globby@10.0.0: slash "^3.0.0" globby@^11.0.0, globby@^11.0.1: - version "11.0.1" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" - integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ== + version "11.0.2" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" + integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" From 054d44defc12ec0f57af6601c8c62477ec8b6365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:19:26 +0100 Subject: [PATCH 31/51] Bump @types/prosemirror-view from 1.16.1 to 1.17.0 (#81) Bumps [@types/prosemirror-view](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/prosemirror-view) from 1.16.1 to 1.17.0. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/prosemirror-view) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index f87fd765..a7f6b3bd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2464,9 +2464,9 @@ "@types/prosemirror-model" "*" "@types/prosemirror-view@*", "@types/prosemirror-view@^1.16.1": - version "1.16.1" - resolved "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.16.1.tgz#09d66e2518366fd8d6c316c35c621bc374a0414c" - integrity sha512-vsL7QB9Qmg9HcBTWsOkmBEGMF0CfA/SZgtqlUArQglnDWV40ZJYonkjBzyP+YhurMC/s4JT4T2vzfnv7rFF/cg== + version "1.17.0" + resolved "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.17.0.tgz#7e283038730a67c35521c8dbc932765a70291edd" + integrity sha512-1OALGaiRmq3c+Y35QVrqqlEykWEszYYx08jAPBhYe6M+YbC6Y2LnmCDXjEOTI1oToJwoADHFPGHl4W59L3fgGg== dependencies: "@types/prosemirror-model" "*" "@types/prosemirror-state" "*" From fbf7d0035a22504582200db53b765ef92a879320 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:19:29 +0100 Subject: [PATCH 32/51] Bump y-webrtc from 10.1.7 to 10.1.8 (#82) Bumps [y-webrtc](https://github.com/yjs/y-webrtc) from 10.1.7 to 10.1.8. - [Release notes](https://github.com/yjs/y-webrtc/releases) - [Commits](https://github.com/yjs/y-webrtc/compare/v10.1.7...v10.1.8) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/yarn.lock b/yarn.lock index a7f6b3bd..6683dd14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9163,14 +9163,7 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -lib0@^0.2.28, lib0@^0.2.31, lib0@^0.2.33, lib0@^0.2.34: - version "0.2.34" - resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.34.tgz#c4479f5f2083894687fcfa9d0b9d9935e35ea008" - integrity sha512-cqsVIMPgFlDtgQcpkt7HOY6W3sbYPIe3qxMnbRSwHTgiQancgm+TRDPx28mC6GUZ6lG6Nr0bIWf4Nog6dWUNUg== - dependencies: - isomorphic.js "^0.1.3" - -lib0@^0.2.35: +lib0@^0.2.28, lib0@^0.2.31, lib0@^0.2.33, lib0@^0.2.34, lib0@^0.2.35: version "0.2.35" resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.35.tgz#1d62adb3feefce70c84f3eb664c5e50286de41ca" integrity sha512-drVD3EscB3TIxiFzceuZg7oF5Z6I8a0KX+7FowNcAXOEsTej/hlHB+ElJ8Pa/Ge73Gy3fklSJtPxpNd2PajdWg== @@ -15433,9 +15426,9 @@ y-protocols@^1.0.0, y-protocols@^1.0.1: lib0 "^0.2.28" y-webrtc@^10.1.7: - version "10.1.7" - resolved "https://registry.yarnpkg.com/y-webrtc/-/y-webrtc-10.1.7.tgz#dd8b46ee790797dc72f7fb37a4efe6a8cd04a41a" - integrity sha512-GzgH6O2s73A1ndGcapIyVeRkjGL0suUAe4dhN+ZIjKIrQK0CjKG7a7cxK5raiKSW1I41XiRN/eOtsjbD/bu5fg== + version "10.1.8" + resolved "https://registry.yarnpkg.com/y-webrtc/-/y-webrtc-10.1.8.tgz#b35d8cb2a96462f134ea9b16a1179c970ad20b48" + integrity sha512-eeKU8QWtT5ahPLv+NCrf6ax8MXXmKYEtFO/eh0Svl8D3VDZ/3H8w9NLWVoL1GEwv5HNH0gu0p78n8v76Ttziuw== dependencies: lib0 "^0.2.34" simple-peer "^9.9.3" From 2f8d975ded6acfcdd207ec36383e6595503a8b44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:19:35 +0100 Subject: [PATCH 33/51] Bump typedoc from 0.20.13 to 0.20.14 (#83) Bumps [typedoc](https://github.com/TypeStrong/TypeDoc) from 0.20.13 to 0.20.14. - [Release notes](https://github.com/TypeStrong/TypeDoc/releases) - [Commits](https://github.com/TypeStrong/TypeDoc/compare/v0.20.13...v0.20.14) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index 6683dd14..3ee875b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14382,15 +14382,15 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typedoc-default-themes@0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.12.0.tgz#42451948e55a148c1350eb2aa68829be5c2b06b3" - integrity sha512-0hHBxwmfxE0rkIslOiO39fJyYwaScQEhUIxcpqx3uS1BL3zhFW5oQfUaPx2cv2XLL/GXhYFxhdFLoVmNptbxEQ== +typedoc-default-themes@0.12.1: + version "0.12.1" + resolved "https://registry.yarnpkg.com/typedoc-default-themes/-/typedoc-default-themes-0.12.1.tgz#6c4a759f9dc365b4021579587b3773deb6fb6eeb" + integrity sha512-6PEvV+/kWAJeUwEtrKgIsZQSbybW5DGCr6s2mMjHsDplpgN8iBHI52UbA+2C+c2TMCxBNMK9TMS6pdeIdwsLSw== typedoc@^0.20.13: - version "0.20.13" - resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.20.13.tgz#9d56df76d0b421a71a33336dc64b1a466dc8f2fd" - integrity sha512-SJVFn6NJd5bWJHMPgEkDUrKIEfMbja6ftIJv/tgd0xQZp5cWxGTdEnmRr56+egIQZkAJFB39eDvmNV4Lqqy4Gw== + version "0.20.14" + resolved "https://registry.yarnpkg.com/typedoc/-/typedoc-0.20.14.tgz#894ff71841a4abbe8f46cf52f3cc96c9d68328dc" + integrity sha512-9bsZp5/qkl+gDSv9DRvHbfbY8Sr0tD8fKx7hNIvcluxeAFzBCEo9o0qDCdLUZw+/axbfd9TaqHvSuCVRu+YH6Q== dependencies: colors "^1.4.0" fs-extra "^9.0.1" @@ -14402,7 +14402,7 @@ typedoc@^0.20.13: progress "^2.0.3" shelljs "^0.8.4" shiki "^0.2.7" - typedoc-default-themes "0.12.0" + typedoc-default-themes "0.12.1" typescript@^4.1.3: version "4.1.3" From 8e5f33134548d3e3a7d9a3e7697fac52fa19139d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Jan 2021 09:19:41 +0100 Subject: [PATCH 34/51] Bump y-websocket from 1.3.8 to 1.3.9 (#84) Bumps [y-websocket](https://github.com/yjs/y-websocket) from 1.3.8 to 1.3.9. - [Release notes](https://github.com/yjs/y-websocket/releases) - [Commits](https://github.com/yjs/y-websocket/compare/v1.3.8...v1.3.9) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 3ee875b7..32538997 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15418,7 +15418,7 @@ y-prosemirror@^1.0.5: dependencies: lib0 "^0.2.34" -y-protocols@^1.0.0, y-protocols@^1.0.1: +y-protocols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/y-protocols/-/y-protocols-1.0.1.tgz#7855c900039a02b369590b8ae78bc6e1cbc13c9f" integrity sha512-QP3fCM7c2gGfUi2nqf8gspyO4VW23zv3kNqPNdD3wNxMbuNQenMyoDVZYEo12jzR4RQ3aaDfPK62Sf31SVOmfg== @@ -15437,14 +15437,14 @@ y-webrtc@^10.1.7: ws "^7.2.0" y-websocket@^1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/y-websocket/-/y-websocket-1.3.8.tgz#1ee881ff20b3d0e3a50ac4e472253757ebdb9ffe" - integrity sha512-ut2srey5upZQPYfBiT0mHhSxa50Fd0mOmfKR+F8Gxx/zwZ3y3tSNUOfblLcJtqY583gjH0s/zMOU+FKjhTCuog== + version "1.3.9" + resolved "https://registry.yarnpkg.com/y-websocket/-/y-websocket-1.3.9.tgz#9a66ac337d248d6c428348c00079c533f777954c" + integrity sha512-iOi1shywIkf7jw10iq6zE/2d7nyKXmD91szdhGTgorcmApVzTte5K9yWVO+XVAcZcdQBT8ho1Nzw43ZFdfhS/A== dependencies: lib0 "^0.2.31" lodash.debounce "^4.0.8" y-leveldb "^0.1.0" - y-protocols "^1.0.0" + y-protocols "^1.0.1" optionalDependencies: ws "^6.2.1" From e4801b0cfae8bf6c573f7018953fdec41b2df9d2 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 11 Jan 2021 14:42:12 +0100 Subject: [PATCH 35/51] allow to pass a fragment name to the collaboration extension --- .../docPages/api/extensions/collaboration.md | 7 +++--- .../docPages/guide/collaborative-editing.md | 22 ++++++++++++++++--- .../src/collaboration.ts | 6 ++++- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/docs/src/docPages/api/extensions/collaboration.md b/docs/src/docPages/api/extensions/collaboration.md index ac17e4ca..e5f5bfe0 100644 --- a/docs/src/docPages/api/extensions/collaboration.md +++ b/docs/src/docPages/api/extensions/collaboration.md @@ -20,9 +20,10 @@ yarn add @tiptap/extension-collaboration yjs y-websocket ``` ## Settings -| Option | Type | Default | Description | -| -------- | -------- | ------- | ----------------------------- | -| document | `Object` | `null` | An initialized Y.js document. | +| Option | Type | Default | Description | +| -------- | -------- | --------- | ----------------------------------------------------------------------------------------- | +| document | `Object` | `null` | An initialized Y.js document. | +| fragment | `String` | `default` | Name of the Y.js fragment, can be changed to sync multiple fields with one Y.js document. | ## Commands | Command | Parameters | Description | diff --git a/docs/src/docPages/guide/collaborative-editing.md b/docs/src/docPages/guide/collaborative-editing.md index 19a10202..562fdb85 100644 --- a/docs/src/docPages/guide/collaborative-editing.md +++ b/docs/src/docPages/guide/collaborative-editing.md @@ -222,13 +222,29 @@ Don’t want to wrap your head around the backend part? No worries, we offer a m ::: --> ### The document name -The document name is `'example-document'` in all examples here, but it could be any string. In a real-world app you’d probably add the name of your entity, the ID of the entity and in some cases even the field (if you have multiple fields that you want to make collaborative). Here is how that could look like for a CMS: +The document name is `'example-document'` in all examples here, but it could be any string. In a real-world app you’d probably add the name of your entity and the ID of the entity. Here is how that could look like: ```js -const documentName = 'page.140.content' +const documentName = 'page.140' ``` -In the backend, you can split the string to know the user is typing on a page with the ID 140 in the `content` field and manage authorization and such accordingly. New documents are created on the fly, no need to tell the backend about them, besides passing a string to the provider. +In the backend, you can split the string to know the user is typing on a page with the ID 140 to manage authorization and such accordingly. New documents are created on the fly, no need to tell the backend about them, besides passing a string to the provider. + +And if you’d like to sync multiple fields with one Y.js document, just pass different fragment names to the collaboration extension: + +```js +// a tiptap instance for the field +Collaboration.configure({ + document: ydoc, + fragment: 'title', +}) + +// and another instance for the summary, both in the same Y.js document +Collaboration.configure({ + document: ydoc, + fragment: 'summary', +}) +``` ### Authentication With the `onConnect` hook you can write a custom Promise to check if a client is authenticated. That can be a request to an API, to a microservice, a database query, or whatever is needed, as long as it’s executing `resolve()` at some point. You can also pass contextual data to the `resolve()` method which will be accessible in other hooks. diff --git a/packages/extension-collaboration/src/collaboration.ts b/packages/extension-collaboration/src/collaboration.ts index c68191fd..a48ac60e 100644 --- a/packages/extension-collaboration/src/collaboration.ts +++ b/packages/extension-collaboration/src/collaboration.ts @@ -11,6 +11,7 @@ export interface CollaborationOptions { * An initialized Y.js document. */ document: any, + fragment: string, } export const Collaboration = Extension.create({ @@ -18,6 +19,7 @@ export const Collaboration = Extension.create({ defaultOptions: { document: null, + fragment: 'default', }, addCommands() { @@ -52,7 +54,9 @@ export const Collaboration = Extension.create({ addProseMirrorPlugins() { return [ ySyncPlugin( - this.options.document.getXmlFragment('prosemirror'), + this.options.document.getXmlFragment( + this.options.fragment, + ), ), yUndoPlugin(), ] From dd39e3a307b5e257732fc718e7e9b758449a091d Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 11 Jan 2021 14:42:47 +0100 Subject: [PATCH 36/51] add an example to sync multiple tiptap instances with one Y.js document --- .../Examples/MultipleEditors/index.spec.js | 7 + .../demos/Examples/MultipleEditors/index.vue | 148 ++++++++++++++++++ .../src/docPages/examples/multiple-editors.md | 9 ++ docs/src/links.yaml | 2 + 4 files changed, 166 insertions(+) create mode 100644 docs/src/demos/Examples/MultipleEditors/index.spec.js create mode 100644 docs/src/demos/Examples/MultipleEditors/index.vue create mode 100644 docs/src/docPages/examples/multiple-editors.md diff --git a/docs/src/demos/Examples/MultipleEditors/index.spec.js b/docs/src/demos/Examples/MultipleEditors/index.spec.js new file mode 100644 index 00000000..e76b0e6d --- /dev/null +++ b/docs/src/demos/Examples/MultipleEditors/index.spec.js @@ -0,0 +1,7 @@ +context('/examples/multiple-editors', () => { + before(() => { + cy.visit('/examples/multiple-editors') + }) + + // TODO: Write tests +}) diff --git a/docs/src/demos/Examples/MultipleEditors/index.vue b/docs/src/demos/Examples/MultipleEditors/index.vue new file mode 100644 index 00000000..6c9f4fdf --- /dev/null +++ b/docs/src/demos/Examples/MultipleEditors/index.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/docs/src/docPages/examples/multiple-editors.md b/docs/src/docPages/examples/multiple-editors.md new file mode 100644 index 00000000..ccfe1c6e --- /dev/null +++ b/docs/src/docPages/examples/multiple-editors.md @@ -0,0 +1,9 @@ +# Multiple editors + +The following examples has three different instances of tiptap. The first is configured to have a single paragraph of text, the second to have a task list and the third to have text. All of them are stored in a single Y.js document, which is synced with other users. + +:::warning Shared Document +Be nice! The content of this editor is shared with other users from the Internet. +::: + + diff --git a/docs/src/links.yaml b/docs/src/links.yaml index 74ea37fa..72ea163e 100644 --- a/docs/src/links.yaml +++ b/docs/src/links.yaml @@ -34,6 +34,8 @@ - title: Drawing link: /examples/drawing draft: true + - title: Multiple editors + link: /examples/multiple-editors - title: Guide items: From b6e57d8a6a5f0b91e790baf06208e5aa161ee1a0 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 11 Jan 2021 14:43:41 +0100 Subject: [PATCH 37/51] add a comment --- packages/extension-collaboration/src/collaboration.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/extension-collaboration/src/collaboration.ts b/packages/extension-collaboration/src/collaboration.ts index a48ac60e..59d3378a 100644 --- a/packages/extension-collaboration/src/collaboration.ts +++ b/packages/extension-collaboration/src/collaboration.ts @@ -11,6 +11,9 @@ export interface CollaborationOptions { * An initialized Y.js document. */ document: any, + /** + * A string to determine the fragment that should be used. + */ fragment: string, } From 9ac2179697765eade925c9a30bab2d96b19b2e98 Mon Sep 17 00:00:00 2001 From: Hans Pagel Date: Mon, 11 Jan 2021 15:30:43 +0100 Subject: [PATCH 38/51] improve the drawing example --- docs/src/components/Demo/style.scss | 3 +++ docs/src/demos/Examples/Drawing/Component.vue | 18 +++++++++++++++--- docs/src/docPages/examples/drawing.md | 11 ++++++++++- docs/src/links.yaml | 2 -- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/docs/src/components/Demo/style.scss b/docs/src/components/Demo/style.scss index 4c6e6d3d..6ef8cee8 100644 --- a/docs/src/components/Demo/style.scss +++ b/docs/src/components/Demo/style.scss @@ -9,6 +9,9 @@ border-bottom-width: 0; color: $colorBlack; background-color: $colorWhite; + max-height: 50rem; + overflow: auto; + scroll-behavior: smooth; } &__source { diff --git a/docs/src/demos/Examples/Drawing/Component.vue b/docs/src/demos/Examples/Drawing/Component.vue index 3d426471..4d1cd508 100644 --- a/docs/src/demos/Examples/Drawing/Component.vue +++ b/docs/src/demos/Examples/Drawing/Component.vue @@ -30,6 +30,10 @@ import { v4 as uuid } from 'uuid' import * as d3 from 'd3' import simplify from 'simplify-js' +const getRandomElement = list => { + return list[Math.floor(Math.random() * list.length)] +} + export default { name: 'Paper', @@ -47,8 +51,16 @@ export default { data() { return { - color: '#000000', - size: 2, + color: getRandomElement([ + '#A975FF', + '#FB5151', + '#FD9170', + '#FFCB6B', + '#68CEF8', + '#80CBC4', + '#9DEF8F', + ]), + size: Math.floor(Math.random() * Math.floor(20)), svg: null, path: null, points: [], @@ -148,7 +160,7 @@ export default {