@plone/volto 18.0.0-alpha.37 → 18.0.0-alpha.39

package/CHANGELOG.md

@@ -17,6 +17,19 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.0.0-alpha.39 (2024-06-28)
+
+### Bugfix
+
+- Cleanup Image widget and pass down onSelectItem prop if any @sneridagh [#6132](https://github.com/plone/volto/issues/6132)
+- Whitelist some dynamic imports to suppress vite warnings in storybook @tomschall [#6133](https://github.com/plone/volto/issues/6133)
+
+## 18.0.0-alpha.38 (2024-06-28)
+
+### Internal
+
+- Renamed `constants/Languages.js` to `constants/Languages.cjs` @sneridagh [#6130](https://github.com/plone/volto/issues/6130)
+
 ## 18.0.0-alpha.37 (2024-06-27)
 
 ### Feature

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.0.0-alpha.37",
+  "version": "18.0.0-alpha.39",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -78,7 +78,7 @@
     },
     "setupFiles": [
       "./test-setup-globals.js",
-      "./test-setup-config.js"
+      "./test-setup-config.jsx"
     ],
     "globalSetup": "./global-test-setup.js",
     "setupFilesAfterEnv": [
@@ -237,8 +237,8 @@
     "use-deep-compare-effect": "1.8.1",
     "uuid": "^8.3.2",
     "@plone/registry": "1.7.0",
-    "@plone/scripts": "3.6.2",
-    "@plone/volto-slate": "18.0.0-alpha.14"
+    "@plone/volto-slate": "18.0.0-alpha.15",
+    "@plone/scripts": "3.6.2"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",

package/razzle.config.js

@@ -20,7 +20,7 @@ const AfterBuildPlugin = require('@fiverr/afterbuild-webpack-plugin');
 const fileLoaderFinder = makeLoaderFinder('file-loader');
 
 const projectRootPath = path.resolve('.');
-const languages = require('./src/constants/Languages');
+const languages = require('./src/constants/Languages.cjs');
 
 const packageJson = require(path.join(projectRootPath, 'package.json'));
 

package/src/components/manage/Add/Add.jsx

@@ -239,7 +239,9 @@ class Add extends Component {
     if (this.props.location?.state?.translationOf) {
       const language = this.props.location.state.languageFrom;
       const langFileName = toGettextLang(language);
-      import('@root/../locales/' + langFileName + '.json').then((locale) => {
+      import(
+        /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+      ).then((locale) => {
         this.props.changeLanguage(language, locale.default);
       });
       this.props.history.push(this.props.location?.state?.translationOf);

package/src/components/manage/Blocks/Image/Edit.jsx

@@ -4,13 +4,8 @@
  */
 
 import React from 'react';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-
-import { injectIntl } from 'react-intl';
 import cx from 'classnames';
 import { ImageSidebar, SidebarPortal } from '@plone/volto/components';
-import { createContent } from '@plone/volto/actions';
 
 import {
   flattenToAppURL,
@@ -21,18 +16,6 @@ import config from '@plone/volto/registry';
 
 import { ImageInput } from '@plone/volto/components/manage/Widgets/ImageWidget';
 
-/**
- * Edit image block function.
- * @function Edit
- */
-
-// const messages = defineMessages({
-//   notImage: {
-//     id: 'The provided link does not lead to an image.',
-//     defaultMessage: 'The provided link does not lead to an image.',
-//   },
-// });
-
 function Edit(props) {
   const { data } = props;
   const Image = config.getComponent({ name: 'Image' }).component;
@@ -120,14 +103,4 @@ function Edit(props) {
   );
 }
 
-export default compose(
-  injectIntl,
-  withBlockExtensions,
-  connect(
-    (state, ownProps) => ({
-      request: state.content.subrequests[ownProps.block] || {},
-      content: state.content.subrequests[ownProps.block]?.data,
-    }),
-    { createContent },
-  ),
-)(Edit);
+export default withBlockExtensions(Edit);

package/src/components/manage/Multilingual/CreateTranslation.jsx

@@ -34,7 +34,9 @@ const CreateTranslation = (props) => {
       // We change the interface language
       if (config.settings.supportedLanguages.includes(language)) {
         const langFileName = toGettextLang(language);
-        import('@root/../locales/' + langFileName + '.json').then((locale) => {
+        import(
+          /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+        ).then((locale) => {
           dispatch(changeLanguage(language, locale.default));
         });
       }

package/src/components/manage/Multilingual/TranslationObject.jsx

@@ -48,7 +48,9 @@ const TranslationObject = ({
       let lang =
         config.settings.supportedLanguages[Object.keys(locales).length];
       const langFileName = toGettextLang(lang);
-      import('@root/../locales/' + langFileName + '.json').then((locale) => {
+      import(
+        /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+      ).then((locale) => {
         setLocales({ ...locales, [toReactIntlLang(lang)]: locale.default });
         setLoadingLocale(false);
       });

package/src/components/manage/Preferences/PersonalPreferences.jsx

@@ -14,7 +14,7 @@ import { toast } from 'react-toastify';
 
 import { Toast } from '@plone/volto/components';
 import { Form } from '@plone/volto/components/manage/Form';
-import languages from '@plone/volto/constants/Languages';
+import languages from '@plone/volto/constants/Languages.cjs';
 import { changeLanguage } from '@plone/volto/actions';
 import { toGettextLang } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
@@ -88,7 +88,9 @@ class PersonalPreferences extends Component {
     let language = data.language || 'en';
     if (config.settings.supportedLanguages.includes(language)) {
       const langFileName = toGettextLang(language);
-      import('@root/../locales/' + langFileName + '.json').then((locale) => {
+      import(
+        /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+      ).then((locale) => {
         this.props.changeLanguage(language, locale.default);
       });
     }

package/src/components/manage/Widgets/ImageWidget.jsx

@@ -75,6 +75,7 @@ const UnconnectedImageInput = (props) => {
     objectBrowserPickerType = 'image',
     description,
     placeholderLinkInput = '',
+    onSelectItem,
   } = props;
 
   const intl = useIntl();
@@ -204,16 +205,15 @@ const UnconnectedImageInput = (props) => {
                           e.preventDefault();
                           openObjectBrowser({
                             mode: objectBrowserPickerType,
-                            onSelectItem: (
-                              url,
-                              { title, image_field, image_scales },
-                            ) => {
-                              onChange(props.id, flattenToAppURL(url), {
-                                title,
-                                image_field,
-                                image_scales,
-                              });
-                            },
+                            onSelectItem: onSelectItem
+                              ? onSelectItem
+                              : (url, { title, image_field, image_scales }) => {
+                                  onChange(props.id, flattenToAppURL(url), {
+                                    title,
+                                    image_field,
+                                    image_scales,
+                                  });
+                                },
                             currentPath: contextUrl,
                           });
                         }}

package/src/components/theme/MultilingualRedirector/MultilingualRedirector.jsx

@@ -24,7 +24,9 @@ const MultilingualRedirector = (props) => {
     let mounted = true;
     if (settings.isMultilingual && pathname === '/') {
       const langFileName = toGettextLang(redirectToLanguage);
-      import('@root/../locales/' + langFileName + '.json').then((locale) => {
+      import(
+        /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+      ).then((locale) => {
         if (mounted) {
           dispatch(changeLanguage(redirectToLanguage, locale.default));
         }

package/src/constants/{Languages.js → Languages.cjs}

@@ -20,3 +20,5 @@ module.exports = {
   pt_BR: 'Português (Brasil)',
   zh_CN: '中文',
 };
+
+// export default languages;

package/src/helpers/AuthToken/AuthToken.js

@@ -102,7 +102,7 @@ export function persistAuthToken(store, req) {
   handleChange(true);
 }
 
-if (module.hot) {
+if (module?.hot) {
   module.hot.dispose((data) => {
     data.reloaded = true;
   });

package/src/middleware/api.js

@@ -237,11 +237,11 @@ const apiMiddlewareFactory =
               config.settings.supportedLanguages.includes(lang)
             ) {
               const langFileName = toGettextLang(lang);
-              import('@root/../locales/' + langFileName + '.json').then(
-                (locale) => {
-                  dispatch(changeLanguage(lang, locale.default));
-                },
-              );
+              import(
+                /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+              ).then((locale) => {
+                dispatch(changeLanguage(lang, locale.default));
+              });
             }
           }
           if (type === LOGIN && settings.websockets) {

package/src/server.jsx

@@ -36,7 +36,7 @@ import userSession from '@plone/volto/reducers/userSession/userSession';
 
 import ErrorPage from '@plone/volto/error';
 
-import languages from '@plone/volto/constants/Languages';
+import languages from '@plone/volto/constants/Languages.cjs';
 
 import configureStore from '@plone/volto/store';
 import { ReduxAsyncConnect, loadOnServer } from './helpers/AsyncConnect';
@@ -46,7 +46,9 @@ let locales = {};
 if (config.settings) {
   config.settings.supportedLanguages.forEach((lang) => {
     const langFileName = toGettextLang(lang);
-    import('@root/../locales/' + langFileName + '.json').then((locale) => {
+    import(
+      /* @vite-ignore */ '@root/../locales/' + langFileName + '.json'
+    ).then((locale) => {
       locales = { ...locales, [toReactIntlLang(lang)]: locale.default };
     });
   });

package/types/components/manage/Blocks/Image/Edit.d.ts

@@ -1,2 +1,2 @@
-declare const _default: any;
+declare const _default: (props: any) => import("react/jsx-runtime").JSX.Element;
 export default _default;

package/types/constants/Languages.d.cts

@@ -0,0 +1,15 @@
+export let ca: string;
+export let de: string;
+export let en: string;
+export let es: string;
+export let eu: string;
+export let fi: string;
+export let fr: string;
+export let hi: string;
+export let it: string;
+export let nl: string;
+export let ro: string;
+export let ja: string;
+export let pt: string;
+export let pt_BR: string;
+export let zh_CN: string;