@plone/volto 18.1.1 → 18.2.0

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

@@ -5,29 +5,31 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { filter, isEqual, map } from 'lodash';
+import filter from 'lodash/filter';
+import isEqual from 'lodash/isEqual';
+import map from 'lodash/map';
 import { Container, Button, Dropdown, Grid, Table } from 'semantic-ui-react';
 import { Link, withRouter } from 'react-router-dom';
 import { createPortal } from 'react-dom';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
 import qs from 'query-string';
 
-import { getDiff, getSchema, getHistory } from '@plone/volto/actions';
+import { getDiff } from '@plone/volto/actions/diff/diff';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import { getHistory } from '@plone/volto/actions/history/history';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import {
-  getBaseUrl,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   hasBlocksData,
-} from '@plone/volto/helpers';
-import {
-  FormattedDate,
-  Icon,
-  Toolbar,
-  Unauthorized,
-} from '@plone/volto/components';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
 import DiffField from '@plone/volto/components/manage/Diff/DiffField';
 
 import backSVG from '@plone/volto/icons/back.svg';

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

@@ -4,7 +4,8 @@
  */
 
 import React from 'react';
-import { join, map } from 'lodash';
+import join from 'lodash/join';
+import map from 'lodash/map';
 import PropTypes from 'prop-types';
 import { Grid } from 'semantic-ui-react';
 import ReactDOMServer from 'react-dom/server';
@@ -13,9 +14,9 @@ import { createBrowserHistory } from 'history';
 import { ConnectedRouter } from 'connected-react-router';
 import { useSelector } from 'react-redux';
 import config from '@plone/volto/registry';
-import { Api } from '@plone/volto/helpers';
+import Api from '@plone/volto/helpers/Api/Api';
 import configureStore from '@plone/volto/store';
-import { RenderBlocks } from '@plone/volto/components';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
 import { serializeNodes } from '@plone/volto-slate/editor/render';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 

package/src/components/manage/Display/Display.jsx

@@ -4,10 +4,15 @@ import { useDispatch, useSelector } from 'react-redux';
 import { compose } from 'redux';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 
-import { getSchema, updateContent, getContent } from '@plone/volto/actions';
-import { getLayoutFieldname } from '@plone/volto/helpers';
-import { usePrevious } from '@plone/volto/helpers';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import {
+  updateContent,
+  getContent,
+} from '@plone/volto/actions/content/content';
+import { getLayoutFieldname } from '@plone/volto/helpers/Content/Content';
+import { usePrevious } from '@plone/volto/helpers/Utils/usePrevious';
+import { FormFieldWrapper } from '@plone/volto/components/manage/Widgets';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { defineMessages, useIntl } from 'react-intl';
 import config from '@plone/volto/registry';
 

package/src/components/manage/DragDropList/DragDropList.jsx

@@ -1,5 +1,5 @@
 import React, { useRef } from 'react';
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import { v4 as uuid } from 'uuid';
 

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

@@ -5,44 +5,41 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet, extractInvariantErrors } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { extractInvariantErrors } from '@plone/volto/helpers/FormValidation/FormValidation';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { asyncConnect, hasApiExpander } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Button, Grid, Menu } from 'semantic-ui-react';
 import { createPortal } from 'react-dom';
 import qs from 'query-string';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import { toast } from 'react-toastify';
 
-import {
-  Forbidden,
-  Icon,
-  Sidebar,
-  Toast,
-  Toolbar,
-  Unauthorized,
-  CompareLanguages,
-  TranslationObject,
-} from '@plone/volto/components';
+import Forbidden from '@plone/volto/components/theme/Forbidden/Forbidden';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Sidebar from '@plone/volto/components/manage/Sidebar/Sidebar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
+import CompareLanguages from '@plone/volto/components/manage/Multilingual/CompareLanguages';
+import TranslationObject from '@plone/volto/components/manage/Multilingual/TranslationObject';
 import { Form } from '@plone/volto/components/manage/Form';
 import {
   updateContent,
   getContent,
   lockContent,
   unlockContent,
-  getSchema,
-  listActions,
-  setFormData,
-} from '@plone/volto/actions';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  hasBlocksData,
-} from '@plone/volto/helpers';
+} from '@plone/volto/actions/content/content';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { setFormData } from '@plone/volto/actions/form/form';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasBlocksData } from '@plone/volto/helpers/Blocks/Blocks';
 import { preloadLazyLibs } from '@plone/volto/helpers/Loadable';
-import { tryParseJSON } from '@plone/volto/helpers';
+import { tryParseJSON } from '@plone/volto/helpers/FormValidation/FormValidation';
 
 import saveSVG from '@plone/volto/icons/save.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

