@plone/volto 18.2.0 → 18.2.2

package/.eslintrc.core.js

@@ -11,6 +11,7 @@ if (process.env.VOLTOCONFIG) {
   rules = null;
 } else {
   rules = {
+    'react/jsx-filename-extension': ['warn', { extensions: ['.tsx', '.jsx'] }],
     'no-restricted-imports': [
       'warn',
       {

package/.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}",

package/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

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.2.0",
+  "version": "18.2.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -237,7 +237,7 @@
     "use-deep-compare-effect": "1.8.1",
     "uuid": "^8.3.2",
     "@plone/registry": "2.1.2",
-    "@plone/volto-slate": "18.0.2",
+    "@plone/volto-slate": "18.0.3",
     "@plone/scripts": "3.8.1"
   },
   "devDependencies": {

package/src/components/theme/EventDetails/EventDetails.jsx

@@ -6,7 +6,7 @@ import {
   Recurrence,
 } from '@plone/volto/components/theme/View/EventDatesInfo';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
-import { expandToBackendURL } from '@plone/volto/helpers/Url/Url';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 import calendarSVG from '@plone/volto/icons/calendar.svg';
 
@@ -147,7 +147,7 @@ const EventDetails = ({ content, display_as = 'aside' }) => {
           className="ics-download"
           target="_blank"
           rel="noreferrer"
-          href={`${expandToBackendURL(content['@id'])}/ics_view`}
+          href={`${flattenToAppURL(content['@id'])}/ics_view`}
         >
           {intl.formatMessage(messages.downloadEvent)}
         </a>

package/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,

package/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;
+}

package/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);

package/src/express-middleware/files.js

@@ -30,7 +30,10 @@ function filesMiddlewareFn(req, res, next) {
 export default function filesMiddleware() {
   const middleware = express.Router();
 
-  middleware.all(['**/@@download/*', '**/@@display-file/*'], filesMiddlewareFn);
+  middleware.all(
+    ['**/@@download/*', '**/@@display-file/*', '**/ics_view'],
+    filesMiddlewareFn,
+  );
   middleware.id = 'filesResourcesProcessor';
   return middleware;
 }

package/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;