Skip to content

Commit

Permalink
Merge pull request #95 from eea/develop
Browse files Browse the repository at this point in the history
Release 8.0.0 - Volto 17 support
  • Loading branch information
avoinea authored Apr 22, 2024
2 parents 8c9f948 + f83edf5 commit 85f579f
Show file tree
Hide file tree
Showing 22 changed files with 375 additions and 285 deletions.
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Jest configuration variables
# - possible values: ON, OFF
JEST_USE_SETUP=OFF
65 changes: 65 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
const fs = require('fs');
const path = require('path');
const projectRootPath = fs.realpathSync(__dirname + '/../../../');

let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto');
let configFile;
if (fs.existsSync(`${projectRootPath}/tsconfig.json`))
configFile = `${projectRootPath}/tsconfig.json`;
else if (fs.existsSync(`${projectRootPath}/jsconfig.json`))
configFile = `${projectRootPath}/jsconfig.json`;

if (configFile) {
const jsConfig = require(configFile).compilerOptions;
const pathsConfig = jsConfig.paths;
if (pathsConfig['@plone/volto'])
voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`;
}

const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`);
const reg = new AddonConfigurationRegistry(projectRootPath);

// 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 addonExtenders = reg.getEslintExtenders().map((m) => require(m));

const defaultConfig = {
extends: `${voltoPath}/.eslintrc`,
settings: {
'import/resolver': {
alias: {
map: [
['@plone/volto', '@plone/volto/src'],
['@plone/volto-slate', '@plone/volto/packages/volto-slate/src'],
...addonAliases,
['@package', `${__dirname}/src`],
['@root', `${__dirname}/src`],
['~', `${__dirname}/src`],
],
extensions: ['.js', '.jsx', '.json'],
},
'babel-plugin-root-import': {
rootPathSuffix: 'src',
},
},
},
rules: {
'react/jsx-no-target-blank': [
'error',
{
allowReferrer: true,
},
],
}
};

const config = addonExtenders.reduce(
(acc, extender) => extender.modify(acc),
defaultConfig,
);

module.exports = config;
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.vscode/
.history
.eslintrc.js
.nyc_output
project
coverage
Expand Down
48 changes: 0 additions & 48 deletions .project.eslintrc.js

This file was deleted.

10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,20 @@ 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).

### [8.0.0](https://github.com/eea/volto-columns-block/compare/7.1.0...8.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 8.0.0 - Volto 17 support [alin - [`19758d9`](https://github.com/eea/volto-columns-block/commit/19758d9efc7eed8086fed2d40f2ba307ec9af1e6)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`4110405`](https://github.com/eea/volto-columns-block/commit/4110405ede007a24c9fc578d4d7ea93e7cd9e471)]

#### :hammer_and_wrench: Others

### [7.1.0](https://github.com/eea/volto-columns-block/compare/7.0.1...7.1.0) - 2 April 2024

#### :bug: Bug Fixes

- fix(toc): use the correct function to render entries in toc #94 from eea/develop [ichim-david - [`8c9f948`](https://github.com/eea/volto-columns-block/commit/8c9f94836bcdeeefdc7a7a4e8608246fc3892e75)]
- fix(toc): use the correct function to render entries in toc [Miu Razvan - [`e3a27d2`](https://github.com/eea/volto-columns-block/commit/e3a27d2065534a87feba83c68d286520d2dccee8)]

#### :hammer_and_wrench: Others
Expand Down
Loading

0 comments on commit 85f579f

Please sign in to comment.