Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tiptap version 2 #6043

Merged
merged 46 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
8f7894d
Updated tiptap version and extensions loading
wiebkevogel May 4, 2022
89ce5be
Updated bard fixed toolbar
wiebkevogel May 4, 2022
466ec76
Added bard source extension
wiebkevogel May 4, 2022
241143c
Added existing remove format function
wiebkevogel May 4, 2022
cd52e58
Update codeblock and remove existing subscript and superscript extension
wiebkevogel May 4, 2022
42b18ab
Added Bubble Menu
wiebkevogel May 4, 2022
346d3b2
Added custom small extension
wiebkevogel May 4, 2022
ba0f748
Added custom image node
wiebkevogel May 5, 2022
00e3d7f
Added custom Link Mark
wiebkevogel May 5, 2022
bf154de
Added custom set and document extension
wiebkevogel May 6, 2022
a87cc65
Update mark and node extensions
wiebkevogel May 9, 2022
6962678
Updated styling for bubble-menu
wiebkevogel May 9, 2022
88d978c
Updated floating-menu position
wiebkevogel May 10, 2022
71aa21a
Replaced html-prose-mirror with tiptap-php
wiebkevogel May 10, 2022
76f5940
Replaced html-to-prosemirror and prosemirror-to-html with tiptap-php
wiebkevogel May 11, 2022
44047df
Updated BardTest
wiebkevogel May 11, 2022
a10080d
Updated bard extension callback
wiebkevogel May 12, 2022
107ec94
indentation
wiebkevogel May 13, 2022
4676dae
render bard sets correctly
May 13, 2022
d75ed81
Don't test against PHP 7.4
May 13, 2022
2c5f342
adjust bard test
May 16, 2022
3343dcb
Merge branch 'update-tiptap' of github.com:spiegeltechlab/cms into up…
May 16, 2022
33b0016
Try testing against on windows with php8
May 16, 2022
048595e
Updated add extension callback
wiebkevogel May 16, 2022
7c58a03
Merge branch 'update-tiptap' of github.com:spiegeltechlab/cms into up…
wiebkevogel May 16, 2022
d0c69d9
Formatting
May 16, 2022
a295f7f
Merge branch 'update-tiptap' of github.com:spiegeltechlab/cms into up…
May 16, 2022
c42ee80
Remove imports
May 16, 2022
0aa425d
Overwrite popover styling in bard sets
wiebkevogel May 17, 2022
08b07e7
Merge branch 'update-tiptap' of github.com:spiegeltechlab/cms into up…
wiebkevogel May 17, 2022
1cd4cb9
Make extensions exchangeable like lego bricks
May 17, 2022
63eab1a
Remove the starter kit so single PHP extensions can be replaced as well
May 17, 2022
56aff1b
Remove null values
May 17, 2022
ccaff0b
Clean up 🧹
May 17, 2022
7762449
🧹
May 17, 2022
1c7e0d6
Add a helpful comment about the image extension
May 17, 2022
16209f0
Use camelCase instead of kebab-case
wiebkevogel May 17, 2022
9e5079b
Add static to replaceExtension
wiebkevogel May 17, 2022
085d2cb
Make the extensions method inside Augmentor public
May 20, 2022
796b3ca
Update Augmentor.php
May 20, 2022
c2abad0
bring back core to tiptap api
wiebkevogel May 30, 2022
8c57785
bring back disable input and paste rules
wiebkevogel Jun 1, 2022
1453013
Add tests for PHP 7.4
Jun 1, 2022
cb87f89
Remove depreciation
Jun 1, 2022
4aa012c
Updated editor commands
wiebkevogel Jun 7, 2022
eed5b87
Merge branch 'master' of github.com:statamic/cms into update-tiptap
wiebkevogel Jun 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
"symfony/lock": "^5.1",
"symfony/var-exporter": "^4.3 || ^5.1",
"symfony/yaml": "^4.1 || ^5.1 || ^6.0",
"ueberdosis/html-to-prosemirror": "^1.3",
"ueberdosis/prosemirror-to-html": "^2.6",
"ueberdosis/tiptap-php": "^1.1",
"voku/portable-ascii": "^1.6.1 || ^2.0",
"wilderborn/partyline": "^1.0"
},
Expand Down
17,056 changes: 7,038 additions & 10,018 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 27 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,31 @@
"@popperjs/core": "^2.5.3",
"@shopify/draggable": "^1.0.0-beta.8",
"@simonwep/pickr": "^1.7.4",
"@tiptap/core": "^2.0.0-beta.175",
"@tiptap/extension-blockquote": "^2.0.0-beta.26",
"@tiptap/extension-bold": "^2.0.0-beta.26",
"@tiptap/extension-bullet-list": "^2.0.0-beta.26",
"@tiptap/extension-code": "^2.0.0-beta.26",
"@tiptap/extension-code-block-lowlight": "^2.0.0-beta.68",
"@tiptap/extension-document": "^2.0.0-beta.15",
"@tiptap/extension-hard-break": "^2.0.0-beta.30",
"@tiptap/extension-heading": "^2.0.0-beta.26",
"@tiptap/extension-history": "^2.0.0-beta.21",
"@tiptap/extension-horizontal-rule": "^2.0.0-beta.31",
"@tiptap/extension-italic": "^2.0.0-beta.26",
"@tiptap/extension-list-item": "^2.0.0-beta.20",
"@tiptap/extension-ordered-list": "^2.0.0-beta.27",
"@tiptap/extension-paragraph": "^2.0.0-beta.23",
"@tiptap/extension-strike": "^2.0.0-beta.27",
"@tiptap/extension-subscript": "^2.0.0-beta.10",
"@tiptap/extension-superscript": "^2.0.0-beta.10",
"@tiptap/extension-table": "^2.0.0-beta.48",
"@tiptap/extension-table-cell": "^2.0.0-beta.20",
"@tiptap/extension-table-header": "^2.0.0-beta.22",
"@tiptap/extension-table-row": "^2.0.0-beta.19",
"@tiptap/extension-text": "^2.0.0-beta.15",
"@tiptap/extension-underline": "^2.0.0-beta.23",
"@tiptap/vue-2": "^2.0.0-beta.78",
"alpinejs": "^3.1.1",
"ansi-to-html": "^0.6.14",
"autosize": "~3.0.12",
Expand All @@ -36,6 +61,7 @@
"jquery": "^3.5.0",
"jquery-ui": "file:resources/js/vendor/jquery-ui",
"laravel-echo": "^1.6.1",
"lowlight": "^2.6.1",
"luminous-lightbox": "^0.2.0",
"marked": "^4.0.10",
"marked-plaintext": "0.0.2",
Expand All @@ -45,6 +71,7 @@
"pdfobject": "^2.2.7",
"portal-vue": "^1.5.1",
"pretty": "^2.0.0",
"prosemirror-state": "^1.3.4",
"pusher-js": "^4.4.0",
"qs": "^6.9.1",
"rangy": "^1.3.0",
Expand All @@ -54,7 +81,6 @@
"striptags": "^3.2.0",
"svgo": "^2.6.1",
"sweetalert": "~1.0.1",
"tiptap-extensions": "^1.28.6",
"underscore": "~1.13.2",
"uniqid": "^5.2.0",
"v-calendar": "^2.3.0",
Expand Down
22 changes: 2 additions & 20 deletions resources/js/components/Bard.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
import * as core from 'tiptap';
import * as commands from 'tiptap-commands';
import * as utils from 'tiptap-utils';
import * as extensions from 'tiptap-extensions';
import Link from './fieldtypes/bard/Link';
import Image from './fieldtypes/bard/Image';
import Subscript from './fieldtypes/bard/Subscript';
import Superscript from './fieldtypes/bard/Superscript';
import * as core from '@tiptap/core';

class Bard {
constructor(instance) {
Expand Down Expand Up @@ -33,18 +26,7 @@ class Bard {
}

get tiptap() {
return {
core,
commands,
utils,
extensions: {
...extensions,
Link,
Image,
Subscript,
Superscript,
},
};
return { core };
jackmcdade marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
Loading