Merge branch 'master' into site-and-navroot

plone · Sep 13, 2023 · 8cccf82 · 8cccf82
2 parents c36e623 + b6e1487
commit 8cccf82
Show file tree

Hide file tree

Showing 71 changed files with 1,934 additions and 216 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
     steps:
       - uses: actions/checkout@v3
 
@@ -24,20 +24,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          group: Core ${{ matrix.node-version }}
           spec: cypress/tests/core/basic/**/*.js
           start: |
             make start-test-acceptance-server
@@ -65,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
     steps:
       - uses: actions/checkout@v3
 
@@ -80,20 +76,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          group: Core Blocks ${{ matrix.node-version }}
           spec: cypress/tests/core/blocks/**/*.js
           start: |
             make start-test-acceptance-server
@@ -121,7 +113,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
     steps:
       - uses: actions/checkout@v3
 
@@ -136,20 +128,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          group: Core Volto Slate ${{ matrix.node-version }}
           spec: cypress/tests/core/volto-slate/**/*.js
           start: |
             make start-test-acceptance-server
@@ -191,20 +179,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: false # Since they run on different node versions, we can't parallel
           browser: chrome
-          group: Core Basic - Plone 5
           spec: cypress/tests/core/basic/**/*.js
           start: |
             make start-test-acceptance-server-5
@@ -246,20 +230,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress Coresandbox Acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: true
           browser: chrome
-          group: Coresandbox
           spec: cypress/tests/coresandbox/**/*.js
           start: |
             make start-test-acceptance-server-coresandbox
@@ -302,21 +282,17 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
           CYPRESS_API: guillotina
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: true
           browser: chrome
-          group: Guillotina
           spec: cypress/tests/guillotina/**/*.js
           start: |
             make start-test-acceptance-server-guillotina
@@ -359,20 +335,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: true
           browser: chrome
-          group: Multilingual
           spec: cypress/tests/multilingual/**/*.js
           start: |
             make start-test-acceptance-server-multilingual
@@ -440,20 +412,16 @@ jobs:
       #     CI: true
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: true
           browser: chrome
-          group: Working Copy
           spec: cypress/tests/workingCopy/**/*.js
           start: |
             make start-test-acceptance-server-workingcopy
@@ -468,7 +436,7 @@ jobs:
           path: cypress/screenshots
       # Upload Cypress videos
       - uses: actions/upload-artifact@v1
-        if: always()
+        if: failure()
         with:
           name: cypress-videos
           path: cypress/videos
@@ -481,7 +449,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x]
+        node-version: [18.x, 20.x]
     env:
       generator-directory: ./packages/generator-volto
       project-directory: ./my-volto-app
@@ -531,20 +499,16 @@ jobs:
         working-directory: ${{env.project-directory}}
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: true
           browser: chrome
-          group: Project Generator
           spec: cypress/tests/minimal/**/*.js
           start: |
             make start-test-acceptance-server
@@ -593,20 +557,16 @@ jobs:
       - run: yarn --immutable
 
       - name: Cypress acceptance tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           BABEL_ENV: production
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           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
-          record: true
-          parallel: true
           browser: chrome
-          group: Seamless
           spec: cypress/tests/core/basic/**/*.js
           config: baseUrl=http://localhost
           start: |

diff --git a/.github/workflows/towncrier.yml b/.github/workflows/towncrier.yml
@@ -6,7 +6,7 @@ on:
       - master
 
 env:
-  node-version: 16.x
+  node-version: 18.x
 
 jobs:
   towncrier:

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -8,15 +8,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [16.x, 18.x]
+        node-version: [18.x, 20.x]
     steps:
       - uses: actions/checkout@v3
 
       # node setup
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-        # remove workaround for 18.x once https://github.com/nodejs/node/issues/47563 is fixed
+          # remove workaround for 18.x once https://github.com/nodejs/node/issues/47563 is fixed
           node-version: ${{ matrix.node-version == '18.x' && '18.15.0' || matrix.node-version }}
           cache: yarn
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -510,7 +510,7 @@
 
 ### Breaking
 
