Removed all imports from barrel files for components, actions, helper…

…s, hooks and lodash
plone · Dec 2, 2024 · 300a9c4 · 300a9c4
1 parent 596ae97
commit 300a9c4
Show file tree

Hide file tree

Showing 288 changed files with 1,195 additions and 938 deletions.
diff --git a/packages/volto/.eslintignore b/packages/volto/.eslintignore
@@ -1 +1 @@
-types/
+/types/
diff --git a/packages/volto/.eslintrc b/packages/volto/.eslintrc
@@ -1,20 +1,21 @@
 {
   "extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
   "plugins": ["prettier", "react-hooks", "jsx-a11y"],
+  "root": true,
   "env": {
     "es6": true,
     "browser": true,
     "node": true,
     "mocha": true,
-    "jasmine": true,
+    "jasmine": true
   },
   "parser": "@babel/eslint-parser",
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module",
     "ecmaFeatures": {
-      "legacyDecorators": true,
-    },
+      "legacyDecorators": true
+    }
   },
   "rules": {
     "import/no-unresolved": 1,
@@ -24,33 +25,50 @@
     "no-debugger": 1,
     "prettier/prettier": [
       "error",
-      { "trailingComma": "all", "singleQuote": true },
+      { "trailingComma": "all", "singleQuote": true }
     ],
     "react-hooks/rules-of-hooks": "error",
     "react-hooks/exhaustive-deps": "warn",
     "react/react-in-jsx-scope": "off",
-    "jsx-a11y/label-has-associated-control": "off",
+    "jsx-a11y/label-has-associated-control": "off"
   },
   "settings": {
+    "import/named": "error",
+    "react/jsx-filename-extension": [1, { "extensions": [".tsx", ".jsx"] }],
+    "no-restricted-imports": [
+      "error",
+      {
+        "name": "@plone/volto/components",
+        "message": "Importing from barrel files is not allowed. Please use direct imports of the modules instead."
+      },
+      {
+        "name": "@plone/volto/helpers",
+        "message": "Importing from barrel files is not allowed. Please use direct imports of the modules instead."
+      },
+      {
+        "name": "@plone/volto/actions",
+        "message": "Importing from barrel files is not allowed. Please use direct imports of the modules instead."
+      }
+    ],
     "import/resolver": {
       "alias": {
         "map": [
           ["@plone/volto", "./src"],
           ["@plone/volto-slate", "../volto-slate/src"],
           ["@plone/types", "../types"],
           ["@package", "./src"],
-          ["@root", "./src"],
+          ["@root", "./src"]
         ],
-        "extensions": [".js", ".jsx", ".ts", ".tsx", ".json"],
+        "extensions": [".js", ".jsx", ".ts", ".tsx", ".json"]
       },
       "babel-plugin-root-import": {
-        "rootPathSuffix": "src",
-      },
+        "rootPathSuffix": "src"
+      }
     },
     "import/core-modules": ["load-volto-addons"],
     "react": {
-      "version": "detect",
-    },
+      "version": "detect"
+    }
   },
   "overrides": [
     {
@@ -60,14 +78,14 @@
       // Re-add it if at some point, we stop relying on it
       "extends": ["react-app", "prettier", "plugin:jsx-a11y/recommended"],
       "plugins": ["prettier", "react-hooks", "jsx-a11y"],
-      "parser": "@typescript-eslint/parser",
+      "parser": "@typescript-eslint/parser"
     },
     {
       "files": ["**/*.stories.js", "**/*.stories.jsx"],
       "rules": {
-        "import/no-anonymous-default-export": "off",
-      },
-    },
+        "import/no-anonymous-default-export": "off"
+      }
+    }
   ],
   "globals": {
     "root": true,
@@ -83,6 +101,6 @@
     "Cypress": true,
     "jest": true,
     "socket": true,
-    "webpackIsomorphicTools": true,
-  },
+    "webpackIsomorphicTools": true
+  }
 }
diff --git a/packages/volto/src/actions/content/content.js b/packages/volto/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';
 
 /**

diff --git a/packages/volto/src/actions/language/language.js b/packages/volto/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) {

diff --git a/packages/volto/src/actions/search/search.js b/packages/volto/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,

diff --git a/packages/volto/src/actions/workflow/workflow.js b/packages/volto/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.

diff --git a/packages/volto/src/components/manage/Actions/Actions.jsx b/packages/volto/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({

diff --git a/packages/volto/src/components/manage/Add/Add.jsx b/packages/volto/src/components/manage/Add/Add.jsx
@@ -5,50 +5,50 @@
 
 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';
 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';
 

diff --git a/packages/volto/src/components/manage/Aliases/Aliases.jsx b/packages/volto/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: {

diff --git a/packages/volto/src/components/manage/AnchorPlugin/components/LinkButton/AddLinkForm.jsx b/packages/volto/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: {

diff --git a/packages/volto/src/components/manage/BlockChooser/BlockChooser.jsx b/packages/volto/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';

diff --git a/packages/volto/src/components/manage/BlockChooser/BlockChooserButton.jsx b/packages/volto/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';

diff --git a/packages/volto/src/components/manage/BlockChooser/BlockChooserSearch.jsx b/packages/volto/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';
 

diff --git a/packages/volto/src/components/manage/Blocks/Block/BlocksForm.jsx b/packages/volto/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';