Merge branch 'main' into fix_scrollToTop_SSR

plone · Dec 9, 2024 · efa614d · efa614d
2 parents 0c34913 + 6b78429
commit efa614d
Show file tree

Hide file tree

Showing 13 changed files with 69 additions and 44 deletions.
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.2.2 (2024-12-09)
+
+### Bugfix
+
+- Fixed circular import error in dev with HMR in core Blocks shadow customizations. @sneridagh [#6525](https://github.com/plone/volto/issues/6525)
+
+## 18.2.1 (2024-12-09)
+
+### Bugfix
+
+- Fixes ICS download in non-public event content. @sneridagh [#6515](https://github.com/plone/volto/issues/6515)
+- Fixed circular import error in dev with HMR in `App` component when imported in the main default config. @sneridagh [#6524](https://github.com/plone/volto/issues/6524)
+
+### Internal
+
+- Fix extension in files containing JSX. @sneridagh [#6520](https://github.com/plone/volto/issues/6520)
+
 ## 18.2.0 (2024-12-08)
 
 ### Internal

diff --git a/packages/volto-slate/CHANGELOG.md b/packages/volto-slate/CHANGELOG.md
@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 18.0.3 (2024-12-09)
+
+### Internal
+
+- Fix extension in files containing JSX. @sneridagh [#6520](https://github.com/plone/volto/issues/6520)
+
 ## 18.0.2 (2024-12-08)
 
 ### Internal

diff --git a/packages/volto-slate/news/6520.internal b/packages/volto-slate/news/6520.internal
diff --git a/packages/volto-slate/package.json b/packages/volto-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@plone/volto-slate",
-  "version": "18.0.2",
+  "version": "18.0.3",
   "description": "Slate.js integration with Volto",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/packages/volto/.release-it.json b/packages/volto/.release-it.json
@@ -3,7 +3,7 @@
     "../scripts/prepublish.js": {}
   },
   "hooks": {
-    "before:bump": ["pnpm i18n", "pnpm build:types", "git add types"],
+    "before:bump": ["pnpm i18n"],
     "after:bump": [
       "pipx run towncrier build --draft --yes --version ${version} > .changelog.draft",
       "pipx run towncrier build --yes --version ${version}",

diff --git a/packages/volto/CHANGELOG.md b/packages/volto/CHANGELOG.md
@@ -17,6 +17,23 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.2.2 (2024-12-09)
+
+### Bugfix
+
+- Fixed circular import error in dev with HMR in core Blocks shadow customizations. @sneridagh [#6525](https://github.com/plone/volto/issues/6525)
+
+## 18.2.1 (2024-12-09)
+
+### Bugfix
+
+- Fixes ICS download in non-public event content. @sneridagh [#6515](https://github.com/plone/volto/issues/6515)
+- Fixed circular import error in dev with HMR in `App` component when imported in the main default config. @sneridagh [#6524](https://github.com/plone/volto/issues/6524)
+
+### Internal
+
+- Fix extension in files containing JSX. @sneridagh [#6520](https://github.com/plone/volto/issues/6520)
+
 ## 18.2.0 (2024-12-08)
 
 ### Internal

diff --git a/packages/volto/news/6515.bugfix b/packages/volto/news/6515.bugfix
diff --git a/packages/volto/news/6520.internal b/packages/volto/news/6520.internal
diff --git a/packages/volto/package.json b/packages/volto/package.json
@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.2.0",
+  "version": "18.2.2",
   "repository": {
     "type": "git",
     "url": "[email protected]:plone/volto.git"

diff --git a/packages/volto/src/config/Blocks.jsx b/packages/volto/src/config/Blocks.jsx
@@ -530,6 +530,15 @@ const requiredBlocks = ['title'];
 const initialBlocks = {};
 const initialBlocksFocus = {}; //{Document:'title'}
 
+export function installDefaultBlocks(config) {
+  config.blocks.requiredBlocks = requiredBlocks;
+  config.blocks.blocksConfig = blocksConfig;
+  config.blocks.groupBlocksOrder = groupBlocksOrder;
+  config.blocks.initialBlocks = initialBlocks;
+  config.blocks.initialBlocksFocus = initialBlocksFocus;
+  config.blocks.showEditBlocksInBabelView = false;
+}
+
 export {
   groupBlocksOrder,
   requiredBlocks,

diff --git a/packages/volto/src/config/Components.jsx b/packages/volto/src/config/Components.jsx
@@ -2,9 +2,12 @@ import App from '@plone/volto/components/theme/App/App';
 import PreviewImage from '@plone/volto/components/theme/PreviewImage/PreviewImage';
 import Image from '@plone/volto/components/theme/Image/Image';
 
-// Register components.
-export const components = {
-  PreviewImage: { component: PreviewImage },
-  App: { component: App },
-  Image: { component: Image },
-};
+export function installDefaultComponents(config) {
+  config.components = {
+    PreviewImage: { component: PreviewImage },
+    App: { component: App },
+    Image: { component: Image },
+  };
+
+  return config;
+}
diff --git a/packages/volto/src/config/index.js b/packages/volto/src/config/index.js
@@ -1,3 +1,4 @@
+import ConfigRegistry from '@plone/volto/registry';
 import { parse as parseUrl } from 'url';
 import { defaultWidget, widgetMapping } from './Widgets';
 import {
@@ -9,14 +10,6 @@ import {
 } from './Views';
 import { nonContentRoutes } from './NonContentRoutes';
 import { nonContentRoutesPublic } from './NonContentRoutesPublic';
-import {
-  groupBlocksOrder,
-  requiredBlocks,
-  blocksConfig,
-  initialBlocks,
-  initialBlocksFocus,
-} from './Blocks';
-import { components } from './Components';
 import { loadables } from './Loadables';
 import { workflowMapping } from './Workflows';
 import slots from './slots';
@@ -32,7 +25,8 @@ import {
 
 import applyAddonConfiguration, { addonsInfo } from 'load-volto-addons';
 
-import ConfigRegistry from '@plone/volto/registry';
+import { installDefaultComponents } from './Components';
+import { installDefaultBlocks } from './Blocks';
 
 import { getSiteAsyncPropExtender } from '@plone/volto/helpers/Site';
 import { registerValidators } from './validation';
@@ -206,17 +200,10 @@ let config = {
     errorViews,
     layoutViewsNamesMapping,
   },
-  blocks: {
-    requiredBlocks,
-    blocksConfig,
-    groupBlocksOrder,
-    initialBlocks,
-    initialBlocksFocus,
-    showEditBlocksInBabelView: false,
-  },
+  blocks: {},
   addonRoutes: [],
   addonReducers: {},
-  components,
+  components: {},
   slots: {},
   utilities: {},
 };
@@ -261,5 +248,7 @@ Object.entries(slots).forEach(([slotName, components]) => {
 });
 
 registerValidators(ConfigRegistry);
+installDefaultComponents(ConfigRegistry);
+installDefaultBlocks(ConfigRegistry);
 
 applyAddonConfiguration(ConfigRegistry);
diff --git a/packages/volto/types/config/Components.d.ts b/packages/volto/types/config/Components.d.ts
@@ -1,14 +1 @@
-export namespace components {
-    namespace PreviewImage {
-        export { PreviewImage as component };
-    }
-    namespace App {
-        export { App as component };
-    }
-    namespace Image {
-        export { Image as component };
-    }
-}
-import PreviewImage_1 from '@plone/volto/components/theme/PreviewImage/PreviewImage';
-import App_1 from '@plone/volto/components/theme/App/App';
-import Image_1 from '@plone/volto/components/theme/Image/Image';
+export function installDefaultComponents(config: any): any;