Merge branch 'main' into toolbar_handler_color_for_homepage

RedTurtle · Jun 26, 2024 · 66e7cb3 · 66e7cb3
2 parents f25623d + 128bb82
commit 66e7cb3
Show file tree

Hide file tree

Showing 218 changed files with 5,410 additions and 2,009 deletions.
diff --git a/.github/ISSUE_TEMPLATE/PLIP.md b/.github/ISSUE_TEMPLATE/PLIP.md
@@ -2,7 +2,7 @@
 name: "\U0001F680 PLIP"
 about: Plone Improvement Proposal
 title: ''
-labels: ''
+labels: '03 type: feature (plip)'
 assignees: ''
 
 ---

diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -63,8 +63,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/basic/**/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend
+            make ci-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -142,8 +142,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/content/**/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend
+            make ci-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -221,8 +221,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/controlpanels/**/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend
+            make ci-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -300,8 +300,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/blocks/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend
+            make ci-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -379,8 +379,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/blocks/listing/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend
+            make ci-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -458,8 +458,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/volto-slate/**/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend
+            make ci-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -536,8 +536,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/core/basic/**/*.js
           start: |
-            make start-test-acceptance-server-5
-            make start-test-acceptance-frontend
+            make plone5-acceptance-backend-start
+            make acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -615,8 +615,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/coresandbox/**/*.js
           start: |
-            make start-test-acceptance-server-coresandbox
-            make start-test-acceptance-frontend-coresandbox
+            make coresandbox-acceptance-backend-start
+            make coresandbox-acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -632,74 +632,6 @@ jobs:
           name: cypress-videos
           path: packages/volto/cypress/videos
 
-  # guillotina:
-  #   if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-  #   name: Guillotina
-  #   runs-on: ubuntu-latest
-  #   timeout-minutes: 35
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       node-version: [18.x]
-  #   steps:
-  #     - uses: actions/checkout@v4
-
-  #     # node setup
-  #     - name: Use Node.js ${{ matrix.node-version }}
-  #       uses: actions/setup-node@v4
-  #       with:
-  #         node-version: ${{ matrix.node-version }}
-
-  #     - name: Enable corepack
-  #       run: corepack enable
-
-  #     - name: Get pnpm store directory
-  #       shell: bash
-  #       run: |
-  #         echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
-
-  #     - uses: actions/cache@v4
-  #       name: Setup pnpm cache
-  #       with:
-  #         path: ${{ env.STORE_PATH }}
-  #         key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-  #         restore-keys: |
-  #           ${{ runner.os }}-pnpm-store-
-
-  #     - run: pnpm i
-
-  #     - name: Cypress acceptance tests
-  #       uses: cypress-io/github-action@v6
-  #       env:
-  #         BABEL_ENV: production
-  #         CYPRESS_API: guillotina
-  #         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/guillotina/**/*.js
-  #         start: |
-  #           make start-test-acceptance-server-guillotina
-  #           make start-test-acceptance-frontend-guillotina
-  #         wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:8081 http://127.0.0.1:3000'
-
-  #     # Upload Cypress screenshots
-  #     - uses: actions/upload-artifact@v1
-  #       if: failure()
-  #       with:
-  #         name: cypress-screenshots
-  #         path: packages/volto/cypress/screenshots
-  #     # Upload Cypress videos
-  #     - uses: actions/upload-artifact@v1
-  #       if: failure()
-  #       with:
-  #         name: cypress-videos
-  #         path: packages/volto/cypress/videos
-
   multilingual:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: Multilingual
@@ -762,8 +694,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/multilingual/**/*.js
           start: |
-            make start-test-acceptance-server-multilingual
-            make start-test-acceptance-frontend-multilingual
+            make multilingual-acceptance-backend-start
+            make multilingual-acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -828,30 +760,6 @@ jobs:
         working-directory: packages/volto
         run: make cypress-install
 
-      # # python setup (temporary, while p.a.iterate changes are in a PR)
-      # - name: Set up Python ${{ matrix.python-version }}
-      #   uses: actions/setup-python@v1
-      #   with:
-      #     python-version: ${{ matrix.python-version }}
-
-      # # python cache
-      # - uses: actions/cache@v1
-      #   with:
-      #     path: ~/.cache/pip
-      #     key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-pip-
-      # # python install
-      # - run: pip install virtualenv
-      # - name: pip install
-      #   working-directory: api
-      #   run: pip install -r requirements.txt
-      # - name: buildout
-      #   working-directory: api
-      #   run: buildout
-      #   env:
-      #     CI: true
-
       - name: Cypress acceptance tests
         uses: cypress-io/github-action@v6
         env:
@@ -866,8 +774,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/workingCopy/**/*.js
           start: |
-            make start-test-acceptance-server-workingcopy
-            make start-test-acceptance-frontend-workingcopy
+            make working-copy-acceptance-backend-start
+            make working-copy-acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -1002,8 +910,8 @@ jobs:
           browser: chrome
           spec: cypress/tests/minimal/**/*.js
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend-project
+            make ci-acceptance-backend-start
+            make project-acceptance-frontend-prod-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000'
 
       # Upload Cypress screenshots