-- Volto 17 drops support for NodeJS 14, and adds support for NodeJS 18.
+- Volto 17 drops support for NodeJS 14, and adds support for Node.js 18.
   Please see the [upgrade guide](https://6.docs.plone.org/volto/upgrade-guide/index.html)
   for more information.
 
@@ -1410,7 +1410,7 @@ See https://6.docs.plone.org/volto/upgrade-guide/index.html for more information
 - Update README with latest versions, point to Plone 6 as recommended default @sneridagh
 - Trigger a new deploy core Plone documentation when Volto documentation is updated @esteele
 - Update supported Python versions. @stevepiercy
-- Add NodeJS 18 (LTS) usage notice @sneridagh
+- Add Node.js 18 (LTS) usage notice @sneridagh
 - Fix Netlify build @sneridagh
 - Fix grammar in Theming Strategy. Fixes #954. @stevepiercy
 - Fix wording in About Semantic UI. Fixes #953. @stevepiercy
@@ -1623,7 +1623,7 @@ See https://6.docs.plone.org/volto/upgrade-guide/index.html for more information
 
 ### Documentation
 
-- Add NodeJS 18 (LTS) usage notice @sneridagh
+- Add Node.js 18 (LTS) usage notice @sneridagh
 - Fix Netlify build @sneridagh
 
 ## 16.0.0-alpha.45 (2022-10-24)

diff --git a/README.md b/README.md
@@ -226,13 +226,14 @@ On the [Plone Training website](https://training.plone.org), you'll find Volto-d
 
 [Timo Stollenwerk - Reinventing Plone, Roadmap to the Modern Web](https://2018.ploneconf.org/talks/reinventing-plone-roadmap-to-the-modern-web)
 
-## Node Support
-
-- Node 18: Supported since Volto 17
-- Node 16: Supported since Volto 14
-- Node 14: No longer supported. It was supported from Volto 8.8.0 - 16
-- Node 12: No longer supported. It was supported from Volto 4 - 15
-- Node 10: No longer supported. It was supported from Volto 1 - 12
+## Node.js Support
+
+- Node.js 20: Supported since Volto 17
+- Node.js 18: Supported since Volto 17
+- Node.js 16: No longer supported. It was supported from Volto 14 - 16
+- Node.js 14: No longer supported. It was supported from Volto 8.8.0 - 16
+- Node.js 12: No longer supported. It was supported from Volto 4 - 15
+- Node.js 10: No longer supported. It was supported from Volto 1 - 12
 
 ## Browser support
 

diff --git a/cypress.config.js b/cypress.config.js
@@ -4,6 +4,7 @@ module.exports = defineConfig({
   viewportWidth: 1280,
   chromeWebSecurity: false,
   projectId: 'hvviu4',
+  video: true, // To remove when Test Replay is available in cypress.io
   e2e: {
     baseUrl: 'http://127.0.0.1:3000',
     excludeSpecPattern: ['*~'],

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -780,13 +780,16 @@ Cypress.Commands.add('lineBreakInSlate', { prevSubject: true }, (subject) => {
   );
 });
 
-Cypress.Commands.add('setSlateSelection', (subject, query, endQuery) => {
-  cy.get('.slate-editor.selected [contenteditable=true]')
-    .focus()
-    // .click()
-    .setSelection(subject, query, endQuery)
-    .wait(1000); // this wait is needed for the selection change to be detected after
-});
+Cypress.Commands.add(
+  'setSlateSelection',
+  (subject, query, endQuery, wait = 1000) => {
+    cy.get('.slate-editor.selected [contenteditable=true]')
+      .focus()
+      // .click()
+      .setSelection(subject, query, endQuery)
+      .wait(wait); // this wait is needed for the selection change to be detected after
+  },
+);
 
 Cypress.Commands.add('getSlateEditorAndType', (type) => {
   cy.getSlate().focus().click().type(type);
@@ -804,9 +807,9 @@ Cypress.Commands.add('setSlateCursor', (subject, query, endQuery) => {
     .wait(1000); // this wait is needed for the selection change to be detected after
 });
 
-Cypress.Commands.add('clickSlateButton', (button) => {
+Cypress.Commands.add('clickSlateButton', (button, timeout = 1000) => {
   cy.get(`.slate-inline-toolbar .button-wrapper a[title="${button}"]`, {
-    timeout: 1000,
+    timeout,
   }).click({ force: true }); // force click is needed to ensure the button in visible in view.
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ on: @@
           - master
     env:
-      node-version: 16.x
+      node-version: 18.x
     jobs:
       towncrier:
@@ Expand Down @@