Merge branch 'feature/ckeditor-44' of github.com:craftcms/ckeditor in…

…to feature/new-installation-methods

package.json

@@ -6,53 +6,54 @@
     "extends @craftcms/browserslist-config"
   ],
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": ">=41.0.0",
-    "@ckeditor/ckeditor5-autoformat": ">=41.0.0",
-    "@ckeditor/ckeditor5-basic-styles": ">=41.0.0",
-    "@ckeditor/ckeditor5-block-quote": ">=41.0.0",
-    "@ckeditor/ckeditor5-code-block": ">=41.0.0",
-    "@ckeditor/ckeditor5-core": ">=41.0.0",
-    "@ckeditor/ckeditor5-dev-translations": "^39.5.1",
-    "@ckeditor/ckeditor5-editor-classic": ">=41.0.0",
-    "@ckeditor/ckeditor5-essentials": ">=41.0.0",
-    "@ckeditor/ckeditor5-find-and-replace": ">=41.0.0",
-    "@ckeditor/ckeditor5-font": ">=41.0.0",
-    "@ckeditor/ckeditor5-heading": ">=41.0.0",
-    "@ckeditor/ckeditor5-horizontal-line": ">=41.0.0",
-    "@ckeditor/ckeditor5-html-embed": ">=41.0.0",
-    "@ckeditor/ckeditor5-html-support": ">=41.0.0",
-    "@ckeditor/ckeditor5-image": ">=41.0.0",
-    "@ckeditor/ckeditor5-indent": ">=41.0.0",
+    "@ckeditor/ckeditor5-alignment": ">=44.0.0",
+    "@ckeditor/ckeditor5-autoformat": ">=44.0.0",
+    "@ckeditor/ckeditor5-basic-styles": ">=44.0.0",
+    "@ckeditor/ckeditor5-block-quote": ">=44.0.0",
+    "@ckeditor/ckeditor5-code-block": ">=44.0.0",
+    "@ckeditor/ckeditor5-core": ">=44.0.0",
+    "@ckeditor/ckeditor5-dev-translations": "^43.0.1",
+    "@ckeditor/ckeditor5-editor-classic": ">=44.0.0",
+    "@ckeditor/ckeditor5-essentials": ">=44.0.0",
+    "@ckeditor/ckeditor5-find-and-replace": ">=44.0.0",
+    "@ckeditor/ckeditor5-font": ">=44.0.0",
+    "@ckeditor/ckeditor5-heading": ">=44.0.0",
+    "@ckeditor/ckeditor5-horizontal-line": ">=44.0.0",
+    "@ckeditor/ckeditor5-html-embed": ">=44.0.0",
+    "@ckeditor/ckeditor5-html-support": ">=44.0.0",
+    "@ckeditor/ckeditor5-image": ">=44.0.0",
+    "@ckeditor/ckeditor5-indent": ">=44.0.0",
     "@ckeditor/ckeditor5-inspector": ">=4.1.0",
-    "@ckeditor/ckeditor5-language": "^41.0.0",
-    "@ckeditor/ckeditor5-link": ">=41.0.0",
-    "@ckeditor/ckeditor5-list": ">=41.0.0",
-    "@ckeditor/ckeditor5-media-embed": ">=41.0.0",
-    "@ckeditor/ckeditor5-package-tools": "^1.1.0",
-    "@ckeditor/ckeditor5-page-break": ">=41.0.0",
-    "@ckeditor/ckeditor5-paragraph": ">=41.0.0",
-    "@ckeditor/ckeditor5-paste-from-office": ">=41.0.0",
-    "@ckeditor/ckeditor5-remove-format": ">=41.0.0",
-    "@ckeditor/ckeditor5-select-all": ">=41.0.0",
-    "@ckeditor/ckeditor5-source-editing": ">=41.0.0",
-    "@ckeditor/ckeditor5-style": ">=41.0.0",
-    "@ckeditor/ckeditor5-table": ">=41.0.0",
-    "@ckeditor/ckeditor5-theme-lark": "^41.0.0",
-    "@ckeditor/ckeditor5-upload": ">=41.0.0",
-    "@ckeditor/ckeditor5-word-count": ">=41.0.0",
+    "@ckeditor/ckeditor5-language": "^44.0.0",
+    "@ckeditor/ckeditor5-link": ">=44.0.0",
+    "@ckeditor/ckeditor5-list": ">=44.0.0",
+    "@ckeditor/ckeditor5-media-embed": ">=44.0.0",
+    "@ckeditor/ckeditor5-package-tools": "^1.0.0",
+    "@ckeditor/ckeditor5-page-break": ">=44.0.0",
+    "@ckeditor/ckeditor5-paragraph": ">=44.0.0",
+    "@ckeditor/ckeditor5-paste-from-office": ">=44.0.0",
+    "@ckeditor/ckeditor5-remove-format": ">=44.0.0",
+    "@ckeditor/ckeditor5-select-all": ">=44.0.0",
+    "@ckeditor/ckeditor5-source-editing": ">=44.0.0",
+    "@ckeditor/ckeditor5-style": ">=44.0.0",
+    "@ckeditor/ckeditor5-table": ">=44.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^44.0.0",
+    "@ckeditor/ckeditor5-upload": ">=44.0.0",
+    "@ckeditor/ckeditor5-word-count": ">=44.0.0",
     "@craftcms/sass": "^1.1.0",
     "@craftcms/webpack": "^1.1.2",
     "@northernco/ckeditor5-anchor-drupal": "^0.5.0",
-    "ckeditor5": ">=41.0.0",
+    "ckeditor5": ">=44.0.0",
     "copy-webpack-plugin": "^12.0.2",
-    "husky": "^9.0.10",
-    "lint-staged": "^15.2.1",
-    "prettier": "^3.2.4"
+    "husky": "^9.1.7",
+    "jquery": "^3.7.1",
+    "lint-staged": "^15.2.10",
+    "prettier": "^3.4.2"
   },
   "scripts": {
     "prebuild": "npm run fix-prettier",
     "build": "webpack --node-env=production --progress",
-    "dev": "webpack --node-env=dev --mode=development --progress",
+    "dev": "webpack --node-env=dev --mode=development --progress -w",
     "serve": "webpack-dev-server --node-env=development",
     "check-prettier": "prettier --check .",
     "fix-prettier": "prettier --write .",

src/Field.php

@@ -110,7 +110,7 @@ class Field extends HtmlField implements ElementContainerFieldInterface, Mergeab
      * @var NestedElementManager[]
      */
     private static array $entryManagers = [];
-    
+
     /**
      * @inheritdoc
      */

src/web/assets/ckeditor/src/ckeditor5-craftcms.js

@@ -558,6 +558,8 @@ export const create = async function (element, config) {
     element = document.querySelector(`#${element}`);
   }
 
+  config.licenseKey = 'GPL';
+
   const editor = await ClassicEditor.create(
     element,
     Object.assign({plugins}, config),

src/web/assets/ckeditor/webpack.config.js

@@ -103,4 +103,13 @@ config.module.rules = config.module.rules
     }),
   ]);
 
-module.exports = config;
+module.exports = (env, argv) => {
+  // Don't minify in dev
+  if (argv.mode === 'development') {
+    config.optimization = {
+      minimize: false,
+    };
+  }
+
+  return config;
+};