Merge branch '18.x.x' into readme-link-check_18

Author: stevepiercy

docs/source/release-notes/index.md

@@ -17,6 +17,12 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.14.1 (2025-04-25)
+
+### Bugfix
+
+- Add support for both Vitest and Jest in `__mocks__` folders of Volto core. Add-on tests using Jest relies on them. @Abhishek-17h [#7000](https://github.com/plone/volto/issues/7000)
+
 ## 18.14.0 (2025-04-23)
 
 ### Feature

packages/registry/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 2.5.2 (2025-04-25)
+
+### Bugfix
+
+- Fixed `unRegisterSlotComponent` method. @sneridagh [#7016](https://github.com/plone/volto/issues/7016)
+
 ## 2.5.1 (2025-04-22)
 
 ### Bugfix

packages/registry/news/7016.bugfix

@@ -9,7 +9,7 @@
   ],
   "funding": "https://github.com/sponsors/plone",
   "license": "MIT",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/plone/volto.git"

packages/registry/package.json

@@ -8,6 +8,12 @@
 
 <!-- towncrier release notes start -->
 
+## 1.4.1 (2025-04-25)
+
+### Bugfix
+
+- Better typing for `apiExpandersType` introduced in #7012. @sneridagh [#7016](https://github.com/plone/volto/issues/7016)
+
 ## 1.4.0 (2025-04-22)
 
 ### Feature

packages/types/CHANGELOG.md

@@ -9,7 +9,7 @@
   ],
   "funding": "https://github.com/sponsors/plone",
   "license": "MIT",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/plone/volto.git"

packages/types/news/7016.bugfix

@@ -17,6 +17,12 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.14.1 (2025-04-25)
+
+### Bugfix
+
+- Add support for both Vitest and Jest in `__mocks__` folders of Volto core. Add-on tests using Jest relies on them. @Abhishek-17h [#7000](https://github.com/plone/volto/issues/7000)
+
 ## 18.14.0 (2025-04-23)
 
 ### Feature

packages/types/package.json

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

packages/volto/CHANGELOG.md

@@ -8,7 +8,11 @@ import Actions from './Actions';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Contents');
+vi.mock('@plone/volto/components/manage/Contents', async () => {
+  return await import(
+    '@plone/volto/components/manage/Contents/__mocks__/index.vitest.tsx'
+  );
+});
 
 describe('Actions', () => {
   it('renders an actions component', () => {

packages/volto/package.json

@@ -7,7 +7,12 @@ import config from '@plone/volto/registry';
 
 config.experimental = { addBlockButton: { enabled: false } };
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable');
+vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
+  return await import(
+    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
+  );
+});
+
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'
@@ -39,7 +44,6 @@ vi.mock('react-beautiful-dnd', () => ({
 }));
 
 vi.mock('./Order/Order', () => ({
-  __esModule: true,
   default: () => <div>Order Component</div>,
 }));
 

packages/volto/src/components/manage/Actions/Actions.test.jsx

@@ -5,7 +5,11 @@ import configureStore from 'redux-mock-store';
 import config from '@plone/volto/registry';
 import { Provider } from 'react-intl-redux';
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 const mockStore = configureStore();
 

packages/volto/src/components/manage/Blocks/Block/BlocksForm.test.jsx

@@ -7,7 +7,12 @@ import Edit from './Edit';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable');
+vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
+  return await import(
+    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
+  );
+});
+
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

packages/volto/src/components/manage/Blocks/Block/Settings.test.jsx

@@ -5,7 +5,11 @@ import { Provider } from 'react-intl-redux';
 
 import ImageSidebar from './ImageSidebar';
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 const mockStore = configureStore();
 

packages/volto/src/components/manage/Blocks/HTML/Edit.test.jsx

@@ -6,6 +6,11 @@ import { Provider } from 'react-intl-redux';
 import LeadImageSidebar from './LeadImageSidebar';
 
 vi.mock('@plone/volto/components/manage/Widgets');
+vi.mock('@plone/volto/components/manage/Widgets', async () => {
+  return await import(
+    '@plone/volto/components/manage/Widgets/__mocks__/index.vitest.tsx'
+  );
+});
 
 const mockStore = configureStore();
 

packages/volto/src/components/manage/Blocks/Image/ImageSidebar.test.jsx

@@ -5,7 +5,11 @@ import { Provider } from 'react-intl-redux';
 
 import MapsSidebar from './MapsSidebar';
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 const mockStore = configureStore();
 

packages/volto/src/components/manage/Blocks/LeadImage/LeadImageSidebar.test.jsx

@@ -6,7 +6,12 @@ import DateRangeFacet from './DateRangeFacet';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable');
+vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
+  return await import(
+    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
+  );
+});
+
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

packages/volto/src/components/manage/Blocks/Maps/MapsSidebar.test.jsx

@@ -6,7 +6,12 @@ import SelectFacet from './SelectFacet';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable');
+vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
+  return await import(
+    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
+  );
+});
+
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

packages/volto/src/components/manage/Blocks/Search/components/DateRangeFacet.test.jsx

