Merge branch 'main' into fix-protected-pages-bug

plone · Feb 10, 2025 · cfcd785 · cfcd785
2 parents a5736b9 + 3330285
commit cfcd785
Show file tree

Hide file tree

Showing 92 changed files with 3,107 additions and 1,032 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.md b/.github/ISSUE_TEMPLATE/1_bug_report.md
@@ -1,8 +1,8 @@
 ---
-name: Bug report
-about: Create a report to help us improve Volto
+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: ''
 ---
 

diff --git a/.github/ISSUE_TEMPLATE/2_feature_request.md b/.github/ISSUE_TEMPLATE/2_feature_request.md
@@ -1,6 +1,6 @@
 ---
-name: Feature request
-about: Suggest an idea for Volto
+name: '🦄 Feature request'
+about: 'Suggest an idea for Volto'
 title: ''
 labels: '04 type: enhancement'
 assignees: ''

diff --git a/.github/ISSUE_TEMPLATE/3_PLIP.md b/.github/ISSUE_TEMPLATE/3_PLIP.md
@@ -1,13 +1,18 @@
 ---
-name: "\U0001F680 PLIP"
-about: Plone Improvement Proposal
+name: '🚀 PLIP'
+about: 'A Plone Improvement Proposal (PLIP) is a change to a Plone package that would affect everyone who uses that package.'
 title: ''
 labels: '03 type: feature (plip)'
+type: 'PLIP'
 assignees: ''
 projects: 'plone/47'
-
 ---
 
+<!-- Keep this admonition when you submit your PLIP -->
+
+> [!IMPORTANT]
+> If you are not a member of the Volto Team or Developers Team in the Plone GitHub organization, then do not work on or comment on this issue.
+
 ## PLIP (Plone Improvement Proposal)
 
 <!--

diff --git a/.github/ISSUE_TEMPLATE/4_PLIP_task.md b/.github/ISSUE_TEMPLATE/4_PLIP_task.md
@@ -0,0 +1,26 @@
+---
+name: "📋 PLIP task"
+about: 'Plone Improvement Proposal (PLIP) tasks are sub-issues of the umbrella PLIP.'
+title: ''
+labels: '06 type: plip task'
+type: 'Feature'
+assignees: ''
+projects: 'plone/47'
+---
+
+<!-- Keep this admonition when you submit your PLIP task -->
+
+> [!IMPORTANT]
+> If you are not a member of the Volto Team or Developers Team in the Plone GitHub organization, then do not work on or comment on this issue.
+
+**Describe the PLIP task**
+
+A clear and concise description of what you want to happen, even if it is already in the PLIP. A conversation about this PLIP task should continue and extend from the PLIP.
+
+**Link to the parent PLIP**
+
+
+
+**Additional context**
+
+Add any other context or screenshots about the PLIP task here.
diff --git a/.github/workflows/cookieplone.yml b/.github/workflows/cookieplone.yml
@@ -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
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
@@ -26,6 +26,7 @@ build:
     # Install dependencies defined in your ``package.json``
     # - npm ci
     # Install any other extra dependencies to build the docs
+    - npm i -g corepack@latest
     - corepack enable
     - corepack prepare pnpm@* --activate
     - asdf reshim nodejs

diff --git a/Makefile b/Makefile
@@ -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
@@ -387,7 +391,7 @@ plone5-acceptance-backend-start: ## Start backend acceptance server for Plone 5
 
 .PHONY: acceptance-server-detached-start
 acceptance-server-detached-start: ## Starts test acceptance server main fixture in detached mode (daemon)
-	docker run -d --name plone-client-acceptance-server -i --rm -p 55001:55001 $(DOCKER_IMAGE_ACCEPTANCE)
+	docker run -d --name plone-client-acceptance-server -i --rm -p 55001:55001 -e APPLY_PROFILES=plone.app.contenttypes:plone-content,plone.restapi:default,plone.volto:default,plone.app.discussion:default $(DOCKER_IMAGE_ACCEPTANCE)
 
 .PHONY: acceptance-server-detached-stop
 acceptance-server-detached-stop: ## Stop test acceptance server main fixture in detached mode (daemon)

diff --git a/docs/source/blocks/examples/custom-schema-and-view.md b/docs/source/blocks/examples/custom-schema-and-view.md
@@ -134,6 +134,7 @@ config.blocks.blocksConfig.block01 = {
   icon: imagesSVG, // this is the image that will be shown in the block selector
   sidebarTab: 1, // this is set to 1 to have the `Block` tab selected in the sidebar
   // editor when editing this block
+  group: 'common' // to show the block in the block select under the `common` category
 };
 ```
 

diff --git a/docs/source/blocks/examples/custom-schema-view-and-edit.md b/docs/source/blocks/examples/custom-schema-view-and-edit.md
@@ -190,6 +190,7 @@ config.blocks.blocksConfig.block02 = {
     // this is set to 1, which selects the `Block` tab in the sidebar editor
     // when editing this block
     sidebarTab: 1,
+    group: 'common' // to show the block in the block select under the `common` category
   };
 ```
 

