diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cdddeb4..1df4f4d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ 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). +### [18.0.3](https://github.com/eea/volto-eea-kitkat/compare/18.0.2...18.0.3) - 23 August 2023 + +#### :rocket: Dependency updates + +- Release @eeacms/volto-accordion-block@10.1.1 [EEA Jenkins - [`7a56ad9`](https://github.com/eea/volto-eea-kitkat/commit/7a56ad931bfe880ae68f3ac762ffa9e9db4870c2)] + +#### :hammer_and_wrench: Others + +- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`f3a61b9`](https://github.com/eea/volto-eea-kitkat/commit/f3a61b95bb39963eb531c65ac02dc634e682c686)] ### [18.0.2](https://github.com/eea/volto-eea-kitkat/compare/18.0.1...18.0.2) - 18 August 2023 #### :rocket: Dependency updates diff --git a/Makefile b/Makefile index 13481d35..4a5cbedd 100644 --- a/Makefile +++ b/Makefile @@ -70,6 +70,11 @@ start: ## Start development environment echo "Running: ${DOCKER_COMPOSE} up" ${DOCKER_COMPOSE} up +.PHONY: shell +shell: ## Start a shell in the frontend container + echo "Running: ${DOCKER_COMPOSE} run frontend bash" + ${DOCKER_COMPOSE} run --entrypoint=bash frontend + .PHONY: cypress-open cypress-open: ## Open cypress integration tests NODE_ENV=development $(NODE_MODULES)/cypress/bin/cypress open diff --git a/docker-compose.yml b/docker-compose.yml index c6f48624..5d79f5cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,12 @@ version: "3" services: backend: - image: plone/plone-backend:${PLONE_VERSION:-6} + image: eeacms/plone-backend ports: - "8080:8080" environment: SITE: "Plone" + PROFILES: "eea.kitkat:testing" frontend: build: @@ -23,6 +24,9 @@ services: volumes: - ./:/app/src/addons/${ADDON_PATH} environment: + CI: "true" + NODE_ENV: "development" + RAZZLE_JEST_CONFIG: "src/addons/${ADDON_PATH}/jest-addon.config.js" RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone" RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone" HOST: "0.0.0.0" diff --git a/package.json b/package.json index 8c302cce..1569fdf0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-eea-kitkat", - "version": "18.0.2", + "version": "18.0.3", "description": "@eeacms/volto-eea-kitkat: Volto Add-ons bundle - A known good set of Volto addons to be used within all EEA projects and beyond", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", @@ -60,7 +60,7 @@ ], "dependencies": { "@eeacms/countup": "2.0.4", - "@eeacms/volto-accordion-block": "10.1.0", + "@eeacms/volto-accordion-block": "10.1.1", "@eeacms/volto-anchors": "0.4.0", "@eeacms/volto-banner": "3.1.3", "@eeacms/volto-block-divider": "6.1.2", @@ -109,7 +109,7 @@ "@eeacms/volto-description-block": "1.1.3", "@eeacms/volto-slate-label": "0.5.2", "@plone-collective/volto-sentry": "0.3.0", - "@eeacms/volto-accordion-block": "10.1.0", + "@eeacms/volto-accordion-block": "10.1.1", "@eeacms/volto-banner": "3.1.3", "@eeacms/volto-block-divider": "6.1.2", "@eeacms/volto-block-image-cards": "1.3.3",