Merge pull request #19 from eea/develop

Develop

CHANGELOG.md

@@ -4,6 +4,22 @@ 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.11.0](https://github.com/eea/marine-frontend/compare/1.10.0...1.11.0) - 18 July 2023
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-searchlib@0.5.8 [EEA Jenkins - [`ddf4fae`](https://github.com/eea/marine-frontend/commit/ddf4fae127782c0f84b2e8aef40f902191255695)]
+
+#### :house: Internal changes
+
+
+#### :house: Documentation changes
+
+
+#### :hammer_and_wrench: Others
+
+- Update Dockerfile [Laszlo Cseh - [`2cbb460`](https://github.com/eea/marine-frontend/commit/2cbb460ea9c114ac6afeaf4d83d4dd704f23cf23)]
+- Added volto-block-image-cards to resolutions [laszlocseh - [`d98821a`](https://github.com/eea/marine-frontend/commit/d98821a900eb18ff860ee34eaa221128429eb9b8)]
 ### [1.10.0](https://github.com/eea/marine-frontend/compare/1.9.0...1.10.0) - 17 July 2023
 
 #### :rocket: Dependency updates
@@ -54,7 +70,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Documentation changes
 
-- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`e7e08d9`](https://github.com/eea/marine-frontend/commit/e7e08d9cdbd0235b84ab38d9a8f3fd86f23c64a5)]
 
 #### :hammer_and_wrench: Others
 

Dockerfile

@@ -21,6 +21,8 @@ USER node
 WORKDIR /opt/frontend/
 
 RUN cd /opt/frontend \
+    && rm -r yarn.lock \
+    && touch yarn.lock \
     && PUBLIC_PATH=VOLTO_PUBLIC_PATH RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn \
     && PUBLIC_PATH=VOLTO_PUBLIC_PATH RAZZLE_API_PATH=VOLTO_API_PATH RAZZLE_INTERNAL_API_PATH=VOLTO_INTERNAL_API_PATH yarn build \
     && rm -rf /home/node/.cache

README.md

@@ -3,7 +3,7 @@
 [![Release](https://img.shields.io/github/v/release/eea/marine-frontend?sort=semver)](https://github.com/eea/marine-frontend/releases)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/master/lastBuild/display/redirect)
 [![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/develop/lastBuild/display/redirect)
-[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2F0.3.0&build=last&subject=release%20.3.0.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/1.10.0/lastBuild/display/redirect/)
+[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2F0.3.0&build=last&subject=release%20.3.0.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/1.11.0/lastBuild/display/redirect/)
 
 ## Documentation
 

package.json

@@ -2,7 +2,7 @@
   "name": "marine-frontend",
   "description": "A Volto-powered Plone frontend",
   "license": "MIT",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "scripts": {
     "start": "razzle start",
     "analyze": "webpack-bundle-analyzer -p $PORT -h 0.0.0.0 ./build/public/stats.json",
@@ -47,7 +47,8 @@
   "resolutions": {
     "d3-array": "2.12.1",
     "classnames": "2.2.6",
-    "@eeacms/volto-searchlib": "0.5.0"
+    "@eeacms/volto-searchlib": "0.5.8",
+    "@eeacms/volto-block-image-cards": "github:eea/volto-block-image-cards#1.1.0"
   },
   "addons": [
     "@eeacms/volto-searchlib",
@@ -68,7 +69,7 @@
     "@eeacms/volto-embed": "5.0.4",
     "@eeacms/volto-marine-theme": "0.1.21",
     "@eeacms/volto-measurescatalog": "0.1.3",
-    "@eeacms/volto-searchlib": "0.5.7",
+    "@eeacms/volto-searchlib": "0.5.8",
     "@eeacms/volto-slate-dataentity": "2.1.0",
     "@eeacms/volto-slots": "0.1.2",
     "@eeacms/volto-tableau": "4.1.0",

yarn.lock

@@ -1739,10 +1739,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-block-image-cards@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@eeacms/volto-block-image-cards@npm:1.3.2"
+"@eeacms/volto-block-image-cards@github:eea/volto-block-image-cards#1.1.0":
+  version: 1.1.0
+  resolution: "@eeacms/volto-block-image-cards@https://github.com/eea/volto-block-image-cards.git#commit=08ba2525071f6f81450149c1f49a88761f97d620"
   dependencies:
+    "@eeacms/volto-block-style": "*"
     "@eeacms/volto-object-widget": "*"
     react-lazy-load-image-component: ^1.4.0
     react-resize-detector: 6.7.6
@@ -1752,7 +1753,7 @@ __metadata:
     classnames: 2.2.6
     react-loadable: 5.5.0
     uuid: 8.3.1
-  checksum: 9e9cf8f5489b26e192fc8d99d881313864daa8e5ce154caff3c1deb2c8a17182de9cbea647cda72fd08d41589ee62921d74bfc3b77e0c5b04a5567a963392b62
+  checksum: e1c76a3ecb60996570ba93eeebb133167845f5e56a0c522acf2d46f0e47386e54129714c544c8bc83b9d10de2cdd38c7e2816dc43214f068424e4c657e9ed555
   languageName: node
   linkType: hard
 
@@ -2080,9 +2081,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eeacms/volto-searchlib@npm:0.5.0":
-  version: 0.5.0
-  resolution: "@eeacms/volto-searchlib@npm:0.5.0"
+"@eeacms/volto-searchlib@npm:0.5.8":
+  version: 0.5.8
+  resolution: "@eeacms/volto-searchlib@npm:0.5.8"
   dependencies:
     "@eeacms/volto-eea-design-system": "*"
     "@elastic/react-search-ui": ^1.9.0
@@ -2120,7 +2121,7 @@ __metadata:
     superagent: 3.8.2
     svg-loader: 0.0.2
     use-deep-compare-effect: 1.8.1
-  checksum: e324e8664a0a0e0422214acafb4560de40285fb656d96a0de811cf638acf3a5e587069cf5cb41c1d53b915f25f82781567a6bee6ea0c1a15d7d3f497c9033e0e
+  checksum: cc1f2b17c4cbd6712dbd2fa763960f0b0669a6e173a2d337b7bacc437800e482a9de6abbe74d9d7158533b63904d9559ebe6dea910e4accdd3993f9b12a6230f
   languageName: node
   linkType: hard
 
@@ -15020,7 +15021,7 @@ __metadata:
     "@eeacms/volto-embed": 5.0.4
     "@eeacms/volto-marine-theme": 0.1.21
     "@eeacms/volto-measurescatalog": 0.1.3
-    "@eeacms/volto-searchlib": 0.5.7
+    "@eeacms/volto-searchlib": 0.5.8
     "@eeacms/volto-slate-dataentity": 2.1.0
     "@eeacms/volto-slots": 0.1.2
     "@eeacms/volto-tableau": 4.1.0