@@ -1025,9 +933,9 @@ jobs:
         if: success()
         working-directory: ${{env.generator-directory}}
 
-  seamless:
+  deployment:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    name: Seamless Mode
+    name: Deployment Mode
     runs-on: ubuntu-latest
     timeout-minutes: 35
     strategy:
@@ -1088,9 +996,9 @@ jobs:
           spec: cypress/tests/core/basic/**/*.js
           config: baseUrl=http://localhost
           start: |
-            make start-test-acceptance-server
-            make start-test-acceptance-frontend-seamless
-            make start-test-acceptance-webserver-seamless
+            make ci-acceptance-backend-start
+            make deployment-acceptance-frontend-prod-start
+            make deployment-acceptance-web-server-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000 http://localhost'
 
       # Upload Cypress screenshots
@@ -1106,9 +1014,9 @@ jobs:
           name: cypress-videos-seamless
           path: packages/volto/cypress/videos
 
-  multilingualseamless:
+  multilingual-deployment:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
-    name: Multilingual in Seamless Mode
+    name: Multilingual in Deployment Mode
     runs-on: ubuntu-latest
     timeout-minutes: 25
     strategy:
@@ -1169,9 +1077,9 @@ jobs:
           spec: cypress/tests/multilingual/**/*.js
           config: baseUrl=http://localhost
           start: |
-            make start-test-acceptance-server-seamless-multilingual
-            make start-test-acceptance-frontend-seamless-multilingual
-            make start-test-acceptance-webserver-seamless
+            make deployment-multilingual-acceptance-backend-start
+            make deployment-multilingual-acceptance-frontend-prod-start
+            make deployment-acceptance-web-server-start
           wait-on: 'npx wait-on --httpTimeout 20000 http-get://127.0.0.1:55001/plone http://127.0.0.1:3000 http://localhost'
 
       # Upload Cypress screenshots

diff --git a/.github/workflows/deployment_tests.yml b/.github/workflows/deployment_tests.yml
@@ -44,7 +44,7 @@ jobs:
         run: pnpm build:all
 
       - name: Start backend
-        run: make start-backend-docker-detached
+        run: make backend-docker-detached-start
 
       - name: Build
         run: pnpm --filter plone-vite-ssr build
@@ -65,7 +65,7 @@ jobs:
         run: node packages/scripts/check_deployment.js
 
       - name: Stop backend
-        run: make stop-backend-docker-detached
+        run: make backend-docker-detached-stop
 
   nextjs:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
@@ -106,7 +106,7 @@ jobs:
         run: pnpm build:all
 
       - name: Start backend
-        run: make start-backend-docker-detached
+        run: make backend-docker-detached-start
 
       - name: Build
         run: pnpm --filter plone-nextjs build
@@ -127,7 +127,7 @@ jobs:
         run: node packages/scripts/check_deployment.js
 
       - name: Stop backend
-        run: make stop-backend-docker-detached
+        run: make backend-docker-detached-stop
 
   remix:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
@@ -168,7 +168,7 @@ jobs:
         run: pnpm build:all
 
       - name: Start backend
-        run: make start-backend-docker-detached
+        run: make backend-docker-detached-start
 
       - name: Build
         run: pnpm --filter plone-remix build
@@ -183,4 +183,4 @@ jobs:
         run: node packages/scripts/check_deployment.js
 
       - name: Stop backend
-        run: make stop-backend-docker-detached
+        run: make backend-docker-detached-stop
diff --git a/.github/workflows/rtd-pr-preview.yml → .github/workflows/docs-rtd-pr-preview.yml b/.github/workflows/rtd-pr-preview.yml → .github/workflows/docs-rtd-pr-preview.yml
@@ -1,4 +1,4 @@
-# .github/workflows/rtd-pr-preview.yml
+# .github/workflows/docs-rtd-pr-preview.yml
 name: readthedocs/actions
 on:
   pull_request_target:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -26,6 +26,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
+          cache-dependency-path: 'requirements-docs.txt'
 
       - name: Create Python virtual environment
         run: pip install virtualenv

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -157,11 +157,14 @@ jobs:
 
       - run: pnpm i
 
-      - run: make start-test-acceptance-server-detached
+      - run: make acceptance-server-detached-start
 
       - run: npx wait-on --httpTimeout 20000 http-get://localhost:55001/plone && pnpm --filter @plone/client test
         working-directory: packages/client
 
+      - run: make acceptance-server-detached-stop
+
+
   helpers:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: '@plone/helpers'

diff --git a/.gitignore b/.gitignore
@@ -33,29 +33,13 @@ lighthouse-report.html
 .*project
 
 # Python
-/api/.installed.cfg
-/api/.mr.developer.cfg
-/api/bin/
-/api/develop-eggs/
-/api/eggs/
-/api/include/
-/api/lib/
-/api/lib64/
-/api/notebook/env/
-/api/parts/
-/api/share/python-wheels/
-/api/src/
-/api/test/
-/api/var/
-/api/venv/
 /bin/
 /lib/
 .Python
 include
 pip-selfcheck.json
 pyvenv.cfg
 share
-/api/lib64
 lib64
 
 # locales