Merge pull request #46 from eea/develop

Develop

CHANGELOG.md

@@ -4,6 +4,17 @@ 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).
 
+### [1.37.0](https://github.com/eea/cca-frontend/compare/1.36.0...1.37.0) - 12 June 2023
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-cca-policy@0.1.24 [EEA Jenkins - [`b3dfe7f`](https://github.com/eea/cca-frontend/commit/b3dfe7f44728761198298b95e72c5b6d32807e3c)]
+- Release @eeacms/volto-openlayers-map@0.3.0 [EEA Jenkins - [`289e8c7`](https://github.com/eea/cca-frontend/commit/289e8c76a0f392d5eacdda0709931c599ecf2d47)]
+
+#### :hammer_and_wrench: Others
+
+- Change develop to false for tabs-block [kreafox - [`83fae01`](https://github.com/eea/cca-frontend/commit/83fae0177efcfb6243c6b5136c9de5591af6bcae)]
+- Update branch for volto-listing-block [kreafox - [`a16bd0e`](https://github.com/eea/cca-frontend/commit/a16bd0ee620135f935a99beb5935a56262b8103b)]
 ### [1.36.0](https://github.com/eea/cca-frontend/compare/1.35.0...1.36.0) - 12 June 2023
 
 #### :rocket: Dependency updates

mrs.developer.json

@@ -147,7 +147,7 @@
     "url": "[email protected]:eea/volto-listing-block.git",
     "https": "https://github.com/eea/volto-listing-block.git",
     "package": "@eeacms/volto-listing-block",
-    "branch": "simple-listing",
+    "branch": "develop",
     "develop": true,
     "path": "src"
   },

package.json

@@ -2,7 +2,7 @@
   "name": "cca-frontend",
   "description": "CCA frontend (Plone 4)",
   "license": "MIT",
-  "version": "1.36.0",
+  "version": "1.37.0",
   "scripts": {
     "start": "razzle start",
     "postinstall": "make omelette && make patches",
@@ -162,14 +162,14 @@
     "d3-array": "^2.12.1"
   },
   "dependencies": {
-    "@eeacms/volto-cca-policy": "0.1.23",
+    "@eeacms/volto-cca-policy": "0.1.24",
     "@eeacms/volto-eea-design-system": "1.13.0",
     "@eeacms/volto-eea-kitkat": "15.4.0",
     "@eeacms/volto-eea-website-theme": "1.17.0",
     "@eeacms/volto-embed": "5.0.3",
     "@eeacms/volto-globalsearch": "^1.0.15",
     "@eeacms/volto-nextcloud-video-block": "0.3.1",
-    "@eeacms/volto-openlayers-map": "0.2.2",
+    "@eeacms/volto-openlayers-map": "0.3.0",
     "@eeacms/volto-workflow-progress": "3.1.0",
     "@kitconcept/volto-blocks-grid": "7.0.2",
     "@plone/volto": "16.20.3",

yarn.lock

@@ -1858,15 +1858,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-cca-policy@npm:0.1.23":
-  version: 0.1.23
-  resolution: "@eeacms/volto-cca-policy@npm:0.1.23"
+"@eeacms/volto-cca-policy@npm:0.1.24":
+  version: 0.1.24
+  resolution: "@eeacms/volto-cca-policy@npm:0.1.24"
   dependencies:
     "@eeacms/volto-eea-design-system": "*"
     "@eeacms/volto-globalsearch": "*"
     "@eeacms/volto-openlayers-map": "*"
     d3: 3
-  checksum: 213fe7ab1935fa56ba99d9dcfebb60561a0af369e0a0a1781f4810162a7a00f5020d09a4a8f3e436487bb0264c7f838f1fecdd9bb196ae21a47bbb9bc1fe37d8
+  checksum: bbc2c0b1f616e970275948f34aa01cc4032ac00bda5d0ac137d1f04b4ef1f848f80d8d0e5ba3da662496c04a73ff0ee68c6f37762ed3977905b2f6e4e1510f34
   languageName: node
   linkType: hard
 
@@ -2080,7 +2080,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-openlayers-map@npm:*, @eeacms/volto-openlayers-map@npm:0.2.2":
+"@eeacms/volto-openlayers-map@npm:*":
   version: 0.2.2
   resolution: "@eeacms/volto-openlayers-map@npm:0.2.2"
   dependencies:
@@ -2089,6 +2089,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@eeacms/volto-openlayers-map@npm:0.3.0":
+  version: 0.3.0
+  resolution: "@eeacms/volto-openlayers-map@npm:0.3.0"
+  dependencies:
+    ol: 6.6.x
+  checksum: d7d33223773199248cb63e05e75042cf984d4dac4be16f4ba24e4fb803067ec8ff6d247461cd007ed6903538ab8d7dbf7e575f17221e6abdc86dd27b805e659c
+  languageName: node
+  linkType: hard
+
 "@eeacms/volto-quote-block@npm:1.1.0":
   version: 1.1.0
   resolution: "@eeacms/volto-quote-block@npm:1.1.0"
@@ -8509,14 +8518,14 @@ __metadata:
   resolution: "cca-frontend@workspace:."
   dependencies:
     "@cypress/code-coverage": ^3.10.0
-    "@eeacms/volto-cca-policy": 0.1.23
+    "@eeacms/volto-cca-policy": 0.1.24
     "@eeacms/volto-eea-design-system": 1.13.0
     "@eeacms/volto-eea-kitkat": 15.4.0
     "@eeacms/volto-eea-website-theme": 1.17.0
     "@eeacms/volto-embed": 5.0.3
     "@eeacms/volto-globalsearch": ^1.0.15
     "@eeacms/volto-nextcloud-video-block": 0.3.1
-    "@eeacms/volto-openlayers-map": 0.2.2
+    "@eeacms/volto-openlayers-map": 0.3.0
     "@eeacms/volto-workflow-progress": 3.1.0
     "@kitconcept/volto-blocks-grid": 7.0.2
     "@plone/scripts": ^2.1.2