Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:eea/marine-frontend into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
laszlocseh committed Mar 23, 2022
2 parents 85603df + cf59b3e commit b3742fb
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 30 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@eeacms/volto-measurescatalog:installMeasuresCatalogue"
],
"dependencies": {
"@eeacms/volto-eea-kitkat": "5.2.4",
"@eeacms/volto-eea-kitkat": "5.2.7",
"@eeacms/volto-embed": "3.0.1",
"@eeacms/volto-marine-theme": "github:eea/volto-marine-theme#0.1.8.alpha.2",
"@eeacms/volto-measurescatalog": "github:eea/volto-measurescatalog#0.1.0.alpha",
Expand Down
108 changes: 79 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1348,10 +1348,10 @@
resolved "https://registry.yarnpkg.com/@eeacms/volto-accordion-block/-/volto-accordion-block-3.4.14.tgz#0775048a94b0fd46485e044bfdbd5e027cf2e7f9"
integrity sha512-nBVtqo9qiog5HcPOKiEPMR8EEognsNLCmgW5cr5Qh+rquuMdV6W01bA++QXED0nTO0651xPaxfq4OTxNVqCZWA==

"@eeacms/volto-banner@2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@eeacms/volto-banner/-/volto-banner-2.0.0.tgz#eb24cab5bcf4969e2a47ac1cf6798e29ea2a552b"
integrity sha512-sINjMe3ktRIOLcjwLlaswM2WFUqrgP2kLe/Z5eszbBCQBvI8c00duRuwlkDw7NrRoSQ0a5LEIP1C3PcHlJXO7A==
"@eeacms/volto-banner@2.1.0":
version "2.1.0"
resolved "https://registry.yarnpkg.com/@eeacms/volto-banner/-/volto-banner-2.1.0.tgz#0228ef6a822c1ff1d7dd998d9f66148866be20a7"
integrity sha512-qFUCbfrYGCkx/P1IVe6msZ513EPftLAhJ+SQOPIo2TXm9M9aa8l/dALRMyd7cLUUWiggrTIhMzr1NeO6uGmoTA==

"@eeacms/[email protected]":
version "2.1.6"
Expand All @@ -1360,10 +1360,10 @@
dependencies:
react-color "~2.18.1"

"@eeacms/volto-block-image-cards@0.1.11":
version "0.1.11"
resolved "https://registry.yarnpkg.com/@eeacms/volto-block-image-cards/-/volto-block-image-cards-0.1.11.tgz#93dab44924896347ccc0aa6102712847257d9223"
integrity sha512-Z0yquj1kngPCQfXMoDcGujZ132xZKKR+8rVb7vbFUU1x69Vc904ZUyX5wVmqbqKV0zjE6uiGL78o/4SSekUSzQ==
"@eeacms/volto-block-image-cards@0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@eeacms/volto-block-image-cards/-/volto-block-image-cards-0.2.0.tgz#84cc86984ff8545e5a2af384e3130e9d8ec6fc59"
integrity sha512-hBtGsswI3jS8kAC6VrgGCIEMPez6gu+oftbBqxk1HcMifopvDjGbRF/idYv//LlaTDGX1/9vUGXC3lf7/Ow9xQ==
dependencies:
"@eeacms/volto-block-style" "*"
react-lazy-load-image-component "^1.4.0"
Expand Down Expand Up @@ -1416,37 +1416,37 @@
resolved "https://registry.yarnpkg.com/@eeacms/volto-depiction/-/volto-depiction-0.1.5.tgz#758467102fe8635601e32923244ea3a9c6279643"
integrity sha512-wp5QMxwOp+xkcXNB3WiMkY3WkaeMuhIxYYz5fWhSWz8aZQdfANI6MKxOohuTjuVk+82Cm80qZnpzYhuwjCwGgg==

"@eeacms/[email protected].4":
version "5.2.4"
resolved "https://registry.yarnpkg.com/@eeacms/volto-eea-kitkat/-/volto-eea-kitkat-5.2.4.tgz#aaf777864de17db6ee0f734397e0ac2d37a53d09"
integrity sha512-IzAbKXVOCLYCgm8Oqju80JdcobXNx7rmWoUDNhaH7o3cjClZuBcwIDCPVwDIuSLfD5iOoJU3GaTwjjaSoDfDWQ==
"@eeacms/[email protected].7":
version "5.2.7"
resolved "https://registry.yarnpkg.com/@eeacms/volto-eea-kitkat/-/volto-eea-kitkat-5.2.7.tgz#4ba9ac4cc92fa3ed86d1494c4fbe25496a157c9c"
integrity sha512-pBUNIihhwAE+uUBJ19STlwMiUve4Ct+Pu1tc0w61+ESIr1fjr2OVSo9THsF7WXs8hCHEh3K2KHoA8u/QTF9gLw==
dependencies:
"@eeacms/volto-accordion-block" "3.4.14"
"@eeacms/volto-banner" "2.0.0"
"@eeacms/volto-banner" "2.1.0"
"@eeacms/volto-block-divider" "2.1.6"
"@eeacms/volto-block-image-cards" "0.1.11"
"@eeacms/volto-block-image-cards" "0.2.0"
"@eeacms/volto-block-style" "3.5.18"
"@eeacms/volto-block-toc" "2.2.5"
"@eeacms/volto-columns-block" "4.4.14"
"@eeacms/volto-corsproxy" "2.1.5"
"@eeacms/volto-depiction" "0.1.5"
"@eeacms/volto-group-block" "4.3.5"
"@eeacms/volto-listing-block" "0.2.0"
"@eeacms/volto-listing-block" "0.3.0"
"@eeacms/volto-matomo" "2.0.7"
"@eeacms/volto-metadata-block" "4.0.7"
"@eeacms/volto-object-widget" "3.0.3"
"@eeacms/volto-resize-helper" "0.2.8"
"@eeacms/volto-sentry-rancher-config" "2.1.5"
"@eeacms/volto-slate-footnote" "4.0.4"
"@eeacms/volto-slate-metadata-mentions" "4.0.2"
"@eeacms/volto-slate-metadata-mentions" "4.0.3"
"@eeacms/volto-slate-zotero" "4.0.4"
"@eeacms/volto-tabs-block" "1.2.12"
"@eeacms/volto-taxonomy" "2.0.4"
"@eeacms/volto-widget-geolocation" "4.0.3"
"@eeacms/volto-widget-temporal-coverage" "4.0.5"
"@eeacms/volto-widget-toggle" "2.2.6"
"@eeacms/volto-widgets-view" "3.0.4"
volto-slate "5.3.4"
volto-slate "5.4.1"

"@eeacms/volto-embed@*", "@eeacms/[email protected]":
version "3.0.1"
Expand All @@ -1463,10 +1463,10 @@
resolved "https://registry.yarnpkg.com/@eeacms/volto-group-block/-/volto-group-block-4.3.5.tgz#43e2413f9f03b9fa9c9541988ef4a351a410d338"
integrity sha512-Takka/4kXVUCwpin7Gj8aNbWx1g7L35bTCM6AAUJIQYPgvNg2j04/S2jaZ+iWWOopasND5GaiBBQ4LqgF1U0zA==

"@eeacms/volto-listing-block@0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@eeacms/volto-listing-block/-/volto-listing-block-0.2.0.tgz#12403fc90db97cf9962604ef3a20133fa6cff6c3"
integrity sha512-qAm1AaWt/fZRk3yaM8xLJgp3nMgftczWPyAJWNpYcDIczoAAREY9f37xdPqnnrmOpLXTOPtGjSZ7lpm+bpPu9A==
"@eeacms/volto-listing-block@0.3.0":
version "0.3.0"
resolved "https://registry.yarnpkg.com/@eeacms/volto-listing-block/-/volto-listing-block-0.3.0.tgz#a7d2a6a33c0a88ae62dca4939dcd3fd61a5407af"
integrity sha512-I2hmZtSGfWZui4mRKMdQ/+BAI1/bOEcaaGglSvpI2m5D8rj8teKjYNm044fY0YnfqKh6uRnVYKGSI6FwNC9h/Q==

"@eeacms/volto-marine-theme@github:eea/volto-marine-theme#0.1.8.alpha.2":
version "0.1.7"
Expand Down Expand Up @@ -1542,10 +1542,10 @@
dependencies:
volto-slate "*"

"@eeacms/[email protected].2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@eeacms/volto-slate-metadata-mentions/-/volto-slate-metadata-mentions-4.0.2.tgz#700c1853a00438b3ab2fe0c13958d4ed41cc0d10"
integrity sha512-95/Q/SjuoIcqLI6TFiy4wlUdFFb4uy9kp9PlCNx4v9SLmuAQPeL1MVc81YDidmyIuAayQpSqHckeejjg2ttr3w==
"@eeacms/[email protected].3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@eeacms/volto-slate-metadata-mentions/-/volto-slate-metadata-mentions-4.0.3.tgz#cb93664fade327e7eacb7c734835f75d0a6ea161"
integrity sha512-jeA2HFC9n6G9Q49N9VWYTC+qbsqJPSGJpNnNd3LPzzvTb+aK5XvSF4p2alc08wEXpporEZoDTsaQb9tLM4ZH5g==
dependencies:
"@eeacms/volto-widgets-view" "*"
volto-slate "*"
Expand Down Expand Up @@ -17733,6 +17733,56 @@ [email protected]:
webpack-node-externals "^1.7.2"
webpackbar "^4.0.0"

"razzle@github:laszlocseh/razzle#marine-new":
version "3.4.5"
resolved "https://codeload.github.com/laszlocseh/razzle/tar.gz/2419797cb213f4700b7fcc165fcb8fffeaaf9d65"
dependencies:
"@babel/core" "7.11.1"
"@pmmmwh/react-refresh-webpack-plugin" "0.3.0"
assets-webpack-plugin "3.9.12"
babel-core "^7.0.0-bridge.0"
babel-jest "^24.9.0"
babel-loader "^8.0.6"
babel-plugin-syntax-jsx "6.18.0"
babel-plugin-transform-define "2.0.0"
babel-preset-razzle "3.4.5"
chalk "^3.0.0"
copy-webpack-plugin "5.1.2"
css-loader "3.5.3"
deepmerge "4.2.2"
dotenv "8.2.0"
dotenv-expand "5.1.0"
file-loader "^4.3.0"
fs-extra "8.1.0"
html-webpack-plugin "^4.0.4"
jest "^24.9.0"
mini-css-extract-plugin "^0.9.0"
mri "^1.1.4"
optimize-css-assets-webpack-plugin "^5.0.3"
pnp-webpack-plugin "^1.6.4"
postcss-flexbugs-fixes "^4.2.0"
postcss-loader "^3.0.0"
postcss-preset-env "^6.7.0"
postcss-safe-parser "^4.0.2"
razzle-dev-utils "3.4.5"
react-dev-utils "10.2.0"
react-error-overlay "^6.0.6"
react-refresh "^0.8.1"
resolve "1.17.0"
sade "^1.4.2"
source-map-support "^0.5.16"
start-server-webpack-plugin "^2.2.5"
string-hash "1.1.3"
style-loader "^1.1.3"
terser-webpack-plugin "^2.3.5"
tiny-async-pool "^1.1.0"
url-loader "^2.3.0"
webpack "^4.42.0"
webpack-dev-server "~3.10.3"
webpack-manifest-plugin "^2.2.0"
webpack-node-externals "^1.7.2"
webpackbar "^4.0.0"

rc-align@^2.4.0:
version "2.4.5"
resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-2.4.5.tgz#c941a586f59d1017f23a428f0b468663fb7102ab"
Expand Down Expand Up @@ -22001,10 +22051,10 @@ vm-browserify@^1.0.0, vm-browserify@^1.0.1:
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==

volto-slate@*, volto-slate@5.3.4:
version "5.3.4"
resolved "https://registry.yarnpkg.com/volto-slate/-/volto-slate-5.3.4.tgz#fd551e31f4d72e3e7ec4d4f8db127de9ad4ced0e"
integrity sha512-ec2u3ZAgX4cek6tEiY+drc/wFIJi5Z9Sz9Zee7/hagpyhexVqaYhOIpnCCf7KtimWKhuP0yq0C5NIABfeEdXAA==
volto-slate@*, volto-slate@5.4.1:
version "5.4.1"
resolved "https://registry.yarnpkg.com/volto-slate/-/volto-slate-5.4.1.tgz#b4586f47ff99a338d2fc53546d3e2d6df4cd2af4"
integrity sha512-CJj5ugOTkLOG67vsu0unuNPxB152x1fKvTRaiIs7IfZxUzkqgRFEOvjiaLpnrcEhzb7F+NWUk/GeKI9ijhV+ww==
dependencies:
"@eeacms/volto-object-widget" "*"
classnames "2.2.6"
Expand Down

0 comments on commit b3742fb

Please sign in to comment.