Skip to content

Commit e2f6271

Browse files
dtdesigndtdesign
committed
Merge branch '6.1' into 6.2
2 parents 255ab7a + a77613c commit e2f6271

9 files changed

Lines changed: 1490 additions & 903 deletions

File tree

‎app.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
Highlight,
2121
HorizontalLine,
2222
HtmlEmbed,
23+
Icons,
2324
Image,
2425
Indent,
2526
Link,
@@ -152,7 +153,7 @@ export async function create(
152153
{
153154
name: "sideLeft",
154155
title: "Left aligned image",
155-
icon: Core.icons.objectLeft,
156+
icon: Icons.IconObjectLeft,
156157
modelElements: ["imageBlock"],
157158
className: "image-style-side-left",
158159
},

‎modules.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export * as Heading from "@ckeditor/ckeditor5-heading";
1515
export * as Highlight from "@ckeditor/ckeditor5-highlight";
1616
export * as HorizontalLine from "@ckeditor/ckeditor5-horizontal-line";
1717
export * as HtmlEmbed from "@ckeditor/ckeditor5-html-embed";
18+
export * as Icons from "@ckeditor/ckeditor5-icons";
1819
export * as Image from "@ckeditor/ckeditor5-image";
1920
export * as Indent from "@ckeditor/ckeditor5-indent";
2021
export * as Language from "@ckeditor/ckeditor5-language";

‎package-lock.json‎

Lines changed: 1439 additions & 858 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,34 @@
44
"dev": "npx webpack --mode development --watch"
55
},
66
"dependencies": {
7-
"@ckeditor/ckeditor5-alignment": "^43.3.1",
8-
"@ckeditor/ckeditor5-autosave": "^43.3.1",
9-
"@ckeditor/ckeditor5-basic-styles": "^43.3.1",
10-
"@ckeditor/ckeditor5-block-quote": "^43.3.1",
11-
"@ckeditor/ckeditor5-code-block": "^43.3.1",
12-
"@ckeditor/ckeditor5-editor-classic": "^43.3.1",
13-
"@ckeditor/ckeditor5-engine": "^43.3.1",
14-
"@ckeditor/ckeditor5-essentials": "^43.3.1",
15-
"@ckeditor/ckeditor5-font": "^43.3.1",
16-
"@ckeditor/ckeditor5-heading": "^43.3.1",
17-
"@ckeditor/ckeditor5-highlight": "^43.3.1",
18-
"@ckeditor/ckeditor5-horizontal-line": "^43.3.1",
19-
"@ckeditor/ckeditor5-html-embed": "^43.3.1",
20-
"@ckeditor/ckeditor5-image": "^43.3.1",
21-
"@ckeditor/ckeditor5-indent": "^43.3.1",
22-
"@ckeditor/ckeditor5-link": "^43.3.1",
23-
"@ckeditor/ckeditor5-list": "^43.3.1",
24-
"@ckeditor/ckeditor5-mention": "^43.3.1",
25-
"@ckeditor/ckeditor5-paragraph": "^43.3.1",
26-
"@ckeditor/ckeditor5-paste-from-office": "^43.3.1",
27-
"@ckeditor/ckeditor5-remove-format": "^43.3.1",
28-
"@ckeditor/ckeditor5-table": "^43.3.1",
29-
"@ckeditor/ckeditor5-theme-lark": "^43.3.1",
30-
"@ckeditor/ckeditor5-ui": "^43.3.1",
31-
"@ckeditor/ckeditor5-undo": "^43.3.1",
32-
"@ckeditor/ckeditor5-utils": "^43.3.1",
33-
"@ckeditor/ckeditor5-widget": "^43.3.1",
7+
"@ckeditor/ckeditor5-alignment": "^45.0.0",
8+
"@ckeditor/ckeditor5-autosave": "^45.0.0",
9+
"@ckeditor/ckeditor5-basic-styles": "^45.0.0",
10+
"@ckeditor/ckeditor5-block-quote": "^45.0.0",
11+
"@ckeditor/ckeditor5-code-block": "^45.0.0",
12+
"@ckeditor/ckeditor5-editor-classic": "^45.0.0",
13+
"@ckeditor/ckeditor5-engine": "^45.0.0",
14+
"@ckeditor/ckeditor5-essentials": "^45.0.0",
15+
"@ckeditor/ckeditor5-font": "^45.0.0",
16+
"@ckeditor/ckeditor5-heading": "^45.0.0",
17+
"@ckeditor/ckeditor5-highlight": "^45.0.0",
18+
"@ckeditor/ckeditor5-horizontal-line": "^45.0.0",
19+
"@ckeditor/ckeditor5-html-embed": "^45.0.0",
20+
"@ckeditor/ckeditor5-icons": "^45.0.0",
21+
"@ckeditor/ckeditor5-image": "^45.0.0",
22+
"@ckeditor/ckeditor5-indent": "^45.0.0",
23+
"@ckeditor/ckeditor5-link": "^45.0.0",
24+
"@ckeditor/ckeditor5-list": "^45.0.0",
25+
"@ckeditor/ckeditor5-mention": "^45.0.0",
26+
"@ckeditor/ckeditor5-paragraph": "^45.0.0",
27+
"@ckeditor/ckeditor5-paste-from-office": "^45.0.0",
28+
"@ckeditor/ckeditor5-remove-format": "^45.0.0",
29+
"@ckeditor/ckeditor5-table": "^45.0.0",
30+
"@ckeditor/ckeditor5-theme-lark": "^45.0.0",
31+
"@ckeditor/ckeditor5-ui": "^45.0.0",
32+
"@ckeditor/ckeditor5-undo": "^45.0.0",
33+
"@ckeditor/ckeditor5-utils": "^45.0.0",
34+
"@ckeditor/ckeditor5-widget": "^45.0.0",
3435
"emoji-picker-element": "^1.25.0"
3536
},
3637
"devDependencies": {
@@ -39,14 +40,14 @@
3940
"@ckeditor/ckeditor5-inspector": "^4.1.0",
4041
"css-loader": "^7.1.2",
4142
"mini-css-extract-plugin": "^2.9.2",
42-
"postcss-hover-media-feature": "^1.0.2",
43+
"@woltlab/postcss-hover-media-feature": "git+https://github.com/WoltLab/postcss-hover-media-feature.git#0e7f5f68efb093a6b98b62964637d8bdac9142de",
4344
"postcss-loader": "^8.1.1",
44-
"prettier": "^3.4.1",
45+
"prettier": "^3.5.3",
4546
"raw-loader": "^4.0.2",
4647
"style-loader": "^4.0.0",
47-
"ts-loader": "^9.5.1",
48-
"typescript": "^5.7.2",
49-
"webpack": "^5.96.1",
50-
"webpack-cli": "^5.1.4"
48+
"ts-loader": "^9.5.2",
49+
"typescript": "^5.8.3",
50+
"webpack": "^5.98.0",
51+
"webpack-cli": "^6.0.1"
5152
}
52-
}
53+
}

