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

Merge pull request #3895 from ueberdosis/feature/ttCollabProvider #3897

Merged
merged 1 commit into from
Mar 28, 2023
Merged

Merge pull request #3895 from ueberdosis/feature/ttCollabProvider #3897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 demos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"ts": "tsc --project tsconfig.base.json --noEmit && tsc --project tsconfig.react.json --noEmit && tsc --project tsconfig.vue-2.json --noEmit && tsc --project tsconfig.vue-3.json --noEmit"
},
"dependencies": {
"@hocuspocus/provider": "^1.0.0-alpha.29",
"@hocuspocus/provider": "^1.1.3",
"d3": "^7.3.0",
"fast-glob": "^3.2.11",
"highlight.js": "^11.6.0",
Expand Down
9 changes: 3 additions & 6 deletions demos/src/Examples/CollaborativeEditing/React/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import './styles.scss'

import { HocuspocusProvider } from '@hocuspocus/provider'
import { TiptapCollabProvider } from '@hocuspocus/provider'
import CharacterCount from '@tiptap/extension-character-count'
import Collaboration from '@tiptap/extension-collaboration'
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
Expand Down Expand Up @@ -60,11 +60,8 @@ const getRandomName = () => getRandomElement(names)
const room = getRandomRoom()

const ydoc = new Y.Doc()
const websocketProvider = new HocuspocusProvider({
url: 'wss://connect.hocuspocus.cloud',
parameters: {
key: 'write_bqgvQ3Zwl34V4Nxt43zR',
},
const websocketProvider = new TiptapCollabProvider({
appId: '7j9y6m10',
name: room,
document: ydoc,
})
Expand Down
9 changes: 3 additions & 6 deletions demos/src/Examples/CollaborativeEditing/Vue/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</template>

<script>
import { HocuspocusProvider } from '@hocuspocus/provider'
import { TiptapCollabProvider } from '@hocuspocus/provider'
import CharacterCount from '@tiptap/extension-character-count'
import Collaboration from '@tiptap/extension-collaboration'
import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
Expand Down Expand Up @@ -67,11 +67,8 @@ export default {
mounted() {
const ydoc = new Y.Doc()

this.provider = new HocuspocusProvider({
url: 'wss://connect.hocuspocus.cloud',
parameters: {
key: 'write_bqgvQ3Zwl34V4Nxt43zR',
},
this.provider = new TiptapCollabProvider({
appId: '7j9y6m10',
name: this.room,
document: ydoc,
})
Expand Down
34 changes: 20 additions & 14 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.