Merge pull request #59 from mostafaznv/dev

Dev
mostafaznv · Jun 28, 2023 · 003dacb · 003dacb
2 parents 69bc004 + fde3727
commit 003dacb
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 45 deletions.
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/dist/js/field.js.LICENSE.txt b/dist/js/field.js.LICENSE.txt
@@ -1,6 +1,20 @@
+/* istanbul ignore else -- @preserve */
+
+/* istanbul ignore else: This is always true because otherwise it would not register a reducer callback. -- @preserve */
+
+/* istanbul ignore file -- @preserve */
+
+/* istanbul ignore if -- @preserve */
+
+/* istanbul ignore if: paranoid check -- @preserve */
+
+/* istanbul ignore next -- @preserve */
+
+/* istanbul ignore next: paranoid check -- @preserve */
+
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
diff --git a/package.json b/package.json
@@ -8,52 +8,52 @@
         "prod": "mix --production"
     },
     "devDependencies": {
-        "@ckeditor/ckeditor5-alignment": "^35.0.0",
-        "@ckeditor/ckeditor5-autoformat": "^35.0.0",
-        "@ckeditor/ckeditor5-basic-styles": "^35.0.0",
-        "@ckeditor/ckeditor5-block-quote": "^35.0.0",
-        "@ckeditor/ckeditor5-code-block": "^35.0.0",
-        "@ckeditor/ckeditor5-dev-utils": "^31.1.5",
-        "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.5",
-        "@ckeditor/ckeditor5-editor-classic": "^35.0.0",
-        "@ckeditor/ckeditor5-essentials": "^35.0.0",
-        "@ckeditor/ckeditor5-font": "^35.0.0",
-        "@ckeditor/ckeditor5-heading": "^35.0.0",
-        "@ckeditor/ckeditor5-horizontal-line": "^35.0.0",
-        "@ckeditor/ckeditor5-html-embed": "^35.0.0",
-        "@ckeditor/ckeditor5-html-support": "^35.0.0",
-        "@ckeditor/ckeditor5-image": "^35.0.0",
-        "@ckeditor/ckeditor5-indent": "^35.0.0",
-        "@ckeditor/ckeditor5-link": "^35.0.0",
-        "@ckeditor/ckeditor5-list": "^35.0.0",
-        "@ckeditor/ckeditor5-media-embed": "^35.0.0",
-        "@ckeditor/ckeditor5-paragraph": "^35.0.0",
-        "@ckeditor/ckeditor5-paste-from-office": "^35.0.0",
-        "@ckeditor/ckeditor5-remove-format": "^35.0.0",
-        "@ckeditor/ckeditor5-source-editing": "^35.0.0",
-        "@ckeditor/ckeditor5-table": "^35.0.0",
-        "@ckeditor/ckeditor5-theme-lark": "^35.0.0",
-        "@ckeditor/ckeditor5-ui": "^35.0.0",
-        "@vue/compiler-sfc": "^3.2.33",
-        "cross-env": "^7.0.2",
+        "@ckeditor/ckeditor5-alignment": "^38.1.0",
+        "@ckeditor/ckeditor5-autoformat": "^38.1.0",
+        "@ckeditor/ckeditor5-basic-styles": "^38.1.0",
+        "@ckeditor/ckeditor5-block-quote": "^38.1.0",
+        "@ckeditor/ckeditor5-code-block": "^38.1.0",
+        "@ckeditor/ckeditor5-dev-utils": "^38.0.2",
+        "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
+        "@ckeditor/ckeditor5-editor-classic": "^38.1.0",
+        "@ckeditor/ckeditor5-essentials": "^38.1.0",
+        "@ckeditor/ckeditor5-font": "^38.1.0",
+        "@ckeditor/ckeditor5-heading": "^38.1.0",
+        "@ckeditor/ckeditor5-horizontal-line": "^38.1.0",
+        "@ckeditor/ckeditor5-html-embed": "^38.1.0",
+        "@ckeditor/ckeditor5-html-support": "^38.1.0",
+        "@ckeditor/ckeditor5-image": "^38.1.0",
+        "@ckeditor/ckeditor5-indent": "^38.1.0",
+        "@ckeditor/ckeditor5-language": "^38.1.0",
+        "@ckeditor/ckeditor5-link": "^38.1.0",
+        "@ckeditor/ckeditor5-list": "^38.1.0",
+        "@ckeditor/ckeditor5-media-embed": "^38.1.0",
+        "@ckeditor/ckeditor5-paragraph": "^38.1.0",
+        "@ckeditor/ckeditor5-paste-from-office": "^38.1.0",
+        "@ckeditor/ckeditor5-remove-format": "^38.1.0",
+        "@ckeditor/ckeditor5-source-editing": "^38.1.0",
+        "@ckeditor/ckeditor5-table": "^38.1.0",
+        "@ckeditor/ckeditor5-theme-lark": "^38.1.0",
+        "@ckeditor/ckeditor5-ui": "^38.1.0",
+        "@vue/compiler-sfc": "^3.3.4",
+        "cross-env": "^7.0.3",
         "drag-drop": "^6.0.0",
-        "laravel-mix": "^6.0",
-        "postcss-loader": "^4.0.0",
-        "raw-loader": "^4.0.1",
+        "laravel-mix": "^6.0.49",
+        "postcss-loader": "^7.3.3",
+        "raw-loader": "^4.0.2",
         "resolve-url-loader": "^5.0.0",
-        "sass": "^1.26.5",
-        "sass-loader": "^8.0.2",
-        "style-loader": "^2.0.0",
+        "sass": "^1.63.6",
+        "sass-loader": "^13.3.2",
+        "style-loader": "^3.3.3",
         "v-lazy-image": "^2.1.1",
-        "vue-loader": "^16.2.0",
-        "vue-template-compiler": "^2.6.11",
-        "webpack": "^5.9.0"
+        "vue-loader": "^17.2.2",
+        "vue-template-compiler": "^2.7.14",
+        "webpack": "^5.88.0"
     },
     "dependencies": {
-        "@ckeditor/ckeditor5-language": "^35.4.0",
         "lodash": "^4.17.21",
-        "postcss-scss": "^4.0.4",
+        "postcss-scss": "^4.0.6",
         "regex-parser": "^2.2.11",
-        "vue": "^3.2.29"
+        "vue": "^3.3.4"
     }
 }
