Merge branch 'main' into prefix_path_router

plone · May 16, 2024 · a38dda0 · a38dda0
2 parents d66b0ac + ad4f127
commit a38dda0
Show file tree

Hide file tree

Showing 48 changed files with 22,787 additions and 16,454 deletions.
diff --git a/.github/workflows/acceptance.yml b/.github/workflows/acceptance.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           # We don't want to install until later,
           # when the cache and Cypress are in place
           run_install: false
@@ -106,7 +106,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -188,7 +188,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -270,7 +270,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -352,7 +352,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -434,7 +434,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -515,7 +515,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -597,7 +597,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -679,7 +679,7 @@ jobs:
   #     - uses: pnpm/action-setup@v3
   #       name: Install pnpm
   #       with:
-  #         version: 8
+  #         version: 9
   #         run_install: false
 
   #     - name: Get pnpm store directory
@@ -750,7 +750,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -833,7 +833,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -943,7 +943,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -968,6 +968,9 @@ jobs:
 
       - run: pnpm i
 
+      - name: Build dependencies
+        run: pnpm build:deps
+
       - name: Install Cypress if not in cache
         if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
         working-directory: packages/volto
@@ -1081,7 +1084,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -1165,7 +1168,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory

diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -58,7 +58,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -98,7 +98,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -138,7 +138,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory

diff --git a/.github/workflows/deployment_tests.yml b/.github/workflows/deployment_tests.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           # We don't want to install until later,
           # when the cache and Cypress are in place
           run_install: false
@@ -45,6 +45,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Build dependencies
+        run: pnpm build:all
+
       - name: Start backend
         run: make start-backend-docker-detached
 
@@ -88,7 +91,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           # We don't want to install until later,
           # when the cache and Cypress are in place
           run_install: false
@@ -109,6 +112,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Build dependencies
+        run: pnpm build:all
+
       - name: Start backend
         run: make start-backend-docker-detached
 
@@ -152,7 +158,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           # We don't want to install until later,
           # when the cache and Cypress are in place
           run_install: false
@@ -173,6 +179,9 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
+      - name: Build dependencies
+        run: pnpm build:all
+
       - name: Start backend
         run: make start-backend-docker-detached
 

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -75,7 +75,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -116,7 +116,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -151,7 +151,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory
@@ -194,7 +194,7 @@ jobs:
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
-          version: 8
+          version: 9
           run_install: false
 
       - name: Get pnpm store directory

diff --git a/Makefile b/Makefile
@@ -100,7 +100,6 @@ clean:
 setup:
 	# Setup ESlint for VSCode
 	node packages/scripts/vscodesettings.js
-	pnpm build:all
 
 ##### Documentation
 
@@ -419,4 +418,4 @@ stop-test-acceptance-server-detached: ## Stop Test Acceptance Server Main Fixtur
 
 # include local overrides if present
 -include Makefile.local
--include ../../../Makefile.local
+-include ../../../Makefile.local
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -62,6 +62,7 @@
     "sphinx.ext.intersphinx",
     "sphinx.ext.todo",
     "sphinx_copybutton",
+    "sphinx_examples",
     "sphinxext.opengraph",
     "sphinxcontrib.video",
 ]

diff --git a/docs/source/contributing/documentation.md b/docs/source/contributing/documentation.md
@@ -155,6 +155,8 @@ To hyperlink to Storybook entries from the narrative documentation, you can use
 Use HTML syntax to enable hyperlinking in development, within Netlify preview builds, and when the main Plone documenation is updated.
 Hyperlinking in development requires that you run both `make docs-html` and `make storybook-build` commands once, then whenever you update either the narrative documentation or the Storybook.
 
+% sphinx-examples does not render HTML
+
 ```html
 <a href="/storybook/index.html?path=/story/edit-widgets-colorpicker--default">color picker widget</a>
 ```
