gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-11 18:04:24 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fix(deps): update ckeditor monorepo to v47.3.0 (#7959)

Browse Source
This commit is contained in:
Elian Doran 2025-12-06 09:26:03 +02:00 committed by GitHub
commit b34118e395
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 1029 additions and 1239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/client/src/stylesheets/style.css
View File

@ -1015,15 +1015,9 @@ div[data-notify="container"] {
font-family: var(--monospace-font-family);
}
svg.ck-icon {
&.ck-icon_inherit-color path[fill="#333"] {
fill: currentColor;
}
&.note-icon {
color: var(--main-text-color);
font-size: 20px;
}
svg.ck-icon.note-icon {
color: var(--main-text-color);
font-size: 20px;
}
.ck-content {

3
package.json
View File

@ -88,8 +88,7 @@
"pnpm": {
"patchedDependencies": {
"@ckeditor/ckeditor5-mention": "patches/@ckeditor__ckeditor5-mention.patch",
"@ckeditor/ckeditor5-code-block": "patches/@ckeditor__ckeditor5-code-block.patch",
"ckeditor5": "patches/ckeditor5.patch"
"@ckeditor/ckeditor5-code-block": "patches/@ckeditor__ckeditor5-code-block.patch"
},
"overrides": {
"mermaid": "11.12.1",

4
packages/ckeditor5-admonition/package.json
View File

@ -28,7 +28,7 @@
"@typescript-eslint/parser": "8.48.0",
"@vitest/browser": "4.0.14",
"@vitest/coverage-istanbul": "4.0.14",
"ckeditor5": "47.2.0",
"ckeditor5": "47.3.0",
"eslint": "9.39.1",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@ -42,7 +42,7 @@
"webdriverio": "9.21.0"
},
"peerDependencies": {
"ckeditor5": "47.2.0"
"ckeditor5": "47.3.0"
},
"author": "Elian Doran <contact@eliandoran.me>",
"license": "GPL-2.0-or-later",

4
packages/ckeditor5-footnotes/package.json
View File

@ -29,7 +29,7 @@
"@typescript-eslint/parser": "8.48.0",
"@vitest/browser": "4.0.14",
"@vitest/coverage-istanbul": "4.0.14",
"ckeditor5": "47.2.0",
"ckeditor5": "47.3.0",
"eslint": "9.39.1",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@ -43,7 +43,7 @@
"webdriverio": "9.21.0"
},
"peerDependencies": {
"ckeditor5": "47.2.0"
"ckeditor5": "47.3.0"
},
"scripts": {
"build": "node ./scripts/build-dist.mjs",

4
packages/ckeditor5-keyboard-marker/package.json
View File

@ -31,7 +31,7 @@
"@typescript-eslint/parser": "8.48.0",
"@vitest/browser": "4.0.14",
"@vitest/coverage-istanbul": "4.0.14",
"ckeditor5": "47.2.0",
"ckeditor5": "47.3.0",
"eslint": "9.39.1",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@ -45,7 +45,7 @@
"webdriverio": "9.21.0"
},
"peerDependencies": {
"ckeditor5": "47.2.0"
"ckeditor5": "47.3.0"
},
"scripts": {
"build": "node ./scripts/build-dist.mjs",

6
packages/ckeditor5-math/package.json
View File

@ -31,7 +31,7 @@
"@typescript-eslint/parser": "8.48.0",
"@vitest/browser": "4.0.14",
"@vitest/coverage-istanbul": "4.0.14",
"ckeditor5": "47.2.0",
"ckeditor5": "47.3.0",
"eslint": "9.39.1",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@ -45,7 +45,7 @@
"webdriverio": "9.21.0"
},
"peerDependencies": {
"ckeditor5": "47.2.0"
"ckeditor5": "47.3.0"
},
"scripts": {
"build": "node ./scripts/build-dist.mjs",
@ -70,6 +70,6 @@
]
},
"dependencies": {
"@ckeditor/ckeditor5-icons": "47.2.0"
"@ckeditor/ckeditor5-icons": "47.3.0"
}
}

4
packages/ckeditor5-mermaid/package.json
View File

@ -31,7 +31,7 @@
"@typescript-eslint/parser": "8.48.0",
"@vitest/browser": "4.0.14",
"@vitest/coverage-istanbul": "4.0.14",
"ckeditor5": "47.2.0",
"ckeditor5": "47.3.0",
"eslint": "9.39.1",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@ -45,7 +45,7 @@
"webdriverio": "9.21.0"
},
"peerDependencies": {
"ckeditor5": "47.2.0"
"ckeditor5": "47.3.0"
},
"scripts": {
"build": "node ./scripts/build-dist.mjs",

4
packages/ckeditor5/package.json
View File

@ -12,8 +12,8 @@
"@triliumnext/ckeditor5-keyboard-marker": "workspace:*",
"@triliumnext/ckeditor5-math": "workspace:*",
"@triliumnext/ckeditor5-mermaid": "workspace:*",
"ckeditor5": "47.2.0",
"ckeditor5-premium-features": "47.2.0"
"ckeditor5": "47.3.0",
"ckeditor5-premium-features": "47.3.0"
},
"devDependencies": {
"@smithy/middleware-retry": "4.4.12",

6
packages/highlightjs/src/index.ts
View File

@ -61,7 +61,11 @@ export async function loadTheme(theme: "none" | Theme) {
document.querySelector("head")?.append(highlightingThemeEl);
}
const themeCss = (await theme.load()).default as string;
let themeCss = (await theme.load()).default as string;
// Increase the specificity of the HLJS selector to render properly within CKEditor without the need of patching the library.
themeCss = themeCss.replace(/^.hljs {/m, ".hljs, .ck-content pre.hljs {");
highlightingThemeEl.textContent = themeCss;
}

27
patches/ckeditor5.patch
View File

@ -1,27 +0,0 @@
diff --git a/dist/ckeditor5.css b/dist/ckeditor5.css
index 58b8ed68f5d3b578656663a5fabb9a7020268638..f1769d623fd453ca7ce2eb4fa456a73da7b06df8 100644
--- a/dist/ckeditor5.css
+++ b/dist/ckeditor5.css
@@ -5783,9 +5783,7 @@ a.ck.ck-button.ck-link-toolbar__preview:has( .ck-icon ) {
*/
.ck-content pre {
- padding: 1em;
- color: hsl(0, 0%, 20.8%);
- background: hsla(0, 0%, 78%, 0.3);
+ padding: 1em;
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
@@ -5803,6 +5801,11 @@ a.ck.ck-button.ck-link-toolbar__preview:has( .ck-icon ) {
min-width: 200px;
}
+.ck-content pre:not(.hljs) {
+ color: hsl(0, 0%, 20.8%);
+ background: hsla(0, 0%, 78%, 0.3);
+}
+
.ck-content pre code {
background: unset;
padding: 0;

2194
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff