Merge branch '6.1' into 6.2

Author: dtdesign

app.ts

@@ -20,6 +20,7 @@ import {
   Highlight,
   HorizontalLine,
   HtmlEmbed,
+  Icons,
   Image,
   Indent,
   Link,
@@ -152,7 +153,7 @@ export async function create(
           {
             name: "sideLeft",
             title: "Left aligned image",
-            icon: Core.icons.objectLeft,
+            icon: Icons.IconObjectLeft,
             modelElements: ["imageBlock"],
             className: "image-style-side-left",
           },

modules.ts

@@ -15,6 +15,7 @@ export * as Heading from "@ckeditor/ckeditor5-heading";
 export * as Highlight from "@ckeditor/ckeditor5-highlight";
 export * as HorizontalLine from "@ckeditor/ckeditor5-horizontal-line";
 export * as HtmlEmbed from "@ckeditor/ckeditor5-html-embed";
+export * as Icons from "@ckeditor/ckeditor5-icons";
 export * as Image from "@ckeditor/ckeditor5-image";
 export * as Indent from "@ckeditor/ckeditor5-indent";
 export * as Language from "@ckeditor/ckeditor5-language";

package-lock.json

@@ -4,33 +4,34 @@
     "dev": "npx webpack --mode development --watch"
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-alignment": "^43.3.1",
-    "@ckeditor/ckeditor5-autosave": "^43.3.1",
-    "@ckeditor/ckeditor5-basic-styles": "^43.3.1",
-    "@ckeditor/ckeditor5-block-quote": "^43.3.1",
-    "@ckeditor/ckeditor5-code-block": "^43.3.1",
-    "@ckeditor/ckeditor5-editor-classic": "^43.3.1",
-    "@ckeditor/ckeditor5-engine": "^43.3.1",
-    "@ckeditor/ckeditor5-essentials": "^43.3.1",
-    "@ckeditor/ckeditor5-font": "^43.3.1",
-    "@ckeditor/ckeditor5-heading": "^43.3.1",
-    "@ckeditor/ckeditor5-highlight": "^43.3.1",
-    "@ckeditor/ckeditor5-horizontal-line": "^43.3.1",
-    "@ckeditor/ckeditor5-html-embed": "^43.3.1",
-    "@ckeditor/ckeditor5-image": "^43.3.1",
-    "@ckeditor/ckeditor5-indent": "^43.3.1",
-    "@ckeditor/ckeditor5-link": "^43.3.1",
-    "@ckeditor/ckeditor5-list": "^43.3.1",
-    "@ckeditor/ckeditor5-mention": "^43.3.1",
-    "@ckeditor/ckeditor5-paragraph": "^43.3.1",
-    "@ckeditor/ckeditor5-paste-from-office": "^43.3.1",
-    "@ckeditor/ckeditor5-remove-format": "^43.3.1",
-    "@ckeditor/ckeditor5-table": "^43.3.1",
-    "@ckeditor/ckeditor5-theme-lark": "^43.3.1",
-    "@ckeditor/ckeditor5-ui": "^43.3.1",
-    "@ckeditor/ckeditor5-undo": "^43.3.1",
-    "@ckeditor/ckeditor5-utils": "^43.3.1",
-    "@ckeditor/ckeditor5-widget": "^43.3.1",
+    "@ckeditor/ckeditor5-alignment": "^45.0.0",
+    "@ckeditor/ckeditor5-autosave": "^45.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "^45.0.0",
+    "@ckeditor/ckeditor5-block-quote": "^45.0.0",
+    "@ckeditor/ckeditor5-code-block": "^45.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^45.0.0",
+    "@ckeditor/ckeditor5-engine": "^45.0.0",
+    "@ckeditor/ckeditor5-essentials": "^45.0.0",
+    "@ckeditor/ckeditor5-font": "^45.0.0",
+    "@ckeditor/ckeditor5-heading": "^45.0.0",
+    "@ckeditor/ckeditor5-highlight": "^45.0.0",
+    "@ckeditor/ckeditor5-horizontal-line": "^45.0.0",
+    "@ckeditor/ckeditor5-html-embed": "^45.0.0",
+    "@ckeditor/ckeditor5-icons": "^45.0.0",
+    "@ckeditor/ckeditor5-image": "^45.0.0",
+    "@ckeditor/ckeditor5-indent": "^45.0.0",
+    "@ckeditor/ckeditor5-link": "^45.0.0",
+    "@ckeditor/ckeditor5-list": "^45.0.0",
+    "@ckeditor/ckeditor5-mention": "^45.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^45.0.0",
+    "@ckeditor/ckeditor5-paste-from-office": "^45.0.0",
+    "@ckeditor/ckeditor5-remove-format": "^45.0.0",
+    "@ckeditor/ckeditor5-table": "^45.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^45.0.0",
+    "@ckeditor/ckeditor5-ui": "^45.0.0",
+    "@ckeditor/ckeditor5-undo": "^45.0.0",
+    "@ckeditor/ckeditor5-utils": "^45.0.0",
+    "@ckeditor/ckeditor5-widget": "^45.0.0",
     "emoji-picker-element": "^1.25.0"
   },
   "devDependencies": {
@@ -39,14 +40,14 @@
     "@ckeditor/ckeditor5-inspector": "^4.1.0",
     "css-loader": "^7.1.2",
     "mini-css-extract-plugin": "^2.9.2",
-    "postcss-hover-media-feature": "^1.0.2",
+    "@woltlab/postcss-hover-media-feature": "git+https://github.com/WoltLab/postcss-hover-media-feature.git#0e7f5f68efb093a6b98b62964637d8bdac9142de",
     "postcss-loader": "^8.1.1",
-    "prettier": "^3.4.1",
+    "prettier": "^3.5.3",
     "raw-loader": "^4.0.2",
     "style-loader": "^4.0.0",
-    "ts-loader": "^9.5.1",
-    "typescript": "^5.7.2",
-    "webpack": "^5.96.1",
-    "webpack-cli": "^5.1.4"
+    "ts-loader": "^9.5.2",
+    "typescript": "^5.8.3",
+    "webpack": "^5.98.0",
+    "webpack-cli": "^6.0.1"
   }
-}
+}

package.json

@@ -7,7 +7,8 @@
  * @since 6.0
  */
 
-import { Editor, icons } from "@ckeditor/ckeditor5-core";
+import { Editor } from "@ckeditor/ckeditor5-core";
+import { IconCancel, IconCheck } from "@ckeditor/ckeditor5-icons";
 import {
   ButtonView,
   createLabeledInputText,
@@ -169,7 +170,7 @@ export class WoltlabBlockQuotePanelView extends View {
 
     buttonView.set({
       label: t("MENU_BAR_MENU_INSERT"),
-      icon: icons.check,
+      icon: IconCheck,
       class: "ck-button-save",
       type: "submit",
       withText: true,
@@ -185,7 +186,7 @@ export class WoltlabBlockQuotePanelView extends View {
 
     buttonView.set({
       label: t("Cancel"),
-      icon: icons.cancel,
+      icon: IconCancel,
       class: "ck-button-cancel",
       withText: true,
     });

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

@@ -8,8 +8,9 @@
  * @since 6.0
  */
 
-import { icons, Plugin } from "@ckeditor/ckeditor5-core";
+import { Plugin } from "@ckeditor/ckeditor5-core";
 import { Element as CKEditorElement } from "@ckeditor/ckeditor5-engine";
+import { IconQuote } from "@ckeditor/ckeditor5-icons";
 import { createDropdown, SplitButtonView } from "@ckeditor/ckeditor5-ui";
 import { first } from "@ckeditor/ckeditor5-utils";
 import { WoltlabBlockQuotePanelView } from "./ui/woltlabblockquotepanelview";
@@ -69,7 +70,7 @@ export class WoltlabBlockQuote extends Plugin {
       splitButtonView.set({
         label: t("Block quote"),
         tooltip: true,
-        icon: icons.quote,
+        icon: IconQuote,
         isToggleable: true,
       });
 

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

@@ -8,7 +8,8 @@
  */
 
 import { getNormalizedAndLocalizedLanguageDefinitions } from "@ckeditor/ckeditor5-code-block/src/utils";
-import { Editor, icons } from "@ckeditor/ckeditor5-core";
+import { Editor } from "@ckeditor/ckeditor5-core";
+import { IconCancel, IconCheck } from "@ckeditor/ckeditor5-icons";
 import {
   addListToDropdown,
   ButtonView,
@@ -258,7 +259,7 @@ export class WoltlabCodeBlockPanelView extends View {
 
     buttonView.set({
       label: t("MENU_BAR_MENU_INSERT"),
-      icon: icons.check,
+      icon: IconCheck,
       class: "ck-button-save",
       type: "submit",
       withText: true,
@@ -274,7 +275,7 @@ export class WoltlabCodeBlockPanelView extends View {
 
     buttonView.set({
       label: t("Cancel"),
-      icon: icons.cancel,
+      icon: IconCancel,
       class: "ck-button-cancel",
       withText: true,
     });

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

@@ -24,7 +24,7 @@ import {
   MentionFeedObjectItem,
   MentionListItemView,
   MentionsView,
-} from "@ckeditor/ckeditor5-mention/";
+} from "@ckeditor/ckeditor5-mention";
 import WoltlabSmileyCommand from "./woltlabsmileycommand";
 
 const MARKER_NAME = "smiley";

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

@@ -16,7 +16,7 @@ module.exports = (_env, argv) => {
     },
     minify: true,
   });
-  postcssOptions.plugins.push(require("postcss-hover-media-feature"));
+  postcssOptions.plugins.push(require("@woltlab/postcss-hover-media-feature"));
 
   const config = {
     // https://webpack.js.org/configuration/entry-context/