Merge branch 'main' into updatedepspocs

.github/workflows/acceptance.yml

@@ -968,9 +968,6 @@ jobs:
 
       - run: pnpm i
 
-      - name: Build packages
-        run: pnpm build:registry
-
       - name: Install Cypress if not in cache
         if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
         working-directory: packages/volto

.github/workflows/changelog.yml

@@ -89,7 +89,7 @@ jobs:
           BASE_BRANCH: ${{ github.base_ref }}
 
       - name: Providers changelog check
-        if: steps.filter.outputs.types == 'true'
+        if: steps.filter.outputs.providers == 'true'
         run: |
           git fetch --no-tags origin main
           towncrier check --compare-with origin/main --dir packages/providers

.github/workflows/deployment_tests.yml

@@ -45,9 +45,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Build packages
-        run: pnpm build:all
-
       - name: Start backend
         run: make start-backend-docker-detached
 
@@ -112,9 +109,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Build packages
-        run: pnpm build:all
-
       - name: Start backend
         run: make start-backend-docker-detached
 
@@ -179,9 +173,6 @@ jobs:
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
-      - name: Build packages
-        run: pnpm build:all
-
       - name: Start backend
         run: make start-backend-docker-detached
 

Makefile

@@ -100,6 +100,7 @@ clean:
 setup:
 	# Setup ESlint for VSCode
 	node packages/scripts/vscodesettings.js
+	pnpm build:all
 
 ##### Documentation
 

docs/source/release-notes/index.md