@@ -163,8 +165,6 @@ Hyperlinking in development requires that you run both `make docs-html` and `mak
 
 Use CommonMark syntax to point only to the main production Plone documentation.
 
-```md
+```{example}
 [color picker widget](https://6.docs.plone.org/storybook/index.html?path=/story/edit-widgets-colorpicker--default)
 ```
-
-[color picker widget](https://6.docs.plone.org/storybook/index.html?path=/story/edit-widgets-colorpicker--default)
diff --git a/docs/source/release-notes/index.md b/docs/source/release-notes/index.md
@@ -17,6 +17,27 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.31 (2024-05-15)
+
+### Bugfix
+
+- Replaced the spinner with a progress bar that shows the number of files being uploaded (Uploading x files out of y), and positioned the progress bar properly, while uploading a large number of files. @victorchrollo14 [#5620](https://github.com/plone/volto/issues/5620)
+- Disable `jsx-a11y/label-has-associated-control` so that we can use `eslint-plugin-jsx-a11y` version 6.8.0 if it's pulled by other dependencies. @ichim-david [#5785](https://github.com/plone/volto/issues/5785)
+- Fix some type definitions in JSDocs @sneridagh [#6014](https://github.com/plone/volto/issues/6014)
+- Use `pnpm` 9.1.1 @sneridagh
+  Remove `postinstall` script for building dependencies @sneridagh [#6017](https://github.com/plone/volto/issues/6017)
+
+### Internal
+
+- Allow `Makefile` options to be modified by a `Makefile.local` file if present. @ichim-david [#5997](https://github.com/plone/volto/issues/5997)
+- Modified `locking` and `block-listing` cypress tests 
+  to use more `assertions` instead of wait times in order to improve
+  the reliability of the tests. @ichim-david [#5998](https://github.com/plone/volto/issues/5998)
+
+### Documentation
+
+- Add sphinx-examples extension, update examples, align docs requirements with main documentation, and fix JSON example in upgrade guide. @stevepiercy [#6011](https://github.com/plone/volto/issues/6011)
+
 ## 18.0.0-alpha.30 (2024-05-02)
 
 ### Bugfix

diff --git a/docs/source/upgrade-guide/index.md b/docs/source/upgrade-guide/index.md
@@ -60,7 +60,7 @@ Then update the version of `@plone/scripts` to at least version `3.6.1`.
 The following example shows the minimum valid versions to use under the `dependencies` key.
 
 ```json
-dependencies: {
+"dependencies": {
   "@plone/volto": "18.0.0-alpha.21",
   "@plone/scripts": "^3.6.1"
 }

diff --git a/package.json b/package.json
@@ -5,9 +5,9 @@
     "preinstall": "npx only-allow pnpm",
     "postinstall": "make setup",
     "watch": "pnpm --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers watch",
-    "build:deps": "pnpm --parallel --filter @plone/registry build",
-    "build:all": "pnpm --parallel --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build",
-    "build:all:force": "pnpm --parallel --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build:force",
+    "build:deps": "pnpm --filter @plone/registry build",
+    "build:all": "pnpm --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build",
+    "build:all:force": "pnpm --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build:force",
     "build:registry": "pnpm --filter @plone/registry run build",
     "build:components": "pnpm --filter @plone/components run build",
     "build": "pnpm --filter @plone/volto build",
@@ -39,7 +39,7 @@
     "typescript": "^5.4.5",
     "vitest": "^1.5.0"
   },
-  "packageManager": "pnpm@8.15.4",
+  "packageManager": "pnpm@9.1.1",
   "pnpm": {
     "overrides": {
       "@pmmmwh/react-refresh-webpack-plugin": "0.5.11",

diff --git a/packages/components/.storybook/main.ts b/packages/components/.storybook/main.ts
@@ -1,5 +1,5 @@
 import type { StorybookConfig } from '@storybook/react-vite';
-const { mergeConfig } = require('vite');
+import { mergeConfig } from 'vite';
 
 const config: StorybookConfig = {
   // For some reason the property does not allow negation