package/src/components/manage/Form/BlockDataForm.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { InlineForm } from '@plone/volto/components/manage/Form';
-import { withVariationSchemaEnhancer } from '@plone/volto/helpers';
+import { withVariationSchemaEnhancer } from '@plone/volto/helpers/Extensions';
 
 const EnhancedBlockDataForm = withVariationSchemaEnhancer(InlineForm);
 

package/src/components/manage/Form/BlocksToolbar.jsx

@@ -2,18 +2,23 @@ import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { injectIntl } from 'react-intl';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
 import {
-  messages,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-} from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Plug } from '@plone/volto/components/manage/Pluggable';
 import { v4 as uuid } from 'uuid';
 import { load } from 'redux-localstorage-simple';
-import { isEqual, omit, without } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import omit from 'lodash/omit';
+import without from 'lodash/without';
 
-import { setBlocksClipboard, resetBlocksClipboard } from '@plone/volto/actions';
+import {
+  setBlocksClipboard,
+  resetBlocksClipboard,
+} from '@plone/volto/actions/blocksClipboard/blocksClipboard';
 import config from '@plone/volto/registry';
 
 import copySVG from '@plone/volto/icons/copy.svg';

package/src/components/manage/Form/Form.jsx

@@ -3,34 +3,33 @@
  * @module components/manage/Form/Form
  */
 
-import { Icon, Toast } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Field, BlocksForm } from '@plone/volto/components/manage/Form';
 import BlocksToolbar from '@plone/volto/components/manage/Form/BlocksToolbar';
 import UndoToolbar from '@plone/volto/components/manage/Form/UndoToolbar';
