Merge pull request #1534 from openeuropa/EWPP-4872

EWPP-4872: Update to ECL 4.9.0.
openeuropa · Dec 16, 2024 · 6e592dd · 6e592dd
2 parents b52d22e + f3cae0c
commit 6e592dd
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 58 deletions.
diff --git a/oe_theme.theme b/oe_theme.theme
@@ -1302,7 +1302,6 @@ function oe_theme_preprocess_block__system_branding_block(&$variables) {
 
   $map_non_eu_langcode = [
     'nb' => 'no',
-    'ja' => 'jp',
     'zh-hans' => 'zh',
   ];
 
@@ -1897,11 +1896,6 @@ function _oe_theme_preprocess_footer_logo(array &$variables): void {
       $variables['desktop_logo_path'] = $footer_logo_path . 'logo-' . $variables['ecl_component_library'] . '--no.svg';
       return;
     }
-    if ($variables['current_language_id'] === 'ja') {
-      // Set correct icon for Norwegian language.
-      $variables['desktop_logo_path'] = $footer_logo_path . 'logo-' . $variables['ecl_component_library'] . '--jp.svg';
-      return;
-    }
     if ($variables['current_language_id'] === 'zh-hans') {
       // Set correct icon for Norwegian language.
       $variables['desktop_logo_path'] = $footer_logo_path . 'logo-' . $variables['ecl_component_library'] . '--zh.svg';

diff --git a/package.json b/package.json
@@ -14,59 +14,59 @@
     "prepare": "patch-package"
   },
   "dependencies": {
-    "@ecl/builder": "4.7.2",
-    "@ecl/preset-ec": "4.7.2",
-    "@ecl/preset-eu": "4.7.2",
-    "@ecl/preset-reset": "4.7.2",
+    "@ecl/builder": "4.9.0",
+    "@ecl/preset-ec": "4.9.0",
+    "@ecl/preset-eu": "4.9.0",
+    "@ecl/preset-reset": "4.9.0",
     "@ecl/stylelint-config": "0.2.1",
-    "@ecl/theme-ec": "4.7.2",
-    "@ecl/theme-eu": "4.7.2",
-    "@ecl/twig-component-accordion": "4.7.2",
-    "@ecl/twig-component-banner": "4.7.2",
-    "@ecl/twig-component-blockquote": "4.7.2",
-    "@ecl/twig-component-breadcrumb": "4.7.2",
-    "@ecl/twig-component-button": "4.7.2",
-    "@ecl/twig-component-card": "4.7.2",
-    "@ecl/twig-component-carousel": "4.7.2",
-    "@ecl/twig-component-content-item": "4.7.2",
-    "@ecl/twig-component-datepicker": "4.7.2",
-    "@ecl/twig-component-description-list": "4.7.2",
-    "@ecl/twig-component-expandable": "4.7.2",
-    "@ecl/twig-component-fact-figures": "4.7.2",
-    "@ecl/twig-component-featured-item": "4.7.2",
-    "@ecl/twig-component-file": "4.7.2",
-    "@ecl/twig-component-gallery": "4.7.2",
-    "@ecl/twig-component-icon": "4.7.2",
-    "@ecl/twig-component-inpage-navigation": "4.7.2",
-    "@ecl/twig-component-label": "4.7.2",
-    "@ecl/twig-component-link": "4.7.2",
-    "@ecl/twig-component-list-illustration": "4.7.2",
-    "@ecl/twig-component-media-container": "4.7.2",
-    "@ecl/twig-component-mega-menu": "4.7.2",
-    "@ecl/twig-component-menu": "4.7.2",
-    "@ecl/twig-component-navigation-list": "4.7.2",
-    "@ecl/twig-component-news-ticker": "4.7.2",
-    "@ecl/twig-component-notification": "4.7.2",
-    "@ecl/twig-component-page-header": "4.7.2",
-    "@ecl/twig-component-pagination": "4.7.2",
-    "@ecl/twig-component-radio": "4.7.2",
-    "@ecl/twig-component-search-form": "4.7.2",
-    "@ecl/twig-component-select": "4.7.2",
-    "@ecl/twig-component-separator": "4.7.2",
-    "@ecl/twig-component-site-footer": "4.7.2",
-    "@ecl/twig-component-site-header": "4.7.2",
-    "@ecl/twig-component-skip-link": "4.7.2",
-    "@ecl/twig-component-social-media-follow": "4.7.2",
-    "@ecl/twig-component-social-media-share": "4.7.2",
-    "@ecl/twig-component-splash-page": "4.7.2",
-    "@ecl/twig-component-table": "4.7.2",
-    "@ecl/twig-component-tabs": "4.7.2",
-    "@ecl/twig-component-tag": "4.7.2",
-    "@ecl/twig-component-text-input": "4.7.2",
-    "@ecl/twig-component-timeline": "4.7.2",
-    "@ecl/twig-component-video": "4.7.2",
-    "@ecl/vanilla-utility-background": "4.7.2",
-    "@ecl/vanilla-utility-border": "4.7.2",
+    "@ecl/theme-ec": "4.9.0",
+    "@ecl/theme-eu": "4.9.0",
+    "@ecl/twig-component-accordion": "4.9.0",
+    "@ecl/twig-component-banner": "4.9.0",
+    "@ecl/twig-component-blockquote": "4.9.0",
+    "@ecl/twig-component-breadcrumb": "4.9.0",
+    "@ecl/twig-component-button": "4.9.0",
+    "@ecl/twig-component-card": "4.9.0",
+    "@ecl/twig-component-carousel": "4.9.0",
+    "@ecl/twig-component-content-item": "4.9.0",
+    "@ecl/twig-component-datepicker": "4.9.0",
+    "@ecl/twig-component-description-list": "4.9.0",
+    "@ecl/twig-component-expandable": "4.9.0",
+    "@ecl/twig-component-fact-figures": "4.9.0",
+    "@ecl/twig-component-featured-item": "4.9.0",
+    "@ecl/twig-component-file": "4.9.0",
+    "@ecl/twig-component-gallery": "4.9.0",
+    "@ecl/twig-component-icon": "4.9.0",
+    "@ecl/twig-component-inpage-navigation": "4.9.0",
+    "@ecl/twig-component-label": "4.9.0",
+    "@ecl/twig-component-link": "4.9.0",
+    "@ecl/twig-component-list-illustration": "4.9.0",
+    "@ecl/twig-component-media-container": "4.9.0",
+    "@ecl/twig-component-mega-menu": "4.9.0",
+    "@ecl/twig-component-menu": "4.9.0",
+    "@ecl/twig-component-navigation-list": "4.9.0",
+    "@ecl/twig-component-news-ticker": "4.9.0",
+    "@ecl/twig-component-notification": "4.9.0",
+    "@ecl/twig-component-page-header": "4.9.0",
+    "@ecl/twig-component-pagination": "4.9.0",
+    "@ecl/twig-component-radio": "4.9.0",
+    "@ecl/twig-component-search-form": "4.9.0",
+    "@ecl/twig-component-select": "4.9.0",
+    "@ecl/twig-component-separator": "4.9.0",
+    "@ecl/twig-component-site-footer": "4.9.0",
+    "@ecl/twig-component-site-header": "4.9.0",
+    "@ecl/twig-component-skip-link": "4.9.0",
+    "@ecl/twig-component-social-media-follow": "4.9.0",
+    "@ecl/twig-component-social-media-share": "4.9.0",
+    "@ecl/twig-component-splash-page": "4.9.0",
+    "@ecl/twig-component-table": "4.9.0",
+    "@ecl/twig-component-tabs": "4.9.0",
+    "@ecl/twig-component-tag": "4.9.0",
+    "@ecl/twig-component-text-input": "4.9.0",
+    "@ecl/twig-component-timeline": "4.9.0",
+    "@ecl/twig-component-video": "4.9.0",
+    "@ecl/vanilla-utility-background": "4.9.0",
+    "@ecl/vanilla-utility-border": "4.9.0",
     "chokidar-cli": "3.0.0",
     "grunt": "1.6.1",
     "grunt-contrib-copy": "1.0.0",

diff --git a/...+twig-component-content-block+4.7.2.patch → ...+twig-component-content-block+4.9.0.patch b/...+twig-component-content-block+4.7.2.patch → ...+twig-component-content-block+4.9.0.patch
diff --git a/patches/@ecl+twig-component-file+4.7.2.patch → patches/@ecl+twig-component-file+4.9.0.patch b/patches/@ecl+twig-component-file+4.7.2.patch → patches/@ecl+twig-component-file+4.9.0.patch
diff --git a/patches/@ecl+twig-component-tabs+4.7.2.patch → patches/@ecl+twig-component-tabs+4.9.0.patch b/patches/@ecl+twig-component-tabs+4.7.2.patch → patches/@ecl+twig-component-tabs+4.9.0.patch