Merge pull request #136 from eea/develop

Release 19.0.0
eea · Oct 16, 2023 · eb27d78 · eb27d78
2 parents 8db263f + bdb31d1
commit eb27d78
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [19.0.0](https://github.com/eea/volto-eea-kitkat/compare/18.2.0...19.0.0) - 16 October 2023
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-description-block 1.2.2 [Alin Voinea - [`f12b5e6`](https://github.com/eea/volto-eea-kitkat/commit/f12b5e66ea65da5cfbb14b4f22c55a342390bbc3)]
+- Release @eeacms/volto-sentry-rancher-config 4.0.0 [Alin Voinea - [`38c6d4c`](https://github.com/eea/volto-eea-kitkat/commit/38c6d4c3bfcba65b60c783997f7f2c6b473209cb)]
+- Release @eeacms/volto-hero-block@5.4.3 [EEA Jenkins - [`abc86f2`](https://github.com/eea/volto-eea-kitkat/commit/abc86f23d0ae679749bd335b50223bb1e624cbeb)]
+- Release @eeacms/volto-tags-block@1.2.3 [EEA Jenkins - [`a110801`](https://github.com/eea/volto-eea-kitkat/commit/a1108017b60f97f8a0e692f384eda4fcd031b408)]
+- Release @eeacms/volto-widget-dataprovenance@0.4.2 [EEA Jenkins - [`69d5cda`](https://github.com/eea/volto-eea-kitkat/commit/69d5cda47339ecb47833c01eb12c067961f8d733)]
+- Release @eeacms/volto-slate-label@0.5.7 [EEA Jenkins - [`fa716c6`](https://github.com/eea/volto-eea-kitkat/commit/fa716c6bdbd261088055abeac40cf72094a01e9e)]
+- Release @eeacms/volto-timeline-block@1.1.4 [EEA Jenkins - [`4f28e31`](https://github.com/eea/volto-eea-kitkat/commit/4f28e310a904e2cc9af9402e837a89941190d1cf)]
+- Release @eeacms/volto-block-style@5.2.5 [EEA Jenkins - [`b29db1b`](https://github.com/eea/volto-eea-kitkat/commit/b29db1bfd76eaad3aeb1f922dd3a8834f4f326b9)]
+- Release @eeacms/volto-listing-block@6.0.1 [EEA Jenkins - [`5481ca0`](https://github.com/eea/volto-eea-kitkat/commit/5481ca046d9d6f0a2ed7c8616e4147bf8e4fb57b)]
+- Release @eeacms/volto-nextcloud-video-block@0.4.7 [EEA Jenkins - [`c80d84b`](https://github.com/eea/volto-eea-kitkat/commit/c80d84beb0d225fbf89c61c1254fa008946c69a1)]
+
+#### :bug: Bug Fixes
+
+- fix: Fix package.json import in order to work also with webpack 5 / Volto 17 [Alin Voinea - [`637486a`](https://github.com/eea/volto-eea-kitkat/commit/637486ae708ef633f0ebc8855d62339e030f9461)]
+
+#### :hammer_and_wrench: Others
+
+- Release volto-sentry 0.3.1 [Alin Voinea - [`3f7ad27`](https://github.com/eea/volto-eea-kitkat/commit/3f7ad27b242a14e596be689536c809c56fade63e)]
+- Release 19.0.0 - Volto 17 / webpack 5 compatible [Alin Voinea - [`6792ccc`](https://github.com/eea/volto-eea-kitkat/commit/6792cccfdb5ad0d3793957255130eb4c3347b8c0)]
 ### [18.2.0](https://github.com/eea/volto-eea-kitkat/compare/18.1.3...18.2.0) - 12 October 2023
 
 #### :rocket: Dependency updates

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-kitkat",
-  "version": "18.2.0",
+  "version": "19.0.0",
   "description": "@eeacms/volto-eea-kitkat: Volto Add-ons bundle - A known good set of Volto addons to be used within all EEA projects and beyond",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -65,71 +65,71 @@
     "@eeacms/volto-banner": "3.1.4",
     "@eeacms/volto-block-divider": "6.1.3",
     "@eeacms/volto-block-image-cards": "1.3.4",
-    "@eeacms/volto-block-style": "5.2.4",
+    "@eeacms/volto-block-style": "5.2.5",
     "@eeacms/volto-call-to-action-block": "4.2.1",
     "@eeacms/volto-columns-block": "6.3.4",
     "@eeacms/volto-corsproxy": "3.1.4",
-    "@eeacms/volto-description-block": "1.2.1",
+    "@eeacms/volto-description-block": "1.2.2",
     "@eeacms/volto-group-block": "6.3.2",
-    "@eeacms/volto-hero-block": "5.4.2",
-    "@eeacms/volto-listing-block": "6.0.0",
+    "@eeacms/volto-hero-block": "5.4.3",
+    "@eeacms/volto-listing-block": "6.0.1",
     "@eeacms/volto-matomo": "4.2.1",
     "@eeacms/volto-metadata-block": "6.0.1",
-    "@eeacms/volto-nextcloud-video-block": "0.4.6",
+    "@eeacms/volto-nextcloud-video-block": "0.4.7",
     "@eeacms/volto-object-widget": "5.1.4",
     "@eeacms/volto-quote-block": "1.2.3",
     "@eeacms/volto-resize-helper": "1.3.4",
-    "@eeacms/volto-sentry-rancher-config": "3.1.2",
+    "@eeacms/volto-sentry-rancher-config": "4.0.0",
     "@eeacms/volto-slate-footnote": "6.1.6",
-    "@eeacms/volto-slate-label": "0.5.6",
+    "@eeacms/volto-slate-label": "0.5.7",
     "@eeacms/volto-slate-metadata-mentions": "7.0.1",
     "@eeacms/volto-slate-zotero": "5.2.4",
     "@eeacms/volto-statistic-block": "4.0.2",
     "@eeacms/volto-tabs-block": "6.0.1",
-    "@eeacms/volto-tags-block": "1.2.2",
+    "@eeacms/volto-tags-block": "1.2.3",
     "@eeacms/volto-taxonomy": "4.1.1",
-    "@eeacms/volto-timeline-block": "1.1.3",
-    "@eeacms/volto-widget-dataprovenance": "0.4.1",
+    "@eeacms/volto-timeline-block": "1.1.4",
+    "@eeacms/volto-widget-dataprovenance": "0.4.2",
     "@eeacms/volto-widget-geolocation": "5.1.4",
     "@eeacms/volto-widget-temporal-coverage": "5.1.4",
     "@eeacms/volto-widget-theme-picker": "1.1.4",
     "@eeacms/volto-widget-toggle": "3.1.3",
     "@kitconcept/volto-blocks-grid": "7.0.2",
-    "@plone-collective/volto-sentry": "0.3.0"
+    "@plone-collective/volto-sentry": "0.3.1"
   },
   "resolutions": {
-    "@eeacms/volto-nextcloud-video-block": "0.4.6",
+    "@eeacms/volto-nextcloud-video-block": "0.4.7",
     "@eeacms/volto-anchors": "0.4.2",
     "@eeacms/volto-quote-block": "1.2.3",
     "@eeacms/volto-statistic-block": "4.0.2",
-    "@eeacms/volto-tags-block": "1.2.2",
+    "@eeacms/volto-tags-block": "1.2.3",
     "@eeacms/volto-call-to-action-block": "4.2.1",
-    "@eeacms/volto-hero-block": "5.4.2",
-    "@eeacms/volto-timeline-block": "1.1.3",
-    "@eeacms/volto-description-block": "1.2.1",
-    "@eeacms/volto-slate-label": "0.5.6",
-    "@plone-collective/volto-sentry": "0.3.0",
+    "@eeacms/volto-hero-block": "5.4.3",
+    "@eeacms/volto-timeline-block": "1.1.4",
+    "@eeacms/volto-description-block": "1.2.2",
+    "@eeacms/volto-slate-label": "0.5.7",
+    "@plone-collective/volto-sentry": "0.3.1",
     "@eeacms/volto-accordion-block": "10.4.1",
     "@eeacms/volto-banner": "3.1.4",
     "@eeacms/volto-block-divider": "6.1.3",
     "@eeacms/volto-block-image-cards": "1.3.4",
-    "@eeacms/volto-block-style": "5.2.4",
+    "@eeacms/volto-block-style": "5.2.5",
     "@eeacms/volto-columns-block": "6.3.4",
     "@eeacms/volto-corsproxy": "3.1.4",
     "@eeacms/volto-group-block": "6.3.2",
-    "@eeacms/volto-listing-block": "6.0.0",
+    "@eeacms/volto-listing-block": "6.0.1",
     "@eeacms/volto-matomo": "4.2.1",
     "@eeacms/volto-metadata-block": "6.0.1",
     "@eeacms/volto-object-widget": "5.1.4",
     "@eeacms/volto-resize-helper": "1.3.4",
-    "@eeacms/volto-sentry-rancher-config": "3.1.2",
+    "@eeacms/volto-sentry-rancher-config": "4.0.0",
     "@eeacms/volto-slate-footnote": "6.1.6",
     "@eeacms/volto-slate-metadata-mentions": "7.0.1",
     "@eeacms/volto-slate-zotero": "5.2.4",
     "@eeacms/volto-tabs-block": "6.0.1",
     "@eeacms/volto-taxonomy": "4.1.1",
     "@eeacms/volto-widget-geolocation": "5.1.4",
-    "@eeacms/volto-widget-dataprovenance": "0.4.1",
+    "@eeacms/volto-widget-dataprovenance": "0.4.2",
     "@eeacms/volto-widget-temporal-coverage": "5.1.4",
     "@eeacms/volto-widget-toggle": "3.1.3",
     "@eeacms/volto-widget-theme-picker": "1.1.4",

diff --git a/src/customizations/volto/components/manage/Controlpanels/VersionOverview.jsx b/src/customizations/volto/components/manage/Controlpanels/VersionOverview.jsx
@@ -7,7 +7,7 @@ import React from 'react';
 import { FormattedMessage } from 'react-intl';
 import { Grid, Label, Header } from 'semantic-ui-react';
 import { formatDate } from '@plone/volto/helpers/Utils/Date';
-import { version as voltoVersion } from '@plone/volto/../package.json';
+import packageJson from '@plone/volto/../package.json';
 
 import config from '@plone/volto/registry';
 
@@ -27,6 +27,7 @@ const VersionOverview = ({
   const locale = config.settings.dateLocale || 'en-gb';
   const frontendVersion = frontend.version || config.settings.frontendVersion;
   const backendVersion = backend.version || config.settings.backendVersion;
+  const voltoVersion = packageJson.version;
 
   return (
     <Grid columns={2} stackable>

diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,4 @@
-import {
-  version as frontendVersion,
-  name as frontendName,
-} from '../../../../package.json';
+import packageJson from '../../../../package.json';
 import { updateSystemInfo } from '@eeacms/volto-eea-kitkat/system';
 
 const applyConfig = (config) => {
@@ -29,12 +26,12 @@ const applyConfig = (config) => {
   config.settings.frontendVersion =
     config.settings.frontendVersion || __SERVER__
       ? process.env?.RAZZLE_FRONTEND_VERSION
-      : window.env?.RAZZLE_FRONTEND_VERSION || frontendVersion;
+      : window.env?.RAZZLE_FRONTEND_VERSION || packageJson.version;
 
   config.settings.frontendName =
     config.settings.frontendName || __SERVER__
       ? process.env?.RAZZLE_FRONTEND_NAME
-      : window.env?.RAZZLE_FRONTEND_NAME || frontendName;
+      : window.env?.RAZZLE_FRONTEND_NAME || packageJson.name;
 
   config.settings.backendVersion =
     config.settings.backendVersion || __SERVER__