@@ -17,6 +17,24 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.28 (2024-04-23)
+
+### Bugfix
+
+- Fix broken user portrait in personal tools menu. @davisagli [#2927](https://github.com/plone/volto/issues/2927)
+- Fix pt_BR translation of invalid email message. @wesleybl [#5953](https://github.com/plone/volto/issues/5953)
+- Fixed rendering if ConditionalLink has no children @pnicolli [#5963](https://github.com/plone/volto/issues/5963)
+- Fix flaky test 'As editor I can add links' by using getSlateEditorAndType. @ksuess [#5965](https://github.com/plone/volto/issues/5965)
+
+### Internal
+
+- Reduced JavaScript bundle size of the production build. Code split several internal modules: Controlpanels, Form, Widgets among other small ones. @pnicolli @deodorhunter [#5295](https://github.com/plone/volto/issues/5295)
+- Improvements to the monorepo setup with utilities, especially ESLint. Build cached option to speedup operations. @sneridagh [#5969](https://github.com/plone/volto/issues/5969)
+
+### Documentation
+
+- Put nvm installation section into a separate include file. @animus888 [#5968](https://github.com/plone/volto/issues/5968)
+
 ## 18.0.0-alpha.27 (2024-04-05)
 
 ### Bugfix

package.json

@@ -4,16 +4,16 @@
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "postinstall": "make setup",
-    "watch": "pnpm --filter @plone/registry watch",
+    "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:cached": "pnpm --parallel --filter @plone/registry --filter @plone/client --filter @plone/components --filter @plone/providers build:cached",
+    "build:all:force": "pnpm --parallel --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",
     "start": "pnpm build:deps && pnpm --filter @plone/volto start",
     "start:project": "pnpm --filter plone run start",
-    "lint": "pnpm build:all:cached && eslint --max-warnings=0 '{apps,packages}/**/*.{js,jsx,ts,tsx}'",
+    "lint": "pnpm build:all && eslint --max-warnings=0 '{apps,packages}/**/*.{js,jsx,ts,tsx}'",
     "lint:volto": "pnpm --filter @plone/volto run lint",
     "test": "pnpm --filter @plone/volto run test:ci",
     "i18n": "pnpm --filter @plone/volto run i18n",

packages/client/news/5980.internal

@@ -0,0 +1 @@
+Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh

packages/client/package.json

@@ -46,8 +46,8 @@
     "react-query"
   ],
   "scripts": {
-    "build": "parcel build --no-cache",
-    "build:cached": "parcel build",
+    "build": "parcel build",
+    "build:force": "parcel build --no-cache",
     "test": "node testRunner.js",
     "vitest": "vitest",
     "check-ts": "tsc --project tsconfig.json",

packages/components/news/5980.internal

@@ -0,0 +1 @@
+Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh

packages/components/package.json

@@ -45,8 +45,8 @@
     "quanta"
   ],
   "scripts": {
-    "build": "parcel build --no-cache && pnpm build:css",
-    "build:cached": "parcel build && pnpm build:css",
+    "build": "parcel build && pnpm build:css",
+    "build:force": "parcel build --no-cache && pnpm build:css",
     "build:css": "pnpm build:basic && pnpm build:quanta",
     "build:basic": "lightningcss --browserslist --bundle --sourcemap src/styles/basic/main.css -o basic.css && mv basic.css* dist/.",
     "build:quanta": "lightningcss --browserslist --bundle --sourcemap src/styles/quanta/main.css -o quanta.css && mv quanta.css* dist/.",

packages/providers/news/5980.internal

@@ -0,0 +1 @@
+Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh

packages/providers/package.json

@@ -42,8 +42,8 @@
   },
   "scripts": {
     "watch": "parcel watch",
-    "build": "parcel build --no-cache",
-    "build:cached": "parcel build",
+    "build": "parcel build",
+    "build:force": "parcel build --no-cache",
     "test": "vitest",
     "dry-release": "release-it --dry-run",
     "release": "release-it",

packages/registry/CHANGELOG.md

@@ -8,6 +8,16 @@
 
 <!-- towncrier release notes start -->
 
+## 1.5.6 (2024-04-23)
+
+### Bugfix
+
+- Remove `parcel-optimizer-react-client` plugin @sneridagh [#5887](https://github.com/plone/volto/issues/5887)
+
+### Internal
+
+- Improvements to the monorepo setup with utilities, especially ESLint. Build cached option to speedup operations. @sneridagh [#5969](https://github.com/plone/volto/issues/5969)
+
 ## 1.5.5 (2024-04-03)
 
 ### Bugfix

packages/registry/news/5980.internal

@@ -0,0 +1 @@
+Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh

packages/registry/package.json

@@ -9,7 +9,7 @@
   ],
   "funding": "https://github.com/sponsors/plone",
   "license": "MIT",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/plone/volto.git"
@@ -50,8 +50,8 @@
   },
   "scripts": {
     "watch": "parcel watch",
-    "build": "parcel build --no-cache",
-    "build:cached": "parcel build",
+    "build": "parcel build",
+    "build:force": "parcel build --no-cache",
     "test": "vitest",
     "dry-release": "release-it --dry-run",
     "release": "release-it",

packages/types/news/5979.bugfix

@@ -0,0 +1 @@
+Better BlocksData definitions @sneridagh

packages/types/news/5980.internal

@@ -0,0 +1 @@
+Saner defaults for building deps, switch default to cached, add `build:force` command @sneridagh

packages/types/src/config/Blocks.d.ts

@@ -193,10 +193,15 @@ export type JSONSchema = {
   required: string[];
 };
 
+export interface BlocksDataBlocks {
+  '@type': string;
+  styles?: any;
+}
+
+type BlocksDataBlocksType = BlocksDataBlocks & Record<string, any>;
+
 export type BlocksData = {
-  blocks: {
-    [key: string]: object;
-  };
+  blocks: Record<string, BlocksDataBlocksType>;
   blocks_layout: {
     items: string[];
   };

packages/volto-slate/CHANGELOG.md

@@ -8,6 +8,16 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.12 (2024-04-23)
+
+### Bugfix
+
+- In the Slate text block, the markup shortcuts for bold, italic and strikethrough work again. @kHAPPY2004 [#5605](https://github.com/plone/volto/issues/5605)
+
+### Internal
+
+- Update imports to work with the new code split components in Volto. @pnicolli [#5295](https://github.com/plone/volto/issues/5295)
+
 ## 18.0.0-alpha.11 (2024-04-03)
 
 ### Bugfix

packages/volto-slate/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.0-alpha.11",
+  "version": "18.0.0-alpha.12",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

packages/volto/CHANGELOG.md

@@ -17,6 +17,24 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.28 (2024-04-23)
+
+### Bugfix
+
+- Fix broken user portrait in personal tools menu. @davisagli [#2927](https://github.com/plone/volto/issues/2927)
+- Fix pt_BR translation of invalid email message. @wesleybl [#5953](https://github.com/plone/volto/issues/5953)
+- Fixed rendering if ConditionalLink has no children @pnicolli [#5963](https://github.com/plone/volto/issues/5963)
+- Fix flaky test 'As editor I can add links' by using getSlateEditorAndType. @ksuess [#5965](https://github.com/plone/volto/issues/5965)
+
+### Internal
+
+- Reduced JavaScript bundle size of the production build. Code split several internal modules: Controlpanels, Form, Widgets among other small ones. @pnicolli @deodorhunter [#5295](https://github.com/plone/volto/issues/5295)
+- Improvements to the monorepo setup with utilities, especially ESLint. Build cached option to speedup operations. @sneridagh [#5969](https://github.com/plone/volto/issues/5969)
+
+### Documentation
+
+- Put nvm installation section into a separate include file. @animus888 [#5968](https://github.com/plone/volto/issues/5968)
+
 ## 18.0.0-alpha.27 (2024-04-05)
 
 ### Bugfix

packages/volto/news/5981.bugfix

@@ -0,0 +1 @@
+Fix no router link in logo @sneridagh

packages/volto/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.0-alpha.27",
+  "version": "18.0.0-alpha.28",
   "repository": {
     "type": "git",
     "url": "[email protected]:plone/volto.git"

packages/volto/src/components/theme/Logo/Logo.jsx

@@ -7,7 +7,7 @@ import { useEffect } from 'react';
 import { Image } from 'semantic-ui-react';
 import LogoImage from '@plone/volto/components/theme/Logo/Logo.svg';
 import { useSelector, useDispatch } from 'react-redux';
-import { useLocation } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
 import { getNavroot } from '@plone/volto/actions';
 import {
   flattenToAppURL,
@@ -48,7 +48,7 @@ const Logo = () => {
   const navRootPath = flattenToAppURL(navroot?.navroot?.['@id']) || '/';
 
   return (
-    <a href={navRootPath} aria-label={intl.formatMessage(messages.home)}>
+    <Link to={navRootPath} aria-label={intl.formatMessage(messages.home)}>
       <Image
         src={
           site['plone.site_logo']
@@ -59,7 +59,7 @@ const Logo = () => {
           intl.formatMessage(messages.logoOf) + ' ' + site['plone.site_title']
         }
       />
-    </a>
+    </Link>
   );
 };
 

packages/volto/src/components/theme/Logo/__snapshots__/Logo.Multilingual.test.jsx.snap

@@ -4,6 +4,7 @@ exports[`Multilingual Logo renders a logo component in a multilingual site langu
 <a
   aria-label="Home"
   href="/en"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"
@@ -17,6 +18,7 @@ exports[`Multilingual Logo renders a logo component in a multilingual site root
 <a
   aria-label="Home"
   href="/en"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"
@@ -30,6 +32,7 @@ exports[`Multilingual Logo renders a logo component with a custom logo in a non-
 <a
   aria-label="Home"
   href="/en"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"
@@ -43,6 +46,7 @@ exports[`Multilingual Logo renders a logo component with a custom logo in a non-
 <a
   aria-label="Home"
   href="/en"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"

packages/volto/src/components/theme/Logo/__snapshots__/Logo.test.jsx.snap

@@ -4,6 +4,7 @@ exports[`Logo renders a logo component with a custom logo 1`] = `
 <a
   aria-label="Home"
   href="/"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"
@@ -17,6 +18,7 @@ exports[`Logo renders a logo component with a custom logo in a non-root url 1`]
 <a
   aria-label="Home"
   href="/"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"
@@ -30,6 +32,7 @@ exports[`Logo renders a logo component with default config 1`] = `
 <a
   aria-label="Home"
   href="/"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"
@@ -43,6 +46,7 @@ exports[`Logo renders a logo component with default config in a non-root url 1`]
 <a
   aria-label="Home"
   href="/"
+  onClick={[Function]}
 >
   <img
     alt="Logo of Plone Site"