diff --git a/src/FieldServiceProvider.php b/src/FieldServiceProvider.php
@@ -29,9 +29,7 @@ public function boot(): void
             Nova::provideToScript(['ckeditor' => config('nova-ckeditor', [])]);
             Nova::style('field-ckeditor', __DIR__ . '/../dist/css/field.css');
 
-            if ($langScript = config('nova-ckeditor.toolbar.ui-language.script')) {
-                Nova::script('ckeditor-lang', $langScript);
-            }
+            $this->registerUiLanguageScripts();
 
             // allow hot reloading
             if (App::environment('local') && file_exists(__DIR__ . '/../dist/hot')) {
@@ -69,6 +67,23 @@ protected function publish(): void
         ], 'nova-ckeditor-stubs');
     }
 
+    private function registerUiLanguageScripts(): void {
+        $toolbars = config('nova-ckeditor.toolbars');
+        $scripts = [];
+
+        foreach ($toolbars as $key => $toolbar) {
+            if (isset($toolbars[$key]['ui-language']['script'])) {
+                $scripts[] = $toolbars[$key]['ui-language']['script'];
+            }
+        }
+
+        $scripts = array_unique($scripts);
+
+        foreach ($scripts as $script) {
+            Nova::script('ckeditor-lang', $script);
+        }
+    }
+
     private function isLegacy(): bool
     {
         $larupload = InstalledVersions::getVersion('mostafaznv/larupload');