Merge pull request #62 from eea/develop

Release
eea · May 18, 2022 · 6211f42 · 6211f42
2 parents d7b716c + 18b62a6
commit 6211f42
Show file tree

Hide file tree

Showing 6 changed files with 317 additions and 245 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,46 @@ 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).
 
+#### [2.20.0](https://github.com/eea/climate-energy-frontend/compare/2.19.1...2.20.0)
+
+- volto-climate-energy-policy back to release cycle [`98ef732`](https://github.com/eea/climate-energy-frontend/commit/98ef732db7792a608eae3be4748a686b4e6f57e6)
+- Release @eeacms/volto-energy-theme@1.0.31 [`71ec77c`](https://github.com/eea/climate-energy-frontend/commit/71ec77c45c970198bf28aca3ff1fc3af2e18cbc6)
+- add volto-climate-energy-policy [`c5e2927`](https://github.com/eea/climate-energy-frontend/commit/c5e29274c46bc8a503dce17523b12ea4dd45bba2)
+- Release @eeacms/volto-eea-kitkat@5.4.1 [`010a93d`](https://github.com/eea/climate-energy-frontend/commit/010a93dea7b382a676abe17ab75ab9a7ada0da97)
+
+#### [2.19.1](https://github.com/eea/climate-energy-frontend/compare/2.19.0...2.19.1)
+
+> 3 May 2022
+
+- Release 2.19.1 [`9f603b9`](https://github.com/eea/climate-energy-frontend/commit/9f603b930c21615f3f324233566db44a49a85d1b)
+- Release @eeacms/volto-energy-theme@1.0.30 [`7475061`](https://github.com/eea/climate-energy-frontend/commit/7475061b8877cb7b74df93d765ab52aa23d40af7)
+
+#### [2.19.0](https://github.com/eea/climate-energy-frontend/compare/2.18.0...2.19.0)
+
+> 2 May 2022
+
+- Release @eeacms/volto-energy-theme@1.0.29 [`2b66747`](https://github.com/eea/climate-energy-frontend/commit/2b66747ee077378258b1fca7bfa65ffc34e82538)
+- upgrade volto to v15.x [`0495a3b`](https://github.com/eea/climate-energy-frontend/commit/0495a3b1e4c7a0b52c38fb9d3a18431812837ad0)
+- Release @eeacms/volto-embed@4.0.1 [`f0218bd`](https://github.com/eea/climate-energy-frontend/commit/f0218bd53cb32c7cdf163e7ddbe3d140f2752557)
+- Release @eeacms/volto-datablocks@3.0.11 [`e0678c1`](https://github.com/eea/climate-energy-frontend/commit/e0678c1bd00168d173d0d5ce6eb2a4e343b98a90)
+- update jsconfig [`25b404f`](https://github.com/eea/climate-energy-frontend/commit/25b404f145db94e04cdc9928dee7b701017ea410)
+- Release @eeacms/volto-eea-kitkat@5.4.0 [`a689d55`](https://github.com/eea/climate-energy-frontend/commit/a689d5529b8465c76960a063fddae0d397fb51c8)
+- Release @eeacms/volto-datablocks@3.0.10 [`86348aa`](https://github.com/eea/climate-energy-frontend/commit/86348aa8f45180ca613a09e9454a0a12b190dd41)
+- Release @eeacms/volto-eea-kitkat@5.3.0 [`36a325d`](https://github.com/eea/climate-energy-frontend/commit/36a325ddbd9e95083c768b55ff857b1fcebea42e)
+- Release @eeacms/volto-plotlycharts@3.0.4 [`4641088`](https://github.com/eea/climate-energy-frontend/commit/4641088ba66f37de5f3808ba3c636c1a6c39df74)
+- Release @eeacms/volto-eea-kitkat@5.2.9 [`543f574`](https://github.com/eea/climate-energy-frontend/commit/543f574da020cbbd1eae9cf2c321328bfda299f5)
+- Release @eeacms/volto-embed@4.0.0 [`169f482`](https://github.com/eea/climate-energy-frontend/commit/169f4822564a81e0842100e52de17643b469d601)
+- Release @eeacms/volto-eea-kitkat@5.2.8 [`4c4106b`](https://github.com/eea/climate-energy-frontend/commit/4c4106b6a65833ba949726d0a83dc6d8b70b1b9b)
+- Release @eeacms/volto-pdf-block@1.0.10 [`13e41bb`](https://github.com/eea/climate-energy-frontend/commit/13e41bbcdce0a140f2e3e80a674b67896f798cb8)
+- Release @eeacms/volto-pdf-block@1.0.9 [`bcf0688`](https://github.com/eea/climate-energy-frontend/commit/bcf0688a37ace541d30ef79b19ca32cbbf722b0f)
+- Release @eeacms/volto-eea-kitkat@5.2.7 [`35b931e`](https://github.com/eea/climate-energy-frontend/commit/35b931e7db14e12d72c596bc91d60af8fe2ebafe)
+- Release @eeacms/volto-eea-kitkat@5.2.6 [`7b26437`](https://github.com/eea/climate-energy-frontend/commit/7b26437372df5ef3ad56a51f570db9ec0b4b5004)
+
 #### [2.18.0](https://github.com/eea/climate-energy-frontend/compare/2.17.1-beta.0...2.18.0)
 
+> 15 March 2022
+
+- Release [`#57`](https://github.com/eea/climate-energy-frontend/pull/57)
 - Merge pull request #56 from eea/develop [`5609c5d`](https://github.com/eea/climate-energy-frontend/commit/5609c5dce0c7d01286eb101d62f56a46900824b5)
 
 #### [2.17.1-beta.0](https://github.com/eea/climate-energy-frontend/compare/2.17.0...2.17.1-beta.0)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/eea/climate-energy-frontend?sort=semver)](https://github.com/eea/climate-energy-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto/climate-energy-frontend/master&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/master/display/redirect)
 [![Pipeline develop](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclimate-energy-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclimate-energy-frontend%2F2.18.0&build=last&subject=release%20v2.18.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/2.18.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclimate-energy-frontend%2F2.20.0&build=last&subject=release%20v2.20.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/2.20.0/lastBuild/display/redirect/)
 
 
 

diff --git a/jsconfig.json b/jsconfig.json
@@ -1,6 +1,53 @@
 {
   "compilerOptions": {
-    "paths": {},
+    "paths": {
+      "@eeacms/volto-matomo": ["develop/volto-matomo/src"],
+      "@eeacms/volto-sentry-rancher-config": [
+        "develop/volto-sentry-rancher-config/src"
+      ],
+      "@eeacms/volto-corsproxy": ["develop/volto-corsproxy/src"],
+      "@eeacms/volto-depiction": ["develop/volto-depiction/src"],
+      "@eeacms/volto-taxonomy": ["develop/volto-taxonomy/src"],
+      "@eeacms/volto-object-widget": ["develop/volto-object-widget/src"],
+      "@eeacms/volto-widgets-view": ["develop/volto-widgets-view/src"],
+      "@eeacms/volto-widget-toggle": ["develop/volto-widget-toggle/src"],
+      "@eeacms/volto-widget-temporal-coverage": [
+        "develop/volto-widget-temporal-coverage/src"
+      ],
+      "@eeacms/volto-widget-geolocation": [
+        "develop/volto-widget-geolocation/src"
+      ],
+      "@eeacms/volto-climate-energy-policy": [
+        "develop/volto-climate-energy-policy/src"
+      ],
+      "volto-slate": ["develop/volto-slate/src"],
+      "@eeacms/volto-slate-metadata-mentions": [
+        "develop/volto-slate-metadata-mentions/src"
+      ],
+      "@eeacms/volto-slate-footnote": ["develop/volto-slate-footnote/src"],
+      "@eeacms/volto-slate-zotero": ["develop/volto-slate-zotero/src"],
+      "@eeacms/volto-accordion-block": ["develop/volto-accordion-block/src"],
+      "@eeacms/volto-block-toc": ["develop/volto-block-toc/src"],
+      "@eeacms/volto-block-divider": ["develop/volto-block-divider/src"],
+      "@eeacms/volto-listing-block": ["develop/volto-listing-block/src"],
+      "@eeacms/volto-metadata-block": ["develop/volto-metadata-block/src"],
+      "@eeacms/volto-group-block": ["develop/volto-group-block/src"],
+      "@eeacms/volto-columns-block": ["develop/volto-columns-block/src"],
+      "@eeacms/volto-tabs-block": ["develop/volto-tabs-block/src"],
+      "@eeacms/volto-block-image-cards": [
+        "develop/volto-block-image-cards/src"
+      ],
+      "@eeacms/volto-banner": ["develop/volto-banner/src"],
+      "@eeacms/volto-resize-helper": ["develop/volto-resize-helper/src"],
+      "@eeacms/volto-block-style": ["develop/volto-block-style/src"],
+      "@eeacms/volto-eea-kitkat": ["develop/volto-eea-kitkat/src"],
+      "@eeacms/volto-plotlycharts": ["develop/volto-plotlycharts/src"],
+      "@eeacms/volto-embed": ["develop/volto-embed/src"],
+      "@eeacms/volto-datablocks": ["develop/volto-datablocks/src"],
+      "@eeacms/volto-tableau": ["develop/volto-tableau/src"],
+      "@eeacms/volto-pdf-block": ["develop/volto-pdf-block/src"],
+      "@eeacms/volto-energy-theme": ["develop/volto-energy-theme/src"]
+    },
     "baseUrl": "src"
   }
 }
diff --git a/mrs.developer.json b/mrs.developer.json
@@ -73,7 +73,7 @@
     "url": "git@github.com:eea/volto-slate.git",
     "https": "https://github.com/eea/volto-slate.git",
     "package": "volto-slate",
-    "branch": "stable",
+    "branch": "develop",
     "path": "src"
   },
   "volto-slate-metadata-mentions": {
@@ -188,12 +188,7 @@
     "branch": "develop",
     "path": "src"
   },
-
-
-
-
-
-
+
   "volto-plotlycharts": {
     "url": "git@github.com:eea/volto-plotlycharts.git",
     "https": "https://github.com/eea/volto-plotlycharts.git",
@@ -208,6 +203,13 @@
     "branch": "develop",
     "path": "src"
   },
+  "volto-climate-energy-policy": {
+    "url": "git@github.com:eea/volto-climate-energy-policy.git",
+    "https": "https://github.com/eea/volto-climate-energy-policy.git",
+    "package": "@eeacms/volto-climate-energy-policy",
+    "branch": "develop",
+    "path": "src"
+  },
   "volto-datablocks": {
     "url": "git@github.com:eea/volto-datablocks.git",
     "https": "https://github.com/eea/volto-datablocks.git",

diff --git a/package.json b/package.json
@@ -2,14 +2,15 @@
   "name": "climate-energy-frontend",
   "description": "Frontend component for the Climate Energy website.",
   "license": "MIT",
-  "version": "2.18.0",
+  "version": "2.20.0",
   "private": true,
   "workspaces": [
     "src/addons/*"
   ],
   "addons": [
     "@eeacms/volto-eea-kitkat",
     "@eeacms/volto-plotlycharts",
+    "@eeacms/volto-climate-energy-policy",
     "@eeacms/volto-embed",
     "@eeacms/volto-datablocks",
     "@eeacms/volto-tableau",
@@ -110,14 +111,15 @@
     "node": "^10 || ^12 || ^14"
   },
   "dependencies": {
-    "@eeacms/volto-datablocks": "3.0.9",
-    "@eeacms/volto-eea-kitkat": "5.2.5",
-    "@eeacms/volto-embed": "3.0.1",
-    "@eeacms/volto-energy-theme": "1.0.28",
-    "@eeacms/volto-pdf-block": "1.0.8",
-    "@eeacms/volto-plotlycharts": "3.0.3",
+    "@eeacms/volto-climate-energy-policy": "0.1.1",
+    "@eeacms/volto-datablocks": "3.0.11",
+    "@eeacms/volto-eea-kitkat": "5.4.1",
+    "@eeacms/volto-embed": "4.0.1",
+    "@eeacms/volto-energy-theme": "1.0.31",
+    "@eeacms/volto-pdf-block": "1.0.10",
+    "@eeacms/volto-plotlycharts": "3.0.4",
     "@eeacms/volto-tableau": "1.2.4",
-    "@plone/volto": "14.2.0"
+    "@plone/volto": "15.5.0"
   },
   "devDependencies": {
     "eslint-plugin-prettier": "3.1.3",