Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-07-07 06:43:03 +02:00
Code Issues Packages Projects Releases Activity

fix(deps): update ckeditor monorepo to v48 (major) (#9270)

Browse Source
This commit is contained in:
Elian Doran
2026-04-04 12:50:07 +03:00
committed by GitHub
parent fe81bde1c9 7ad8d307dc
commit 66add6b9e4
14 changed files with 996 additions and 2059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/type_widgets/text/CKEditorWithWatchdog.tsx
View File

@@ -205,7 +205,7 @@ export default function CKEditorWithWatchdog({ containerRef: externalContainerRe
watchdog.on("stateChange", () => onWatchdogStateChange(watchdog));
}
await watchdog.create(container);
await watchdog.create(container, {});
};
init();

2
apps/client/src/widgets/type_widgets/text/toolbar.ts
View File

@@ -1,6 +1,6 @@
import utils from "../../../services/utils.js";
import options from "../../../services/options.js";
import IconAlignCenter from "@ckeditor/ckeditor5-icons/theme/icons/align-center.svg?raw";
import { IconAlignCenter } from "@ckeditor/ckeditor5-icons";
const TEXT_FORMATTING_GROUP = {
label: "Text formatting",

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

@@ -28,7 +28,7 @@
"@typescript-eslint/parser": "8.58.0",
"@vitest/browser": "4.1.2",
"@vitest/coverage-istanbul": "4.1.2",
"ckeditor5": "47.6.1",
"ckeditor5": "48.0.0",
"eslint": "10.1.0",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@@ -42,7 +42,7 @@
"webdriverio": "9.27.0"
},
"peerDependencies": {
"ckeditor5": "47.6.1"
"ckeditor5": "48.0.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.58.0",
"@vitest/browser": "4.1.2",
"@vitest/coverage-istanbul": "4.1.2",
"ckeditor5": "47.6.1",
"ckeditor5": "48.0.0",
"eslint": "10.1.0",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@@ -43,7 +43,7 @@
"webdriverio": "9.27.0"
},
"peerDependencies": {
"ckeditor5": "47.6.1"
"ckeditor5": "48.0.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.58.0",
"@vitest/browser": "4.1.2",
"@vitest/coverage-istanbul": "4.1.2",
"ckeditor5": "47.6.1",
"ckeditor5": "48.0.0",
"eslint": "10.1.0",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@@ -45,7 +45,7 @@
"webdriverio": "9.27.0"
},
"peerDependencies": {
"ckeditor5": "47.6.1"
"ckeditor5": "48.0.0"
},
"scripts": {
"build": "node ./scripts/build-dist.mjs",

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

@@ -31,7 +31,7 @@
"@typescript-eslint/parser": "8.58.0",
"@vitest/browser": "4.1.2",
"@vitest/coverage-istanbul": "4.1.2",
"ckeditor5": "47.6.1",
"ckeditor5": "48.0.0",
"eslint": "10.1.0",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@@ -45,7 +45,7 @@
"webdriverio": "9.27.0"
},
"peerDependencies": {
"ckeditor5": "47.6.1"
"ckeditor5": "48.0.0"
},
"scripts": {
"build": "node ./scripts/build-dist.mjs",
@@ -70,7 +70,7 @@
]
},
"dependencies": {
"@ckeditor/ckeditor5-icons": "47.6.1",
"@ckeditor/ckeditor5-icons": "48.0.0",
"mathlive": "0.109.0"
}
}

3
packages/ckeditor5-math/src/ui/mainformview.ts
View File

@@ -1,6 +1,5 @@
import { ButtonView, FocusCycler, FocusTracker, KeystrokeHandler, LabelView, submitHandler, SwitchButtonView, View, ViewCollection, type FocusableView, type Locale } from 'ckeditor5';
import IconCheck from "@ckeditor/ckeditor5-icons/theme/icons/check.svg?raw";
import IconCancel from "@ckeditor/ckeditor5-icons/theme/icons/cancel.svg?raw";
import { IconCheck, IconCancel } from "@ckeditor/ckeditor5-icons";
import { extractDelimiters, hasDelimiters } from '../utils.js';
import MathView, { type MathViewOptions } from './mathview.js';
import MathInputView from './mathinputview.js';

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