diff --git a/docs/source/blocks/examples/custom-view-and-variations.md b/docs/source/blocks/examples/custom-view-and-variations.md
@@ -203,6 +203,7 @@ config.blocks.blocksConfig.block03 = {
   icon: imagesSVG, // this is the image that will be shown in the block selector
   sidebarTab: 1, // this is set to 1 to have the `Block` tab selected in the sidebar
   // editor when editing this block these are the variations available for this block
+  group: 'common', // to show the block in the block select under the `common` category
   variations: [
     {
       id: 'variation01', // this is the id of the variation

diff --git a/docs/source/blocks/examples/custom-view-variations-and-schema-enhancer.md b/docs/source/blocks/examples/custom-view-variations-and-schema-enhancer.md
@@ -238,6 +238,7 @@ config.blocks.blocksConfig.block04 = {
   sidebarTab: 1, // this is set to 1 to have the `Block` tab selected in the sidebar
   // editor when editing this block these are the variations available for this block
   // these are the variations available for this block
+  group: 'common', // to show the block in the block select under the `common` category
   variations: [
     {
       id: 'variation01', // this is the id of the variation

diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -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

diff --git a/packages/blocks/CHANGELOG.md b/packages/blocks/CHANGELOG.md
@@ -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

diff --git a/packages/blocks/news/6641.internal b/packages/blocks/news/6641.internal
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
@@ -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"
@@ -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": {

diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -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

diff --git a/packages/client/news/6640.internal b/packages/client/news/6640.internal
diff --git a/packages/client/news/6641.internal b/packages/client/news/6641.internal
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -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"
@@ -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",
@@ -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"

diff --git a/packages/client/src/restapi/aliases/get.test.tsx b/packages/client/src/restapi/aliases/get.test.tsx
@@ -7,7 +7,8 @@ const cli = ploneClient.initialize({
   apiPath: 'http://localhost:55001/plone',
 });
 
-const { getAliasesQuery } = cli;
+const { login, getAliasesQuery } = cli;
+await login({ username: 'admin', password: 'secret' });
 
 describe('[GET] Aliases', () => {
   test('Hook - Successful', async () => {

diff --git a/packages/client/src/restapi/aliases/get_list.test.tsx b/packages/client/src/restapi/aliases/get_list.test.tsx
@@ -7,7 +7,8 @@ const cli = ploneClient.initialize({
   apiPath: 'http://localhost:55001/plone',
 });
 
-const { getAliasesListQuery } = cli;
+const { login, getAliasesListQuery } = cli;
+await login({ username: 'admin', password: 'secret' });
 
 describe('[GET] AliasesList', () => {
   test('Hook - Successful', async () => {

diff --git a/packages/client/src/restapi/content/get.test.tsx b/packages/client/src/restapi/content/get.test.tsx
@@ -18,7 +18,7 @@ describe('[GET] Content', () => {
 
     await waitFor(() => expect(result.current.isSuccess).toBe(true));
 
-    expect(result.current.data?.title).toBe('Welcome to Plone 6!');
+    expect(result.current.data?.title).toBe('Welcome to Plone');
   });
 
   test('Hook - Failure', async () => {
@@ -41,7 +41,7 @@ describe('[GET] Content', () => {
 
     await waitFor(() => expect(result.current.isSuccess).toBe(true));
 
-    expect(result.current.data?.title).toBe('Welcome to Plone 6!');
+    expect(result.current.data?.title).toBe('Welcome to Plone');
   });
 
   test('Hook - expand', async () => {
@@ -59,7 +59,7 @@ describe('[GET] Content', () => {
 
     await waitFor(() => expect(result.current.isSuccess).toBe(true));
 
-    expect(result.current.data?.title).toBe('Welcome to Plone 6!');
+    expect(result.current.data?.title).toBe('Welcome to Plone');
     expect(
       result.current.data?.['@components']?.breadcrumbs?.items,
     ).toStrictEqual([]);
@@ -90,7 +90,7 @@ describe('[GET] Content', () => {
 
     await waitFor(() => expect(result.current.isSuccess).toBe(true));
 
-    expect(result.current.data?.title).toBe('Welcome to Plone 6!');
+    expect(result.current.data?.title).toBe('Welcome to Plone');
   });
 
   test.skip('Hook - fullObjects && version', async () => {
@@ -106,7 +106,7 @@ describe('[GET] Content', () => {
 
     await waitFor(() => expect(result.current.isSuccess).toBe(true));
 
-    expect(result.current.data?.title).toBe('Welcome to Plone 6!');
+    expect(result.current.data?.title).toBe('Welcome to Plone');
   });
 });