@plone/volto 18.1.2 → 18.2.1

package/.eslintignore

@@ -1 +1 @@
-types/
+/types/

package/.eslintrc

@@ -1,6 +1,12 @@
 {
-  "extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
+  "extends": [
+    "react-app",
+    "prettier",
+    "plugin:jsx-a11y/recommended",
+    "./.eslintrc.core.js",
+  ],
   "plugins": ["prettier", "react-hooks", "jsx-a11y"],
+  "root": true,
   "env": {
     "es6": true,
     "browser": true,
@@ -18,6 +24,7 @@
   },
   "rules": {
     "import/no-unresolved": 1,
+    "import/named": "error",
     "react/jsx-key": [2, { "checkFragmentShorthand": true }],
     "no-alert": 1,
     "no-console": 1,

package/.eslintrc.core.js

@@ -0,0 +1,43 @@
+/** This file is intended to have ESlint configuration only meant to be applied in
+ * Volto core. Since it relies on the `VOLTOCONFIG` environment variable, it will
+ * not be applied in CI and command line `make lint` in Volto projects.
+ * However, it will be applied in IDEs, adding a layer of convenience for developers,
+ * so they can adapt to use best practices and future deprecations and changes in
+ * Volto core codebase.
+ */
+let rules;
+
+if (process.env.VOLTOCONFIG) {
+  rules = null;
+} else {
+  rules = {
+    'react/jsx-filename-extension': ['warn', { extensions: ['.tsx', '.jsx'] }],
+    'no-restricted-imports': [
+      'warn',
+      {
+        name: '@plone/volto/components',
+        message:
+          'Importing from barrel files is not allowed. The usage of barrel files is discouraged and they will be removed in Plone 7. Please use direct imports of the modules instead.',
+      },
+      {
+        name: '@plone/volto/helpers',
+        message:
+          'Importing from barrel files is not allowed. The usage of barrel files is discouraged and they will be removed in Plone 7. Please use direct imports of the modules instead.',
+      },
+      {
+        name: '@plone/volto/actions',
+        message:
+          'Importing from barrel files is not allowed. The usage of barrel files is discouraged and they will be removed in Plone 7. Please use direct imports of the modules instead.',
+      },
+      {
+        name: 'lodash',
+        message:
+          "Importing directly from `lodash` is not allowed. Please use `import <helper> from 'lodash/<helper>'` instead.",
+      },
+    ],
+  };
+}
+
+module.exports = {
+  ...(rules && { rules }),
+};

package/CHANGELOG.md

@@ -17,6 +17,23 @@ myst:
 
 <!-- towncrier release notes start -->
 
+## 18.2.1 (2024-12-09)
+
+### Bugfix
+
+- Fixes ICS download in non-public event content. @sneridagh [#6515](https://github.com/plone/volto/issues/6515)
+- Fixed circular import error in dev with HMR in `App` component when imported in the main default config. @sneridagh [#6524](https://github.com/plone/volto/issues/6524)
+
+### Internal
+
+- Fix extension in files containing JSX. @sneridagh [#6520](https://github.com/plone/volto/issues/6520)
+
+## 18.2.0 (2024-12-08)
+
+### Internal
+
+- Removed all imports from barrel files for components, actions, helpers, hooks and lodash. @pnicolli [#6509](https://github.com/plone/volto/issues/6509)
+
 ## 18.1.2 (2024-12-05)
 
 ### Bugfix

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "license": "MIT",
-  "version": "18.1.2",
+  "version": "18.2.1",
   "repository": {
     "type": "git",
     "url": "git@github.com:plone/volto.git"
@@ -236,9 +236,9 @@
     "url": "^0.11.3",
     "use-deep-compare-effect": "1.8.1",
     "uuid": "^8.3.2",
-    "@plone/registry": "2.1.2",
     "@plone/scripts": "3.8.1",
-    "@plone/volto-slate": "18.0.1"
+    "@plone/volto-slate": "18.0.3",
+    "@plone/registry": "2.1.2"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",

package/src/actions/content/content.js

@@ -16,7 +16,7 @@ import {
   LINK_INTEGRITY_CHECK,
   UPDATE_UPLOADED_FILES,
 } from '@plone/volto/constants/ActionTypes';
-import { nestContent } from '@plone/volto/helpers';
+import { nestContent } from '@plone/volto/helpers/Content/Content';
 import config from '@plone/volto/registry';
 
 /**

package/src/actions/language/language.js

@@ -2,8 +2,8 @@ import { updateIntl } from 'react-intl-redux';
 import {
   toGettextLang,
   toReactIntlLang,
-  getCookieOptions,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Utils/Utils';
+import { getCookieOptions } from '@plone/volto/helpers/Cookies/cookies';
 import Cookies from 'universal-cookie';
 
 export function changeLanguageCookies(language, req) {

package/src/actions/search/search.js

@@ -3,7 +3,13 @@
  * @module actions/search/search
  */
 
-import { compact, concat, isArray, join, map, pickBy, toPairs } from 'lodash';
+import compact from 'lodash/compact';
+import concat from 'lodash/concat';
+import isArray from 'lodash/isArray';
+import join from 'lodash/join';
+import map from 'lodash/map';
+import pickBy from 'lodash/pickBy';
+import toPairs from 'lodash/toPairs';
 
 import {
   RESET_SEARCH_CONTENT,

package/src/actions/workflow/workflow.js

@@ -8,7 +8,7 @@ import {
   GET_WORKFLOW_MULTIPLE,
   TRANSITION_WORKFLOW,
 } from '@plone/volto/constants/ActionTypes';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 /**
  * Get workflow function.

package/src/components/manage/Actions/Actions.jsx

@@ -6,9 +6,14 @@ import { Dropdown, Icon } from 'semantic-ui-react';
 import { toast } from 'react-toastify';
 import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
 
-import { cut, copy, copyContent, moveContent } from '@plone/volto/actions';
-import { getBaseUrl } from '@plone/volto/helpers';
-import { Toast } from '@plone/volto/components';
+import {
+  cut,
+  copy,
+  copyContent,
+  moveContent,
+} from '@plone/volto/actions/clipboard/clipboard';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 import { ContentsRenameModal } from '@plone/volto/components/manage/Contents';
 
 const messages = defineMessages({

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

@@ -5,14 +5,10 @@
 
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import {
-  BodyClass,
-  Helmet,
-  extractInvariantErrors,
-} from '@plone/volto/helpers';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
-import { keys, isEmpty } from 'lodash';
+import keys from 'lodash/keys';
+import isEmpty from 'lodash/isEmpty';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Button, Grid, Menu } from 'semantic-ui-react';
 import { createPortal } from 'react-dom';
@@ -20,35 +16,39 @@ import { v4 as uuid } from 'uuid';
 import qs from 'query-string';
 import { toast } from 'react-toastify';
 
-import {
-  createContent,
-  getSchema,
-  changeLanguage,
-  setFormData,
-} from '@plone/volto/actions';
-import {
-  Icon,
-  Toolbar,
-  Sidebar,
-  Toast,
-  TranslationObject,
-} from '@plone/volto/components';
+import { createContent } from '@plone/volto/actions/content/content';
+import { getSchema } from '@plone/volto/actions/schema/schema';
+import { changeLanguage } from '@plone/volto/actions/language/language';
+import { setFormData } from '@plone/volto/actions/form/form';
+
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Sidebar from '@plone/volto/components/manage/Sidebar/Sidebar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
+import TranslationObject from '@plone/volto/components/manage/Multilingual/TranslationObject';
 import { Form } from '@plone/volto/components/manage/Form';
+
+import { getBaseUrl, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import {
-  getBaseUrl,
   hasBlocksData,
-  flattenToAppURL,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
-  getLanguageIndependentFields,
-  langmap,
-  toGettextLang,
+} from '@plone/volto/helpers/Blocks/Blocks';
+import { getLanguageIndependentFields } from '@plone/volto/helpers/Content/Content';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
+import { toGettextLang } from '@plone/volto/helpers/Utils/Utils';
+import {
   getSimpleDefaultBlocks,
   getDefaultBlocks,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/defaultBlocks';
+import {
+  tryParseJSON,
+  extractInvariantErrors,
+} from '@plone/volto/helpers/FormValidation/FormValidation';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
 
 import { preloadLazyLibs } from '@plone/volto/helpers/Loadable';
-import { tryParseJSON } from '@plone/volto/helpers';
 
 import config from '@plone/volto/registry';
 

package/src/components/manage/Aliases/Aliases.jsx

@@ -4,11 +4,11 @@
  */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Helmet } from '@plone/volto/helpers';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { Link } from 'react-router-dom';
 import { createPortal } from 'react-dom';
+import { toast } from 'react-toastify';
 import {
   Button,
   Checkbox,
@@ -24,15 +24,17 @@ import {
   removeAliases,
   addAliases,
   getAliases,
-  getContent,
-} from '@plone/volto/actions';
+} from '@plone/volto/actions/aliases/aliases';
+import { getContent } from '@plone/volto/actions/content/content';
+
+import Helmet from '@plone/volto/helpers/Helmet/Helmet';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
-import { Icon, Toolbar } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import Toolbar from '@plone/volto/components/manage/Toolbar/Toolbar';
+import Toast from '@plone/volto/components/manage/Toast/Toast';
 
 import backSVG from '@plone/volto/icons/back.svg';
-import { getBaseUrl } from '@plone/volto/helpers';
-import { toast } from 'react-toastify';
-import { Toast } from '@plone/volto/components';
 
 const messages = defineMessages({
   back: {

package/src/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm.jsx

@@ -6,17 +6,17 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { compose } from 'redux';
-
-// import unionClassNames from 'union-class-names';
+import { withRouter } from 'react-router';
 import cx from 'classnames';
+
 import {
   addAppURL,
   isInternalURL,
   flattenToAppURL,
   URLUtils,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Url/Url';
 
-import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
+import doesNodeContainClick from 'semantic-ui-react/dist/commonjs/lib/doesNodeContainClick';
 import { Input, Form, Button } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 
@@ -25,10 +25,8 @@ import navTreeSVG from '@plone/volto/icons/nav.svg';
 import aheadSVG from '@plone/volto/icons/ahead.svg';
 import linkSVG from '@plone/volto/icons/link.svg';
 
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
-import { withRouter } from 'react-router';
-
-import { Icon } from '@plone/volto/components';
 
 const messages = defineMessages({
   placeholder: {

package/src/components/manage/AnchorPlugin/useLinkEditor.jsx

@@ -13,7 +13,7 @@
  */
 
 import React from 'react';
-import { PositionedToolbar } from '@plone/volto-slate/editor/ui';
+import PositionedToolbar from '@plone/volto-slate/editor/ui/PositionedToolbar';
 import AddLinkForm from '@plone/volto/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm';
 
 function getPositionStyle(position) {

package/src/components/manage/BlockChooser/BlockChooser.jsx

@@ -1,10 +1,13 @@
 import React from 'react';
-import { useUser } from '@plone/volto/hooks';
+import useUser from '@plone/volto/hooks/user/useUser';
 import PropTypes from 'prop-types';
-import { filter, map, groupBy, isEmpty } from 'lodash';
+import filter from 'lodash/filter';
+import map from 'lodash/map';
+import groupBy from 'lodash/groupBy';
+import isEmpty from 'lodash/isEmpty';
 import { Accordion, Button } from 'semantic-ui-react';
 import { useIntl, defineMessages } from 'react-intl';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import AnimateHeight from 'react-animate-height';
 import config from '@plone/volto/registry';
 import upSVG from '@plone/volto/icons/up-key.svg';

package/src/components/manage/BlockChooser/BlockChooserButton.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
-import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
+import doesNodeContainClick from 'semantic-ui-react/dist/commonjs/lib/doesNodeContainClick';
 import addSVG from '@plone/volto/icons/circle-plus.svg';
-import { blockHasValue } from '@plone/volto/helpers';
-import { Icon, BlockChooser } from '@plone/volto/components';
+import { blockHasValue } from '@plone/volto/helpers/Blocks/Blocks';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import BlockChooser from '@plone/volto/components/manage/BlockChooser/BlockChooser';
 import config from '@plone/volto/registry';
 import { Button, Ref } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';

package/src/components/manage/BlockChooser/BlockChooserSearch.jsx

@@ -1,6 +1,6 @@
 import React, { useRef } from 'react';
 import { Button, Form, Input } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { defineMessages, useIntl } from 'react-intl';
 import clearSVG from '@plone/volto/icons/clear.svg';
 

package/src/components/manage/Blocks/Block/BlocksForm.jsx

@@ -1,16 +1,15 @@
 import React, { useEffect, useState } from 'react';
 import { useIntl } from 'react-intl';
-import { cloneDeep, map } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import map from 'lodash/map';
 import EditBlock from './Edit';
-import { DragDropList } from '@plone/volto/components';
+import DragDropList from '@plone/volto/components/manage/DragDropList/DragDropList';
 import {
   getBlocks,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   applyBlockDefaults,
   getBlocksHierarchy,
-} from '@plone/volto/helpers';
-import {
   addBlock,
   insertBlock,
   changeBlock,
@@ -20,11 +19,13 @@ import {
   mutateBlock,
   nextBlockId,
   previousBlockId,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import { useDetectClickOutside } from '@plone/volto/helpers/Utils/useDetectClickOutside';
+import { useEvent } from '@plone/volto/helpers/Utils/useEvent';
 import EditBlockWrapper from './EditBlockWrapper';
-import { setSidebarTab, setUIState } from '@plone/volto/actions';
+import { setSidebarTab } from '@plone/volto/actions/sidebar/sidebar';
+import { setUIState } from '@plone/volto/actions/form/form';
 import { useDispatch } from 'react-redux';
-import { useDetectClickOutside, useEvent } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
 import { createPortal } from 'react-dom';
 

package/src/components/manage/Blocks/Block/DefaultEdit.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import config from '@plone/volto/registry';
 import { useIntl } from 'react-intl';
-import { SidebarPortal } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { BlockDataForm } from '@plone/volto/components/manage/Form';
 import DefaultBlockView from './DefaultView';
 

package/src/components/manage/Blocks/Block/DefaultView.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Container, Segment, Grid, Label } from 'semantic-ui-react';
-import { ErrorBoundary } from '@plone/volto/components';
+import ErrorBoundary from '@plone/volto/components/theme/Error/ErrorBoundary';
 import { getWidget } from '@plone/volto/helpers/Widget/utils';
 import config from '@plone/volto/registry';
 

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

@@ -9,16 +9,15 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { defineMessages, injectIntl } from 'react-intl';
 import cx from 'classnames';
-import { setSidebarTab, setUIState } from '@plone/volto/actions';
+import { setSidebarTab } from '@plone/volto/actions/sidebar/sidebar';
+import { setUIState } from '@plone/volto/actions/form/form';
 import config from '@plone/volto/registry';
 import withObjectBrowser from '@plone/volto/components/manage/Sidebar/ObjectBrowser';
-import { ViewDefaultBlock, EditDefaultBlock } from '@plone/volto/components';
-
-import {
-  SidebarPortal,
-  BlockSettingsSidebar,
-  BlockSettingsSchema,
-} from '@plone/volto/components';
+import ViewDefaultBlock from '@plone/volto/components/manage/Blocks/Block/DefaultView';
+import EditDefaultBlock from '@plone/volto/components/manage/Blocks/Block/DefaultEdit';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import BlockSettingsSidebar from '@plone/volto/components/manage/Blocks/Block/Settings';
+import BlockSettingsSchema from '@plone/volto/components/manage/Blocks/Block/Schema';
 
 const messages = defineMessages({
   unknownBlock: {

package/src/components/manage/Blocks/Block/EditBlockWrapper.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import {
   applyBlockDefaults,
   applyBlockInitialValue,
@@ -8,7 +8,7 @@ import {
   buildStyleClassNamesFromData,
   buildStyleObjectFromData,
   buildStyleClassNamesExtenders,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 import dragSVG from '@plone/volto/icons/drag.svg';
 import { Button } from 'semantic-ui-react';
 import includes from 'lodash/includes';
@@ -16,7 +16,7 @@ import isBoolean from 'lodash/isBoolean';
 import { defineMessages, injectIntl } from 'react-intl';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
-import { BlockChooserButton } from '@plone/volto/components';
+import BlockChooserButton from '@plone/volto/components/manage/BlockChooser/BlockChooserButton';
 
 import trashSVG from '@plone/volto/icons/delete.svg';
 

package/src/components/manage/Blocks/Block/Order/Item.jsx

@@ -1,10 +1,10 @@
 import React, { forwardRef } from 'react';
 import classNames from 'classnames';
 import { useDispatch, useSelector } from 'react-redux';
-import { includes } from 'lodash';
+import includes from 'lodash/includes';
 import cx from 'classnames';
-import { Icon } from '@plone/volto/components';
-import { setUIState } from '@plone/volto/actions';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { setUIState } from '@plone/volto/actions/form/form';
 import config from '@plone/volto/registry';
 
 import deleteSVG from '@plone/volto/icons/delete.svg';

package/src/components/manage/Blocks/Block/Order/Order.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { find, min } from 'lodash';
+import find from 'lodash/find';
+import min from 'lodash/min';
 
 import { flattenTree, getProjection, removeChildrenOf } from './utilities';
 import SortableItem from './SortableItem';

package/src/components/manage/Blocks/Block/Order/utilities.js

@@ -1,6 +1,6 @@
-import { isArray } from 'lodash';
+import isArray from 'lodash/isArray';
 
-import { getBlocksLayoutFieldname } from '@plone/volto/helpers';
+import { getBlocksLayoutFieldname } from '@plone/volto/helpers/Blocks/Blocks';
 
 function getDragDepth(offset, indentationWidth) {
   return Math.round(offset / indentationWidth);

package/src/components/manage/Blocks/Block/StyleWrapper.jsx

@@ -4,7 +4,7 @@ import {
   buildStyleClassNamesFromData,
   buildStyleClassNamesExtenders,
   buildStyleObjectFromData,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
 
 const StyleWrapper = (props) => {
   let classNames,

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

@@ -1,14 +1,14 @@
 import { useState } from 'react';
 import { useIntl } from 'react-intl';
-import { pickBy } from 'lodash';
-import { SidebarPortal } from '@plone/volto/components';
+import pickBy from 'lodash/pickBy';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
 import { BlocksForm } from '@plone/volto/components/manage/Form';
 import PropTypes from 'prop-types';
 import ContainerData from './Data';
 import DefaultEditBlockWrapper from './EditBlockWrapper';
 import SimpleContainerToolbar from './SimpleContainerToolbar';
 import { v4 as uuid } from 'uuid';
-import { blocksFormGenerator } from '@plone/volto/helpers';
+import { blocksFormGenerator } from '@plone/volto/helpers/Blocks/Blocks';
 
 import DefaultTemplateChooser from '@plone/volto/components/manage/TemplateChooser/TemplateChooser';
 

package/src/components/manage/Blocks/Container/EditBlockWrapper.jsx

@@ -1,9 +1,9 @@
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { Button } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import NewBlockAddButton from './NewBlockAddButton';
 import cx from 'classnames';
-import { isInteractiveElement } from '@plone/volto/helpers';
+import { isInteractiveElement } from '@plone/volto/helpers/Utils/Utils';
 
 import clearSVG from '@plone/volto/icons/clear.svg';
 

package/src/components/manage/Blocks/Container/NewBlockAddButton.jsx

@@ -1,8 +1,9 @@
 import React from 'react';
 import { Button, Ref } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
-import { BlockChooser, Icon } from '@plone/volto/components';
-import { useDetectClickOutside } from '@plone/volto/helpers';
+import BlockChooser from '@plone/volto/components/manage/BlockChooser/BlockChooser';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { useDetectClickOutside } from '@plone/volto/helpers/Utils/useDetectClickOutside';
 import addSVG from '@plone/volto/icons/add.svg';
 import { usePopper } from 'react-popper';
 import { createPortal } from 'react-dom';

package/src/components/manage/Blocks/Container/SimpleContainerToolbar.jsx

@@ -1,6 +1,6 @@
 import { defineMessages, useIntl } from 'react-intl';
 import { Button } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import addSVG from '@plone/volto/icons/add.svg';
 import configSVG from '@plone/volto/icons/configuration.svg';

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

@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import cx from 'classnames';
 import ContainerEdit from '../Container/Edit';
 import { useDispatch, useSelector } from 'react-redux';
-import { setUIState } from '@plone/volto/actions';
+import { setUIState } from '@plone/volto/actions/form/form';
 
 const GridBlockEdit = (props) => {
   const { data } = props;

package/src/components/manage/Blocks/Grid/View.jsx

@@ -1,7 +1,7 @@
 import { Grid } from 'semantic-ui-react';
 import cx from 'classnames';
-import { RenderBlocks } from '@plone/volto/components';
-import { withBlockExtensions } from '@plone/volto/helpers';
+import RenderBlocks from '@plone/volto/components/theme/View/RenderBlocks';
+import { withBlockExtensions } from '@plone/volto/helpers/Extensions';
 import config from '@plone/volto/registry';
 
 const GridBlockView = (props) => {

package/src/components/manage/Blocks/Grid/templates.js

@@ -1,5 +1,5 @@
 import { defineMessages } from 'react-intl';
-import { blocksFormGenerator } from '@plone/volto/helpers';
+import { blocksFormGenerator } from '@plone/volto/helpers/Blocks/Blocks';
 
 import gridTemplate1 from './grid-1.svg';
 import gridTemplate2 from './grid-2.svg';

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

@@ -9,9 +9,9 @@ import PropTypes from 'prop-types';
 import { Button, Popup } from 'semantic-ui-react';
 import { defineMessages, injectIntl } from 'react-intl';
 import loadable from '@loadable/component';
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable/Loadable';
 import showSVG from '@plone/volto/icons/show.svg';
 import clearSVG from '@plone/volto/icons/clear.svg';