@eeacms/volto-marine-policy 2.0.41 → 3.0.0

package/.eslintrc.js

@@ -16,16 +16,16 @@ if (configFile) {
     voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
 }
 
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(projectRootPath);
+const { AddonRegistry } = require('@plone/registry/addon-registry');
+const { registry } = AddonRegistry.init(projectRootPath);
 
 // Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map((o) => [
+const addonAliases = Object.keys(registry.packages).map((o) => [
   o,
-  reg.packages[o].modulePath,
+  registry.packages[o].modulePath,
 ]);
 
-const addonExtenders = reg.getEslintExtenders().map((m) => require(m));
+const addonExtenders = registry.getEslintExtenders().map((m) => require(m));
 
 const defaultConfig = {
   extends: `${voltoPath}/.eslintrc`,
@@ -34,7 +34,7 @@ const defaultConfig = {
       alias: {
         map: [
           ['@plone/volto', '@plone/volto/src'],
-          ['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
+          ['@plone/volto-slate', '@plone/volto-slate/src'],
           ...addonAliases,
           ['@package', `${__dirname}/src`],
           ['@root', `${__dirname}/src`],

package/CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [3.0.0](https://github.com/eea/volto-marine-policy/compare/2.0.41...3.0.0) - 24 April 2026
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-openlayers-map@2.0.0 [EEA Jenkins - [`f5bbf26`](https://github.com/eea/volto-marine-policy/commit/f5bbf26ebc1ee51ac465cd618fee96c443fbd71a)]
+
+#### :bug: Bug Fixes
+
+- fix: eslint for 18 [nileshgulia1 - [`b9e66fb`](https://github.com/eea/volto-marine-policy/commit/b9e66fbc055ded48a406cab4077a62b9ca146e5e)]
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`3d454c5`](https://github.com/eea/volto-marine-policy/commit/3d454c59fa5d11c496dbc90eac7c64bbce6eb077)]
+
+#### :hammer_and_wrench: Others
+
+- bump v3.0 [nileshgulia1 - [`6fa81ec`](https://github.com/eea/volto-marine-policy/commit/6fa81ecce7f551d9b337df238d14bb4c2e2d429e)]
+- fix sonarqube [nileshgulia1 - [`7a52d10`](https://github.com/eea/volto-marine-policy/commit/7a52d10765e2f3344417f509787eaae0ed225280)]
+- fix imports [nileshgulia1 - [`214d4fb`](https://github.com/eea/volto-marine-policy/commit/214d4fb3a58d2c10a368ab6b93cfe37f1be29570)]
 ### [2.0.41](https://github.com/eea/volto-marine-policy/compare/2.0.40...2.0.41) - 2 April 2026
 
 #### :rocket: Dependency updates

package/docker-compose.yml

@@ -1,32 +1,32 @@
-version: "3"
+version: '3'
 services:
   backend:
     image: eeacms/plone-backend
     ports:
-      - "8080:8080"
+      - '8080:8080'
     environment:
-      SITE: "Plone"
-      PROFILES: "eea.kitkat:testing"
+      SITE: 'Plone'
+      PROFILES: 'eea.kitkat:testing'
 
-  frontend: 
+  frontend:
     build:
       context: ./
       dockerfile: ./Dockerfile
       args:
-        ADDON_NAME: "${ADDON_NAME}"
-        ADDON_PATH: "${ADDON_PATH}"
-        VOLTO_VERSION: ${VOLTO_VERSION:-16}
+        ADDON_NAME: '${ADDON_NAME}'
+        ADDON_PATH: '${ADDON_PATH}'
+        VOLTO_VERSION: ${VOLTO_VERSION:-18-yarn}
     ports:
-    - "3000:3000"
-    - "3001:3001"
+      - '3000:3000'
+      - '3001:3001'
     depends_on:
       - backend
     volumes:
       - ./:/app/src/addons/${ADDON_PATH}
     environment:
-      CI: "true"
-      NODE_ENV: "development"
-      RAZZLE_JEST_CONFIG: "src/addons/${ADDON_PATH}/jest-addon.config.js"
-      RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
-      RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
-      HOST: "0.0.0.0"
+      CI: 'true'
+      NODE_ENV: 'development'
+      RAZZLE_JEST_CONFIG: 'src/addons/${ADDON_PATH}/jest-addon.config.js'
+      RAZZLE_INTERNAL_API_PATH: 'http://backend:8080/Plone'
+      RAZZLE_DEV_PROXY_API_PATH: 'http://backend:8080/Plone'
+      HOST: '0.0.0.0'

package/jest-addon.config.js

@@ -1,5 +1,24 @@
 require('dotenv').config({ path: __dirname + '/.env' });
 
+const fs = require('fs');
+const path = require('path');
+
+// Volto 18 exposes @plone/volto-slate as a top-level package.
+const voltoSlatePath = fs.existsSync(
+  path.join(
+    __dirname,
+    '..',
+    '..',
+    '..',
+    'node_modules',
+    '@plone',
+    'volto-slate',
+    'src',
+  ),
+)
+  ? '<rootDir>/node_modules/@plone/volto-slate/src'
+  : '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src';
+
 module.exports = {
   testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
   collectCoverageFrom: [
@@ -21,10 +40,8 @@ module.exports = {
     '@eeacms/search':
       '<rootDir>/node_modules/@eeacms/volto-searchlib/searchlib',
     '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
-    '@plone/volto-slate$':
-      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
-    '@plone/volto-slate/(.*)$':
-      '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src/$1',
+    '@plone/volto-slate$': voltoSlatePath,
+    '@plone/volto-slate/(.*)$': `${voltoSlatePath}/$1`,
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-marine-policy",
-  "version": "2.0.41",
+  "version": "3.0.0",
   "description": "@eeacms/volto-marine-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -40,9 +40,9 @@
     "@eeacms/volto-eea-website-theme": "*",
     "@eeacms/volto-embed": "*",
     "@eeacms/volto-globalsearch": "^2.0.0",
-    "@eeacms/volto-metadata-block": "*",
     "@eeacms/volto-group-block": "^9.0.0",
-    "@eeacms/volto-openlayers-map": "1.0.1",
+    "@eeacms/volto-metadata-block": "*",
+    "@eeacms/volto-openlayers-map": "2.0.0",
     "@eeacms/volto-searchlib": "^2.0.2",
     "@eeacms/volto-tabs-block": "*",
     "@eeacms/volto-workflow-progress": "*",
@@ -57,8 +57,7 @@
     "slick-carousel": "^1.8.1"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@cypress/code-coverage": "^3.9.5",
+    "@cypress/code-coverage": "^3.10.0",
     "@plone/scripts": "2.1.1",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "cypress": "13.1.0",

package/src/components/Blocks/DemoSitesExplorer/{DemoSitesExplorerEdit.js → DemoSitesExplorerEdit.jsx}

@@ -1,5 +1,6 @@
 import DemoSitesExplorerView from './DemoSitesExplorerView';
-import { SidebarPortal, BlockDataForm } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import schema from './schema';
 
 export default function DemoSitesExplorerEdit(props) {

package/src/components/Blocks/DemoSitesExplorer/{DemoSitesExplorerView.js → DemoSitesExplorerView.jsx}

@@ -1,8 +1,9 @@
 import React from 'react';
 import { Grid } from 'semantic-ui-react'; // Dropdown,
-import { addAppURL } from '@plone/volto/helpers';
+import { addAppURL } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 import { VisibilitySensor } from '@eeacms/volto-datablocks/components';
+import Image from '@plone/volto/components/theme/Image/Image';
 
 import DemoSitesMap from './DemoSitesMap';
 import { ActiveFilters, DemoSitesFilters } from './DemoSitesFilters';
@@ -146,7 +147,7 @@ export default function DemoSitesExplorerView(props) {
                     <div className="legend-row">
                       <div className="circle">
                         {/* <div className="dot-demosite"></div> */}
-                        <img
+                        <Image
                           src="/marine/europe-seas/eu-mission-restore-our-oceans-and-water/icon-point-light.png/@@images/image/small"
                           alt=""
                         />
@@ -156,7 +157,7 @@ export default function DemoSitesExplorerView(props) {
                     <div className="legend-row">
                       <div className="circle">
                         {/* <div className="dot-region"></div> */}
-                        <img
+                        <Image
                           src="/marine/europe-seas/eu-mission-restore-our-oceans-and-water/icon-region-light.png/@@images/image/small"
                           alt=""
                         />

package/src/components/Blocks/DemoSitesExplorer/DemoSitesMap.jsx

@@ -172,13 +172,8 @@ function DemoSitesMap(props) {
               onSelectedCase(null);
               clearFilters(setActiveFilters);
               setHighlightedIndex(5);
-              if (hideFilters) {
-                // zoomMapToFeatures(map, getFeatures(activeItems));
-                centerAndResetMapZoom({ map, ol });
-              } else {
-                centerAndResetMapZoom({ map, ol });
-                // zoomMapToFeatures(map, getFeatures(activeItems));
-              }
+              // zoomMapToFeatures(map, getFeatures(activeItems));
+              centerAndResetMapZoom({ map, ol });
               map.getInteractions().array_[9].getFeatures().clear();
             }}
           >

package/src/components/Blocks/MsfdDataExplorerBlock/Edit.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import { SidebarPortal, BlockDataForm } from '@plone/volto/components';
+import SidebarPortal from '@plone/volto/components/manage/Sidebar/SidebarPortal';
+import BlockDataForm from '@plone/volto/components/manage/Form/BlockDataForm';
 import MsfdDataExplorerBlockView from './View';
 import schema from './schema';
 

package/src/components/Blocks/MsfdDataExplorerBlock/View.test.jsx

@@ -1,6 +1,6 @@
 import { render, waitFor, screen } from '@testing-library/react';
 import axios from 'axios';
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom';
 
 import MsfdDataExplorerBlockView from './View';
 

package/src/components/Widgets/MeasureViewWidget.jsx

@@ -3,8 +3,8 @@ import { Portal } from 'react-portal';
 import { fields } from '@eeacms/volto-marine-policy/constants/measureFields';
 import String from './String';
 import { Accordion } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
-import { BodyClass } from '@plone/volto/helpers';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import './measure.css';

package/src/components/Widgets/String.jsx

@@ -4,12 +4,12 @@ const StringWidget = ({ val }) => {
   return typeof val === 'string'
     ? val
     : Array.isArray(val)
-    ? val.map((item, i) => (
-        <span key={i} className="array-string-item">
-          <StringWidget val={item} key={i} />
-        </span>
-      ))
-    : `${val}`;
+      ? val.map((item, i) => (
+          <span key={i} className="array-string-item">
+            <StringWidget val={item} key={i} />
+          </span>
+        ))
+      : `${val}`;
 };
 
 export default StringWidget;

package/src/components/Widgets/TextAlign.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Button } from 'semantic-ui-react';
-import { FormFieldWrapper, Icon } from '@plone/volto/components';
+import FormFieldWrapper from '@plone/volto/components/manage/Widgets/FormFieldWrapper';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 
 import alignLeftSVG from '@plone/volto/icons/align-left.svg';
 import alignRightSVG from '@plone/volto/icons/align-right.svg';

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

@@ -4,8 +4,9 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { defineMessages, useIntl } from 'react-intl';
 import { Button } from 'semantic-ui-react';
-import { BodyClass, isCmsUi } from '@plone/volto/helpers';
-import { Icon } from '@plone/volto/components';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { isCmsUi } from '@plone/volto/helpers/Url/Url';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import printerSVG from '@plone/volto/icons/printer.svg';
 
 import './css/printpage.less';

package/src/components/theme/DatabaseItemView/DatabaseItemView.jsx

@@ -1,4 +1,4 @@
-import { BodyClass } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import {
   ItemMetadataSnippet,
   ItemMetadata,

package/src/components/theme/ItemMetadata/ItemMetadata.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 { Table, Button } from 'semantic-ui-react';
 import { MapPreview } from '@eeacms/volto-marine-policy/components';
 import { getPath } from '@eeacms/volto-marine-policy/utils';

package/src/components/theme/MetadataListingView/MapPreview.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Modal, Button } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import config from '@plone/volto/registry';
 import fullscreenSVG from '@plone/volto/icons/slider.svg';
 import { useHistory, useLocation } from 'react-router-dom';

package/src/components/theme/ProgressWorkflow/ProgressWorkflow.jsx

@@ -1,5 +1,5 @@
 import config from '@plone/volto/registry';
-import { getBaseUrl, flattenToAppURL } from '@plone/volto/helpers';
+import { getBaseUrl, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 import PropTypes from 'prop-types';
 import { useEffect, useRef, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
@@ -110,8 +110,8 @@ const customSelectStyles = {
     color: state.isSelected
       ? '#007bc1'
       : state.isFocused
-      ? '#4a4a4a'
-      : 'inherit',
+        ? '#4a4a4a'
+        : 'inherit',
     ':active': {
       backgroundColor: null,
     },
@@ -155,8 +155,8 @@ const itemTracker = (tracker, currentStateKey, currentState) => {
         is_active
           ? 'progress__item--active'
           : tracker[1] < currentState.done
-          ? 'progress__item--completed'
-          : 'progress__item--next'
+            ? 'progress__item--completed'
+            : 'progress__item--next'
       }`}
     >
       {tracker[2].map((title, index) => (
@@ -382,8 +382,8 @@ const ProgressWorkflow = (props) => {
               currentStateClass[currentStateKey]
                 ? `review-state-${currentStateKey}`
                 : currentState.done === 100
-                ? 'review-state-published'
-                : ''
+                  ? 'review-state-published'
+                  : ''
             }`}
             id="toolbar-cut-blocks"
             onClick={toggleVisibleSide}
@@ -435,8 +435,8 @@ const ProgressWorkflow = (props) => {
             currentStateClass[currentStateKey]
               ? `review-state-${currentStateKey}`
               : currentState.done === 100
-              ? 'review-state-published'
-              : ''
+                ? 'review-state-published'
+                : ''
           }`}
           id="toolbar-cut-blocks"
           onClick={toggleVisibleSide}

package/src/components/theme/Tableau/TableauDownload.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Popup, Button, Modal } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import downloadSVG from '@plone/volto/icons/download.svg';
 
 const TableauDownload = (props) => {

package/src/components/theme/Tableau/TableauFullscreen.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Modal, Button } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { useHistory, useLocation } from 'react-router-dom';
 import fullscreenSVG from '@plone/volto/icons/fullscreen.svg';
 

package/src/components/theme/Tableau/TableauShare.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Popup, Tab, Button, Menu, Input } from 'semantic-ui-react';
-import { Icon } from '@plone/volto/components';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
 import { useCopyToClipboard } from '@eeacms/volto-marine-policy/helpers';
 
 import shareSVG from '@plone/volto/icons/share.svg';

package/src/components/theme/View/FullwidthView.jsx

@@ -7,14 +7,14 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Container } from 'semantic-ui-react';
-import { map } from 'lodash';
+import map from 'lodash/map';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 import {
-  BodyClass,
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   hasBlocksData,
-  getBaseUrl,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 const messages = defineMessages({

package/src/components/theme/View/HeroSectionView.jsx

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import { defineMessages, injectIntl } from 'react-intl';
 
 import { Container } from 'semantic-ui-react';
-import { map } from 'lodash';
+import map from 'lodash/map';
 
 import config from '@plone/volto/registry';
 
@@ -16,8 +16,8 @@ import {
   getBlocksFieldname,
   getBlocksLayoutFieldname,
   hasBlocksData,
-  getBaseUrl,
-} from '@plone/volto/helpers';
+} from '@plone/volto/helpers/Blocks/Blocks';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
 
 const messages = defineMessages({
   unknownBlock: {

package/src/customizations/@eeacms/volto-block-toc/Block/variations/DefaultTocRenderer.jsx

@@ -5,7 +5,7 @@
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import { map } from 'lodash';
+import map from 'lodash/map';
 import { List } from 'semantic-ui-react';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import AnchorLink from 'react-anchor-link-smooth-scroll';

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/Header.jsx

@@ -17,7 +17,7 @@ import HeaderSearchPopUp from '@eeacms/volto-marine-policy/customizations/@eeacm
 import HeaderMenuPopUp from '@eeacms/volto-marine-policy/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderMenuPopUp';
 import PropTypes from 'prop-types';
 
-import { isInternalURL } from '@plone/volto/helpers';
+import { isInternalURL } from '@plone/volto/helpers/Url/Url';
 import config from '@plone/volto/registry';
 
 Header.propTypes = {

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderMenuPopUp.js

@@ -1,3 +1,5 @@
+/* eslint-disable react/jsx-filename-extension */
+
 import React, { useEffect, useState } from 'react';
 import {
   Accordion,
@@ -8,7 +10,7 @@ import {
   Transition,
 } from 'semantic-ui-react';
 
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 
 import { useClickOutside } from '@eeacms/volto-eea-design-system/helpers';
 

package/src/customizations/@eeacms/volto-eea-design-system/ui/Header/HeaderSearchPopUp.js

@@ -1,3 +1,5 @@
+/* eslint-disable react/jsx-filename-extension */
+
 import React, { useEffect } from 'react';
 import { Container, Input, List } from 'semantic-ui-react';
 import { withRouter, Link } from 'react-router-dom';

package/src/customizations/volto/components/manage/Contents/ContentsBreadcrumbs.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Breadcrumb } from 'semantic-ui-react';
 import { Link, useLocation } from 'react-router-dom';
 import { defineMessages, useIntl } from 'react-intl';
-import { langmap } from '@plone/volto/helpers';
+import langmap from '@plone/volto/helpers/LanguageMap/LanguageMap';
 import ContentsBreadcrumbsRootItem from '@plone/volto/components/manage/Contents/ContentsBreadcrumbsRootItem';
 import ContentsBreadcrumbsHomeItem from '@plone/volto/components/manage/Contents/ContentsBreadcrumbsHomeItem';
 

package/src/customizations/volto/components/manage/Toolbar/PersonalTools.jsx

@@ -8,14 +8,13 @@ import { connect } from 'react-redux';
 import jwtDecode from 'jwt-decode';
 import cx from 'classnames';
 import { FormattedMessage, injectIntl, defineMessages } from 'react-intl';
-import { Icon, UniversalLink } from '@plone/volto/components';
-import { getUser } from '@plone/volto/actions';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { getUser } from '@plone/volto/actions/users/users';
 import { Pluggable } from '@plone/volto/components/manage/Pluggable';
-import {
-  flattenToAppURL,
-  getBaseUrl,
-  userHasRoles,
-} from '@plone/volto/helpers';
+import { flattenToAppURL, getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { userHasRoles } from '@plone/volto/helpers/User/User';
+import Image from '@plone/volto/components/theme/Image/Image';
 import { withRouter } from 'react-router-dom';
 import { compose } from 'redux';
 
@@ -133,7 +132,7 @@ class PersonalTools extends Component {
         </header>
         <div className={cx('avatar', { default: !this.props.user.portrait })}>
           {this.props.user.portrait ? (
-            <img
+            <Image
               src={flattenToAppURL(this.props.user.portrait)}
               alt={this.props.intl.formatMessage(messages.userAvatar)}
             />

package/src/customizations/volto/components/manage/Toolbar/Toolbar.jsx

@@ -11,7 +11,8 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { doesNodeContainClick } from 'semantic-ui-react/dist/commonjs/lib';
 import { withCookies } from 'react-cookie';
-import { filter, find } from 'lodash';
+import find from 'lodash/find';
+import filter from 'lodash/filter';
 import cx from 'classnames';
 import config from '@plone/volto/registry';
 
@@ -21,19 +22,16 @@ import Types from '@plone/volto/components/manage/Toolbar/Types';
 import PersonalInformation from '@plone/volto/components/manage/Preferences/PersonalInformation';
 import PersonalPreferences from '@plone/volto/components/manage/Preferences/PersonalPreferences';
 import StandardWrapper from '@plone/volto/components/manage/Toolbar/StandardWrapper';
-import {
-  getTypes,
-  listActions,
-  setExpandedToolbar,
-  unlockContent,
-} from '@plone/volto/actions';
-import { Icon, UniversalLink } from '@plone/volto/components';
-import {
-  BodyClass,
-  getBaseUrl,
-  getCookieOptions,
-  hasApiExpander,
-} from '@plone/volto/helpers';
+import { getTypes } from '@plone/volto/actions/types/types';
+import { listActions } from '@plone/volto/actions/actions/actions';
+import { setExpandedToolbar } from '@plone/volto/actions/toolbar/toolbar';
+import { unlockContent } from '@plone/volto/actions/content/content';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getCookieOptions } from '@plone/volto/helpers/Cookies/cookies';
 import { Pluggable } from '@plone/volto/components/manage/Pluggable';
 
 import penSVG from '@plone/volto/icons/pen.svg';

package/src/customizations/volto/components/theme/Breadcrumbs/Breadcrumbs.jsx

@@ -7,8 +7,9 @@ import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { useLocation } from 'react-router';
-import { getBaseUrl, hasApiExpander } from '@plone/volto/helpers';
-import { getBreadcrumbs } from '@plone/volto/actions';
+import { getBaseUrl } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getBreadcrumbs } from '@plone/volto/actions/breadcrumbs/breadcrumbs';
 
 import EEABreadcrumbs from '@eeacms/volto-eea-design-system/ui/Breadcrumbs/Breadcrumbs';
 

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -8,22 +8,19 @@ import { Dropdown, Image } from 'semantic-ui-react';
 import { connect, useDispatch, useSelector } from 'react-redux';
 
 import { withRouter } from 'react-router-dom';
-import { UniversalLink } from '@plone/volto/components';
-import {
-  getBaseUrl,
-  hasApiExpander,
-  flattenToAppURL,
-} from '@plone/volto/helpers';
-import { getNavigation } from '@plone/volto/actions';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
+import { getBaseUrl, flattenToAppURL } from '@plone/volto/helpers/Url/Url';
+import { hasApiExpander } from '@plone/volto/helpers/Utils/Utils';
+import { getNavigation } from '@plone/volto/actions/navigation/navigation';
 import { Header, Logo } from '@eeacms/volto-eea-design-system/ui';
 import { usePrevious } from '@eeacms/volto-eea-design-system/helpers';
-import { find } from 'lodash';
+import find from 'lodash/find';
 import globeIcon from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/global-line.svg';
 import eeaFlag from '@eeacms/volto-eea-design-system/../theme/themes/eea/assets/images/Header/eea.png';
 
 import config from '@plone/volto/registry';
 import { compose } from 'recompose';
-import { BodyClass } from '@plone/volto/helpers';
+import BodyClass from '@plone/volto/helpers/BodyClass/BodyClass';
 
 import cx from 'classnames';
 

package/src/express-middleware.js

@@ -1,5 +1,5 @@
 import express from 'express';
-import { getAPIResourceWithAuth } from '@plone/volto/helpers';
+import { getAPIResourceWithAuth } from '@plone/volto/helpers/Api/APIResourceWithAuth';
 
 const HEADERS = [
   'Accept-Ranges',

package/src/index.js

@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-filename-extension */
 import {
   // HeroSectionView,
   // FullwidthView,
@@ -28,7 +29,7 @@ import { LinkElement } from '@plone/volto-slate/editor/plugins/AdvancedLink/rend
 import { withLink } from '@plone/volto-slate/editor/plugins/AdvancedLink/extensions';
 import { linkDeserializer } from '@plone/volto-slate/editor/plugins/AdvancedLink/deserialize';
 import LinkEditSchema from '@plone/volto-slate/editor/plugins/AdvancedLink/schema';
-import { getBlocks } from '@plone/volto/helpers';
+import { getBlocks } from '@plone/volto/helpers/Blocks/Blocks';
 import { defineMessages } from 'react-intl'; // , defineMessages
 import installDemoSitesExplorer from './components/Blocks/DemoSitesExplorer';
 import marineLogo from '@eeacms/volto-marine-policy/../theme/assets/images/Header/wise-marine-logo.svg';

package/src/reducers/breadcrumb/breadcrumb.js

@@ -3,8 +3,8 @@
  * @module reducers/breadcrumbs/breadcrumbs
  */
 
-import { map } from 'lodash';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 import { GET_BREADCRUMBS } from '@plone/volto/constants/ActionTypes';
 

package/src/reducers/localnavigation/localnavigation.js

@@ -3,8 +3,8 @@
  * @module reducers/navigation/navigation
  */
 
-import { map } from 'lodash';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import map from 'lodash/map';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 import { GET_NAVIGATION } from '@plone/volto/constants/ActionTypes';
 

package/src/utils.js

@@ -1,5 +1,5 @@
 import config from '@plone/volto/registry';
-import { flattenToAppURL } from '@plone/volto/helpers';
+import { flattenToAppURL } from '@plone/volto/helpers/Url/Url';
 
 export const getPath = (url) =>
   url.startsWith('http') ? new URL(url).pathname : url;