Skip to content

Commit

Permalink
Merge pull request #55 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
GhitaB authored Jul 28, 2023
2 parents caf298c + ded78e4 commit 10fea7d
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 30 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ 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.45.0](https://github.com/eea/cca-frontend/compare/1.44.0...1.45.0) - 28 July 2023

#### :rocket: Dependency updates

- Release @eeacms/volto-cca-policy@0.1.32 [EEA Jenkins - [`33acc6a`](https://github.com/eea/cca-frontend/commit/33acc6ad32cef3f38e50a864d62902854d97c4ca)]
- Release @eeacms/volto-cca-policy@0.1.31 [EEA Jenkins - [`4687cea`](https://github.com/eea/cca-frontend/commit/4687cea9a14051bd5056d4ad393f7dbc99fc6965)]

#### :hammer_and_wrench: Others

- Add widgets [Tiberiu Ichim - [`ed45887`](https://github.com/eea/cca-frontend/commit/ed45887ec3f8c9c34c49e79ab168a9d83b0f9585)]
- New sha for backend [Tiberiu Ichim - [`ce3cd5c`](https://github.com/eea/cca-frontend/commit/ce3cd5c5ee011ac9be3c32ca453cce8a658f8464)]
- Refs #255643 - Add widgets addons [GhitaB - [`36a3565`](https://github.com/eea/cca-frontend/commit/36a356563acdce6621cff209280745bcb988c23b)]
- Refs #255643 - Add widgets addons [GhitaB - [`26d211b`](https://github.com/eea/cca-frontend/commit/26d211bb63b17362fedfd197dcfccbb20c2e202c)]
### [1.44.0](https://github.com/eea/cca-frontend/compare/1.43.0...1.44.0) - 27 July 2023

#### :rocket: Dependency updates
Expand All @@ -28,6 +41,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [YARN] Automated update of yarn.lock [EEA Jenkins - [`9c354e0`](https://github.com/eea/cca-frontend/commit/9c354e08ba3d41728509ec4fdb43b5a1c8652304)]

#### :hammer_and_wrench: Others

Expand Down
2 changes: 1 addition & 1 deletion eea.docker.plone-climateadapt
9 changes: 9 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@
],
"@eeacms/volto-accordion-block": [
"addons/volto-accordion-block/src"
],
"@eeacms/volto-widget-dataprovenance": [
"addons/volto-widget-dataprovenance/src"
],
"@eeacms/volto-widget-temporal-coverage": [
"addons/volto-widget-temporal-coverage/src"
],
"@eeacms/volto-widget-geolocation": [
"addons/volto-widget-geolocation/src"
]
},
"baseUrl": "src"
Expand Down
6 changes: 3 additions & 3 deletions mrs.developer.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,23 +84,23 @@
"https": "https://github.com/eea/volto-widget-dataprovenance.git",
"package": "@eeacms/volto-widget-dataprovenance",
"branch": "develop",
"develop": false,
"develop": true,
"path": "src"
},
"volto-widget-temporal-coverage": {
"url": "[email protected]:eea/volto-widget-temporal-coverage.git",
"https": "https://github.com/eea/volto-widget-temporal-coverage.git",
"package": "@eeacms/volto-widget-temporal-coverage",
"branch": "develop",
"develop": false,
"develop": true,
"path": "src"
},
"volto-widget-geolocation": {
"url": "[email protected]:eea/volto-widget-geolocation.git",
"https": "https://github.com/eea/volto-widget-geolocation.git",
"package": "@eeacms/volto-widget-geolocation",
"branch": "develop",
"develop": false,
"develop": true,
"path": "src"
},
"volto-slate-metadata-mentions": {
Expand Down
12 changes: 10 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "cca-frontend",
"description": "CCA frontend (Plone 4)",
"license": "MIT",
"version": "1.44.0",
"version": "1.45.0",
"scripts": {
"start": "razzle start",
"postinstall": "make omelette && make patches",
Expand Down Expand Up @@ -53,6 +53,10 @@
"@eeacms/volto-eea-website-theme",
"@eeacms/volto-workflow-progress",
"@eeacms/volto-nextcloud-video-block",
"@eeacms/volto-widget-temporal-coverage",
"@eeacms/volto-widget-geolocation",
"@eeacms/volto-widget-dataprovenance",
"@eeacms/volto-accordion-block",
"@eeacms/volto-cca-policy",
"volto-subsites"
],
Expand Down Expand Up @@ -161,14 +165,18 @@
"d3-array": "^2.12.1"
},
"dependencies": {
"@eeacms/volto-cca-policy": "0.1.30",
"@eeacms/volto-accordion-block": "9.3.0",
"@eeacms/volto-cca-policy": "0.1.32",
"@eeacms/volto-eea-design-system": "1.15.0",
"@eeacms/volto-eea-kitkat": "17.0.0",
"@eeacms/volto-eea-website-theme": "1.18.1",
"@eeacms/volto-embed": "6.0.0",
"@eeacms/volto-globalsearch": "^1.0.15",
"@eeacms/volto-nextcloud-video-block": "0.4.3",
"@eeacms/volto-openlayers-map": "0.3.0",
"@eeacms/volto-widget-dataprovenance": "0.3.3",
"@eeacms/volto-widget-geolocation": "5.1.2",
"@eeacms/volto-widget-temporal-coverage": "5.1.2",
"@eeacms/volto-workflow-progress": "3.1.1",
"@kitconcept/volto-blocks-grid": "7.0.2",
"@plone/volto": "16.20.3",
Expand Down
42 changes: 18 additions & 24 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1797,7 +1797,7 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-accordion-block@npm:9.3.0":
"@eeacms/volto-accordion-block@npm:*, @eeacms/volto-accordion-block@npm:9.3.0":
version: 9.3.0
resolution: "@eeacms/volto-accordion-block@npm:9.3.0"
dependencies:
Expand Down Expand Up @@ -1889,10 +1889,11 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-cca-policy@npm:0.1.30":
version: 0.1.30
resolution: "@eeacms/volto-cca-policy@npm:0.1.30"
"@eeacms/volto-cca-policy@npm:0.1.32":
version: 0.1.32
resolution: "@eeacms/volto-cca-policy@npm:0.1.32"
dependencies:
"@eeacms/volto-accordion-block": "*"
"@eeacms/volto-eea-design-system": "*"
"@eeacms/volto-globalsearch": "*"
"@eeacms/volto-openlayers-map": "*"
Expand All @@ -1901,7 +1902,7 @@ __metadata:
"@eeacms/volto-widget-temporal-coverage": "*"
d3: 3
d3-geo: 3
checksum: c34eda9055018b0f2ae291f837c671bf9c063dba2799bfc7fdf0a95c086acd4b1acb0718c5461f009475ec883c6b7a12a080501ee6f476cc66b2c64e54e94cc9
checksum: 67448ab5196f93efb4a27de23ad3b986c7ff9c6b64f043f488286e086d6f5f4cebaaab30a2147b891f6d259614c476ff05e98cd1c2c2023cf69616cb2ccc1d45
languageName: node
linkType: hard

Expand Down Expand Up @@ -2023,18 +2024,7 @@ __metadata:
languageName: node
linkType: hard

"@eeacms/volto-embed@npm:*":
version: 5.0.4
resolution: "@eeacms/volto-embed@npm:5.0.4"
dependencies:
"@eeacms/volto-corsproxy": "*"
"@eeacms/volto-datablocks": "*"
react-visibility-sensor: 5.1.1
checksum: 99eab2aff6ba3eb6f393167ee5b0ccf1d3e87406bec38e6df75d3993f780cf3fba7ea753bc9380804c0b85f31e0442f36b29f3cbe3031637e6a1eb32e0795c17
languageName: node
linkType: hard

"@eeacms/volto-embed@npm:6.0.0":
"@eeacms/volto-embed@npm:*, @eeacms/volto-embed@npm:6.0.0":
version: 6.0.0
resolution: "@eeacms/volto-embed@npm:6.0.0"
dependencies:
Expand All @@ -2046,12 +2036,12 @@ __metadata:
linkType: hard

"@eeacms/volto-globalsearch@npm:*, @eeacms/volto-globalsearch@npm:^1.0.15":
version: 1.0.18
resolution: "@eeacms/volto-globalsearch@npm:1.0.18"
version: 1.0.19
resolution: "@eeacms/volto-globalsearch@npm:1.0.19"
dependencies:
"@eeacms/volto-listing-block": "*"
"@eeacms/volto-searchlib": "*"
checksum: 9a1898a82bcab5c4172daa095a9fca646246e73ecb84b8a28a08e36d7fc03d3bdd4bf7f16ac8586a7dc14192499365353d6e7f4ec5b43af693fe02ddc68124c4
checksum: 673ed53f311db8a7819755fe75fd5d37d4523fdc572c15830563860fe517531f582c24b4cb533aa215aa444886ea21687d6bc752b83f5ffed27dfd7e30a970ca
languageName: node
linkType: hard

Expand Down Expand Up @@ -2176,8 +2166,8 @@ __metadata:
linkType: hard

"@eeacms/volto-searchlib@npm:*":
version: 0.5.8
resolution: "@eeacms/volto-searchlib@npm:0.5.8"
version: 0.6.0
resolution: "@eeacms/volto-searchlib@npm:0.6.0"
dependencies:
"@eeacms/volto-eea-design-system": "*"
"@elastic/react-search-ui": ^1.9.0
Expand Down Expand Up @@ -2215,7 +2205,7 @@ __metadata:
superagent: 3.8.2
svg-loader: 0.0.2
use-deep-compare-effect: 1.8.1
checksum: cc1f2b17c4cbd6712dbd2fa763960f0b0669a6e173a2d337b7bacc437800e482a9de6abbe74d9d7158533b63904d9559ebe6dea910e4accdd3993f9b12a6230f
checksum: 1e3a6112da8f57c3f2e87ca19a80bc00db60bbc0a522767ee576e75d16d98e281f74acc01282a2f9eb69b4f859b1860690a6f08553088d8d70430b93cd1ad488
languageName: node
linkType: hard

Expand Down Expand Up @@ -8564,14 +8554,18 @@ __metadata:
resolution: "cca-frontend@workspace:."
dependencies:
"@cypress/code-coverage": ^3.10.0
"@eeacms/volto-cca-policy": 0.1.30
"@eeacms/volto-accordion-block": 9.3.0
"@eeacms/volto-cca-policy": 0.1.32
"@eeacms/volto-eea-design-system": 1.15.0
"@eeacms/volto-eea-kitkat": 17.0.0
"@eeacms/volto-eea-website-theme": 1.18.1
"@eeacms/volto-embed": 6.0.0
"@eeacms/volto-globalsearch": ^1.0.15
"@eeacms/volto-nextcloud-video-block": 0.4.3
"@eeacms/volto-openlayers-map": 0.3.0
"@eeacms/volto-widget-dataprovenance": 0.3.3
"@eeacms/volto-widget-geolocation": 5.1.2
"@eeacms/volto-widget-temporal-coverage": 5.1.2
"@eeacms/volto-workflow-progress": 3.1.1
"@kitconcept/volto-blocks-grid": 7.0.2
"@plone/scripts": ^2.1.2
Expand Down

0 comments on commit 10fea7d

Please sign in to comment.