@plone/volto 18.14.0 → 18.15.0

package/src/helpers/Loadable/__mocks__/Loadable.jsx

@@ -1,4 +1,19 @@
-import React from 'react';
+/* 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:
+
+vi.mock('@plone/volto/helpers/Loadable/Loadable', async () => {
+  return await import(
+    '@plone/volto/helpers/Loadable/__mocks__/Loadable.vitest.jsx'
+  );
+});
+
+with the following:
+
+vi.mock('@plone/volto/helpers/Loadable/Loadable');
+
+Finally, remove this comment.
+*/
+
 import config from '@plone/volto/registry';
 const loadables = config.settings.loadables;
 
@@ -18,21 +33,21 @@ export const __setLoadables = async () => {
 };
 
 // TODO: filter mockAllLoadables
-export const injectLazyLibs = vi.fn().mockImplementation(function ([
+export const injectLazyLibs = jest.fn().mockImplementation(function ([
   libraries,
 ]) {
-  return vi.fn((WrappedComponent) =>
-    vi.fn((props) => {
+  return jest.fn((WrappedComponent) =>
+    jest.fn((props) => {
       return <WrappedComponent {...props} {...mockAllLoadables} />;
     }),
   );
 });
 
-export const preloadLazyLibs = vi.fn().mockImplementation(function ([
+export const preloadLazyLibs = jest.fn().mockImplementation(function ([
   libraries,
 ]) {
-  return vi.fn((WrappedComponent) =>
-    vi.fn((props) => {
+  return jest.fn((WrappedComponent) =>
+    jest.fn((props) => {
       return <WrappedComponent {...props} />;
     }),
   );

package/src/helpers/Loadable/__mocks__/Loadable.vitest.jsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import config from '@plone/volto/registry';
+const loadables = config.settings.loadables;
+
+let mockAllLoadables = Object.create(null);
+
+export const __setLoadables = async () => {
+  if (Object.keys(mockAllLoadables).length > 0) return;
+  const resolved = await Promise.all(
+    Object.keys(loadables).map(async (n) => {
+      const lib = await Promise.resolve(loadables[n].load());
+      return [n, { current: lib }];
+    }),
+  );
+  resolved.forEach(([name, { current }]) => {
+    mockAllLoadables[name] = current;
+  });
+};
+
+// TODO: filter mockAllLoadables
+export const injectLazyLibs = vi.fn().mockImplementation(function ([
+  libraries,
+]) {
+  return vi.fn((WrappedComponent) =>
+    vi.fn((props) => {
+      return <WrappedComponent {...props} {...mockAllLoadables} />;
+    }),
+  );
+});
+
+export const preloadLazyLibs = vi.fn().mockImplementation(function ([
+  libraries,
+]) {
+  return vi.fn((WrappedComponent) =>
+    vi.fn((props) => {
+      return <WrappedComponent {...props} />;
+    }),
+  );
+});

package/tsconfig.declarations.json

@@ -10,7 +10,7 @@
     "jsx": "react-jsx",
     "preserveSymlinks": true,
     "downlevelIteration": true,
-    "types": ["vitest/globals"],
+    "types": ["vitest/globals", "jest"],
     "paths": {
       "@plone/volto/*": ["./src/*"],
       "react": ["./node_modules/@types/react"],

package/tsconfig.json

@@ -7,7 +7,8 @@
       "ESNext"
     ],
     "types": [
-      "vitest/globals"
+      "vitest/globals",
+      "jest"
     ],
     "module": "commonjs",
     "allowJs": true,

package/types/components/manage/Contents/__mocks__/index.d.ts

@@ -1,2 +1,2 @@
-export declare const Contents: any;
-export declare const ContentsRenameModal: any;
+export declare const Contents: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ContentsRenameModal: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;

package/types/components/manage/Contents/__mocks__/index.vitest.d.ts

@@ -0,0 +1,2 @@
+export declare const Contents: any;
+export declare const ContentsRenameModal: any;

package/types/components/manage/Form/__mocks__/index.d.ts

@@ -1,8 +1,8 @@
-export declare const Field: any;
-export declare const InlineForm: any;
-export declare const ModalForm: any;
-export declare const UndoToolbar: any;
-export declare const BlocksToolbar: any;
-export declare const BlockDataForm: any;
-export declare const BlocksForm: any;
-export declare const Form: any;
+export declare const Field: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
+export declare const InlineForm: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
+export declare const ModalForm: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
+export declare const UndoToolbar: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const BlocksToolbar: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const BlockDataForm: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
+export declare const BlocksForm: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;
+export declare const Form: jest.Mock<import("react/jsx-runtime").JSX.Element, [props: any], any>;

package/types/components/manage/Form/__mocks__/index.vitest.d.ts

@@ -0,0 +1,8 @@
+export declare const Field: any;
+export declare const InlineForm: any;
+export declare const ModalForm: any;
+export declare const UndoToolbar: any;
+export declare const BlocksToolbar: any;
+export declare const BlockDataForm: any;
+export declare const BlocksForm: any;
+export declare const Form: any;

package/types/components/manage/MaybeWrap/MaybeWrap.d.ts

@@ -1,5 +1,7 @@
-export default function MaybeWrap({ condition, as: Component, ...props }: {
-    [x: string]: any;
-    condition: any;
-    as?: string;
-}): any;
+import React, { ComponentPropsWithoutRef } from 'react';
+type MaybeWrapProps<T extends React.ElementType> = {
+    condition: boolean;
+    as: T;
+} & ComponentPropsWithoutRef<React.ElementType extends T ? 'div' : T>;
+declare function MaybeWrap<T extends React.ElementType = 'div'>(props: MaybeWrapProps<T>): any;
+export default MaybeWrap;

package/types/components/manage/Widgets/__mocks__/index.d.ts

@@ -1,33 +1,33 @@
-export declare const AlignWidget: any;
-export declare const ButtonsWidget: any;
-export declare const ArrayWidget: any;
-export declare const CheckboxWidget: any;
-export declare const FileWidget: any;
-export declare const IdWidget: any;
-export declare const PasswordWidget: any;
-export declare const QueryWidget: any;
-export declare const QuerySortOnWidget: any;
-export declare const QuerystringWidget: any;
-export declare const SchemaWidget: any;
-export declare const SelectWidget: any;
-export declare const TextareaWidget: any;
-export declare const TextWidget: any;
-export declare const TokenWidget: any;
-export declare const WysiwygWidget: any;
-export declare const UrlWidget: any;
-export declare const InternalUrlWidget: any;
-export declare const EmailWidget: any;
-export declare const NumberWidget: any;
-export declare const ImageSizeWidget: any;
-export declare const RegistryImageWidget: any;
-export declare const ReferenceWidget: any;
-export declare const ObjectBrowserWidget: any;
-export declare const ObjectWidget: any;
-export declare const ObjectListWidget: any;
-export declare const VocabularyTermsWidget: any;
-export declare const SelectMetadataWidget: any;
-export declare const SelectAutoComplete: any;
-export declare const ColorPickerWidget: any;
-export declare const DatetimeWidget: any;
-export declare const RecurrenceWidget: any;
-export declare const FormFieldWrapper: any;
+export declare const AlignWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ButtonsWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ArrayWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const CheckboxWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const FileWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const IdWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const PasswordWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const QueryWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const QuerySortOnWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const QuerystringWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const SchemaWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const SelectWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const TextareaWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const TextWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const TokenWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const WysiwygWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const UrlWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const InternalUrlWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const EmailWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const NumberWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ImageSizeWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const RegistryImageWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ReferenceWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ObjectBrowserWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ObjectWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ObjectListWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const VocabularyTermsWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const SelectMetadataWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const SelectAutoComplete: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const ColorPickerWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const DatetimeWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const RecurrenceWidget: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;
+export declare const FormFieldWrapper: jest.Mock<import("react/jsx-runtime").JSX.Element, [], any>;

package/types/components/manage/Widgets/__mocks__/index.vitest.d.ts

@@ -0,0 +1,33 @@
+export declare const AlignWidget: any;
+export declare const ButtonsWidget: any;
+export declare const ArrayWidget: any;
+export declare const CheckboxWidget: any;
+export declare const FileWidget: any;
+export declare const IdWidget: any;
+export declare const PasswordWidget: any;
+export declare const QueryWidget: any;
+export declare const QuerySortOnWidget: any;
+export declare const QuerystringWidget: any;
+export declare const SchemaWidget: any;
+export declare const SelectWidget: any;
+export declare const TextareaWidget: any;
+export declare const TextWidget: any;
+export declare const TokenWidget: any;
+export declare const WysiwygWidget: any;
+export declare const UrlWidget: any;
+export declare const InternalUrlWidget: any;
+export declare const EmailWidget: any;
+export declare const NumberWidget: any;
+export declare const ImageSizeWidget: any;
+export declare const RegistryImageWidget: any;
+export declare const ReferenceWidget: any;
+export declare const ObjectBrowserWidget: any;
+export declare const ObjectWidget: any;
+export declare const ObjectListWidget: any;
+export declare const VocabularyTermsWidget: any;
+export declare const SelectMetadataWidget: any;
+export declare const SelectAutoComplete: any;
+export declare const ColorPickerWidget: any;
+export declare const DatetimeWidget: any;
+export declare const RecurrenceWidget: any;
+export declare const FormFieldWrapper: any;

package/types/helpers/Loadable/__mocks__/Loadable.d.ts

@@ -1,3 +1,3 @@
 export function __setLoadables(): Promise<void>;
-export const injectLazyLibs: any;
-export const preloadLazyLibs: any;
+export const injectLazyLibs: jest.Mock<any, any, any>;
+export const preloadLazyLibs: jest.Mock<any, any, any>;

package/types/helpers/Loadable/__mocks__/Loadable.vitest.d.ts

@@ -0,0 +1,3 @@
+export function __setLoadables(): Promise<void>;
+export const injectLazyLibs: any;
+export const preloadLazyLibs: any;

package/src/components/manage/MaybeWrap/MaybeWrap.jsx

@@ -1,9 +0,0 @@
-import React from 'react';
-
-export default function MaybeWrap({
-  condition,
-  as: Component = 'div',
-  ...props
-}) {
-  return condition ? <Component {...props} /> : props.children;
-}