lint:fix & prettier:fix

.eslintrc.js

@@ -1,24 +1,16 @@
-const jsConfig = require('./jsconfig').compilerOptions;
 const path = require('path');
 const projectRootPath = __dirname;
 const packageJson = require(path.join(projectRootPath, 'package.json'));
 
-const pathsConfig = jsConfig.paths;
-let voltoPath = './node_modules/@plone/volto';
-Object.keys(pathsConfig).forEach((pkg) => {
-  if (pkg === '@plone/volto') {
-    voltoPath = `./${jsConfig.baseUrl}/${pathsConfig[pkg][0]}`;
-  }
-});
-
-const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
-const reg = new AddonConfigurationRegistry(__dirname);
-
 // Extends ESlint configuration for adding the aliases to `src` directories in Volto addons
-const addonAliases = Object.keys(reg.packages).map((o) => [
-  o,
-  reg.packages[o].modulePath,
-]);
+const addonsAliases = [];
+if (packageJson.addons) {
+  const addons = packageJson.addons;
+  addons.forEach(addon => {
+    const addonPath = `${addon}/src`;
+    addonsAliases.push([addon, addonPath]);
+  });
+}
 
 module.exports = {
   extends: `${projectRootPath}/node_modules/@plone/volto/.eslintrc`,
@@ -27,7 +19,7 @@ module.exports = {
       alias: {
         map: [
           ['@plone/volto', '@plone/volto/src'],
-          ...addonAliases,
+          ...addonsAliases,
           ['@package', `${__dirname}/src`],
           ['~', `${__dirname}/src`],
         ],
@@ -38,4 +30,4 @@ module.exports = {
       },
     },
   },
-};
+};

jsconfig.json

@@ -7,13 +7,13 @@
             "@eeacms/volto-grid-block": [
                 "develop/volto-grid-block/src"
             ],