+import { difference } from '@plone/volto/helpers/Utils/Utils';
+import FormValidation from '@plone/volto/helpers/FormValidation/FormValidation';
 import {
-  difference,
-  FormValidation,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   hasBlocksData,
-  messages,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import downSVG from '@plone/volto/icons/down-key.svg';
-import {
-  findIndex,
-  isEmpty,
-  isEqual,
-  keys,
-  map,
-  mapValues,
-  pickBy,
-  without,
-  cloneDeep,
-  xor,
-} from 'lodash';
+import findIndex from 'lodash/findIndex';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import keys from 'lodash/keys';
+import map from 'lodash/map';
+import mapValues from 'lodash/mapValues';
+import pickBy from 'lodash/pickBy';
+import without from 'lodash/without';
+import cloneDeep from 'lodash/cloneDeep';
+import xor from 'lodash/xor';
 import isBoolean from 'lodash/isBoolean';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
@@ -52,9 +51,8 @@ import {
   setMetadataFieldsets,
   resetMetadataFocus,
   setSidebarTab,
-  setFormData,
-  setUIState,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/sidebar/sidebar';
+import { setFormData, setUIState } from '@plone/volto/actions/form/form';
 import { compose } from 'redux';
 import config from '@plone/volto/registry';
 import SlotRenderer from '@plone/volto/components/theme/SlotRenderer/SlotRenderer';

package/src/components/manage/Form/InlineForm.jsx

@@ -3,7 +3,9 @@ import PropTypes from 'prop-types';
 import { Accordion, Segment, Message } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import AnimateHeight from 'react-animate-height';
-import { keys, map, isEqual } from 'lodash';
+import keys from 'lodash/keys';
+import map from 'lodash/map';
+import isEqual from 'lodash/isEqual';
 import { useAtom } from 'jotai';
 import { inlineFormFieldsetsState } from './InlineFormState';
 import {
@@ -11,9 +13,9 @@ import {
   removeFromArray,
   arrayRange,
 } from '@plone/volto/helpers/Utils/Utils';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Field } from '@plone/volto/components/manage/Form';
-import { applySchemaDefaults } from '@plone/volto/helpers';
+import { applySchemaDefaults } from '@plone/volto/helpers/Blocks/Blocks';
 
 import upSVG from '@plone/volto/icons/up-key.svg';
 import downSVG from '@plone/volto/icons/down-key.svg';

package/src/components/manage/Form/InlineFormState.js

@@ -1,6 +1,6 @@
 import { atom } from 'jotai';
 import { atomFamily } from 'jotai/utils';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 
 export const inlineFormFieldsetsState = atomFamily(
   ({ name, initialState }) => atom(initialState),

package/src/components/manage/Form/ModalForm.jsx

@@ -5,7 +5,8 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { keys, map } from 'lodash';
+import keys from 'lodash/keys';
+import map from 'lodash/map';
 import {
   Button,
   Form as UiForm,
@@ -17,8 +18,8 @@ import {
   Loader,
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { FormValidation } from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+import FormValidation from '@plone/volto/helpers/FormValidation/FormValidation';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Field } from '@plone/volto/components/manage/Form';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

package/src/components/manage/Form/UndoToolbar.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Plug } from '@plone/volto/components/manage/Pluggable';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Button } from 'semantic-ui-react';
-import { useUndoManager } from '@plone/volto/helpers';
+import useUndoManager from '@plone/volto/helpers/UndoManager/useUndoManager';
 import config from '@plone/volto/registry';
 
 import undoSVG from '@plone/volto/icons/undo.svg';

package/src/components/manage/History/History.jsx

@@ -5,7 +5,7 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
@@ -16,20 +16,25 @@ import {
   Segment,
   Table,
 } from 'semantic-ui-react';
-import { concat, map, reverse, find } from 'lodash';
+import concat from 'lodash/concat';
+import map from 'lodash/map';
+import reverse from 'lodash/reverse';
+import find from 'lodash/find';
 import { createPortal } from 'react-dom';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import { asyncConnect } from '@plone/volto/helpers';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
 
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import IconNext from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Forbidden from '@plone/volto/components/theme/Forbidden/Forbidden';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
 import {
-  FormattedDate,
-  Icon as IconNext,
-  Toolbar,
-  Forbidden,
-  Unauthorized,
-} from '@plone/volto/components';
-import { getHistory, revertHistory, listActions } from '@plone/volto/actions';
-import { getBaseUrl } from '@plone/volto/helpers';
+  getHistory,
+  revertHistory,
+} from '@plone/volto/actions/history/history';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 import backSVG from '@plone/volto/icons/back.svg';

package/src/components/manage/LinkMore/LinkMore.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { flattenToAppURL } from '@plone/volto/helpers';
-import { isInternalURL } from '@plone/volto/helpers/Url/Url';
-import { ConditionalLink, UniversalLink } from '@plone/volto/components';
+import { flattenToAppURL, isInternalURL } from '@plone/volto/helpers/Url/Url';
+import ConditionalLink from '@plone/volto/components/manage/ConditionalLink/ConditionalLink';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 const LinkMore = ({ data, isEditMode }) => {
   let href = data.linkHref?.[0]?.['@id'] || '';

package/src/components/manage/LinksToItem/LinksToItem.jsx

@@ -3,24 +3,24 @@
  * @module components/manage/LinksToItem/LinksToItem
  */
 import React, { useEffect, useState } from 'react';
-import { find } from 'lodash';
-import { Helmet } from '@plone/volto/helpers';
+import find from 'lodash/find';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 import { Link } from 'react-router-dom';
 import { createPortal } from 'react-dom';
 import { Container, Segment, Table } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 import { useDispatch, useSelector } from 'react-redux';
-import { getContent, queryRelations, listActions } from '@plone/volto/actions';
-import { asyncConnect } from '@plone/volto/helpers';
+import { getContent } from '@plone/volto/actions/content/content';
+import { queryRelations } from '@plone/volto/actions/relations/relations';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { asyncConnect } from '@plone/volto/helpers/AsyncConnect';
 
-import {
-  Icon as IconNext,
-  Toolbar,
-  UniversalLink,
-  Unauthorized,
-} from '@plone/volto/components';
+import IconNext from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import Unauthorized from '@plone/volto/components/theme/Unauthorized/Unauthorized';
 
-import { getBaseUrl } from '@plone/volto/helpers';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import backSVG from '@plone/volto/icons/back.svg';
 import settingsSVG from '@plone/volto/icons/settings.svg';
 

package/src/components/manage/LockingToastsFactory/LockingToastsFactory.jsx

@@ -3,7 +3,8 @@ import { toast } from 'react-toastify';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
-import { FormattedDate, Toast } from '@plone/volto/components';
+import FormattedDate from '@plone/volto/components/theme/FormattedDate/FormattedDate';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 
 const messages = defineMessages({

package/src/components/manage/Messages/Messages.jsx

@@ -1,8 +1,8 @@
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { Message, Container } from 'semantic-ui-react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 
-import { removeMessage } from '@plone/volto/actions';
+import { removeMessage } from '@plone/volto/actions/messages/messages';
 
 const Messages = () => {
   const dispatch = useDispatch();

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

@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import config from '@plone/volto/registry';
-import { langmap, useDetectClickOutside } from '@plone/volto/helpers';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
+import { useDetectClickOutside } from '@plone/volto/helpers/Utils/useDetectClickOutside';
 
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Button } from 'semantic-ui-react';
 import translateSVG from '@plone/volto/icons/translate.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';

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

@@ -1,12 +1,11 @@
 import React from 'react';
 import { Redirect } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
-import {
-  changeLanguage,
-  getTranslationLocator,
-  getContent,
-} from '@plone/volto/actions';
-import { flattenToAppURL, toGettextLang } from '@plone/volto/helpers';
+import { changeLanguage } from '@plone/volto/actions/language/language';
+import { getTranslationLocator } from '@plone/volto/actions/translations/translations';
+import { getContent } from '@plone/volto/actions/content/content';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { toGettextLang } from '@plone/volto/helpers/Utils/Utils';
 import config from '@plone/volto/registry';
 
 const CreateTranslation = (props) => {

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

@@ -1,18 +1,21 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Container, Segment, Table } from 'semantic-ui-react';
-import { Helmet } from '@plone/volto/helpers';
-import { flattenToAppURL, getBaseUrl, langmap } from '@plone/volto/helpers';
-import { reduce } from 'lodash';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
+import reduce from 'lodash/reduce';
 import { Link, useLocation } from 'react-router-dom';
-import { Icon, Toast, Toolbar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
 import config from '@plone/volto/registry';
 
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
 import {
   deleteLinkTranslation,
-  getContent,
   linkTranslation,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/translations/translations';
+import { getContent } from '@plone/volto/actions/content/content';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import { useSelector, useDispatch } from 'react-redux';
 import { createPortal } from 'react-dom';

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

@@ -1,18 +1,18 @@
 import React, { useEffect, useState } from 'react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { defineMessages, useIntl } from 'react-intl';
 import { Form as UiForm, Menu, Segment } from 'semantic-ui-react';
 import { Provider } from 'react-intl-redux';
 import { Form, Field } from '@plone/volto/components/manage/Form';
 import config from '@plone/volto/registry';
 import configureStore from '@plone/volto/store';
+import Api from '@plone/volto/helpers/Api/Api';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
 import {
-  Api,
-  flattenToAppURL,
-  langmap,
   toGettextLang,
   toReactIntlLang,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Utils/Utils';
 import { createBrowserHistory } from 'history';
 
 const messages = defineMessages({

package/src/components/manage/Pluggable/index.js

@@ -2,7 +2,7 @@
 // We've renamed Slot => Pluggable, not to clash with Volto slots
 
 import React from 'react';
-import { sortBy } from 'lodash';
+import sortBy from 'lodash/sortBy';
 
 export const context = React.createContext();
 

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

@@ -6,11 +6,14 @@ import { Container } from 'semantic-ui-react';
 import jwtDecode from 'jwt-decode';
 import { toast } from 'react-toastify';
 
-import { Helmet } from '@plone/volto/helpers';
-import { useClient } from '@plone/volto/hooks';
-import { Form, Icon, Toast, Toolbar } from '@plone/volto/components';
-import { updatePassword } from '@plone/volto/actions';
-import { getBaseUrl } from '@plone/volto/helpers';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { useClient } from '@plone/volto/hooks/client/useClient';
+import { Form } from '@plone/volto/components/manage/Form';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import { updatePassword } from '@plone/volto/actions/users/users';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import backSVG from '@plone/volto/icons/back.svg';
 
 const messages = defineMessages({

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

@@ -5,10 +5,11 @@ import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import jwtDecode from 'jwt-decode';
 import { toast } from 'react-toastify';
-import { messages } from '@plone/volto/helpers';
-import { Toast } from '@plone/volto/components';
+import { messages } from '@plone/volto/helpers/MessageLabels/MessageLabels';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Form } from '@plone/volto/components/manage/Form';
-import { getUser, updateUser, getUserSchema } from '@plone/volto/actions';
+import { getUser, updateUser } from '@plone/volto/actions/users/users';
+import { getUserSchema } from '@plone/volto/actions/userschema/userschema';
 
 const PersonalInformation = (props) => {
   const intl = useIntl();

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

@@ -1,16 +1,17 @@
 import PropTypes from 'prop-types';
 import { useDispatch } from 'react-redux';
-import { map, keys } from 'lodash';
+import map from 'lodash/map';
+import keys from 'lodash/keys';
 import { defineMessages, useIntl } from 'react-intl';
 import { toast } from 'react-toastify';
 import { compose } from 'redux';
 import { withCookies } from 'react-cookie';
 
-import { Toast } from '@plone/volto/components';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { Form } from '@plone/volto/components/manage/Form';
 import languages from '@plone/volto/constants/Languages.cjs';
-import { changeLanguage } from '@plone/volto/actions';
-import { toGettextLang } from '@plone/volto/helpers';
+import { changeLanguage } from '@plone/volto/actions/language/language';
+import { toGettextLang } from '@plone/volto/helpers/Utils/Utils';
 import config from '@plone/volto/registry';
 
 const messages = defineMessages({