Skip to content

Commit 94f2317

Browse files
committed
Merge remote-tracking branch 'origin/main' into refactor/zod-props-v2
2 parents bd0c5eb + 49af3da commit 94f2317

File tree

18 files changed

+11041
-17409
lines changed

18 files changed

+11041
-17409
lines changed

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@shikijs/langs-precompiled": "^3.2.1",
5757
"@shikijs/themes": "^3.2.1",
5858
"@shikijs/types": "^3.2.1",
59-
"@tiptap/core": "^3.7.2",
59+
"@tiptap/core": "^3.10.2",
6060
"@uppy/core": "^3.13.1",
6161
"@uppy/dashboard": "^3.9.1",
6262
"@uppy/drag-drop": "^3.1.1",

examples/08-extensions/01-tiptap-arrow-conversion/.bnexample.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"tags": ["Extension"],
66
"pro": true,
77
"dependencies": {
8-
"@tiptap/core": "^3.7.2"
8+
"@tiptap/core": "^3.10.2"
99
}
1010
}

examples/08-extensions/01-tiptap-arrow-conversion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"zod": "^4.0.0",
2323
"react": "^19.2.0",
2424
"react-dom": "^19.2.0",
25-
"@tiptap/core": "^3.7.2"
25+
"@tiptap/core": "^3.10.2"
2626
},
2727
"devDependencies": {
2828
"@types/react": "^19.2.2",

packages/core/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,26 +81,26 @@
8181
"dependencies": {
8282
"@emoji-mart/data": "^1.2.1",
8383
"@shikijs/types": "3.13.0",
84-
"@tiptap/core": "^3.7.2",
85-
"@tiptap/extension-bold": "^3.7.2",
86-
"@tiptap/extension-code": "^3.7.2",
87-
"@tiptap/extension-gapcursor": "^3.7.2",
88-
"@tiptap/extension-history": "^3.7.2",
89-
"@tiptap/extension-horizontal-rule": "^3.7.2",
90-
"@tiptap/extension-italic": "^3.7.2",
91-
"@tiptap/extension-link": "^3.7.2",
92-
"@tiptap/extension-paragraph": "^3.7.2",
93-
"@tiptap/extension-strike": "^3.7.2",
94-
"@tiptap/extension-text": "^3.7.2",
95-
"@tiptap/extension-underline": "^3.7.2",
96-
"@tiptap/pm": "^3.7.2",
84+
"@tiptap/core": "^3.10.2",
85+
"@tiptap/extension-bold": "^3.10.2",
86+
"@tiptap/extension-code": "^3.10.2",
87+
"@tiptap/extension-gapcursor": "^3.10.2",
88+
"@tiptap/extension-history": "^3.10.2",
89+
"@tiptap/extension-horizontal-rule": "^3.10.2",
90+
"@tiptap/extension-italic": "^3.10.2",
91+
"@tiptap/extension-link": "^3.10.2",
92+
"@tiptap/extension-paragraph": "^3.10.2",
93+
"@tiptap/extension-strike": "^3.10.2",
94+
"@tiptap/extension-text": "^3.10.2",
95+
"@tiptap/extension-underline": "^3.10.2",
96+
"@tiptap/pm": "^3.10.2",
9797
"emoji-mart": "^5.6.0",
9898
"fast-deep-equal": "^3.1.3",
9999
"hast-util-from-dom": "^5.0.1",
100100
"prosemirror-dropcursor": "^1.8.2",
101101
"prosemirror-highlight": "^0.13.0",
102-
"prosemirror-model": "^1.25.3",
103-
"prosemirror-state": "^1.4.3",
102+
"prosemirror-model": "^1.25.4",
103+
"prosemirror-state": "^1.4.4",
104104
"prosemirror-tables": "^1.8.1",
105105
"prosemirror-transform": "^1.10.4",
106106
"prosemirror-view": "^1.41.3",

packages/react/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
"@blocknote/core": "0.41.1",
6262
"@emoji-mart/data": "^1.2.1",
6363
"@floating-ui/react": "^0.27.16",
64-
"@tiptap/core": "^3.7.2",
65-
"@tiptap/pm": "^3.7.2",
66-
"@tiptap/react": "^3.7.2",
64+
"@tiptap/core": "^3.10.2",
65+
"@tiptap/pm": "^3.10.2",
66+
"@tiptap/react": "^3.10.2",
6767
"emoji-mart": "^5.6.0",
6868
"lodash.merge": "^4.6.2",
6969
"react-icons": "^5.5.0",

packages/server-util/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
"dependencies": {
5959
"@blocknote/core": "0.41.1",
6060
"@blocknote/react": "0.41.1",
61-
"@tiptap/core": "^3.7.2",
62-
"@tiptap/pm": "^3.7.2",
61+
"@tiptap/core": "^3.10.2",
62+
"@tiptap/pm": "^3.10.2",
6363
"jsdom": "^25.0.1",
6464
"y-prosemirror": "^1.3.7",
6565
"y-protocols": "^1.0.6",

packages/xl-ai/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
"@blocknote/prosemirror-suggest-changes": "^0.1.3",
7272
"@blocknote/react": "0.41.1",
7373
"@floating-ui/react": "^0.26.28",
74-
"@tiptap/core": "^3.7.2",
74+
"@tiptap/core": "^3.10.2",
7575
"ai": "^5.0.76",
7676
"lodash.isequal": "^4.5.0",
7777
"prosemirror-changeset": "^2.3.1",
78-
"prosemirror-model": "^1.25.3",
79-
"prosemirror-state": "^1.4.3",
78+
"prosemirror-model": "^1.25.4",
79+
"prosemirror-state": "^1.4.4",
8080
"prosemirror-tables": "^1.8.1",
8181
"prosemirror-transform": "^1.10.4",
8282
"prosemirror-view": "^1.41.3",

packages/xl-multi-column/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
"dependencies": {
5454
"@blocknote/core": "0.41.1",
5555
"@blocknote/react": "0.41.1",
56-
"@tiptap/core": "^3.7.2",
57-
"prosemirror-model": "^1.25.3",
58-
"prosemirror-state": "^1.4.3",
56+
"@tiptap/core": "^3.10.2",
57+
"prosemirror-model": "^1.25.4",
58+
"prosemirror-state": "^1.4.4",
5959
"prosemirror-tables": "^1.8.1",
6060
"prosemirror-transform": "^1.10.4",
6161
"prosemirror-view": "^1.41.3",

playground/src/examples.gen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1588,7 +1588,7 @@
15881588
],
15891589
"pro": true,
15901590
"dependencies": {
1591-
"@tiptap/core": "^3.7.2"
1591+
"@tiptap/core": "^3.10.2"
15921592
} as any
15931593
},
15941594
"title": "TipTap extension (arrow InputRule)",

0 commit comments

Comments
 (0)