diff --git a/.drone.yml b/.drone.yml index 2f29f691e..acb64a5b4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -42,7 +42,7 @@ services: pipeline: ecl-build: group: prepare - image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/node:18.18.2 + image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/node:20.9.0 commands: # To build the theme using a development version of ECL set its development branch in .env.dist # and make sure that ECL_BUILD is set to "dev". diff --git a/docker-compose.yml b/docker-compose.yml index 8dca565a9..f73298158 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,7 +37,7 @@ services: - '4444' shm_size: 2g node: - image: node:18.18.2 + image: node:20.9.0 user: "node" working_dir: /home/node/app environment: diff --git a/package.json b/package.json index 41ab409a7..a0eed4c4e 100644 --- a/package.json +++ b/package.json @@ -14,58 +14,58 @@ "prepare": "patch-package" }, "dependencies": { - "@ecl/builder": "4.6.5", - "@ecl/preset-ec": "4.6.5", - "@ecl/preset-eu": "4.6.5", - "@ecl/preset-reset": "4.6.5", + "@ecl/builder": "4.7.0", + "@ecl/preset-ec": "4.7.0", + "@ecl/preset-eu": "4.7.0", + "@ecl/preset-reset": "4.7.0", "@ecl/stylelint-config": "0.2.1", - "@ecl/theme-ec": "4.6.5", - "@ecl/theme-eu": "4.6.5", - "@ecl/twig-component-accordion": "4.6.5", - "@ecl/twig-component-banner": "4.6.5", - "@ecl/twig-component-blockquote": "4.6.5", - "@ecl/twig-component-breadcrumb": "4.6.5", - "@ecl/twig-component-button": "4.6.5", - "@ecl/twig-component-card": "4.6.5", - "@ecl/twig-component-carousel": "4.6.5", - "@ecl/twig-component-content-item": "4.6.5", - "@ecl/twig-component-datepicker": "4.6.5", - "@ecl/twig-component-description-list": "4.6.5", - "@ecl/twig-component-expandable": "4.6.5", - "@ecl/twig-component-fact-figures": "4.6.5", - "@ecl/twig-component-featured-item": "4.6.5", - "@ecl/twig-component-file": "4.6.5", - "@ecl/twig-component-gallery": "4.6.5", - "@ecl/twig-component-icon": "4.6.5", - "@ecl/twig-component-inpage-navigation": "4.6.5", - "@ecl/twig-component-label": "4.6.5", - "@ecl/twig-component-link": "4.6.5", - "@ecl/twig-component-list-illustration": "4.6.5", - "@ecl/twig-component-media-container": "4.6.5", - "@ecl/twig-component-mega-menu": "4.6.5", - "@ecl/twig-component-menu": "4.6.5", - "@ecl/twig-component-navigation-list": "4.6.5", - "@ecl/twig-component-news-ticker": "4.6.5", - "@ecl/twig-component-notification": "4.6.5", - "@ecl/twig-component-page-header": "4.6.5", - "@ecl/twig-component-pagination": "4.6.5", - "@ecl/twig-component-radio": "4.6.5", - "@ecl/twig-component-search-form": "4.6.5", - "@ecl/twig-component-select": "4.6.5", - "@ecl/twig-component-site-footer": "4.6.5", - "@ecl/twig-component-site-header": "4.6.5", - "@ecl/twig-component-skip-link": "4.6.5", - "@ecl/twig-component-social-media-follow": "4.6.5", - "@ecl/twig-component-social-media-share": "4.6.5", - "@ecl/twig-component-splash-page": "4.6.5", - "@ecl/twig-component-table": "4.6.5", - "@ecl/twig-component-tabs": "4.6.5", - "@ecl/twig-component-tag": "4.6.5", - "@ecl/twig-component-text-input": "4.6.5", - "@ecl/twig-component-timeline": "4.6.5", - "@ecl/twig-component-video": "4.6.5", - "@ecl/vanilla-utility-background": "4.6.5", - "@ecl/vanilla-utility-border": "4.6.5", + "@ecl/theme-ec": "4.7.0", + "@ecl/theme-eu": "4.7.0", + "@ecl/twig-component-accordion": "4.7.0", + "@ecl/twig-component-banner": "4.7.0", + "@ecl/twig-component-blockquote": "4.7.0", + "@ecl/twig-component-breadcrumb": "4.7.0", + "@ecl/twig-component-button": "4.7.0", + "@ecl/twig-component-card": "4.7.0", + "@ecl/twig-component-carousel": "4.7.0", + "@ecl/twig-component-content-item": "4.7.0", + "@ecl/twig-component-datepicker": "4.7.0", + "@ecl/twig-component-description-list": "4.7.0", + "@ecl/twig-component-expandable": "4.7.0", + "@ecl/twig-component-fact-figures": "4.7.0", + "@ecl/twig-component-featured-item": "4.7.0", + "@ecl/twig-component-file": "4.7.0", + "@ecl/twig-component-gallery": "4.7.0", + "@ecl/twig-component-icon": "4.7.0", + "@ecl/twig-component-inpage-navigation": "4.7.0", + "@ecl/twig-component-label": "4.7.0", + "@ecl/twig-component-link": "4.7.0", + "@ecl/twig-component-list-illustration": "4.7.0", + "@ecl/twig-component-media-container": "4.7.0", + "@ecl/twig-component-mega-menu": "4.7.0", + "@ecl/twig-component-menu": "4.7.0", + "@ecl/twig-component-navigation-list": "4.7.0", + "@ecl/twig-component-news-ticker": "4.7.0", + "@ecl/twig-component-notification": "4.7.0", + "@ecl/twig-component-page-header": "4.7.0", + "@ecl/twig-component-pagination": "4.7.0", + "@ecl/twig-component-radio": "4.7.0", + "@ecl/twig-component-search-form": "4.7.0", + "@ecl/twig-component-select": "4.7.0", + "@ecl/twig-component-site-footer": "4.7.0", + "@ecl/twig-component-site-header": "4.7.0", + "@ecl/twig-component-skip-link": "4.7.0", + "@ecl/twig-component-social-media-follow": "4.7.0", + "@ecl/twig-component-social-media-share": "4.7.0", + "@ecl/twig-component-splash-page": "4.7.0", + "@ecl/twig-component-table": "4.7.0", + "@ecl/twig-component-tabs": "4.7.0", + "@ecl/twig-component-tag": "4.7.0", + "@ecl/twig-component-text-input": "4.7.0", + "@ecl/twig-component-timeline": "4.7.0", + "@ecl/twig-component-video": "4.7.0", + "@ecl/vanilla-utility-background": "4.7.0", + "@ecl/vanilla-utility-border": "4.7.0", "chokidar-cli": "3.0.0", "grunt": "1.6.1", "grunt-contrib-copy": "1.0.0", diff --git a/patches/@ecl+twig-component-content-block+4.6.5.patch b/patches/@ecl+twig-component-content-block+4.7.0.patch similarity index 100% rename from patches/@ecl+twig-component-content-block+4.6.5.patch rename to patches/@ecl+twig-component-content-block+4.7.0.patch diff --git a/patches/@ecl+twig-component-file+4.6.5.patch b/patches/@ecl+twig-component-file+4.7.0.patch similarity index 83% rename from patches/@ecl+twig-component-file+4.6.5.patch rename to patches/@ecl+twig-component-file+4.7.0.patch index 7bd99c00b..c883ba3a6 100644 --- a/patches/@ecl+twig-component-file+4.6.5.patch +++ b/patches/@ecl+twig-component-file+4.7.0.patch @@ -1,8 +1,8 @@ diff --git a/node_modules/@ecl/twig-component-file/file-translation-item.html.twig b/node_modules/@ecl/twig-component-file/file-translation-item.html.twig -index 30788cd..2b92789 100644 +index a934d0f..0671b73 100644 --- a/node_modules/@ecl/twig-component-file/file-translation-item.html.twig +++ b/node_modules/@ecl/twig-component-file/file-translation-item.html.twig -@@ -5,18 +5,23 @@ +@@ -5,20 +5,25 @@ - "title" (string) (default: '') - "meta" (string) (default: '') - "lang" (string) (default: '') @@ -10,6 +10,7 @@ index 30788cd..2b92789 100644 - "id" (string) (default: '') - "title_id" (string) (default: '') - "download" (object) (default to the parent download property) object of type Link + - "download_attribute" (bool) (default to the parent download attribute) + - "description (string) (default:'') #} @@ -19,6 +20,7 @@ index 30788cd..2b92789 100644 +{% set _lang_full = lang_full|default('') %} {% set _meta = meta|default('') %} {% set _download = download|default({}) %} + {% set _download_attribute = download_attribute|default(download_attribute_default) %} {% set _id = id|default('') %} {% set _title_id = title_id|default('') %} +{% set _description = description|default('') %} @@ -26,7 +28,7 @@ index 30788cd..2b92789 100644 {% set _link_id = _id ~ '-link' %} {% set _label_id = _link_id ~ '-label' %} -@@ -35,13 +40,36 @@ +@@ -37,13 +42,36 @@ {% endset %}
  • @@ -67,9 +69,9 @@ index 30788cd..2b92789 100644 + {% endif %} - {% include '@ecl/link/link.html.twig' with _download|merge({ +
    diff --git a/node_modules/@ecl/twig-component-file/file-translations.html.twig b/node_modules/@ecl/twig-component-file/file-translations.html.twig -index 85c46d7..d9f4b6a 100644 +index 0d40c88..6dd85ba 100644 --- a/node_modules/@ecl/twig-component-file/file-translations.html.twig +++ b/node_modules/@ecl/twig-component-file/file-translations.html.twig @@ -2,6 +2,7 @@ @@ -88,30 +90,29 @@ index 85c46d7..d9f4b6a 100644 #} {# Internal properties #} -@@ -16,6 +18,8 @@ - {% set _items = items|default([]) %} +@@ -17,6 +19,8 @@ {% set _toggle = toggle|default({}) %} {% set _id = id|default('') %} + {% set _download_attribute_default = download_attribute_default|default(false) %} +{% set _description = description|default('') %} +{% set _variant = variant|default('default') %} {% if _items is not empty %}
    - {% for key, _item in _items %} - {% include '@ecl/file/file-translation-item.html.twig' with _item|merge({ -- id: _id ~ '-translation-' ~ key, -- title_id: _id ~ '-title', -- }) only %} -- {% endfor %} + {% for key, _item in _items %} + {% include '@ecl/file/file-translation-item.html.twig' with _item|merge({ -+ id: _id ~ '-translation-' ~ key, -+ title_id: _id ~ '-title', -+ variant: _variant + id: _id ~ '-translation-' ~ key, + title_id: _id ~ '-title', + download_attribute_default: _download_attribute_default, +- }) only %} +- {% endfor %} ++ variant: _variant + }) only %} + {% endfor %} +
  • @@ -121,10 +122,10 @@ index 85c46d7..d9f4b6a 100644 {% endif %} diff --git a/node_modules/@ecl/twig-component-file/file.html.twig b/node_modules/@ecl/twig-component-file/file.html.twig -index f8d91b3..bb456fe 100644 +index d18c512..6368be9 100644 --- a/node_modules/@ecl/twig-component-file/file.html.twig +++ b/node_modules/@ecl/twig-component-file/file.html.twig -@@ -31,6 +31,7 @@ +@@ -32,6 +32,7 @@ - "meta" (string) (default: '') - "lang" (string) (default: '') - "download" (object) (default to the parent download property) object of type Link @@ -132,3 +133,11 @@ index f8d91b3..bb456fe 100644 - "extra_classes" (optional) (string) (default: '') - "extra_attributes" (optional) (array) (default: []) [{ - "name" (string) Attribute name, eg. 'data-test' +@@ -205,6 +206,7 @@ + {% include '@ecl/file/file-translations.html.twig' with _translation|merge({ + id: _id, + download_attribute_default: _download_attribute, ++ variant: _variant|default('default'), + }) only %} + {% endif %} + diff --git a/patches/@ecl+twig-component-tabs+4.6.5.patch b/patches/@ecl+twig-component-tabs+4.7.0.patch similarity index 100% rename from patches/@ecl+twig-component-tabs+4.6.5.patch rename to patches/@ecl+twig-component-tabs+4.7.0.patch