Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"react-github-btn": "^1.4.0",
"react-icons": "^5.2.1",
"y-partykit": "^0.0.25",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
},
"devDependencies": {
"@types/node": "^20",
Expand Down
2 changes: 1 addition & 1 deletion examples/06-collaboration/01-partykit/.bnexample.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"tags": ["Advanced", "Saving/Loading", "Collaboration"],
"dependencies": {
"y-partykit": "^0.0.25",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
}
}
2 changes: 1 addition & 1 deletion examples/06-collaboration/01-partykit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"y-partykit": "^0.0.25",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
},
"devDependencies": {
"@types/react": "^18.0.25",
Expand Down
2 changes: 1 addition & 1 deletion examples/06-collaboration/02-liveblocks/.bnexample.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
"@liveblocks/client": "^1.10.0",
"@liveblocks/react": "^1.10.0",
"@liveblocks/yjs": "^1.10.0",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
}
}
2 changes: 1 addition & 1 deletion examples/06-collaboration/02-liveblocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@liveblocks/client": "^1.10.0",
"@liveblocks/react": "^1.10.0",
"@liveblocks/yjs": "^1.10.0",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
},
"devDependencies": {
"@types/react": "^18.0.25",
Expand Down
2,344 changes: 1,166 additions & 1,178 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,5 @@
"prepublishOnly": "npm run build && cp README.md packages/core/README.md && cp README.md packages/react/README.md",
"postpublish": "rm -rf packages/core/README.md && rm -rf packages/react/README.md",
"clean": "lerna run --stream clean"
},
"overrides": {
"react": "18.2.0",
"react-dom": "18.2.0",
"prosemirror-model": "1.18.3"
}
}
54 changes: 27 additions & 27 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,32 +54,32 @@
"clean": "rimraf dist && rimraf types"
},
"dependencies": {
"@tiptap/core": "^2.0.3",
"@tiptap/extension-bold": "^2.0.3",
"@tiptap/extension-code": "^2.0.3",
"@tiptap/extension-collaboration": "^2.0.3",
"@tiptap/extension-collaboration-cursor": "^2.0.3",
"@tiptap/extension-dropcursor": "^2.0.3",
"@tiptap/extension-gapcursor": "^2.0.3",
"@tiptap/extension-hard-break": "^2.0.3",
"@tiptap/extension-history": "^2.0.3",
"@tiptap/extension-horizontal-rule": "^2.0.3",
"@tiptap/extension-italic": "^2.0.3",
"@tiptap/extension-link": "^2.0.3",
"@tiptap/extension-paragraph": "^2.0.3",
"@tiptap/extension-strike": "^2.0.3",
"@tiptap/extension-table-cell": "^2.0.3",
"@tiptap/extension-table-header": "^2.0.3",
"@tiptap/extension-table-row": "^2.0.3",
"@tiptap/extension-text": "^2.0.3",
"@tiptap/extension-underline": "^2.0.3",
"@tiptap/pm": "^2.0.3",
"@tiptap/core": "^2.4.0",
"@tiptap/extension-bold": "^2.4.0",
"@tiptap/extension-code": "^2.4.0",
"@tiptap/extension-collaboration": "^2.4.0",
"@tiptap/extension-collaboration-cursor": "^2.4.0",
"@tiptap/extension-dropcursor": "^2.4.0",
"@tiptap/extension-gapcursor": "^2.4.0",
"@tiptap/extension-hard-break": "^2.4.0",
"@tiptap/extension-history": "^2.4.0",
"@tiptap/extension-horizontal-rule": "^2.4.0",
"@tiptap/extension-italic": "^2.4.0",
"@tiptap/extension-link": "^2.4.0",
"@tiptap/extension-paragraph": "^2.4.0",
"@tiptap/extension-strike": "^2.4.0",
"@tiptap/extension-table-cell": "^2.4.0",
"@tiptap/extension-table-header": "^2.4.0",
"@tiptap/extension-table-row": "^2.4.0",
"@tiptap/extension-text": "^2.4.0",
"@tiptap/extension-underline": "^2.4.0",
"@tiptap/pm": "^2.4.0",
"hast-util-from-dom": "^4.2.0",
"prosemirror-model": "^1.18.3",
"prosemirror-model": "^1.21.0",
"prosemirror-state": "^1.4.3",
"prosemirror-tables": "^1.3.4",
"prosemirror-transform": "^1.7.2",
"prosemirror-view": "^1.31.4",
"prosemirror-tables": "^1.3.7",
"prosemirror-transform": "^1.9.0",
"prosemirror-view": "^1.33.7",
"rehype-format": "^5.0.0",
"rehype-parse": "^8.0.4",
"rehype-remark": "^9.1.2",
Expand All @@ -90,9 +90,9 @@
"remark-stringify": "^10.0.2",
"unified": "^10.1.2",
"uuid": "^8.3.2",
"y-prosemirror": "1.2.1",
"y-protocols": "^1.0.5",
"yjs": "^13.6.1"
"y-prosemirror": "1.2.5",
"y-protocols": "^1.0.6",
"yjs": "^13.6.15"
},
"devDependencies": {
"@types/hast": "^2.3.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/schema/blocks/createSpec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ParseRule } from "@tiptap/pm/model";
import { TagParseRule } from "@tiptap/pm/model";
import type { BlockNoteEditor } from "../../editor/BlockNoteEditor";
import { InlineContentSchema } from "../inlineContent/types";
import { StyleSchema } from "../styles/types";
Expand Down Expand Up @@ -68,7 +68,7 @@ export function getParseRules(
config: BlockConfig,
customParseFunction: CustomBlockImplementation<any, any, any>["parse"]
) {
const rules: ParseRule[] = [
const rules: TagParseRule[] = [
{
tag: "[data-content-type=" + config.type + "]",
contentElement: "[data-editable]",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/schema/inlineContent/createSpec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Node } from "@tiptap/core";
import { ParseRule } from "@tiptap/pm/model";
import { TagParseRule } from "@tiptap/pm/model";
import { nodeToCustomInlineContent } from "../../api/nodeConversions/nodeConversions";
import { propsToAttributes } from "../blocks/internal";
import { Props } from "../propTypes";
Expand Down Expand Up @@ -46,7 +46,7 @@ export type CustomInlineContentImplementation<

export function getInlineContentParseRules(
config: CustomInlineContentConfig
): ParseRule[] {
): TagParseRule[] {
return [
{
tag: `[data-inline-content-type="${config.type}"]`,
Expand Down
4 changes: 2 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
"dependencies": {
"@blocknote/core": "^0.13.4",
"@floating-ui/react": "^0.26.4",
"@tiptap/core": "^2.0.3",
"@tiptap/react": "^2.0.3",
"@tiptap/core": "^2.4.0",
"@tiptap/react": "^2.4.0",
"lodash.merge": "^4.6.2",
"react": "^18",
"react-dom": "^18",
Expand Down
2 changes: 1 addition & 1 deletion playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"react-icons": "^5.2.1",
"react-router-dom": "^6.20.0",
"y-partykit": "^0.0.25",
"yjs": "^13.6.10"
"yjs": "^13.6.15"
},
"devDependencies": {
"@types/react": "^18.0.25",
Expand Down
4 changes: 2 additions & 2 deletions playground/src/examples.gen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@
],
"dependencies": {
"y-partykit": "^0.0.25",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
}
},
"title": "Collaborative Editing with PartyKit",
Expand All @@ -785,7 +785,7 @@
"@liveblocks/client": "^1.10.0",
"@liveblocks/react": "^1.10.0",
"@liveblocks/yjs": "^1.10.0",
"yjs": "^13.6.1"
"yjs": "^13.6.15"
}
},
"title": "Collaborative Editing with Liveblocks",
Expand Down