-            "volto-datablocks": [
+            "@eeacms/volto-datablocks": [
                 "develop/volto-datablocks/src"
             ],
             "volto-addons": [
                 "develop/volto-addons/src"
             ],
-            "volto-embed": [
+            "@eeacms/volto-embed": [
                 "develop/volto-embed/src"
             ],
             "volto-matomo": [

mrs.developer.json

@@ -13,7 +13,8 @@
   "volto-datablocks": {
     "url": "https://github.com/eea/volto-datablocks.git",
     "branch": "master",
-    "path": "src"
+    "path": "src",
+    "package": "@eeacms/volto-datablocks"
   },
   "volto-addons": {
     "url": "https://github.com/eea/volto-addons.git",
@@ -22,8 +23,9 @@
   },
   "volto-embed": {
     "url": "https://github.com/eea/volto-embed.git",
-    "branch": "generic_protection_wrapper",
-    "path": "src"
+    "branch": "master",
+    "path": "src",
+    "package": "@eeacms/volto-embed"
   },
   "volto-matomo": {
     "url": "https://github.com/eea/volto-matomo.git",

package.json

@@ -34,9 +34,9 @@
     "@eeacms/volto-grid-block",
     "@eeacms/volto-matomo",
     "@eeacms/volto-sentry-rancher-config",
-    "volto-addons",
-    "volto-datablocks",
-    "volto-embed"
+    "@eeacms/volto-datablocks",
+    "@eeacms/volto-embed",
+    "volto-addons"
   ],
   "scripts": {
     "start": "razzle start",
@@ -47,18 +47,7 @@
     "start:prod": "NODE_ENV=production node build/server.js",
     "i18n": "NODE_ENV=production node node_modules/@plone/volto/src/i18n.js",
     "develop:npx": "npx -p mrs-developer missdev --config=jsconfig.json --output=develop",
-    "develop": "missdev --config=jsconfig.json --output=develop",
-    "release": "release-it",
-    "bootstrap": "node bootstrap",
-    "stylelint": "./node_modules/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}'",
-    "stylelint:overrides": "./node_modules/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'",
-    "stylelint:fix": "yarn stylelint --fix && yarn stylelint:overrides --fix",
-    "prettier": "./node_modules/.bin/prettier --single-quote --check 'src/**/*.{js,jsx,json,css,less,md}'",
-    "prettier:fix": "./node_modules/.bin/prettier --single-quote --write 'src/**/*.{js,jsx,json,css,less,md}'",
-    "lint": "./node_modules/eslint/bin/eslint.js --max-warnings=0 'src/**/*.{js,jsx}'",
-    "lint:fix": "./node_modules/eslint/bin/eslint.js --fix 'src/**/*.{js,jsx}'",
-    "cypress:run": "./node_modules/cypress/bin/cypress run",
-    "cypress:open": "./node_modules/cypress/bin/cypress open"
+    "develop": "missdev --config=jsconfig.json --output=develop"
   },
   "jest": {
     "modulePathIgnorePatterns": [

src/components/manage/Blocks/DetailedLink/View.jsx

@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { settings } from '~/config';
 import cx from 'classnames';
 import './style.css';
-import { deleteQueryParam } from 'volto-datablocks/actions';
+import { deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 
 const getPath = (url) => {
   if (!url) return '';

src/components/manage/Blocks/DiscodataComponents/Custom/View.jsx

@@ -4,8 +4,8 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray, isDate } from 'lodash';
 import { Dropdown, Header } from 'semantic-ui-react';
-import { setQueryParam } from 'volto-datablocks/actions';
-import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
+import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
 import ReactTooltip from 'react-tooltip';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';

src/components/manage/Blocks/DiscodataComponents/List/View.jsx

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray, isDate } from 'lodash';
 import { Link } from 'react-router-dom';
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import moment from 'moment';
 import cx from 'classnames';

src/components/manage/Blocks/DiscodataComponents/Select/View.jsx

@@ -4,7 +4,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { isArray } from 'lodash';
 import { Dropdown } from 'semantic-ui-react';
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 
 import cx from 'classnames';
 

src/components/manage/Blocks/DiscodataComponentsBlock/Edit.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import qs from 'query-string';
 import View from './View';
-import DiscodataSqlBuilderEdit from 'volto-datablocks/DiscodataSqlBuilder/Edit';
+import DiscodataSqlBuilderEdit from '@eeacms/volto-datablocks/DiscodataSqlBuilder/Edit';
 
 const makeChoices = (keys) => keys && keys.map((k) => [k, k]);
 

src/components/manage/Blocks/DiscodataComponentsBlock/View.jsx

@@ -8,8 +8,8 @@ import { arrayToTree } from 'performant-array-to-tree';
 import qs from 'query-string';
 import { Table, Dropdown, List, Header } from 'semantic-ui-react';
 import './style.css';
-import DiscodataSqlBuilderView from 'volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import DiscodataSqlBuilderView from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import cx from 'classnames';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/PrivacyProtection.jsx

@@ -8,7 +8,7 @@ import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import { settings } from '~/config';
 
-import 'volto-embed/css/embed-styles.css';
+import '@eeacms/volto-embed/css/embed-styles.css';
 
 const key = (domain_key) => `accept-${domain_key}`;
 

src/components/manage/Blocks/DiscodataOpenlayersMapBlock/View.jsx

@@ -16,7 +16,7 @@ import { isArray } from 'lodash';
 import { Icon as VoltoIcon, Toast } from '@plone/volto/components';
 import PrivacyProtection from './PrivacyProtection';
 // VOLTO-DATABLOCKS
-import { setQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 // SEMANTIC REACT UI
 import { Grid, Header } from 'semantic-ui-react';
 // SVGs

src/components/manage/Blocks/DiscodataTableBlock/Edit.jsx

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { injectIntl } from 'react-intl';
 import View from './View';
-import DiscodataSqlBuilderEdit from 'volto-datablocks/DiscodataSqlBuilder/Edit';
+import DiscodataSqlBuilderEdit from '@eeacms/volto-datablocks/DiscodataSqlBuilder/Edit';
 
 const schema = {
   itemsCountKey: {

src/components/manage/Blocks/DiscodataTableBlock/View.jsx

@@ -8,8 +8,8 @@ import { Table, Pagination } from 'semantic-ui-react';
 import downSVG from '@plone/volto/icons/down-key.svg';
 import upSVG from '@plone/volto/icons/up-key.svg';
 import { Icon } from '@plone/volto/components';
-import DiscodataSqlBuilderView from 'volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam } from 'volto-datablocks/actions';
+import DiscodataSqlBuilderView from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam } from '@eeacms/volto-datablocks/actions';
 import { Dimmer, Loader } from 'semantic-ui-react';
 import LinearProgress from '@material/react-linear-progress';
 

src/components/manage/Blocks/FiltersBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/FiltersBlock/View.jsx

@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 import { Header, Modal, Select, Input, List } from 'semantic-ui-react';
 import { Portal } from 'react-portal';
 import { Icon } from '@plone/volto/components';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import { settings } from '~/config';
 import _uniqueId from 'lodash/uniqueId';
 import axios from 'axios';

src/components/manage/Blocks/GlossarySearchBlock/View.jsx

@@ -16,7 +16,7 @@ import {
 } from 'volto-addons/actions';
 import Highlighter from 'react-highlight-words';
 import cx from 'classnames';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import './style.css';
 
 const messages = defineMessages({

src/components/manage/Blocks/Iframe/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 import './style.css';

src/components/manage/Blocks/LinkButton/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/NavigationBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/NavigationBlock/View.jsx

@@ -12,7 +12,7 @@ import {
   getNavigationByParent,
   getBasePath,
 } from 'volto-tabsview/helpers';
-import { deleteQueryParam, setQueryParam } from 'volto-datablocks/actions';
+import { deleteQueryParam, setQueryParam } from '@eeacms/volto-datablocks/actions';
 import { useEffect } from 'react';
 
 const View = ({ content, ...props }) => {

src/components/manage/Blocks/PollutantIndex/View.jsx

@@ -2,8 +2,8 @@ import React, { useState, useEffect, useRef } from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Tab, Dropdown, Table } from 'semantic-ui-react';
-import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import qs from 'query-string';
 import cx from 'classnames';
 import './style.css';

src/components/manage/Blocks/QueryParamButton/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/QueryParamText/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 import './style.css';

src/components/manage/Blocks/SidebarBlock/Edit.jsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import _uniqueId from 'lodash/uniqueId';
-import RenderFields from 'volto-datablocks/Utils/RenderFields';
+import RenderFields from '@eeacms/volto-datablocks/Utils/RenderFields';
 import View from './View';
 import { settings } from '~/config';
 

src/components/manage/Blocks/SidebarBlock/View.jsx

@@ -12,7 +12,7 @@ import {
   getBasePath,
 } from 'volto-tabsview/helpers';
 
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 
 import { getFacilities, getInstallations, getLcps } from '~/helpers/api';
 

src/components/manage/Blocks/SiteBlocks/Header/View.jsx

@@ -3,7 +3,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { Tab, Dropdown, Table } from 'semantic-ui-react';
 import QueryBuilder from '../QueryBuilder';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import cx from 'classnames';
 import './style.css';
 

src/components/manage/Blocks/SiteBlocks/LcpDetails/View.jsx

@@ -3,7 +3,7 @@ import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
 import { Link } from 'react-router-dom';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import CompetentAuthority from '../CompetentAuthority';

src/components/manage/Blocks/SiteBlocks/PollutantsFacilityDetails/View.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import infoSVG from '@plone/volto/icons/info.svg';
 import CompetentAuthority from '../CompetentAuthority';

src/components/manage/Blocks/SiteBlocks/PollutantsSiteDetails/View.jsx

@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import _uniqueId from 'lodash/uniqueId';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import CompetentAuthority from '../CompetentAuthority';

src/components/manage/Blocks/SiteBlocks/QueryBuilder.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useRef } from 'react';
-import DiscodataSqlBuilder from 'volto-datablocks/DiscodataSqlBuilder/View';
+import DiscodataSqlBuilder from '@eeacms/volto-datablocks/DiscodataSqlBuilder/View';
 import Flags from '~/components/manage/Blocks/Flags/View';
 
 const QueryBuilder = (props) => {

src/components/manage/Blocks/SiteBlocks/RegulatoryInstallationDetails/View.jsx

@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import _uniqueId from 'lodash/uniqueId';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import RenderTable from '../RenderTable';

src/components/manage/Blocks/SiteBlocks/RegulatorySiteDetails/View.jsx

@@ -3,7 +3,7 @@ import { useHistory } from 'react-router-dom';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import ReactTooltip from 'react-tooltip';
-import { setQueryParam, deleteQueryParam } from 'volto-datablocks/actions';
+import { setQueryParam, deleteQueryParam } from '@eeacms/volto-datablocks/actions';
 import _uniqueId from 'lodash/uniqueId';
 import Icon from '@plone/volto/components/theme/Icon/Icon';
 import RenderTable from '../RenderTable';