@@ -31,7 +31,7 @@
"@typescript-eslint/parser": "8.58.0",
"@vitest/browser": "4.1.2",
"@vitest/coverage-istanbul": "4.1.2",
"ckeditor5": "47.6.1",
"ckeditor5": "48.0.0",
"eslint": "10.1.0",
"eslint-config-ckeditor5": ">=9.1.0",
"http-server": "14.1.1",
@@ -45,7 +45,7 @@
"webdriverio": "9.27.0"
},
"peerDependencies": {
"ckeditor5": "47.6.1"
"ckeditor5": "48.0.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.6.1",
"ckeditor5-premium-features": "47.6.1"
"ckeditor5": "48.0.0",
"ckeditor5-premium-features": "48.0.0"
},
"devDependencies": {
"@smithy/middleware-retry": "4.4.46",

6
packages/ckeditor5/src/extra_slash_commands.ts
View File

@@ -1,11 +1,7 @@
import type { Editor } from 'ckeditor5';
import type { SlashCommandEditorConfig } from 'ckeditor5-premium-features';
import { icons as footnoteIcons } from '@triliumnext/ckeditor5-footnotes';
import IconPageBreak from "@ckeditor/ckeditor5-icons/theme/icons/page-break.svg?raw";
import IconAlignLeft from "@ckeditor/ckeditor5-icons/theme/icons/align-left.svg?raw";
import IconAlignCenter from "@ckeditor/ckeditor5-icons/theme/icons/align-center.svg?raw";
import IconAlignRight from "@ckeditor/ckeditor5-icons/theme/icons/align-right.svg?raw";
import IconAlignJustify from "@ckeditor/ckeditor5-icons/theme/icons/align-justify.svg?raw";
import { IconPageBreak, IconAlignLeft, IconAlignCenter, IconAlignRight, IconAlignJustify } from "@ckeditor/ckeditor5-icons";
import bxInfoCircle from "boxicons/svg/regular/bx-info-circle.svg?raw";
import bxBulb from "boxicons/svg/regular/bx-bulb.svg?raw";
import bxCommentError from "boxicons/svg/regular/bx-comment-error.svg?raw";

4
packages/ckeditor5/src/plugins/file_upload/progressbarview.ts
View File

@@ -1,4 +1,4 @@
import cancelIcon from '@ckeditor/ckeditor5-core/theme/icons/cancel.svg?raw';
import { IconCancel } from '@ckeditor/ckeditor5-icons';
import { ButtonView, Locale, toUnit, View } from 'ckeditor5';
const toPx = toUnit('%');
@@ -54,7 +54,7 @@ export default class ProgressBarView extends View {
_createCancelButton(locale: Locale) {
const view = new ButtonView(locale);
view.set({
icon: cancelIcon,
icon: IconCancel,
tooltip: true,
label: 'Cancel',
//@ts-expect-error Object literal may only specify known properties, and 'attributes' does not exist in type

36
patches/@ckeditor__ckeditor5-code-block.patch
View File

@@ -1,33 +1,37 @@
diff --git a/dist/index.css b/dist/index.css
index 8276289d55abd0f70d399e33c5f6c2d006745000..c70f12f1644dcebea6730b9b201a6933fa28969b 100644
index 50d1b0005b464f33fb3f07f69c06f36a35e0c406..785e95ceeb7fce12be6249b43abf9b83e15fcfde 100644
--- a/dist/index.css
+++ b/dist/index.css
@@ -9,8 +9,6 @@
@@ -26,12 +26,10 @@
}
.ck-content pre {
padding: 1em;
- color: hsl(0, 0%, 20.8%);
- background: hsla(0, 0%, 78%, 0.3);
border: 1px solid hsl(0, 0%, 77%);
border-radius: 2px;
@@ -28,6 +26,11 @@
min-width: 200px;
- color: #353535;
text-align: left;
tab-size: 4;
white-space: pre-wrap;
direction: ltr;
- background: #c7c7c74d;
border: 1px solid #c4c4c4;
border-radius: 2px;
min-width: 200px;
@@ -40,6 +38,11 @@
font-style: normal;
}
+.ck-content pre:not(.hljs) {
+ color: hsl(0, 0%, 20.8%);
+ background: hsla(0, 0%, 78%, 0.3);
+ color: #353535;
+ background: #c7c7c74d;
+}
+
.ck-content pre code {
background: unset;
padding: 0;
background: unset;
border-radius: 0;
diff --git a/dist/index.js b/dist/index.js
index f0f8aec2323e8cdb34fa0bb4f48c2b433abcb804..b9600d356df2bf1922d51c6cebd1f74ee3ed9155 100644
index 2e231803ce8450f8498e2a37f1be8c32ff52d090..b54c4943904d2b325f3ca6cef08888b3defc29b9 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -656,6 +656,7 @@ function getLastOutdentableSequenceRange(model, position, sequence) {
@@ -673,6 +673,7 @@ function getLastOutdentableSequenceRange(model, position, sequence) {
// Attributes added only in the editing view.
if (useLabels) {
preAttributes['data-language'] = languagesToLabels[codeBlockLanguage];

11
patches/@ckeditor__ckeditor5-mention.patch
View File

@@ -1,11 +1,8 @@
diff --git a/build/mention.js b/build/mention.js
deleted file mode 100644
index 3ef262a2fb7cbb953b35cb7e07a999edce6dc72a..0000000000000000000000000000000000000000
diff --git a/dist/index.js b/dist/index.js
index bbe511c5550e1cac8612e998034382b4eea1f1b8..8394fd8bba89f8a7b82d62fe613be6f12703ff53 100644
index 5c1b7d98d6a47f56a00440a6753368676bc26a7a..46cf87ae341bd2405fb756ba827c61b5b062f6b6 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -603,6 +603,16 @@ const defaultCommitKeyCodes = [
@@ -609,6 +609,16 @@ const defaultCommitKeyCodes = [
}
if (data.keyCode == keyCodes.esc) {
this._hideUIAndRemoveMarker();
@@ -22,7 +19,7 @@ index bbe511c5550e1cac8612e998034382b4eea1f1b8..8394fd8bba89f8a7b82d62fe613be6f1
}
}
}, {
@@ -1067,12 +1077,11 @@ const defaultCommitKeyCodes = [
@@ -1075,12 +1085,11 @@ const defaultCommitKeyCodes = [
*/ function createRegExp(marker, minimumCharacters) {
const numberOfCharacters = minimumCharacters == 0 ? '*' : `{${minimumCharacters},}`;
const openAfterCharacters = env.features.isRegExpUnicodePropertySupported ? '\\p{Ps}\\p{Pi}"\'' : '\\(\\[{"\'';
@@ -36,7 +33,7 @@ index bbe511c5550e1cac8612e998034382b4eea1f1b8..8394fd8bba89f8a7b82d62fe613be6f1
// The pattern consists of 3 groups:
//
// - 0 (non-capturing): Opening sequence - start of the line, space or an opening punctuation character like "(" or "\"",
@@ -1081,7 +1090,7 @@ const defaultCommitKeyCodes = [
@@ -1089,7 +1098,7 @@ const defaultCommitKeyCodes = [
//
// The pattern matches up to the caret (end of string switch - $).
// (0: opening sequence )(1: marker )(2: typed mention )$

2965
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff