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.

Sign up for GitHub

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

Jump to bottom

Make y-prosemirror a peer dependency (extension-collaboration) #3697

Merged
merged 3 commits into from
Feb 7, 2023
Merged

Make y-prosemirror a peer dependency (extension-collaboration) #3697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fff2f5e
refactor(extension-collaboration): make y-prosemirror a peer dep
svenadlung Feb 3, 2023
e572c7b
docs: update installation of extension-collaboration
svenadlung Feb 3, 2023
68539fc
Merge branch 'main' into refactoring/make-y-prosemirror-a-peer-dep
bdbch Feb 7, 2023
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/api/extensions/collaboration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ We kindly ask you to [sponsor our work](/sponsor) when using this extension in p

## Installation
```bash
npm install @tiptap/extension-collaboration yjs y-websocket
npm install @tiptap/extension-collaboration yjs y-websocket y-prosemirror
```

## Settings
Expand Down
4 changes: 2 additions & 2 deletions docs/guide/collaborative-editing.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ WebRTC uses a server only to connect clients with each other. The actual data is
First, install the dependencies:

```bash
npm install @tiptap/extension-collaboration yjs y-webrtc
npm install @tiptap/extension-collaboration yjs y-webrtc y-prosemirror
```

Now, create a new Y document, and register it with Tiptap:
Expand Down Expand Up @@ -71,7 +71,7 @@ For most uses cases, a WebSocket provider is the recommended choice. It’s very
For the client, the example is nearly the same, only the provider is different. First, let’s install the dependencies:

```bash
npm install @tiptap/extension-collaboration @hocuspocus/provider
npm install @tiptap/extension-collaboration @hocuspocus/provider y-prosemirror
```

And then register the WebSocket provider with Tiptap:
Expand Down
9 changes: 4 additions & 5 deletions packages/extension-collaboration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,15 @@
"src",
"dist"
],
"dependencies": {
"y-prosemirror": "1.0.20"
},
"peerDependencies": {
"@tiptap/core": "^2.0.0-beta.209",
"@tiptap/pm": "^2.0.0-beta.209"
"@tiptap/pm": "^2.0.0-beta.209",
"y-prosemirror": "1.0.20"
},
"devDependencies": {
"@tiptap/core": "^2.0.0-beta.213",
"@tiptap/pm": "^2.0.0-beta.213"
"@tiptap/pm": "^2.0.0-beta.213",
"y-prosemirror": "1.0.20"
},
"repository": {
"type": "git",
Expand Down