@@ -5,7 +5,11 @@ import { Provider } from 'react-intl-redux';
 
 import VideoSidebar from './VideoSidebar';
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 const mockStore = configureStore();
 

packages/volto/src/components/manage/Blocks/Search/components/SelectFacet.test.jsx

@@ -8,7 +8,12 @@ import { __test__ as Contents } from './Contents';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/helpers/Loadable/Loadable');
+vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
+  return await import(
+    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
+  );
+});
+
 beforeAll(async () => {
   const { __setLoadables } = await import(
     '@plone/volto/helpers/Loadable/Loadable'

packages/volto/src/components/manage/Blocks/Video/VideoSidebar.test.jsx

@@ -7,7 +7,11 @@ import ContentsPropertiesModal from './ContentsPropertiesModal';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 describe('ContentsPropertiesModal', () => {
   it('renders a contents properties modal component', () => {

packages/volto/src/components/manage/Contents/Contents.test.jsx

@@ -7,7 +7,11 @@ import ContentsRenameModal from './ContentsRenameModal';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 describe('ContentsRenameModal', () => {
   it('renders a contents rename modal component', () => {

packages/volto/src/components/manage/Contents/ContentsPropertiesModal.test.jsx

@@ -7,7 +7,11 @@ import ContentsTagsModal from './ContentsTagsModal';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 describe('ContentsTagsModal', () => {
   it('renders a contents tags modal component', () => {

packages/volto/src/components/manage/Contents/ContentsRenameModal.test.jsx

@@ -7,7 +7,11 @@ import ContentsWorkflowModal from './ContentsWorkflowModal';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 describe('ContentsWorkflowModal', () => {
   it('renders a contents workflow modal component', () => {

packages/volto/src/components/manage/Contents/ContentsTagsModal.test.jsx

@@ -1,5 +1,21 @@
-export const Contents = vi.fn(() => <div className="Contents" />);
+/* TODO: When the Volto Team removes Jest configuration support from Volto core, update this file with the Vitest version of the mock.
+Then, in the tests, we need to replace:
 
-export const ContentsRenameModal = vi.fn(() => (
+vi.mock('@plone/volto/components/manage/Contents', async () => {
+  return await import(
+    '@plone/volto/components/manage/Contents/__mocks__/index.vitest.tsx'
+  );
+});
+
+with the following:
+
+vi.mock('@plone/volto/components/manage/Contents');
+
+Finally, remove this comment.
+*/
+
+export const Contents = jest.fn(() => <div className="Contents" />);
+
+export const ContentsRenameModal = jest.fn(() => (
   <div className="ContentsRenameModal" />
 ));

packages/volto/src/components/manage/Contents/ContentsWorkflowModal.test.jsx

@@ -0,0 +1,5 @@
+export const Contents = vi.fn(() => <div className="Contents" />);
+
+export const ContentsRenameModal = vi.fn(() => (
+  <div className="ContentsRenameModal" />
+));

packages/volto/src/components/manage/Contents/__mocks__/index.tsx

@@ -10,7 +10,12 @@ import { MemoryRouter } from 'react-router';
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
-vi.mock('@plone/volto/components/manage/Widgets');
+vi.mock('@plone/volto/components/manage/Widgets', async () => {
+  return await import(
+    '@plone/volto/components/manage/Widgets/__mocks__/index.vitest.tsx'
+  );
+});
+
 vi.mock('../../Toolbar/Toolbar', () => ({
   default: vi.fn(() => <div id="Portal" />),
 }));

packages/volto/src/components/manage/Contents/__mocks__/index.vitest.tsx

@@ -8,7 +8,11 @@ import ContentType from './ContentType';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 vi.mock('../../Toolbar/Toolbar', () => ({
   default: vi.fn(() => <div id="Portal" />),
 }));

packages/volto/src/components/manage/Controlpanels/Aliases.test.jsx

@@ -9,7 +9,12 @@ import AddRule from './AddRule';
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
+
 vi.mock('../../Toolbar/Toolbar', () => ({
   default: vi.fn(() => <div id="Toolbar" />),
 }));

packages/volto/src/components/manage/Controlpanels/ContentType.test.jsx

@@ -13,7 +13,11 @@ vi.mock('../../Toolbar/Toolbar', () => ({
   default: vi.fn(() => <div id="Portal" />),
 }));
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 
 describe('EditRule', () => {
   it('renders rules edit interface', () => {

packages/volto/src/components/manage/Controlpanels/Rules/AddRule.test.jsx

@@ -7,7 +7,11 @@ import UndoControlpanel from './UndoControlpanel';
 
 const mockStore = configureStore();
 
-vi.mock('@plone/volto/components/manage/Form');
+vi.mock('@plone/volto/components/manage/Form', async () => {
+  return await import(
+    '@plone/volto/components/manage/Form/__mocks__/index.vitest.tsx'
+  );
+});
 vi.mock('../../Toolbar/Toolbar', () => ({
   default: vi.fn(() => <div id="Portal" />),
 }));