Skip to content

Commit

Permalink
Merge remote-tracking branch origin/main into prefix_path_router
Browse files Browse the repository at this point in the history
  • Loading branch information
wesleybl committed Feb 10, 2025
2 parents 4e758d7 + 3330285 commit c7135b4
Show file tree
Hide file tree
Showing 78 changed files with 3,015 additions and 1,002 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1_bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: '🐞 Bug report'
about: 'Create a report to help us improve Volto'
title: ''
labels: ['01 type: bug', 'needs: triage']
labels: ['01 type: bug', '30 needs: triage']
assignees: ''
---

Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/cookieplone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,63 @@ jobs:
with:
name: cypress-videos
path: packages/seven/cypress/videos

volto:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
runs-on: ubuntu-latest
name: Volto Cookieplone
timeout-minutes: 45
strategy:
fail-fast: false
matrix:
node-version: [22.x]
steps:
- uses: actions/checkout@v4
- run: echo "Current branch is ${GITHUB_REF#refs/heads/}"
- name: Set up Node.js environment
uses: ./.github/actions/node_env_setup
with:
node-version: ${{ matrix.node-version }}

- name: Generate Cookieplone-based frontend addon
run: |
pipx install cookieplone
pipx run --no-cache cookieplone frontend_addon --no-input
- name: Install generated package
working-directory: volto-add-on
run: |
pnpm dlx mrs-developer missdev --no-config --fetch-https
(cd core && git fetch --depth 1 origin ${GITHUB_REF#refs/heads/}:${GITHUB_REF#refs/heads/} && git checkout ${GITHUB_REF#refs/heads/})
pnpm i
- name: Cypress acceptance tests
uses: cypress-io/github-action@v6
env:
BABEL_ENV: production
CYPRESS_RETRIES: 2
# Recommended: pass the GitHub token lets this action correctly
# determine the unique run id necessary to re-run the checks
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
install: false
working-directory: packages/volto
browser: chrome
spec: cypress/tests/minimal/**/*.js
start: |
make ci-acceptance-backend-start
make cookieplone-acceptance-frontend-prod-start
wait-on: 'pnpm dlx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'

# Upload Cypress screenshots
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-screenshots
path: packages/seven/cypress/screenshots
# Upload Cypress videos
- uses: actions/upload-artifact@v4
if: failure()
with:
name: cypress-videos
path: packages/seven/cypress/videos
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,11 @@ deployment-acceptance-web-server-start: ## Start the reverse proxy (Traefik) in
deployment-ci-acceptance-test-run-all: ## With a single command, run the backend, frontend, and the Cypress tests in headless mode for CI for deployment tests
$(MAKE) -C "./packages/volto/" deployment-ci-acceptance-test-run-all

######### Project Acceptance tests
######### Cookieplone / (deprecated) Project Acceptance tests

.PHONY: cookieplone-acceptance-frontend-prod-start
cookieplone-acceptance-frontend-prod-start: ## Start acceptance frontend in production mode for project tests
$(MAKE) -C "./packages/volto/" cookieplone-acceptance-frontend-prod-start

.PHONY: project-acceptance-frontend-prod-start
project-acceptance-frontend-prod-start: ## Start acceptance frontend in production mode for project tests
Expand Down
17 changes: 17 additions & 0 deletions docs/source/release-notes/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,23 @@ myst:

<!-- towncrier release notes start -->

## 18.8.2 (2025-02-08)

### Bugfix

- Use a text widget for editing the frontend domain setting in the Volto Settings control panel, instead of the URL widget which causes problems by erasing the current domain. @davisagli [#4171](https://github.com/plone/volto/issues/4171)
- Update Dutch translations. @mauritsvanrees [#6476](https://github.com/plone/volto/issues/6476)

### Internal

- Test(cypress): fix breaking a list by typing Enter refs- #6586 @nileshgulia1 [#6570](https://github.com/plone/volto/issues/6570)
- Add the block `group` name in the block configuration. @erral [#6679](https://github.com/plone/volto/issues/6679)
- Test with Plone 6.1.0rc1. @sneridagh [#6682](https://github.com/plone/volto/issues/6682)
- Revise the existing issue templates and create a new one for PLIP tasks. @stevepiercy [#6683](https://github.com/plone/volto/issues/6683)
- Fix documentation build at Read the Docs. @sneridagh [#6684](https://github.com/plone/volto/issues/6684)
- Upgrade jotai to 2.11.3 @ksuess [#6685](https://github.com/plone/volto/issues/6685)
- Add Makefile command for testing Cookieplone in CI @sneridagh [#6728](https://github.com/plone/volto/issues/6728)

## 18.8.1 (2025-02-04)

### Bugfix
Expand Down
8 changes: 8 additions & 0 deletions packages/blocks/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@

<!-- towncrier release notes start -->

## 1.0.0-alpha.3 (2025-02-08)

### Internal

- Update internal `peerDependencies` to include React 19.
Update TS version. @sneridagh [#6641](https://github.com/plone/volto/pull/6641)
- Update internal `peerDependencies` to include React 19, now for real. @sneridagh [#6728](https://github.com/plone/volto/pull/6728)

## 1.0.0-alpha.2 (2025-01-24)

### Feature
Expand Down
2 changes: 0 additions & 2 deletions packages/blocks/news/6641.internal

This file was deleted.

6 changes: 3 additions & 3 deletions packages/blocks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"funding": "https://github.com/sponsors/plone",
"license": "MIT",
"version": "1.0.0-alpha.2",
"version": "1.0.0-alpha.3",
"repository": {
"type": "git",
"url": "https://github.com/plone/volto.git"
Expand Down Expand Up @@ -39,8 +39,8 @@
"release-alpha": "release-it --preRelease=alpha"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
},
"peerDependenciesMeta": {
"react-dom": {
Expand Down
10 changes: 10 additions & 0 deletions packages/client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@

<!-- towncrier release notes start -->

## 1.0.0-alpha.23 (2025-02-08)

### Internal

- Update Vite version. @sneridagh [#6640](https://github.com/plone/volto/pull/6640)
- Update internal `peerDependencies` to include React 19.
Update TS version. @sneridagh [#6641](https://github.com/plone/volto/pull/6641)
- Test with Plone 6.1.0rc1. @sneridagh [#6682](https://github.com/plone/volto/pull/6682)
- Remove hard dependencies on `react`, use `peerDependencies` instead. @sneridagh [#6728](https://github.com/plone/volto/pull/6728)

## 1.0.0-alpha.22 (2025-01-24)

### Documentation
Expand Down
1 change: 0 additions & 1 deletion packages/client/news/6640.internal

This file was deleted.

2 changes: 0 additions & 2 deletions packages/client/news/6641.internal

This file was deleted.

1 change: 0 additions & 1 deletion packages/client/news/6682.internal

This file was deleted.

22 changes: 10 additions & 12 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
],
"license": "MIT",
"version": "1.0.0-alpha.22",
"version": "1.0.0-alpha.23",
"repository": {
"type": "git",
"url": "[email protected]:plone/volto.git"
Expand Down Expand Up @@ -55,21 +55,26 @@
"publishConfig": {
"access": "public"
},
"dependencies": {
"@tanstack/react-query": "^5.59.0",
"axios": "^1.6.7",
"debug": "4.3.4",
"query-string": "^9.0.0",
"zod": "^3.22.4"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.16.4",
"@plone/types": "workspace: *",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "13.4.0",
"@types/debug": "^4.1.12",
"@types/react": "18.2.27",
"@types/react-dom": "18.2.12",
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/uuid": "^9.0.2",
"@vitejs/plugin-react": "^4.1.0",
"@vitest/coverage-v8": "^1.3.1",
"glob": "7.1.6",
"jsdom": "^21.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"release-it": "17.1.1",
"tsup": "^8.3.5",
"typescript": "^5.7.3",
Expand All @@ -79,13 +84,6 @@
"vitest": "^2.1.3",
"wait-on": "^7.2.0"
},
"dependencies": {
"@tanstack/react-query": "^5.59.0",
"axios": "^1.6.7",
"debug": "4.3.4",
"query-string": "^9.0.0",
"zod": "^3.22.4"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
Expand Down
10 changes: 10 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@

<!-- towncrier release notes start -->

## 3.0.2 (2025-02-08)

### Internal

- Update Storybook version.
Update Vite version. @sneridagh [#6640](https://github.com/plone/volto/issues/6640)
- Update internal `peerDependencies` to include React 19. @sneridagh [#6641](https://github.com/plone/volto/issues/6641)
- Test with Plone 6.1.0rc1. @sneridagh [#6682](https://github.com/plone/volto/issues/6682)
- Update dependencies versions. @sneridagh [#6728](https://github.com/plone/volto/issues/6728)

## 3.0.1 (2024-12-17)

### Bugfix
Expand Down
2 changes: 0 additions & 2 deletions packages/components/news/6640.internal

This file was deleted.

1 change: 0 additions & 1 deletion packages/components/news/6641.internal

This file was deleted.

1 change: 0 additions & 1 deletion packages/components/news/6682.internal

This file was deleted.

20 changes: 10 additions & 10 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
],
"license": "MIT",
"version": "3.0.1",
"version": "3.0.2",
"repository": {
"type": "git",
"url": "http://github.com/plone/volto.git"
Expand Down Expand Up @@ -75,6 +75,13 @@
"last 2 versions",
"not dead"
],
"dependencies": {
"@react-aria/utils": "^3.27.0",
"@react-spectrum/utils": "^3.12.1",
"@storybook/test": "^8.5.3",
"clsx": "^2.1.1",
"react-aria-components": "^1.6.0"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.16.4",
"@plone/types": "workspace: *",
Expand All @@ -99,8 +106,8 @@
"eslint-plugin-storybook": "^0.11.2",
"jest-axe": "^8.0.0",
"jsdom": "^22.1.0",
"lightningcss": "^1.24.0",
"lightningcss-cli": "^1.24.0",
"lightningcss": "^1.29.0",
"lightningcss-cli": "^1.29.1",
"release-it": "17.1.1",
"storybook": "^8.5.3",
"tsup": "^8.3.5",
Expand All @@ -109,13 +116,6 @@
"vitest": "^2.1.3",
"vitest-axe": "^0.1.0"
},
"dependencies": {
"@react-aria/utils": "^3.26.0",
"@react-spectrum/utils": "^3.12.0",
"@storybook/test": "^8.5.3",
"clsx": "^2.1.1",
"react-aria-components": "^1.5.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
Expand Down
6 changes: 6 additions & 0 deletions packages/generator-volto/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@

<!-- towncrier release notes start -->

## 9.0.1 (2025-02-08)

### Internal

- Test with Plone 6.1.0rc1. @sneridagh [#6682](https://github.com/plone/volto/issues/6682)

## 9.0.0 (2024-10-31)

### Internal
Expand Down
1 change: 0 additions & 1 deletion packages/generator-volto/news/6682.internal

This file was deleted.

2 changes: 1 addition & 1 deletion packages/generator-volto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"license": "MIT",
"version": "9.0.0",
"version": "9.0.1",
"repository": {
"type": "git",
"url": "git+https://github.com/plone/generator-volto.git"
Expand Down
7 changes: 7 additions & 0 deletions packages/helpers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@

<!-- towncrier release notes start -->

## 1.0.2 (2025-02-08)

### Internal

- Update internal `peerDependencies` to include React 19.
Update TS version. @sneridagh [#6641](https://github.com/plone/volto/issues/6641)

## 1.0.1 (2025-01-24)

### Internal
Expand Down
2 changes: 0 additions & 2 deletions packages/helpers/news/6641.internal

This file was deleted.

2 changes: 1 addition & 1 deletion packages/helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"funding": "https://github.com/sponsors/plone",
"license": "MIT",
"version": "1.0.1",
"version": "1.0.2",
"repository": {
"type": "git",
"url": "https://github.com/plone/volto.git"
Expand Down
8 changes: 8 additions & 0 deletions packages/providers/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@

<!-- towncrier release notes start -->

## 1.0.0-alpha.8 (2025-02-08)

### Internal

- Update internal `peerDependencies` to include React 19.
Update TS version. @sneridagh [#6641](https://github.com/plone/volto/issues/6641)
- Remove no longer required dependencies. @sneridagh [#6728](https://github.com/plone/volto/issues/6728)

## 1.0.0-alpha.7 (2025-01-24)

### Internal
Expand Down
2 changes: 0 additions & 2 deletions packages/providers/news/6641.internal

This file was deleted.

5 changes: 2 additions & 3 deletions packages/providers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
],
"funding": "https://github.com/sponsors/plone",
"license": "MIT",
"version": "1.0.0-alpha.7",
"version": "1.0.0-alpha.8",
"repository": {
"type": "git",
"url": "https://github.com/plone/volto.git"
Expand Down Expand Up @@ -62,10 +62,9 @@
},
"dependencies": {
"@plone/client": "workspace:*",
"@plone/components": "workspace:*",
"@plone/registry": "workspace:*",
"@tanstack/react-query": "^5.59.0",
"react-aria-components": "^1.5.0"
"react-aria-components": "^1.6.0"
},
"devDependencies": {
"@arethetypeswrong/cli": "^0.16.4",
Expand Down
Loading

0 comments on commit c7135b4

Please sign in to comment.