‎plugins/ckeditor5-woltlab-block-quote/src/ui/woltlabblockquotepanelview.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
* @since 6.0
88
*/
99

10-
import { Editor, icons } from "@ckeditor/ckeditor5-core";
10+
import { Editor } from "@ckeditor/ckeditor5-core";
11+
import { IconCancel, IconCheck } from "@ckeditor/ckeditor5-icons";
1112
import {
1213
ButtonView,
1314
createLabeledInputText,
@@ -169,7 +170,7 @@ export class WoltlabBlockQuotePanelView extends View {
169170

170171
buttonView.set({
171172
label: t("MENU_BAR_MENU_INSERT"),
172-
icon: icons.check,
173+
icon: IconCheck,
173174
class: "ck-button-save",
174175
type: "submit",
175176
withText: true,
@@ -185,7 +186,7 @@ export class WoltlabBlockQuotePanelView extends View {
185186

186187
buttonView.set({
187188
label: t("Cancel"),
188-
icon: icons.cancel,
189+
icon: IconCancel,
189190
class: "ck-button-cancel",
190191
withText: true,
191192
});

‎plugins/ckeditor5-woltlab-block-quote/src/woltlabblockquote.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
* @since 6.0
99
*/
1010

11-
import { icons, Plugin } from "@ckeditor/ckeditor5-core";
11+
import { Plugin } from "@ckeditor/ckeditor5-core";
1212
import { Element as CKEditorElement } from "@ckeditor/ckeditor5-engine";
13+
import { IconQuote } from "@ckeditor/ckeditor5-icons";
1314
import { createDropdown, SplitButtonView } from "@ckeditor/ckeditor5-ui";
1415
import { first } from "@ckeditor/ckeditor5-utils";
1516
import { WoltlabBlockQuotePanelView } from "./ui/woltlabblockquotepanelview";
@@ -69,7 +70,7 @@ export class WoltlabBlockQuote extends Plugin {
6970
splitButtonView.set({
7071
label: t("Block quote"),
7172
tooltip: true,
72-
icon: icons.quote,
73+
icon: IconQuote,
7374
isToggleable: true,
7475
});
7576

‎plugins/ckeditor5-woltlab-code-block/src/ui/woltlabcodeblockpanelview.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
*/
99

1010
import { getNormalizedAndLocalizedLanguageDefinitions } from "@ckeditor/ckeditor5-code-block/src/utils";
11-
import { Editor, icons } from "@ckeditor/ckeditor5-core";
11+
import { Editor } from "@ckeditor/ckeditor5-core";
12+
import { IconCancel, IconCheck } from "@ckeditor/ckeditor5-icons";
1213
import {
1314
addListToDropdown,
1415
ButtonView,
@@ -258,7 +259,7 @@ export class WoltlabCodeBlockPanelView extends View {
258259

259260
buttonView.set({
260261
label: t("MENU_BAR_MENU_INSERT"),
261-
icon: icons.check,
262+
icon: IconCheck,
262263
class: "ck-button-save",
263264
type: "submit",
264265
withText: true,
@@ -274,7 +275,7 @@ export class WoltlabCodeBlockPanelView extends View {
274275

275276
buttonView.set({
276277
label: t("Cancel"),
277-
icon: icons.cancel,
278+
icon: IconCancel,
278279
class: "ck-button-cancel",
279280
withText: true,
280281
});

‎plugins/ckeditor5-woltlab-smiley/src/woltlabsmileyui.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
MentionFeedObjectItem,
2525
MentionListItemView,
2626
MentionsView,
27-
} from "@ckeditor/ckeditor5-mention/";
27+
} from "@ckeditor/ckeditor5-mention";
2828
import WoltlabSmileyCommand from "./woltlabsmileycommand";
2929

3030
const MARKER_NAME = "smiley";

‎webpack.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = (_env, argv) => {
1616
},
1717
minify: true,
1818
});
19-
postcssOptions.plugins.push(require("postcss-hover-media-feature"));
19+
postcssOptions.plugins.push(require("@woltlab/postcss-hover-media-feature"));
2020

2121
const config = {
2222
// https://webpack.js.org/configuration/entry-context/

0 commit comments

Comments
 (0)