diff --git a/backend/Dockerfile b/backend/Dockerfile index 68c77b92..5430d592 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG PLONE_VERSION=6.0.4 +ARG PLONE_VERSION=6.0.7 FROM plone/plone-backend:${PLONE_VERSION} LABEL maintainer="Simples Consultoria " \ diff --git a/backend/Dockerfile.acceptance b/backend/Dockerfile.acceptance index 863a2c24..b8910137 100644 --- a/backend/Dockerfile.acceptance +++ b/backend/Dockerfile.acceptance @@ -1,4 +1,4 @@ -ARG PLONE_VERSION=6.0.4 +ARG PLONE_VERSION=6.0.7 FROM plone/plone-backend:${PLONE_VERSION} LABEL maintainer="Jonas Piterek " \ diff --git a/backend/Makefile b/backend/Makefile index 7be28a20..74d99141 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -15,7 +15,7 @@ GREEN=`tput setaf 2` RESET=`tput sgr0` YELLOW=`tput setaf 3` -PLONE_VERSION=6.0.4 +PLONE_VERSION=6.0.7 BACKEND_FOLDER=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) diff --git a/backend/constraints.txt b/backend/constraints.txt index 40fc351b..a030e953 100644 --- a/backend/constraints.txt +++ b/backend/constraints.txt @@ -1 +1 @@ --c https://dist.plone.org/release/6.0.4/constraints.txt \ No newline at end of file +-c https://dist.plone.org/release/6.0-dev/constraints.txt \ No newline at end of file diff --git a/frontend/package.json b/frontend/package.json index 82dade5c..0ca09285 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -140,19 +140,19 @@ "node": "^16 || ^18" }, "dependencies": { - "@eeacms/volto-accordion-block": "8.0.0", - "@eeacms/volto-matomo": "3.0.1", - "@kitconcept/volto-blocks-grid": "8.0.0", - "@kitconcept/volto-button-block": "2.2.0", - "@kitconcept/volto-dsgvo-banner": "2.1.0", + "@eeacms/volto-accordion-block": "10.3.0", + "@eeacms/volto-matomo": "4.1.3", + "@kitconcept/volto-blocks-grid": "8.0.3", + "@kitconcept/volto-button-block": "2.3.1", + "@kitconcept/volto-dsgvo-banner": "2.2.0", "@kitconcept/volto-export": "1.1.0", - "@kitconcept/volto-heading-block": "2.3.0", - "@kitconcept/volto-separator-block": "3.2.1", + "@kitconcept/volto-heading-block": "2.4.0", + "@kitconcept/volto-separator-block": "4.0.0", "@kitconcept/volto-slider-block": "4.3.0", "@plone-collective/volto-authomatic": "1.3.0", - "@plone/volto": "17.0.0-alpha.16", + "@plone/volto": "17.0.0-alpha.26", "date-fns": "2.30.0", - "volto-form-block": "3.0.1" + "volto-form-block": "3.1.0" }, "devDependencies": { "@plone/scripts": "^3.0.0", diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Header/Header.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Header/Header.jsx index ea8866ac..a3456dac 100644 --- a/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Header/Header.jsx +++ b/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Header/Header.jsx @@ -46,7 +46,7 @@ class Header extends Component {
-
+
diff --git a/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Logo/Logo.jsx b/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Logo/Logo.jsx new file mode 100644 index 00000000..ef987c75 --- /dev/null +++ b/frontend/src/addons/volto-plonede/src/customizations/volto/components/theme/Logo/Logo.jsx @@ -0,0 +1,59 @@ +/** + * Logo component. + * @module components/theme/Logo/Logo + */ +import { useEffect } from 'react'; +import { Image } from 'semantic-ui-react'; +import { ConditionalLink } from '@plone/volto/components'; +import LogoImage from '@plone/volto/components/theme/Logo/Logo.svg'; +import { useSelector, useDispatch } from 'react-redux'; +import { getNavroot } from '@plone/volto/actions'; +import { + flattenToAppURL, + hasApiExpander, + getBaseUrl, + toPublicURL, +} from '@plone/volto/helpers'; + +/** + * Logo component class. + * @function Logo + * @param {Object} intl Intl object + * @returns {string} Markup of the component. + */ +const Logo = () => { + const pathname = useSelector((state) => state.router.location.pathname); + const site = useSelector((state) => state.site.data); + const navroot = useSelector((state) => state.navroot.data); + const dispatch = useDispatch(); + + useEffect(() => { + if (pathname && !hasApiExpander('navroot', getBaseUrl(pathname))) { + dispatch(getNavroot(getBaseUrl(pathname))); + } + }, [dispatch, pathname]); + + // remove trailing slash + const currentURL = toPublicURL(pathname).replace(/\/$/, ''); + + return ( + + {navroot?.navroot?.title} + + ); +}; + +export default Logo; diff --git a/frontend/theme/extras/custom.less b/frontend/theme/extras/custom.less index ef5db98b..bde70b06 100644 --- a/frontend/theme/extras/custom.less +++ b/frontend/theme/extras/custom.less @@ -128,7 +128,7 @@ body.cms-ui .ui.basic.segment.content-area { position: relative; height: 69px; - .logo { + .logo-wrapper { display: flex; width: 155px; height: 40px; @@ -374,7 +374,7 @@ body.cms-ui .ui.basic.segment.content-area { color: @plone-blue !important; } -img.ui.image { +img.ui.image:not(.logo) { display: inline; margin-bottom: 14px; } @@ -461,7 +461,7 @@ body #page-sitemap .ui.container { .ui.container { .header { .logo-nav-wrapper { - .logo { + .logo-wrapper { margin: auto; } @@ -515,7 +515,7 @@ body #page-sitemap .ui.container { .ui.container { .header { .logo-nav-wrapper { - .logo { + .logo-wrapper { margin: auto; } diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9c7200e4..1f8d19fd 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1695,9 +1695,9 @@ __metadata: languageName: node linkType: hard -"@cypress/request@npm:^2.88.10": - version: 2.88.10 - resolution: "@cypress/request@npm:2.88.10" +"@cypress/request@npm:^3.0.0": + version: 3.0.1 + resolution: "@cypress/request@npm:3.0.1" dependencies: aws-sign2: ~0.7.0 aws4: ^1.8.0 @@ -1712,12 +1712,12 @@ __metadata: json-stringify-safe: ~5.0.1 mime-types: ~2.1.19 performance-now: ^2.1.0 - qs: ~6.5.2 + qs: 6.10.4 safe-buffer: ^5.1.2 - tough-cookie: ~2.5.0 + tough-cookie: ^4.1.3 tunnel-agent: ^0.6.0 uuid: ^8.3.2 - checksum: 69c3e3b332e9be4866a900f6bcca5d274d8cea6c99707fbcce061de8dbab11c9b1e39f4c017f6e83e6e682717781d4f6106fd6b7cf9546580fcfac353b6676cf + checksum: 7175522ebdbe30e3c37973e204c437c23ce659e58d5939466615bddcd58d778f3a8ea40f087b965ae8b8138ea8d102b729c6eb18c6324f121f3778f4a2e8e727 languageName: node linkType: hard @@ -1812,21 +1812,21 @@ __metadata: languageName: node linkType: hard -"@eeacms/volto-accordion-block@npm:8.0.0": - version: 8.0.0 - resolution: "@eeacms/volto-accordion-block@npm:8.0.0" +"@eeacms/volto-accordion-block@npm:10.3.0": + version: 10.3.0 + resolution: "@eeacms/volto-accordion-block@npm:10.3.0" dependencies: "@eeacms/volto-widget-theme-picker": "*" - checksum: 899c1a723fcd7dd17f2d84e364310c7bbde378b4c64f403d0d23db82de9d5684799fc925ac60800d2bc41247debfc663489681504c726a4f7cb41064b779fb45 + checksum: 2e6706faa6ace1dcd2eafaa7bd9d6a6fba870c7d774abad1f68f7b25aa5e021cfd4dc8b820b2037ecaee4f1c2b1ca50030432b5681da13c5a8c2288fbc9cbdbc languageName: node linkType: hard -"@eeacms/volto-matomo@npm:3.0.1": - version: 3.0.1 - resolution: "@eeacms/volto-matomo@npm:3.0.1" +"@eeacms/volto-matomo@npm:4.1.3": + version: 4.1.3 + resolution: "@eeacms/volto-matomo@npm:4.1.3" dependencies: "@datapunt/matomo-tracker-react": 0.3.1 - checksum: bdb771de6423a300d719d1c8994ec9dd651b2f93da5f01720cac4c9fe46f9eca97540e19ab9323a7fac2fecdee9605b8b35cd8225e5c4f47f92fdcd5c3368c41 + checksum: 6c84a246215ebadd935e3fd8c528823d85a6eca932a0f2c3c50cc6284f921b8d0ecb87ee20442f02ef405c5dbd8f3b647f38cf692722db5d42c58d6832341d6a languageName: node linkType: hard @@ -2533,32 +2533,32 @@ __metadata: languageName: node linkType: hard -"@kitconcept/volto-blocks-grid@npm:8.0.0": - version: 8.0.0 - resolution: "@kitconcept/volto-blocks-grid@npm:8.0.0" +"@kitconcept/volto-blocks-grid@npm:8.0.3": + version: 8.0.3 + resolution: "@kitconcept/volto-blocks-grid@npm:8.0.3" dependencies: "@dnd-kit/core": 6.0.8 "@dnd-kit/sortable": 7.0.2 peerDependencies: "@plone/volto": ">=16.0.0" - checksum: c715d1b49294ff866af514a0b80416a467c02682fb7baf1b5d054f1d89ae5216c691e1af557f4aef2b82d0ef950d1e55e1d58a3c492a4583a1422cd284880e6a + checksum: 34446c00ea0a8c6077bd53e3a5fe8c970315d8fed87ebaba5f8994edd0fe5f76409baf5666d3e096ee52b5e0a216e9acf8d706a8e6cd30eea25b632e8bee3463 languageName: node linkType: hard -"@kitconcept/volto-button-block@npm:2.2.0": - version: 2.2.0 - resolution: "@kitconcept/volto-button-block@npm:2.2.0" - checksum: 4299209a94b3387e802aeac077e796314827bd740b74ef6dac1e8acb22b2b22848a993c87694ff341f4c4e01aee644a7a2715e362ca7f93814b0ebb2bed6a3aa +"@kitconcept/volto-button-block@npm:2.3.1": + version: 2.3.1 + resolution: "@kitconcept/volto-button-block@npm:2.3.1" + checksum: c8b2dd02d48b3db640784116c92e585267fda6bacf6a856233720e05bbffb9c89dace536176937b38c038b6bd24a452fb880538157f58da35423d558f29c90d2 languageName: node linkType: hard -"@kitconcept/volto-dsgvo-banner@npm:2.1.0": - version: 2.1.0 - resolution: "@kitconcept/volto-dsgvo-banner@npm:2.1.0" +"@kitconcept/volto-dsgvo-banner@npm:2.2.0": + version: 2.2.0 + resolution: "@kitconcept/volto-dsgvo-banner@npm:2.2.0" dependencies: "@datapunt/matomo-tracker-js": 0.5.1 react-ga4: ^2.1.0 - checksum: 997b60841950700b5649a50d068c41c40477778bd616b7fc5d010027cc15e04d9f24b11228bc84f57fb16bcfb49e02ae869c22349943b636f6c10a1dafe5a5eb + checksum: 6e80d2e9e71f22841646795d7c170ace525fb2ae2f96d9768a5d0e8f5df90e83e582729b251a62f918b7e607bedee8e45cf6d9e38050cdff009a5568e3d198b4 languageName: node linkType: hard @@ -2569,21 +2569,21 @@ __metadata: languageName: node linkType: hard -"@kitconcept/volto-heading-block@npm:2.3.0": - version: 2.3.0 - resolution: "@kitconcept/volto-heading-block@npm:2.3.0" +"@kitconcept/volto-heading-block@npm:2.4.0": + version: 2.4.0 + resolution: "@kitconcept/volto-heading-block@npm:2.4.0" dependencies: react-contenteditable: 3.3.6 - checksum: af89953eff837718c5bbc69f165ba4cffa3730353a87dda3ad96417822afac4eaeb21df71e417b9f72471bd29fc735a6bd9f89e0910cf1adcbe9c3641b07503c + checksum: baf6814d34286eda9ced00bb8eb8a0683af9a6381a05e5f9d3fe1ccb51e02b37dedda79bb70a2749471084a5ba894620ca548ca9d30c4ca7364a2ef32812e9cd languageName: node linkType: hard -"@kitconcept/volto-separator-block@npm:3.2.1": - version: 3.2.1 - resolution: "@kitconcept/volto-separator-block@npm:3.2.1" +"@kitconcept/volto-separator-block@npm:4.0.0": + version: 4.0.0 + resolution: "@kitconcept/volto-separator-block@npm:4.0.0" peerDependencies: "@plone/volto": ">=16.0.0" - checksum: 79d75dab471f6b3b096c47c6b4c12c7319d23677789cee389014647142ccd5b32187f7d0921199f9a25eb2f3c1071d0aad072acb3b3200cbee1ae43277aa4f56 + checksum: 36924c9c3e60eba06b62a73a10128577addf9fc645326dde137152ca78b922099715286162cd38340747ef7696b5f4dce5a2073ce5ec506181df84bafc92bce1 languageName: node linkType: hard @@ -2806,28 +2806,7 @@ __metadata: languageName: node linkType: hard -"@plone/scripts@npm:2.1.2": - version: 2.1.2 - resolution: "@plone/scripts@npm:2.1.2" - dependencies: - babel-plugin-react-intl: 5.1.17 - babel-preset-razzle: 4.2.17 - chalk: 4 - commander: 8.2.0 - fs-extra: 10.1.0 - git-url-parse: ^11.6.0 - mrs-developer: "*" - pofile: 1.0.10 - simple-git: 3.5.0 - bin: - addon: addon/index.js - changelogupdater: changelogupdater.cjs - i18n: i18n.cjs - checksum: 8afc64bd7cd2a60e5c9cdd552e54fe8aef48e91f57824ce4a03158c3ecde2fd40a2b7c66f0a9df90c60caf7e037edf670a1361b36667b6603da1c2e3244c1654 - languageName: node - linkType: hard - -"@plone/scripts@npm:^3.0.0": +"@plone/scripts@npm:3.0.0, @plone/scripts@npm:^3.0.0": version: 3.0.0 resolution: "@plone/scripts@npm:3.0.0" dependencies: @@ -2847,9 +2826,9 @@ __metadata: languageName: node linkType: hard -"@plone/volto@npm:17.0.0-alpha.16": - version: 17.0.0-alpha.16 - resolution: "@plone/volto@npm:17.0.0-alpha.16" +"@plone/volto@npm:17.0.0-alpha.26": + version: 17.0.0-alpha.26 + resolution: "@plone/volto@npm:17.0.0-alpha.26" dependencies: "@babel/core": ^7.0.0 "@babel/plugin-proposal-export-default-from": 7.18.9 @@ -2864,8 +2843,8 @@ __metadata: "@loadable/component": 5.14.1 "@loadable/server": 5.14.0 "@loadable/webpack-plugin": 5.15.2 - "@plone/scripts": 2.1.2 - "@testing-library/cypress": 8.0.7 + "@plone/scripts": 3.0.0 + "@testing-library/cypress": 9.0.0 "@testing-library/jest-dom": 5.16.4 "@testing-library/react": 12.1.5 "@testing-library/react-hooks": 8.0.1 @@ -2877,15 +2856,14 @@ __metadata: babel-plugin-react-intl: 5.1.17 babel-plugin-root-import: 6.1.0 babel-preset-razzle: 4.2.17 - bundlewatch: 0.2.7 circular-dependency-plugin: 5.2.2 classnames: 2.2.6 commander: 8.2.0 connected-react-router: 6.8.0 crypto-random-string: 3.2.0 css-loader: 5.2.7 - cypress: 11.1.0 - cypress-axe: 1.0.0 + cypress: 13.1.0 + cypress-axe: 1.5.0 cypress-file-upload: 5.0.8 debug: 4.3.2 decorate-component-with-props: 1.2.1 @@ -3005,7 +2983,6 @@ __metadata: rrule: 2.7.1 semantic-ui-less: 2.4.1 semantic-ui-react: 2.0.3 - semver: 5.6.0 serialize-javascript: 3.1.0 slate: 0.84.0 slate-hyperscript: 0.81.3 @@ -3031,7 +3008,7 @@ __metadata: webpack-node-externals: 3.0.0 xmlrpc: 1.3.2 yarnhook: 0.5.1 - checksum: ab01ef1dc808bbe59fbfe89549a8a560a072d076b3d84637e4cea8975eedc02613588e505afb0e73cb3b4ce2bf0437a9d85923c79019b89ce3609fccdc811e0b + checksum: 717434a917978dbd84063518d867ea8e36826cc8a0a7f5568deb6332f86aa47e788194c0fb6848f33b444e08c8f91a3c11b71a5987b0d9e0ba1e12c5659f640a languageName: node linkType: hard @@ -4579,15 +4556,15 @@ __metadata: languageName: node linkType: hard -"@testing-library/cypress@npm:8.0.7": - version: 8.0.7 - resolution: "@testing-library/cypress@npm:8.0.7" +"@testing-library/cypress@npm:9.0.0": + version: 9.0.0 + resolution: "@testing-library/cypress@npm:9.0.0" dependencies: "@babel/runtime": ^7.14.6 "@testing-library/dom": ^8.1.0 peerDependencies: - cypress: ^2.1.0 || ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 - checksum: e005bc1a7ec808706c57e95ed312069fb5be39ea7362900dc2a32c09f124d478ade69ebcd7df88c076e3867ab328ae6e6ce13791bdf042621ff66b56552bf74b + cypress: ^12.0.0 + checksum: fbd24e8f0b8a60279b336de5f6bc0e7ad6fb31316eacab5128dacc7fccde1eb40935b90f2c3bddc7d814115fe3965c6dbf011785448cd15b5a5b0bc40ef5bb4c languageName: node linkType: hard @@ -5061,10 +5038,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^14.14.31": - version: 14.18.36 - resolution: "@types/node@npm:14.18.36" - checksum: da7f479b3fc996d585e60b8329987c6e310ddbf051e14f2d900ce04f7768f42fa7b760f0eb376008d3eca130ce9431018fb5c9e44027dcb7bb139c547e44b9c5 +"@types/node@npm:^16.18.39": + version: 16.18.51 + resolution: "@types/node@npm:16.18.51" + checksum: 32adea8d5738c8af2dd98ff5fb05295a2b72aa88212f4b1a598c8cfaea1552d6ed556e6ac7f77311a18a145a59f9680bfab8f8b4fd4ec2a843d1a64c7b08e35d languageName: node linkType: hard @@ -6628,15 +6605,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.19.0": - version: 0.19.2 - resolution: "axios@npm:0.19.2" - dependencies: - follow-redirects: 1.5.10 - checksum: dcace11a0a25fdf9b3b97fc9d011d23dd9c67cc13d91778080482ddddbbfe731f7410a090b11aa0bbbdf83686c5911ccb4289fd3683b7488c1b0c4d3c882380c - languageName: node - linkType: hard - "axios@npm:^0.21.1": version: 0.21.4 resolution: "axios@npm:0.21.4" @@ -7454,26 +7422,6 @@ __metadata: languageName: node linkType: hard -"bundlewatch@npm:0.2.7": - version: 0.2.7 - resolution: "bundlewatch@npm:0.2.7" - dependencies: - axios: ^0.19.0 - bytes: ^3.0.0 - chalk: ^4.0.0 - ci-env: ^1.14.0 - commander: ^5.0.0 - glob: ^7.1.2 - gzip-size: ^5.1.1 - jsonpack: ^1.1.5 - lodash.merge: ^4.6.1 - read-pkg-up: ^7.0.1 - bin: - bundlewatch: lib/bin/index.js - checksum: e1072408780caf04f35a23b83452eeb7e75532ff77753fdac2a17bd13c248d4dd4142f7bb59e31868e77caece78507e7727e099791bd30f5bafa375628b05094 - languageName: node - linkType: hard - "bytes@npm:3.0.0": version: 3.0.0 resolution: "bytes@npm:3.0.0" @@ -7481,7 +7429,7 @@ __metadata: languageName: node linkType: hard -"bytes@npm:3.1.2, bytes@npm:^3.0.0": +"bytes@npm:3.1.2": version: 3.1.2 resolution: "bytes@npm:3.1.2" checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e @@ -7942,13 +7890,6 @@ __metadata: languageName: node linkType: hard -"ci-env@npm:^1.14.0": - version: 1.17.0 - resolution: "ci-env@npm:1.17.0" - checksum: e6a06d9a6c5abce1ab8fa0f1b0f80e7eb7615d59a937ed0a20a3589441cf49cff1fc64f4fa4b289e3b789dd4a1d9a8255f36a93ed3fc15b6e2be9b795d21fb46 - languageName: node - linkType: hard - "ci-info@npm:^2.0.0": version: 2.0.0 resolution: "ci-info@npm:2.0.0" @@ -8319,7 +8260,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^5.0.0, commander@npm:^5.1.0": +"commander@npm:^5.0.0": version: 5.1.0 resolution: "commander@npm:5.1.0" checksum: 0b7fec1712fbcc6230fcb161d8d73b4730fa91a21dc089515489402ad78810547683f058e2a9835929c212fead1d6a6ade70db28bbb03edbc2829a9ab7d69447 @@ -9197,13 +9138,13 @@ __metadata: languageName: node linkType: hard -"cypress-axe@npm:1.0.0": - version: 1.0.0 - resolution: "cypress-axe@npm:1.0.0" +"cypress-axe@npm:1.5.0": + version: 1.5.0 + resolution: "cypress-axe@npm:1.5.0" peerDependencies: axe-core: ^3 || ^4 - cypress: ^10 - checksum: 02b5d8ac11b659772fc11e587c61c75b86fdbd1dda7930ec76e02ed4f7e774d01a087bd21681460d9664d469f1bc778a8402825e9c7fd95e0aa2688264a381c2 + cypress: ^10 || ^11 || ^12 || ^13 + checksum: 7b5574da4ea2c1a1141f79cb4465a4f30879e30b9ac08da4aca935dfc7662d3fa170254be8c4eff26841bc065e6115bf6e6b8a8eee5ff7cb9812bbcbeb863ff2 languageName: node linkType: hard @@ -9216,13 +9157,13 @@ __metadata: languageName: node linkType: hard -"cypress@npm:11.1.0": - version: 11.1.0 - resolution: "cypress@npm:11.1.0" +"cypress@npm:13.1.0": + version: 13.1.0 + resolution: "cypress@npm:13.1.0" dependencies: - "@cypress/request": ^2.88.10 + "@cypress/request": ^3.0.0 "@cypress/xvfb": ^1.2.4 - "@types/node": ^14.14.31 + "@types/node": ^16.18.39 "@types/sinonjs__fake-timers": 8.1.1 "@types/sizzle": ^2.3.2 arch: ^2.2.0 @@ -9234,10 +9175,10 @@ __metadata: check-more-types: ^2.24.0 cli-cursor: ^3.1.0 cli-table3: ~0.6.1 - commander: ^5.1.0 + commander: ^6.2.1 common-tags: ^1.8.0 dayjs: ^1.10.4 - debug: ^4.3.2 + debug: ^4.3.4 enquirer: ^2.3.6 eventemitter2: 6.4.7 execa: 4.1.0 @@ -9252,19 +9193,20 @@ __metadata: listr2: ^3.8.3 lodash: ^4.17.21 log-symbols: ^4.0.0 - minimist: ^1.2.6 + minimist: ^1.2.8 ospath: ^1.2.2 pretty-bytes: ^5.6.0 + process: ^0.11.10 proxy-from-env: 1.0.0 request-progress: ^3.0.0 - semver: ^7.3.2 + semver: ^7.5.3 supports-color: ^8.1.1 tmp: ~0.2.1 untildify: ^4.0.0 yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: ee0097778cf3cdf3854325cabf19a60a7486d46ae70082034c05b22b203f21ff85a4871c08dadc6641be649a64c739a443dd3f2d6a5ab112fc9ead703e1f1be3 + checksum: 238057b288f54401ad3fa8693c31ec08eef2d98a7fc93ce7f60bc009fcae18539e84be4c1cd41526816603f642f63444a7adce9d914b1338a53c0bf756bdb762 languageName: node linkType: hard @@ -9354,15 +9296,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:=3.1.0": - version: 3.1.0 - resolution: "debug@npm:3.1.0" - dependencies: - ms: 2.0.0 - checksum: 0b52718ab957254a5b3ca07fc34543bc778f358620c206a08452251eb7fc193c3ea3505072acbf4350219c14e2d71ceb7bdaa0d3370aa630b50da790458d08b3 - languageName: node - linkType: hard - "debug@npm:^3.0.0, debug@npm:^3.1.0, debug@npm:^3.2.5, debug@npm:^3.2.7": version: 3.2.7 resolution: "debug@npm:3.2.7" @@ -11734,15 +11667,6 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:1.5.10": - version: 1.5.10 - resolution: "follow-redirects@npm:1.5.10" - dependencies: - debug: =3.1.0 - checksum: 0edc4b74e37e7b88ee716188a8f2a790238877c1d954f00c7b78d560f3bef40061c130536d13bee8e47b4e8e71edf1175a2de2729e51ab8206e4646b2370e484 - languageName: node - linkType: hard - "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" @@ -11930,18 +11854,18 @@ __metadata: version: 0.0.0-use.local resolution: "frontend@workspace:." dependencies: - "@eeacms/volto-accordion-block": 8.0.0 - "@eeacms/volto-matomo": 3.0.1 - "@kitconcept/volto-blocks-grid": 8.0.0 - "@kitconcept/volto-button-block": 2.2.0 - "@kitconcept/volto-dsgvo-banner": 2.1.0 + "@eeacms/volto-accordion-block": 10.3.0 + "@eeacms/volto-matomo": 4.1.3 + "@kitconcept/volto-blocks-grid": 8.0.3 + "@kitconcept/volto-button-block": 2.3.1 + "@kitconcept/volto-dsgvo-banner": 2.2.0 "@kitconcept/volto-export": 1.1.0 - "@kitconcept/volto-heading-block": 2.3.0 - "@kitconcept/volto-separator-block": 3.2.1 + "@kitconcept/volto-heading-block": 2.4.0 + "@kitconcept/volto-separator-block": 4.0.0 "@kitconcept/volto-slider-block": 4.3.0 "@plone-collective/volto-authomatic": 1.3.0 "@plone/scripts": ^3.0.0 - "@plone/volto": 17.0.0-alpha.16 + "@plone/volto": 17.0.0-alpha.26 "@storybook/addon-actions": ^6.3.0 "@storybook/addon-controls": 6.3.0 "@storybook/addon-essentials": ^6.3.0 @@ -11958,7 +11882,7 @@ __metadata: stylelint-config-idiomatic-order: 8.1.0 stylelint-config-prettier: 8.0.1 stylelint-prettier: 1.1.2 - volto-form-block: 3.0.1 + volto-form-block: 3.1.0 languageName: unknown linkType: soft @@ -12546,7 +12470,7 @@ __metadata: languageName: node linkType: hard -"gzip-size@npm:5.1.1, gzip-size@npm:^5.0.0, gzip-size@npm:^5.1.1": +"gzip-size@npm:5.1.1, gzip-size@npm:^5.0.0": version: 5.1.1 resolution: "gzip-size@npm:5.1.1" dependencies: @@ -15320,13 +15244,6 @@ __metadata: languageName: node linkType: hard -"jsonpack@npm:^1.1.5": - version: 1.1.5 - resolution: "jsonpack@npm:1.1.5" - checksum: 60ae0a52343a6bc254ff6677e87c55f4d71347b4a0c981b53cd3fdc184e139e0bf1b6bc127d42c1ab41b3c99d98e1e81559a94ba74a1c91c9143f70c8d751bf6 - languageName: node - linkType: hard - "jsprim@npm:^1.2.2": version: 1.4.2 resolution: "jsprim@npm:1.4.2" @@ -15789,13 +15706,6 @@ __metadata: languageName: node linkType: hard -"lodash.merge@npm:^4.6.1": - version: 4.6.2 - resolution: "lodash.merge@npm:4.6.2" - checksum: ad580b4bdbb7ca1f7abf7e1bce63a9a0b98e370cf40194b03380a46b4ed799c9573029599caebc1b14e3f24b111aef72b96674a56cfa105e0f5ac70546cdc005 - languageName: node - linkType: hard - "lodash.once@npm:^4.1.1": version: 4.1.1 resolution: "lodash.once@npm:4.1.1" @@ -16429,6 +16339,13 @@ __metadata: languageName: node linkType: hard +"minimist@npm:^1.2.8": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 + languageName: node + linkType: hard + "minipass-collect@npm:^1.0.2": version: 1.0.2 resolution: "minipass-collect@npm:1.0.2" @@ -18982,6 +18899,15 @@ __metadata: languageName: node linkType: hard +"qs@npm:6.10.4": + version: 6.10.4 + resolution: "qs@npm:6.10.4" + dependencies: + side-channel: ^1.0.4 + checksum: 31e4fedd759d01eae52dde6692abab175f9af3e639993c5caaa513a2a3607b34d8058d3ae52ceeccf37c3025f22ed5e90e9ddd6c2537e19c0562ddd10dc5b1eb + languageName: node + linkType: hard + "qs@npm:6.11.0, qs@npm:^6.10.0, qs@npm:^6.5.1, qs@npm:^6.9.4": version: 6.11.0 resolution: "qs@npm:6.11.0" @@ -21358,15 +21284,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:5.6.0": - version: 5.6.0 - resolution: "semver@npm:5.6.0" - bin: - semver: ./bin/semver - checksum: 15409e2282f496e240cb2c3355f60e46b09df3820ed6cad359ae6d90e5395b5b75f38a46f91f478473ed65c8d1b086842cf1f7f1f6d26303003759ab8458e752 - languageName: node - linkType: hard - "semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0": version: 6.3.0 resolution: "semver@npm:6.3.0" @@ -21387,6 +21304,17 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.5.3": + version: 7.5.4 + resolution: "semver@npm:7.5.4" + dependencies: + lru-cache: ^6.0.0 + bin: + semver: bin/semver.js + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 + languageName: node + linkType: hard + "send@npm:0.17.2": version: 0.17.2 resolution: "send@npm:0.17.2" @@ -21656,17 +21584,6 @@ __metadata: languageName: node linkType: hard -"simple-git@npm:3.5.0": - version: 3.5.0 - resolution: "simple-git@npm:3.5.0" - dependencies: - "@kwsites/file-exists": ^1.1.1 - "@kwsites/promise-deferred": ^1.1.1 - debug: ^4.3.3 - checksum: be078d9e898d1dea99bb15d4f6927c0f61aafde73114c7423fb0efca6d6f99012da2a2f43b5e2151a1707994cc9c75139bc12e3d307dd25da48ed1dce1167748 - languageName: node - linkType: hard - "simple-git@npm:^3.3.0": version: 3.15.1 resolution: "simple-git@npm:3.15.1" @@ -23337,6 +23254,18 @@ __metadata: languageName: node linkType: hard +"tough-cookie@npm:^4.1.3": + version: 4.1.3 + resolution: "tough-cookie@npm:4.1.3" + dependencies: + psl: ^1.1.33 + punycode: ^2.1.1 + universalify: ^0.2.0 + url-parse: ^1.5.3 + checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc + languageName: node + linkType: hard + "tough-cookie@npm:~2.5.0": version: 2.5.0 resolution: "tough-cookie@npm:2.5.0" @@ -24256,9 +24185,9 @@ __metadata: languageName: node linkType: hard -"volto-form-block@npm:3.0.1": - version: 3.0.1 - resolution: "volto-form-block@npm:3.0.1" +"volto-form-block@npm:3.1.0": + version: 3.1.0 + resolution: "volto-form-block@npm:3.1.0" dependencies: "@hcaptcha/react-hcaptcha": ^0.3.6 file-saver: ^2.0.5 @@ -24267,7 +24196,7 @@ __metadata: peerDependencies: "@plone/volto": ">=16.0.0-alpha.38" volto-subblocks: ^2.0.0 - checksum: 6d70971826e847a6615a5344ec48e502447e07cde0332c3ff1dd9e2b80324cf66dbf4ccfefeac830bf975838b0d9ffbcc8c8993b5eedfa43552f2b8da28a4e2b + checksum: a8707b864ee32acf99151d302de6389d9a395623b2c384dbae3a1acb9e2b5c57f355f5d9318834fa9e49b004f14f97494534dd435daea65414ddce087e340009 languageName: node linkType: hard