Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ueberdosis/tiptap
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: @tiptap/extension-bold@2.5.1
Choose a base ref
...
head repository: ueberdosis/tiptap
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: @tiptap/extension-bold@2.5.2
Choose a head ref
  • 2 commits
  • 112 files changed
  • 3 contributors

Commits on Jul 17, 2024

  1. fix(core): configuring extensions should add to the parent's options … 

    …not replace them (#5357)

* fix(core): configuring extensions should add to the parent's options not replace them

* fix: order of tests
    @nperez0111
    nperez0111 authored Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    07f4c03 View commit details

  2. chore: publish 2.5.2 (#5358) 

    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
    @github-actions
    github-actions[bot] and github-actions[bot] authored Jul 17, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    b97ce6a View commit details
Showing with 685 additions and 242 deletions.
  1. +7 −0 packages/core/CHANGELOG.md
  2. +3 −3 packages/core/package.json
  3. +2 −2 packages/core/src/Extension.ts
  4. +2 −2 packages/core/src/Mark.ts
  5. +2 −2 packages/core/src/Node.ts
  6. +7 −0 packages/extension-blockquote/CHANGELOG.md
  7. +3 −3 packages/extension-blockquote/package.json
  8. +7 −0 packages/extension-bold/CHANGELOG.md
  9. +3 −3 packages/extension-bold/package.json
  10. +8 −0 packages/extension-bubble-menu/CHANGELOG.md
  11. +5 −5 packages/extension-bubble-menu/package.json
  12. +7 −0 packages/extension-bullet-list/CHANGELOG.md
  13. +3 −3 packages/extension-bullet-list/package.json
  14. +8 −0 packages/extension-character-count/CHANGELOG.md
  15. +5 −5 packages/extension-character-count/package.json
  16. +9 −0 packages/extension-code-block-lowlight/CHANGELOG.md
  17. +7 −7 packages/extension-code-block-lowlight/package.json
  18. +8 −0 packages/extension-code-block/CHANGELOG.md
  19. +5 −5 packages/extension-code-block/package.json
  20. +7 −0 packages/extension-code/CHANGELOG.md
  21. +3 −3 packages/extension-code/package.json
  22. +7 −0 packages/extension-collaboration-cursor/CHANGELOG.md
  23. +3 −3 packages/extension-collaboration-cursor/package.json
  24. +8 −0 packages/extension-collaboration/CHANGELOG.md
  25. +5 −5 packages/extension-collaboration/package.json
  26. +8 −0 packages/extension-color/CHANGELOG.md
  27. +5 −5 packages/extension-color/package.json
  28. +7 −0 packages/extension-document/CHANGELOG.md
  29. +3 −3 packages/extension-document/package.json
  30. +8 −0 packages/extension-dropcursor/CHANGELOG.md
  31. +5 −5 packages/extension-dropcursor/package.json
  32. +8 −0 packages/extension-floating-menu/CHANGELOG.md
  33. +5 −5 packages/extension-floating-menu/package.json
  34. +8 −0 packages/extension-focus/CHANGELOG.md
  35. +5 −5 packages/extension-focus/package.json
  36. +8 −0 packages/extension-font-family/CHANGELOG.md
  37. +5 −5 packages/extension-font-family/package.json
  38. +8 −0 packages/extension-gapcursor/CHANGELOG.md
  39. +5 −5 packages/extension-gapcursor/package.json
  40. +7 −0 packages/extension-hard-break/CHANGELOG.md
  41. +3 −3 packages/extension-hard-break/package.json
  42. +7 −0 packages/extension-heading/CHANGELOG.md
  43. +3 −3 packages/extension-heading/package.json
  44. +7 −0 packages/extension-highlight/CHANGELOG.md
  45. +3 −3 packages/extension-highlight/package.json
  46. +8 −0 packages/extension-history/CHANGELOG.md
  47. +5 −5 packages/extension-history/package.json
  48. +8 −0 packages/extension-horizontal-rule/CHANGELOG.md
  49. +5 −5 packages/extension-horizontal-rule/package.json
  50. +7 −0 packages/extension-image/CHANGELOG.md
  51. +3 −3 packages/extension-image/package.json
  52. +7 −0 packages/extension-italic/CHANGELOG.md
  53. +3 −3 packages/extension-italic/package.json
  54. +8 −0 packages/extension-link/CHANGELOG.md
  55. +5 −5 packages/extension-link/package.json
  56. +7 −0 packages/extension-list-item/CHANGELOG.md
  57. +3 −3 packages/extension-list-item/package.json
  58. +7 −0 packages/extension-list-keymap/CHANGELOG.md
  59. +3 −3 packages/extension-list-keymap/package.json
  60. +9 −0 packages/extension-mention/CHANGELOG.md
  61. +7 −7 packages/extension-mention/package.json
  62. +7 −0 packages/extension-ordered-list/CHANGELOG.md
  63. +3 −3 packages/extension-ordered-list/package.json
  64. +7 −0 packages/extension-paragraph/CHANGELOG.md
  65. +3 −3 packages/extension-paragraph/package.json
  66. +8 −0 packages/extension-placeholder/CHANGELOG.md
  67. +5 −5 packages/extension-placeholder/package.json
  68. +7 −0 packages/extension-strike/CHANGELOG.md
  69. +3 −3 packages/extension-strike/package.json
  70. +7 −0 packages/extension-subscript/CHANGELOG.md
  71. +3 −3 packages/extension-subscript/package.json
  72. +7 −0 packages/extension-superscript/CHANGELOG.md
  73. +3 −3 packages/extension-superscript/package.json
  74. +7 −0 packages/extension-table-cell/CHANGELOG.md
  75. +3 −3 packages/extension-table-cell/package.json
  76. +7 −0 packages/extension-table-header/CHANGELOG.md
  77. +3 −3 packages/extension-table-header/package.json
  78. +7 −0 packages/extension-table-row/CHANGELOG.md
  79. +3 −3 packages/extension-table-row/package.json
  80. +8 −0 packages/extension-table/CHANGELOG.md
  81. +5 −5 packages/extension-table/package.json
  82. +8 −0 packages/extension-task-item/CHANGELOG.md
  83. +5 −5 packages/extension-task-item/package.json
  84. +7 −0 packages/extension-task-list/CHANGELOG.md
  85. +3 −3 packages/extension-task-list/package.json
  86. +7 −0 packages/extension-text-align/CHANGELOG.md
  87. +3 −3 packages/extension-text-align/package.json
  88. +7 −0 packages/extension-text-style/CHANGELOG.md
  89. +3 −3 packages/extension-text-style/package.json
  90. +7 −0 packages/extension-text/CHANGELOG.md
  91. +3 −3 packages/extension-text/package.json
  92. +7 −0 packages/extension-typography/CHANGELOG.md
  93. +3 −3 packages/extension-typography/package.json
  94. +7 −0 packages/extension-underline/CHANGELOG.md
  95. +3 −3 packages/extension-underline/package.json
  96. +7 −0 packages/extension-youtube/CHANGELOG.md
  97. +3 −3 packages/extension-youtube/package.json
  98. +8 −0 packages/html/CHANGELOG.md
  99. +5 −5 packages/html/package.json
  100. +2 −0 packages/pm/CHANGELOG.md
  101. +1 −1 packages/pm/package.json
  102. +10 −0 packages/react/CHANGELOG.md
  103. +7 −7 packages/react/package.json
  104. +25 −0 packages/starter-kit/CHANGELOG.md
  105. +20 −20 packages/starter-kit/package.json
  106. +8 −0 packages/suggestion/CHANGELOG.md
  107. +5 −5 packages/suggestion/package.json
  108. +10 −0 packages/vue-2/CHANGELOG.md
  109. +7 −7 packages/vue-2/package.json
  110. +10 −0 packages/vue-3/CHANGELOG.md
  111. +7 −7 packages/vue-3/package.json
  112. +24 −3 tests/cypress/integration/core/extendExtensions.spec.ts
7 changes: 7 additions & 0 deletions packages/core/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.5.2

### Patch Changes

- 07f4c03: There was a bug where doing a `.configure` on an extension, node or mark would overwrite the extensions options instead of being merged with the default options.
- @tiptap/pm@2.5.2

## 2.5.1

### Patch Changes
6 changes: 3 additions & 3 deletions packages/core/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/core",
"description": "headless rich text editor",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -32,10 +32,10 @@
"dist"
],
"devDependencies": {
"@tiptap/pm": "^2.5.1"
"@tiptap/pm": "^2.5.2"
},
"peerDependencies": {
"@tiptap/pm": "^2.5.1"
"@tiptap/pm": "^2.5.2"
},
"repository": {
"type": "git",
4 changes: 2 additions & 2 deletions packages/core/src/Extension.ts
View file
Original file line number Diff line number Diff line change
@@ -459,8 +459,8 @@ export class Extension<Options = any, Storage = any> {
// with different calls of `configure`
const extension = this.extend({
...this.config,
addOptions() {
return mergeDeep(this.parent?.() || {}, options) as Options
addOptions: () => {
return mergeDeep(this.options as Record<string, any>, options) as Options
},
})

4 changes: 2 additions & 2 deletions packages/core/src/Mark.ts
View file
Original file line number Diff line number Diff line change
@@ -591,8 +591,8 @@ export class Mark<Options = any, Storage = any> {
// with different calls of `configure`
const extension = this.extend({
...this.config,
addOptions() {
return mergeDeep(this.parent?.() || {}, options) as Options
addOptions: () => {
return mergeDeep(this.options as Record<string, any>, options) as Options
},
})

4 changes: 2 additions & 2 deletions packages/core/src/Node.ts
View file
Original file line number Diff line number Diff line change
@@ -782,8 +782,8 @@ export class Node<Options = any, Storage = any> {
// with different calls of `configure`
const extension = this.extend({
...this.config,
addOptions() {
return mergeDeep(this.parent?.() || {}, options) as Options
addOptions: () => {
return mergeDeep(this.options as Record<string, any>, options) as Options
},
})

7 changes: 7 additions & 0 deletions packages/extension-blockquote/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2

## 2.5.1

### Patch Changes
6 changes: 3 additions & 3 deletions packages/extension-blockquote/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-blockquote",
"description": "blockquote extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,10 +29,10 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"repository": {
"type": "git",
7 changes: 7 additions & 0 deletions packages/extension-bold/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2

## 2.5.1

### Patch Changes
6 changes: 3 additions & 3 deletions packages/extension-bold/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-bold",
"description": "bold extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,10 +29,10 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"repository": {
"type": "git",
8 changes: 8 additions & 0 deletions packages/extension-bubble-menu/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2
- @tiptap/pm@2.5.2

## 2.5.1

### Patch Changes
10 changes: 5 additions & 5 deletions packages/extension-bubble-menu/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-bubble-menu",
"description": "bubble-menu extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -38,12 +38,12 @@
},
"sideEffects": false,
"devDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"scripts": {
"clean": "rm -rf dist",
7 changes: 7 additions & 0 deletions packages/extension-bullet-list/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2

## 2.5.1

### Patch Changes
6 changes: 3 additions & 3 deletions packages/extension-bullet-list/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-bullet-list",
"description": "bullet list extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,10 +29,10 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"repository": {
"type": "git",
8 changes: 8 additions & 0 deletions packages/extension-character-count/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2
- @tiptap/pm@2.5.2

## 2.5.1

### Patch Changes
10 changes: 5 additions & 5 deletions packages/extension-character-count/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-character-count",
"description": "font family extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,12 +29,12 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"repository": {
"type": "git",
9 changes: 9 additions & 0 deletions packages/extension-code-block-lowlight/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2
- @tiptap/extension-code-block@2.5.2
- @tiptap/pm@2.5.2

## 2.5.1

### Patch Changes
14 changes: 7 additions & 7 deletions packages/extension-code-block-lowlight/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-code-block-lowlight",
"description": "code block extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,14 +29,14 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/extension-code-block": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/extension-code-block": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/extension-code-block": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/extension-code-block": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"repository": {
"type": "git",
8 changes: 8 additions & 0 deletions packages/extension-code-block/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2
- @tiptap/pm@2.5.2

## 2.5.1

### Patch Changes
10 changes: 5 additions & 5 deletions packages/extension-code-block/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-code-block",
"description": "code block extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,12 +29,12 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1",
"@tiptap/pm": "^2.5.1"
"@tiptap/core": "^2.5.2",
"@tiptap/pm": "^2.5.2"
},
"repository": {
"type": "git",
7 changes: 7 additions & 0 deletions packages/extension-code/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2

## 2.5.1

### Patch Changes
6 changes: 3 additions & 3 deletions packages/extension-code/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@tiptap/extension-code",
"description": "code extension for tiptap",
"version": "2.5.1",
"version": "2.5.2",
"homepage": "https://tiptap.dev",
"keywords": [
"tiptap",
@@ -29,10 +29,10 @@
"dist"
],
"devDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"peerDependencies": {
"@tiptap/core": "^2.5.1"
"@tiptap/core": "^2.5.2"
},
"repository": {
"type": "git",
7 changes: 7 additions & 0 deletions packages/extension-collaboration-cursor/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.5.2

### Patch Changes

- Updated dependencies [07f4c03]
- @tiptap/core@2.5.2

## 2.5.1

### Patch Changes
Loading