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

chore: update tiptap to v2.6.6 #6596

Merged
merged 5 commits into from
Sep 18, 2024
Merged

chore: update tiptap to v2.6.6 #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59df93c
chore: update tiptap to v2.6.6
aonnikov Sep 17, 2024
6c88e1a
fix: add defaultLanguage to code block options
aonnikov Sep 17, 2024
1aade20
fix: pass tabindex to editor props to show readonly menus
aonnikov Sep 17, 2024
0571728
chore: update yjs versions
aonnikov Sep 17, 2024
544b82a
fix: use proper link format in tests
aonnikov Sep 18, 2024
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
1,016 changes: 474 additions & 542 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions packages/text/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,32 +40,32 @@
},
"dependencies": {
"@hcengineering/core": "^0.6.32",
"@tiptap/core": "^2.2.4",
"@tiptap/html": "^2.2.4",
"@tiptap/pm": "^2.2.4",
"@tiptap/starter-kit": "^2.2.4",
"@tiptap/extension-gapcursor": "^2.2.4",
"@tiptap/extension-heading": "^2.2.4",
"@tiptap/extension-highlight": "^2.2.4",
"@tiptap/extension-history": "^2.2.4",
"@tiptap/extension-link": "^2.2.4",
"@tiptap/extension-mention": "^2.2.4",
"@tiptap/extension-table": "^2.2.4",
"@tiptap/extension-table-cell": "^2.2.4",
"@tiptap/extension-table-header": "^2.2.4",
"@tiptap/extension-table-row": "^2.2.4",
"@tiptap/extension-task-item": "^2.2.4",
"@tiptap/extension-task-list": "^2.2.4",
"@tiptap/extension-typography": "^2.2.4",
"@tiptap/extension-code-block": "^2.2.4",
"@tiptap/extension-code": "^2.2.4",
"@tiptap/extension-underline": "^2.2.4",
"@tiptap/suggestion": "^2.2.4",
"@tiptap/core": "^2.6.6",
"@tiptap/html": "^2.6.6",
"@tiptap/pm": "^2.6.6",
"@tiptap/starter-kit": "^2.6.6",
"@tiptap/extension-gapcursor": "^2.6.6",
"@tiptap/extension-heading": "^2.6.6",
"@tiptap/extension-highlight": "^2.6.6",
"@tiptap/extension-history": "^2.6.6",
"@tiptap/extension-link": "^2.6.6",
"@tiptap/extension-mention": "^2.6.6",
"@tiptap/extension-table": "^2.6.6",
"@tiptap/extension-table-cell": "^2.6.6",
"@tiptap/extension-table-header": "^2.6.6",
"@tiptap/extension-table-row": "^2.6.6",
"@tiptap/extension-task-item": "^2.6.6",
"@tiptap/extension-task-list": "^2.6.6",
"@tiptap/extension-typography": "^2.6.6",
"@tiptap/extension-code-block": "^2.6.6",
"@tiptap/extension-code": "^2.6.6",
"@tiptap/extension-underline": "^2.6.6",
"@tiptap/suggestion": "^2.6.6",
"prosemirror-codemark": "^0.4.2",
"markdown-it": "^14.0.0",
"fast-equals": "^5.0.1",
"yjs": "^13.5.52",
"y-prosemirror": "^1.2.1"
"yjs": "^13.6.19",
"y-prosemirror": "^1.2.12"
},
"repository": "https://github.com/hcenginneing/anticrm",
"publishConfig": {
Expand Down
1 change: 1 addition & 0 deletions packages/text/src/nodes/codeblock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { isActive, textblockTypeInputRule } from '@tiptap/core'
import CodeBlock, { CodeBlockOptions } from '@tiptap/extension-code-block'

export const codeBlockOptions: CodeBlockOptions = {
defaultLanguage: null,
languageClassPrefix: 'language-',
exitOnArrowDown: true,
exitOnTripleEnter: true,
Expand Down
2 changes: 1 addition & 1 deletion plugins/controlled-documents-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@hcengineering/controlled-documents": "^0.1.0",
"@hcengineering/training": "^0.1.0",
"@hcengineering/training-resources": "^0.1.0",
"@tiptap/core": "^2.2.4",
"@tiptap/core": "^2.6.6",
"effector": "~22.8.7",
"svelte": "^4.2.12",
"slugify": "^1.6.6",
Expand Down
2 changes: 1 addition & 1 deletion plugins/document-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@hcengineering/document": "^0.6.0",
"@hcengineering/time": "^0.6.0",
"@hcengineering/rank": "^0.6.4",
"@tiptap/core": "^2.2.4",
"@tiptap/core": "^2.6.6",
"slugify": "^1.6.6",
"fast-equals": "^5.0.1"
}
Expand Down
46 changes: 23 additions & 23 deletions plugins/text-editor-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,33 +48,33 @@
"@hcengineering/text": "^0.6.5",
"@hcengineering/text-editor": "^0.6.0",
"@hcengineering/collaborator-client": "^0.6.4",
"@tiptap/core": "^2.2.4",
"@tiptap/pm": "^2.2.4",
"@tiptap/extension-code-block-lowlight": "^2.2.4",
"@tiptap/extension-collaboration": "^2.2.4",
"@tiptap/extension-collaboration-cursor": "^2.2.4",
"@tiptap/extension-placeholder": "^2.2.4",
"@tiptap/extension-hard-break": "^2.2.4",
"@tiptap/extension-bubble-menu": "^2.2.4",
"@tiptap/extension-table": "^2.2.4",
"@tiptap/extension-table-cell": "^2.2.4",
"@tiptap/extension-table-header": "^2.2.4",
"@tiptap/extension-table-row": "^2.2.4",
"@tiptap/extension-heading": "^2.2.4",
"@tiptap/extension-list-keymap": "^2.2.4",
"@tiptap/extension-code": "^2.2.4",
"@tiptap/extension-code-block": "^2.2.4",
"@tiptap/extension-highlight": "^2.2.4",
"@tiptap/extension-typography": "^2.2.4",
"@tiptap/extension-link": "^2.2.4",
"@tiptap/starter-kit": "^2.2.4",
"@tiptap/extension-underline": "^2.2.4",
"@tiptap/core": "^2.6.6",
"@tiptap/pm": "^2.6.6",
"@tiptap/extension-code-block-lowlight": "^2.6.6",
"@tiptap/extension-collaboration": "^2.6.6",
"@tiptap/extension-collaboration-cursor": "^2.6.6",
"@tiptap/extension-placeholder": "^2.6.6",
"@tiptap/extension-hard-break": "^2.6.6",
"@tiptap/extension-bubble-menu": "^2.6.6",
"@tiptap/extension-table": "^2.6.6",
"@tiptap/extension-table-cell": "^2.6.6",
"@tiptap/extension-table-header": "^2.6.6",
"@tiptap/extension-table-row": "^2.6.6",
"@tiptap/extension-heading": "^2.6.6",
"@tiptap/extension-list-keymap": "^2.6.6",
"@tiptap/extension-code": "^2.6.6",
"@tiptap/extension-code-block": "^2.6.6",
"@tiptap/extension-highlight": "^2.6.6",
"@tiptap/extension-typography": "^2.6.6",
"@tiptap/extension-link": "^2.6.6",
"@tiptap/starter-kit": "^2.6.6",
"@tiptap/extension-underline": "^2.6.6",
"@hocuspocus/provider": "^2.11.0",
"prosemirror-codemark": "^0.4.2",
"y-protocols": "^1.0.6",
"y-prosemirror": "^1.2.1",
"y-prosemirror": "^1.2.12",
"y-websocket": "^2.0.4",
"yjs": "^13.5.52",
"yjs": "^13.6.19",
"fast-equals": "^5.0.1",
"rfc6902": "^5.0.1",
"diff": "^5.1.0",
Expand Down
6 changes: 5 additions & 1 deletion plugins/text-editor-resources/src/components/editor/editorProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
export const defaultEditorAttributes: Record<string, string> = { class: 'text-editor-view' }
export const defaultEditorAttributes: Record<string, string> = {
class: 'text-editor-view',
// https://github.com/ueberdosis/tiptap/issues/3357
tabindex: '0'
}
6 changes: 3 additions & 3 deletions plugins/text-editor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"@types/jest": "^29.5.5",
"yjs": "^13.5.52"
"yjs": "^13.6.19"
},
"dependencies": {
"@hcengineering/presentation": "^0.6.3",
"@hcengineering/platform": "^0.6.11",
"@hcengineering/core": "^0.6.32",
"@hcengineering/ui": "^0.6.15",
"@tiptap/core": "^2.2.4",
"@tiptap/pm": "^2.2.4"
"@tiptap/core": "^2.6.6",
"@tiptap/pm": "^2.6.6"
}
}
4 changes: 2 additions & 2 deletions plugins/time-resources/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
"@hcengineering/text-editor-resources": "^0.6.0",
"@hcengineering/time": "^0.6.0",
"@hcengineering/rank": "^0.6.4",
"@tiptap/extension-task-item": "^2.2.4",
"@tiptap/extension-task-list": "^2.2.4",
"@tiptap/extension-task-item": "^2.6.6",
"@tiptap/extension-task-list": "^2.6.6",
"fast-equals": "^5.0.1",
"@hcengineering/activity": "^0.6.0",
"@hcengineering/activity-resources": "^0.6.1",
Expand Down
2 changes: 1 addition & 1 deletion server/collaboration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
"@hcengineering/core": "^0.6.32",
"@hcengineering/server-core": "^0.6.1",
"base64-js": "^1.5.1",
"yjs": "^13.5.52"
"yjs": "^13.6.19"
}
}
8 changes: 4 additions & 4 deletions server/collaborator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
"@hcengineering/mongo": "^0.6.1",
"@hocuspocus/server": "^2.13.5",
"@hocuspocus/transformer": "^2.13.5",
"@tiptap/core": "^2.2.4",
"@tiptap/html": "^2.2.4",
"@tiptap/core": "^2.6.6",
"@tiptap/html": "^2.6.6",
"mongodb": "^6.9.0",
"yjs": "^13.5.52",
"y-prosemirror": "^1.2.1",
"yjs": "^13.6.19",
"y-prosemirror": "^1.2.12",
"express": "^4.19.2",
"body-parser": "^1.20.2",
"cors": "^2.8.5",
Expand Down
46 changes: 23 additions & 23 deletions services/github/pod-github/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,29 +86,29 @@
"fast-equals": "^5.0.1",
"@hcengineering/minio": "^0.6.0",
"markdown-it": "^14.0.0",
"@tiptap/html": "^2.2.4",
"@tiptap/core": "^2.2.4",
"@tiptap/pm": "^2.2.4",
"@tiptap/starter-kit": "^2.2.4",
"@tiptap/extension-highlight": "^2.2.4",
"@tiptap/extension-placeholder": "^2.2.4",
"@tiptap/extension-mention": "^2.2.4",
"@tiptap/extension-typography": "^2.2.4",
"@tiptap/extension-link": "^2.2.4",
"@tiptap/suggestion": "^2.2.4",
"@tiptap/extension-task-list": "^2.2.4",
"@tiptap/extension-task-item": "^2.2.4",
"@tiptap/extension-collaboration": "^2.2.4",
"@tiptap/extension-collaboration-cursor": "^2.2.4",
"@tiptap/extension-code-block": "^2.2.4",
"@tiptap/extension-gapcursor": "^2.2.4",
"@tiptap/extension-heading": "^2.2.4",
"@tiptap/extension-table": "^2.2.4",
"@tiptap/extension-table-cell": "^2.2.4",
"@tiptap/extension-table-header": "^2.2.4",
"@tiptap/extension-table-row": "^2.2.4",
"@tiptap/extension-code": "^2.2.4",
"@tiptap/extension-bubble-menu": "^2.2.4",
"@tiptap/html": "^2.6.6",
"@tiptap/core": "^2.6.6",
"@tiptap/pm": "^2.6.6",
"@tiptap/starter-kit": "^2.6.6",
"@tiptap/extension-highlight": "^2.6.6",
"@tiptap/extension-placeholder": "^2.6.6",
"@tiptap/extension-mention": "^2.6.6",
"@tiptap/extension-typography": "^2.6.6",
"@tiptap/extension-link": "^2.6.6",
"@tiptap/suggestion": "^2.6.6",
"@tiptap/extension-task-list": "^2.6.6",
"@tiptap/extension-task-item": "^2.6.6",
"@tiptap/extension-collaboration": "^2.6.6",
"@tiptap/extension-collaboration-cursor": "^2.6.6",
"@tiptap/extension-code-block": "^2.6.6",
"@tiptap/extension-gapcursor": "^2.6.6",
"@tiptap/extension-heading": "^2.6.6",
"@tiptap/extension-table": "^2.6.6",
"@tiptap/extension-table-cell": "^2.6.6",
"@tiptap/extension-table-header": "^2.6.6",
"@tiptap/extension-table-row": "^2.6.6",
"@tiptap/extension-code": "^2.6.6",
"@tiptap/extension-bubble-menu": "^2.6.6",
"@hcengineering/task": "^0.6.20",
"express": "^4.19.2",
"cors": "^2.8.5",
Expand Down
4 changes: 2 additions & 2 deletions tests/sanity/tests/documents/documents.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ test.describe('Documents tests', () => {
await documentContentPage.addRandomLines(5)
await documentContentPage.addContentToTheNewLine(contentLink)
await documentContentPage.addRandomLines(5)
await documentContentPage.addLinkToText(contentLink, 'test/link/123456')
await documentContentPage.checkLinkInTheText(contentLink, 'test/link/123456')
await documentContentPage.addLinkToText(contentLink, 'http://test/link/123456')
await documentContentPage.checkLinkInTheText(contentLink, 'http://test/link/123456')
})

test('Locked document and checking URL', async ({ page, context }) => {
Expand Down