gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-21 16:14:23 +01:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

fix(deps): update dependency marked to v17 (#7652)

Browse Source
This commit is contained in:
Elian Doran 2025-11-18 20:39:02 +02:00 committed by GitHub
commit c744e36f3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/package.json
View File

@ -53,7 +53,7 @@
"leaflet": "1.9.4",
"leaflet-gpx": "2.2.0",
"mark.js": "8.11.1",
"marked": "16.4.2",
"marked": "17.0.0",
"mermaid": "11.12.1",
"mind-elixir": "5.3.6",
"normalize.css": "8.0.1",

2
apps/server/package.json
View File

@ -103,7 +103,7 @@
"is-animated": "2.0.2",
"is-svg": "6.1.0",
"jimp": "1.6.0",
"marked": "16.4.2",
"marked": "17.0.0",
"mime-types": "3.0.1",
"multer": "2.0.2",
"normalize-strings": "1.1.1",

4
apps/server/src/services/import/markdown.ts
View File

@ -66,7 +66,7 @@ class CustomMarkdownRenderer extends Renderer {
// Handle todo-list in the CKEditor format.
if (item.task) {
let itemBody = '';
const checkbox = this.checkbox({ checked: !!item.checked });
const checkbox = this.checkbox({ checked: !!item.checked, raw: "- [ ]", type: "checkbox" });
if (item.loose) {
if (item.tokens[0]?.type === 'paragraph') {
item.tokens[0].text = checkbox + item.tokens[0].text;
@ -86,7 +86,7 @@ class CustomMarkdownRenderer extends Renderer {
itemBody += checkbox;
}
itemBody += `<span class="todo-list__label__description">${this.parser.parse(item.tokens, !!item.loose)}</span>`;
itemBody += `<span class="todo-list__label__description">${this.parser.parse(item.tokens.filter(t => t.type !== "checkbox"))}</span>`;
return `<li><label class="todo-list__label">${itemBody}</label></li>`;
}

31
pnpm-lock.yaml generated
View File

@ -272,8 +272,8 @@ importers:
specifier: 8.11.1
version: 8.11.1
marked:
specifier: 16.4.2
version: 16.4.2
specifier: 17.0.0
version: 17.0.0
mermaid:
specifier: 11.12.1
version: 11.12.1
@ -715,8 +715,8 @@ importers:
specifier: 1.6.0
version: 1.6.0
marked:
specifier: 16.4.2
version: 16.4.2
specifier: 17.0.0
version: 17.0.0
mime-types:
specifier: 3.0.1
version: 3.0.1
@ -10078,6 +10078,11 @@ packages:
engines: {node: '>= 20'}
hasBin: true
marked@17.0.0:
resolution: {integrity: sha512-KkDYEWEEiYJw/KC+DVm1zzlpMQSMIu6YRltkcCvwheCp8HWPXCk9JwOmHJKBlGfzcpzcIt6x3sMnTsRm/51oDg==}
engines: {node: '>= 20'}
hasBin: true
marked@4.3.0:
resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
engines: {node: '>= 12'}
@ -15478,6 +15483,8 @@ snapshots:
'@ckeditor/ckeditor5-core': 47.2.0
'@ckeditor/ckeditor5-upload': 47.2.0
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-ai@47.2.0(bufferutil@4.0.9)(utf-8-validate@6.0.5)':
dependencies:
@ -15690,6 +15697,8 @@ snapshots:
'@ckeditor/ckeditor5-utils': 47.2.0
'@ckeditor/ckeditor5-watchdog': 47.2.0
es-toolkit: 1.39.5
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-dev-build-tools@43.1.0(@swc/helpers@0.5.17)(tslib@2.8.1)(typescript@5.9.3)':
dependencies:
@ -15857,6 +15866,8 @@ snapshots:
'@ckeditor/ckeditor5-utils': 47.2.0
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
es-toolkit: 1.39.5
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-editor-classic@47.2.0':
dependencies:
@ -15866,6 +15877,8 @@ snapshots:
'@ckeditor/ckeditor5-utils': 47.2.0
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
es-toolkit: 1.39.5
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-editor-decoupled@47.2.0':
dependencies:
@ -15884,6 +15897,8 @@ snapshots:
'@ckeditor/ckeditor5-utils': 47.2.0
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
es-toolkit: 1.39.5
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-editor-multi-root@47.2.0':
dependencies:
@ -16480,6 +16495,8 @@ snapshots:
'@ckeditor/ckeditor5-ui': 47.2.0
'@ckeditor/ckeditor5-utils': 47.2.0
ckeditor5: 47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41)
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-special-characters@47.2.0':
dependencies:
@ -16591,6 +16608,8 @@ snapshots:
'@ckeditor/ckeditor5-icons': 47.2.0
'@ckeditor/ckeditor5-ui': 47.2.0
'@ckeditor/ckeditor5-utils': 47.2.0
transitivePeerDependencies:
- supports-color
'@ckeditor/ckeditor5-upload@47.2.0':
dependencies:
@ -22063,8 +22082,6 @@ snapshots:
ckeditor5-collaboration@47.2.0:
dependencies:
'@ckeditor/ckeditor5-collaboration-core': 47.2.0
transitivePeerDependencies:
- supports-color
ckeditor5-premium-features@47.2.0(bufferutil@4.0.9)(ckeditor5@47.2.0(patch_hash=8331a09d41443b39ea1c784daaccfeb0da4f9065ed556e7de92e9c77edd9eb41))(utf-8-validate@6.0.5):
dependencies:
@ -26528,6 +26545,8 @@ snapshots:
marked@16.4.2: {}
marked@17.0.0: {}
marked@4.3.0: {}
matcher@3.0.0: