@plone/volto 18.12.0 → 18.12.1

package/CHANGELOG.md

@@ -17,6 +17,17 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.12.1 (2025-04-15)
+
+### Bugfix
+
+- Fixed broken tests in add-ons in Volto 18.12.0. @Abhishek-17h [#6989](https://github.com/plone/volto/issues/6989)
+
+### Internal
+
+- Removes make commands in root of repository whose packages no longer exist. @wesleybl [#6975](https://github.com/plone/volto/issues/6975)
+- Use `Image` from `@plone/volto/components/theme/Image/Image` instead of `semantic-ui-react` in `ContentsUploadModal`. @wesleybl [#6982](https://github.com/plone/volto/issues/6982)
+
 ## 18.12.0 (2025-04-12)
 
 ### Feature

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.12.0",
+  "version": "18.12.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -363,7 +363,7 @@
     "webpack-dev-server": "4.11.1",
     "webpack-node-externals": "3.0.0",
     "why": "0.6.2",
-    "@plone/types": "1.3.2",
+    "@plone/types": "1.3.3",
     "@plone/volto-coresandbox": "1.0.0"
   },
   "volta": {

package/src/components/manage/Contents/ContentsUploadModal.jsx

@@ -6,7 +6,6 @@ import {
   Dimmer,
   Header,
   Icon,
-  Image,
   Modal,
   Table,
   Segment,
@@ -24,6 +23,7 @@ import FormattedRelativeDate from '@plone/volto/components/theme/FormattedDate/F
 import { createContent } from '@plone/volto/actions/content/content';
 import { validateFileUploadSize } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import Image from '@plone/volto/components/theme/Image/Image';
 
 const Dropzone = loadable(() => import('react-dropzone'));
 
@@ -259,7 +259,11 @@ const ContentsUploadModal = (props) => {
                     <Table.Cell>{filesize(file.size, { round: 0 })}</Table.Cell>
                     <Table.Cell>
                       {file.type.split('/')[0] === 'image' && (
-                        <Image src={file.preview} height={60} />
+                        <Image
+                          src={file.preview}
+                          height={60}
+                          className="ui image"
+                        />
                       )}
                     </Table.Cell>
                     <Table.Cell>

package/src/components/manage/Contents/__mocks__/index.tsx

@@ -1,4 +1,3 @@
-import { vi } from 'vitest';
 export const Contents = vi.fn(() => <div className="Contents" />);
 
 export const ContentsRenameModal = vi.fn(() => (

package/src/components/manage/Diff/Diff.test.jsx

@@ -6,8 +6,6 @@ import { waitFor, render, screen } from '@testing-library/react';
 
 import Diff from './Diff';
 
-import { vi, beforeAll } from 'vitest';
-
 const mockStore = configureStore();
 
 vi.mock('../Toolbar/Toolbar', () => ({

package/src/components/manage/Form/__mocks__/index.tsx

@@ -1,6 +1,5 @@
 import type { JSONSchema } from '@plone/types';
 import type { Ref } from 'react';
-import { vi } from 'vitest';
 import { forwardRef } from 'react';
 
 const cleanupSchema = (schema: JSONSchema | null): JSONSchema | null => {

package/src/components/manage/Widgets/__mocks__/index.tsx

@@ -1,5 +1,3 @@
-import { vi } from 'vitest';
-
 export const AlignWidget = vi.fn(() => <div id="AlignWidget" />);
 export const ButtonsWidget = vi.fn(() => <div id="ButtonsWidget" />);
 export const ArrayWidget = vi.fn(() => <div id="ArrayWidget" />);

package/src/components/theme/AppExtras/AppExtras.test.jsx

@@ -3,8 +3,6 @@ import renderer from 'react-test-renderer';
 import config from '@plone/volto/registry';
 import AppExtras from './AppExtras';
 
-import { vi } from 'vitest';
-
 beforeAll(() => {
   config.settings.appExtras = [
     {

package/src/helpers/Api/Api.plone.rest.test.js

@@ -1,6 +1,5 @@
 import config from '@plone/volto/registry';
 import Api from './Api';
-import { vi } from 'vitest';
 
 vi.mock('superagent', () => ({
   default: {

package/src/helpers/Api/Api.test.js

@@ -1,12 +1,6 @@
 // import superagent from 'superagent';
 import config from '@plone/volto/registry';
 import Api from './Api';
-import { vi } from 'vitest';
-
-// jest.mock('react-cookie', () => ({
-//   load: jest.fn(() => 'token'),
-// }));
-//
 
 vi.mock('superagent', () => ({
   default: {

package/src/helpers/AuthToken/AuthToken.test.js

@@ -1,4 +1,3 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
 import Cookies from 'universal-cookie';
 import jwt from 'jsonwebtoken';
 import jwtDecode from 'jwt-decode';

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import config from '@plone/volto/registry';
-import { vi } from 'vitest';
 const loadables = config.settings.loadables;
 
 let mockAllLoadables = Object.create(null);

package/test-setup-globals-vitest.js

@@ -0,0 +1,46 @@
+import '@testing-library/jest-dom';
+import { expect, describe, it, vi } from 'vitest';
+
+global.describe = describe;
+global.it = it;
+global.expect = expect;
+global.vi = vi;
+
+global.__CLIENT__ = true;
+global.__DEVELOPMENT__ = false;
+global.__SERVER__ = false;
+global.__TEST__ = true;
+
+window.matchMedia =
+  window.matchMedia ||
+  function (query) {
+    return {
+      matches: query === '(min-width: 1024px)',
+      addListener: function () {},
+      removeListener: function () {},
+    };
+  };
+
+vi.stubGlobal(
+  'fetch',
+  vi.fn(() =>
+    Promise.resolve({
+      json: () => Promise.resolve({}),
+      text: () => Promise.resolve(''),
+    }),
+  ),
+);
+
+vi.stubGlobal('localStorage', {
+  getItem: vi.fn(),
+  setItem: vi.fn(),
+  removeItem: vi.fn(),
+  clear: vi.fn(),
+});
+
+vi.stubGlobal('sessionStorage', {
+  getItem: vi.fn(),
+  setItem: vi.fn(),
+  removeItem: vi.fn(),
+  clear: vi.fn(),
+});

package/test-setup-globals.js

@@ -1,46 +1,12 @@
-import '@testing-library/jest-dom';
-import { expect, describe, it, vi } from 'vitest';
-
-global.describe = describe;
-global.it = it;
-global.expect = expect;
-global.vi = vi;
-
 global.__CLIENT__ = true;
 global.__DEVELOPMENT__ = false;
-global.__SERVER__ = false;
-global.__TEST__ = true;
 
 window.matchMedia =
   window.matchMedia ||
-  function (query) {
+  function () {
     return {
-      matches: query === '(min-width: 1024px)',
+      matches: false,
       addListener: function () {},
       removeListener: function () {},
     };
   };
-
-vi.stubGlobal(
-  'fetch',
-  vi.fn(() =>
-    Promise.resolve({
-      json: () => Promise.resolve({}),
-      text: () => Promise.resolve(''),
-    }),
-  ),
-);
-
-vi.stubGlobal('localStorage', {
-  getItem: vi.fn(),
-  setItem: vi.fn(),
-  removeItem: vi.fn(),
-  clear: vi.fn(),
-});
-
-vi.stubGlobal('sessionStorage', {
-  getItem: vi.fn(),
-  setItem: vi.fn(),
-  removeItem: vi.fn(),
-  clear: vi.fn(),
-});

package/tsconfig.declarations.json

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

package/vitest.config.ts

@@ -36,7 +36,7 @@ export default defineConfig({
     globals: true,
     environment: 'jsdom',
     setupFiles: [
-      './test-setup-globals.js',
+      './test-setup-globals-vitest.js',
       './test-setup-config.jsx',
       './jest-setup-afterenv.js',
       './jest-addons-loader.js',