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

chore: migrate to new versions of prosemirror packages #2854

Merged
merged 14 commits into from
Jun 20, 2022
Merged

chore: migrate to new versions of prosemirror packages #2854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1307423
refactor: upgrade prosemirror packages to new typescript versions
bdbch Jun 6, 2022
8149746
refactor: merge main into prosemirror-ts-update
bdbch Jun 6, 2022
bc1e7e8
refactor: migrate to new typings from prosemirror
bdbch Jun 7, 2022
95b8850
style: fix linting issues
bdbch Jun 7, 2022
2ecedb6
style: fix linting issues
bdbch Jun 7, 2022
e9e8c86
refactor: merge main into branch & resolve conflicts
bdbch Jun 17, 2022
177d0eb
style: fix linting issues
bdbch Jun 17, 2022
9d4d309
fix(ci): fix build process by reimplement filterTransaction
bdbch Jun 18, 2022
63146e4
fix(extension-test): fix broken build because of wrong output file names
bdbch Jun 18, 2022
5301636
fix: fix prosemirror-tables not being bundled correctly for ES6
bdbch Jun 18, 2022
6eb2855
fix: move to prosemirror-tables-contently until es6 build is working
bdbch Jun 18, 2022
b711aff
fix: fix tests for youtube
bdbch Jun 18, 2022
7e6a20e
fix: fix youtube test
bdbch Jun 18, 2022
75740d3
fix(demos): fix demos build
bdbch Jun 19, 2022
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
8 changes: 4 additions & 4 deletions demos/includeDependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ prosemirror-keymap
prosemirror-model
prosemirror-schema-list
prosemirror-state
prosemirror-tables
prosemirror-tables-contently
prosemirror-transform
prosemirror-view
react
react-dom
react-dom/client
shiki
simplify-js
tippy.js
uuid
y-webrtc
yjs
react
react-dom
react-dom/client
1 change: 1 addition & 0 deletions demos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"simplify-js": "^1.2.4",
"y-webrtc": "^10.2.2",
"yjs": "^13.5.26",
"y-prosemirror": "1.0.20",
"lowlight": "^1.20.0"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions demos/src/Examples/CollaborativeEditing/React/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ context('/src/Examples/CollaborativeEditing/React/', () => {
})

it('should show the current room with participants', () => {
cy.wait(3000)
cy.wait(6000)
cy.get('.editor__status')
.should('contain', 'rooms.')
.should('contain', 'users online')
Expand All @@ -14,7 +14,7 @@ context('/src/Examples/CollaborativeEditing/React/', () => {
cy.window().then(win => {
cy.stub(win, 'prompt').returns('John Doe')
cy.get('.editor__name > button').click()
cy.wait(3000)
cy.wait(6000)
cy.get('.editor__name').should('contain', 'John Doe')
})

Expand Down
4 changes: 2 additions & 2 deletions demos/src/Examples/CollaborativeEditing/Vue/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ context('/src/Examples/CollaborativeEditing/Vue/', () => {
})

it('should show the current room with participants', () => {
cy.wait(3000)
cy.wait(6000)
cy.get('.editor__status')
.should('contain', 'rooms.')
.should('contain', 'users online')
Expand All @@ -14,7 +14,7 @@ context('/src/Examples/CollaborativeEditing/Vue/', () => {
cy.window().then(win => {
cy.stub(win, 'prompt').returns('John Doe')
cy.get('.editor__name > button').click()
cy.wait(3000)
cy.wait(6000)
cy.get('.editor__name').should('contain', 'John Doe')
})
})
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Experiments/GlobalDragHandle/Vue/DragHandle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Extension } from '@tiptap/core'
import { NodeSelection, Plugin } from 'prosemirror-state'
import { serializeForClipboard } from 'prosemirror-view/src/clipboard'
import { __serializeForClipboard as serializeForClipboard } from 'prosemirror-view'

function removeNode(node) {
node.parentNode.removeChild(node)
Expand Down
4 changes: 3 additions & 1 deletion demos/src/Experiments/Youtube/React/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ export default () => {
const editor = useEditor({
extensions: [
StarterKit,
Youtube,
Youtube.configure({
controls: false,
}),
],
content: `
<p>Tiptap now supports youtube embeds! Awesome!</p>
Expand Down
4 changes: 3 additions & 1 deletion demos/src/Experiments/Youtube/Vue/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ export default {
this.editor = new Editor({
extensions: [
StarterKit,
Youtube,
Youtube.configure({
controls: false,
}),
],
content: `
<p>Tiptap now supports youtube embeds! Awesome!</p>
Expand Down
Loading