Merge pull request #54 from eea/develop

Update addons
eea · Jul 4, 2023 · 00d2f87 · 00d2f87
2 parents f8daf28 + 60cf9c8
commit 00d2f87
Show file tree

Hide file tree

Showing 10 changed files with 626 additions and 232 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,56 @@ 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).
 
-### [3.23.0](https://github.com/eea/industry-frontend/compare/3.22.0...3.23.0) - 5 April 2023
+### [3.25.0](https://github.com/eea/industry-frontend/compare/3.24.0...3.25.0) - 4 July 2023
+
+#### :house: Documentation changes
+
+- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`00b9572`](https://github.com/eea/industry-frontend/commit/00b9572c6d1bdf10004a3f3b39de4fe386e87bc3)]
 
 #### :hammer_and_wrench: Others
 
-- use volto-tableau@2.0.0 [Miu Razvan - [`d6a2317`](https://github.com/eea/industry-frontend/commit/d6a231771a4bdf0e8a4fa4fe9c2b3830835cd73a)]
+- fix versions & build [Claudia Ifrim - [`c6ba026`](https://github.com/eea/industry-frontend/commit/c6ba026b99ac55a32bbab1f6bfef45a3dc1338b2)]
+### [3.24.0](https://github.com/eea/industry-frontend/compare/3.23.0...3.24.0) - 4 July 2023
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-industry-theme@2.0.15 [EEA Jenkins - [`9e133d7`](https://github.com/eea/industry-frontend/commit/9e133d7dd7ef8c0e9c136b6e15bee4511075bcd9)]
+- Release @eeacms/volto-eea-kitkat@16.0.2 [EEA Jenkins - [`4de140a`](https://github.com/eea/industry-frontend/commit/4de140a23f267d0240f018811d12c2d40dea1742)]
+- Release @eeacms/volto-spotlight@2.0.10 [EEA Jenkins - [`a33a1b9`](https://github.com/eea/industry-frontend/commit/a33a1b9b3f91d0688ecd78efe9ed2d293a8950a3)]
+- Release @eeacms/volto-datablocks@5.0.2 [EEA Jenkins - [`e601111`](https://github.com/eea/industry-frontend/commit/e601111e21490b1c50b7cc549e0393468e2dcf07)]
+- Release @eeacms/volto-eea-kitkat@16.0.1 [EEA Jenkins - [`cbbc90f`](https://github.com/eea/industry-frontend/commit/cbbc90fafbc1c96b58b122635d9c66429c098a73)]
+- Release @eeacms/volto-spotlight@2.0.9 [EEA Jenkins - [`77eed3b`](https://github.com/eea/industry-frontend/commit/77eed3b504a7121b084afc62bac6fc22c2d65493)]
+- Release @eeacms/volto-tableau@4.1.0 [EEA Jenkins - [`a320947`](https://github.com/eea/industry-frontend/commit/a32094764b8cb09d7926a5bf3c6042212deb1a0d)]
+- Release @eeacms/volto-eea-kitkat@16.0.0 [EEA Jenkins - [`6be98ee`](https://github.com/eea/industry-frontend/commit/6be98eeb1e6cd02b3a7bcc705b5acf8c54c30eed)]
+- Release @eeacms/volto-tableau@4.0.0 [EEA Jenkins - [`2730bd5`](https://github.com/eea/industry-frontend/commit/2730bd5c8ccdd6a0c294bc4a0d87c100a7cb3e89)]
+- Release @eeacms/volto-datablocks@5.0.1 [EEA Jenkins - [`5289249`](https://github.com/eea/industry-frontend/commit/52892498fd677f1c61d27f7d98d82e7eae79cb33)]
+- Release @eeacms/volto-openlayers-map@0.3.0 [EEA Jenkins - [`e73498a`](https://github.com/eea/industry-frontend/commit/e73498a1a0e384a55f7498119f1fe5deee4ab963)]
+- Release @eeacms/volto-spotlight@2.0.8 [EEA Jenkins - [`2719136`](https://github.com/eea/industry-frontend/commit/271913677be5fcf6c5d4f36f041e11b21a5fe556)]
+- Release @eeacms/volto-spotlight@2.0.7 [EEA Jenkins - [`f9d8b30`](https://github.com/eea/industry-frontend/commit/f9d8b30e871a09e3f89777b2335a51c49eefd2cd)]
+- Release @eeacms/volto-spotlight@2.0.6 [EEA Jenkins - [`4369155`](https://github.com/eea/industry-frontend/commit/43691551275939028f4dffe6344aa1218d7a268a)]
+- Release @eeacms/volto-eea-kitkat@15.5.1 [EEA Jenkins - [`56652b5`](https://github.com/eea/industry-frontend/commit/56652b5e10b30e66a6e93ab211036a9761bd9435)]
+- Release @eeacms/volto-eea-kitkat@15.5.0 [EEA Jenkins - [`36eb815`](https://github.com/eea/industry-frontend/commit/36eb81584e571111a6fb2b0d273952d3006264f8)]
+- Release @eeacms/volto-spotlight@2.0.5 [EEA Jenkins - [`d670c37`](https://github.com/eea/industry-frontend/commit/d670c379a0bd1dd159e66f471f4f105c057afeed)]
+- Release @eeacms/volto-eea-kitkat@15.4.0 [EEA Jenkins - [`c4d5026`](https://github.com/eea/industry-frontend/commit/c4d5026cfc961267aad439f47f46b824ab4a68c5)]
+- Release @eeacms/volto-datablocks@5.0.0 [EEA Jenkins - [`a1ec532`](https://github.com/eea/industry-frontend/commit/a1ec532116e91e7f38cef6b0298593e39cd8ac08)]
+- Release @eeacms/volto-tableau@3.0.8 [EEA Jenkins - [`5432dbc`](https://github.com/eea/industry-frontend/commit/5432dbc8d738355aeb56ff88909cc2867d2384b8)]
+- Release @eeacms/volto-spotlight@2.0.4 [EEA Jenkins - [`f966f1a`](https://github.com/eea/industry-frontend/commit/f966f1ae0d1471c9b9a17374fc7fd502673e7d48)]
+- Release @eeacms/volto-datablocks@4.0.5 [EEA Jenkins - [`9630cd1`](https://github.com/eea/industry-frontend/commit/9630cd18262ea69785100f21a8456b21bdac5bb0)]
+- Release @eeacms/volto-spotlight@2.0.3 [EEA Jenkins - [`a3a2c96`](https://github.com/eea/industry-frontend/commit/a3a2c96bbb87a74c6a721c1348d3668d7985e12c)]
+- Release @eeacms/volto-eea-kitkat@15.3.0 [EEA Jenkins - [`b301664`](https://github.com/eea/industry-frontend/commit/b3016640d05f44e6685dd978eed7fa58cd1714e1)]
+- Release @eeacms/volto-spotlight@2.0.2 [EEA Jenkins - [`a6a2702`](https://github.com/eea/industry-frontend/commit/a6a2702934ae0ceabad516a057291f64f534a1ce)]
+- Release @eeacms/volto-spotlight@2.0.1 [EEA Jenkins - [`343af7c`](https://github.com/eea/industry-frontend/commit/343af7cbb47fe6fb97e631fc2fba65aa5ec70d9a)]
+- Release @eeacms/volto-eea-kitkat@15.2.1 [EEA Jenkins - [`596765f`](https://github.com/eea/industry-frontend/commit/596765f0389b362fe2d37c8fabb1c8e3600fc8e0)]
+- Release @eeacms/volto-tableau@3.0.7 [EEA Jenkins - [`d92d5b7`](https://github.com/eea/industry-frontend/commit/d92d5b703c96fec6cf4c0827701f1175fc115a74)]
+- Release @eeacms/volto-eea-kitkat@15.2.0 [EEA Jenkins - [`a4baa80`](https://github.com/eea/industry-frontend/commit/a4baa809ff600e167b5bc5adc213e74324641ea8)]
+
+#### :hammer_and_wrench: Others
+
+- Release 3.24.0 [Miu Razvan - [`d4444f1`](https://github.com/eea/industry-frontend/commit/d4444f18a584e11b1972131da3af4153afeca7ec)]
+- update [Miu Razvan - [`cff39eb`](https://github.com/eea/industry-frontend/commit/cff39ebb8dc8a98802a1c125022693c92eee9e1e)]
+- update addons [Miu Razvan - [`d01fa6a`](https://github.com/eea/industry-frontend/commit/d01fa6a65559f782f15c8503762648d147cd1c1a)]
+### [3.23.0](https://github.com/eea/industry-frontend/compare/3.22.0...3.23.0) - 5 April 2023
+
 ### [3.22.0](https://github.com/eea/industry-frontend/compare/3.21.0...3.22.0) - 5 April 2023
 
 #### :rocket: New Features
@@ -365,7 +410,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - Release 3.1.1 [Miu Razvan - [`044f3ac`](https://github.com/eea/industry-frontend/commit/044f3ac7adf7e45a60b834a393a661e1e97cf9f6)]
 - Update [Miu Razvan - [`d03e614`](https://github.com/eea/industry-frontend/commit/d03e614a0e69840481ad596eab3bc0e6bb729a74)]
-### [3.1.0](https://github.com/eea/industry-frontend/compare/3.0.0-beta.0...3.1.0) - 2 November 2021
+## [3.1.0](https://github.com/eea/industry-frontend/compare/3.0.0-beta.0...3.1.0) - 2 November 2021
 
 #### :rocket: Dependency updates
 
@@ -843,7 +888,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Small css fix for articles sparql [Miu Razvan - [`37a6e17`](https://github.com/eea/industry-frontend/commit/37a6e17de10d061bfe11f5c187081873b3bccad5)]
-### [1.0.0](https://github.com/eea/industry-frontend/compare/0.0.2-beta.8...1.0.0) - 27 November 2020
+## [1.0.0](https://github.com/eea/industry-frontend/compare/0.0.2-beta.8...1.0.0) - 27 November 2020
 
 #### :hammer_and_wrench: Others
 

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/industry-frontend?sort=semver)](https://github.com/eea/industry-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/master/lastBuild/display/redirect)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.23.0&build=last&subject=release%20v3.23.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.23.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Findustry-frontend%2F3.25.0&build=last&subject=release%20v3.25.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/industry-frontend/job/3.25.0/lastBuild/display/redirect/)
 
 
 ## Documentation

diff --git a/jsconfig.json b/jsconfig.json
@@ -1,6 +1,10 @@
 {
     "compilerOptions": {
-        "paths": {},
+        "paths": {
+            "@eeacms/volto-industry-theme": [
+                "addons/volto-industry-theme/src"
+            ]
+        },
         "baseUrl": "src"
     }
 }
diff --git a/locales/de.json b/locales/de.json
diff --git a/locales/en.json b/locales/en.json
diff --git a/locales/pt_BR.json b/locales/pt_BR.json
diff --git a/locales/ro.json b/locales/ro.json
diff --git a/mrs.developer.json b/mrs.developer.json
@@ -5,7 +5,7 @@
     "package": "@eeacms/volto-industry-theme",
     "branch": "develop",
     "path": "src",
-    "develop": false
+    "develop": true
   },
   "volto-datablocks": {
     "url": "git@github.com:eea/volto-datablocks.git",

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@eeacms/industry-frontend",
   "description": "Volto-based frontend server and SPA for the Industrial Emissions Portal website (former EPRTR) industry.eea.europa.eu",
   "license": "MIT",
-  "version": "3.23.0",
+  "version": "3.25.0",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
   "homepage": "https://github.com/eea/industry-frontend",
@@ -148,15 +148,16 @@
     "node": "^14 || ^16"
   },
   "resolutions": {
-    "@eeacms/volto-tableau": "2.0.0"
+    "@eeacms/volto-tableau": "4.1.0",
+    "@eeacms/volto-datablocks": "4.0.5"
   },
   "dependencies": {
-    "@eeacms/volto-datablocks": "4.0.4",
-    "@eeacms/volto-eea-kitkat": "15.1.0",
-    "@eeacms/volto-industry-theme": "2.0.14",
-    "@eeacms/volto-openlayers-map": "0.2.2",
-    "@eeacms/volto-spotlight": "1.0.0",
-    "@eeacms/volto-tableau": "2.0.0",
+    "@eeacms/volto-datablocks": "~4.0.5",
+    "@eeacms/volto-eea-kitkat": "16.0.2",
+    "@eeacms/volto-industry-theme": "2.0.15",
+    "@eeacms/volto-openlayers-map": "0.3.0",
+    "@eeacms/volto-spotlight": "2.0.10",
+    "@eeacms/volto-tableau": "4.1.0",
     "@plone/volto": "16.19.0"
   },
   "devDependencies": {