Skip to content

Commit

Permalink
Merge pull request #39 from eea/develop
Browse files Browse the repository at this point in the history
Release 7.0.0 - Volto 17 support
  • Loading branch information
avoinea authored Apr 22, 2024
2 parents 817718c + 38865f7 commit 9b92d2b
Show file tree
Hide file tree
Showing 16 changed files with 532 additions and 909 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.

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

### [6.0.0](https://github.com/eea/volto-object-widget/compare/5.2.0...6.0.0) - 8 December 2023
### [7.0.0](https://github.com/eea/volto-object-widget/compare/6.0.0...7.0.0) - 22 April 2024

#### :rocket: New Features

- feat: enhance UrlWidget/InternalUrlWidget [Miu Razvan - [`1814384`](https://github.com/eea/volto-object-widget/commit/181438475532646d4bb07d651a2e09f31cf085bb)]
- feat: Release 7.0.0 - Volto 17 support [alin - [`085cb98`](https://github.com/eea/volto-object-widget/commit/085cb980fe9d29a99f00232b21a946a085903739)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`47612bf`](https://github.com/eea/volto-object-widget/commit/47612bf9a6eb63847c0581cef6443b28034e0867)]

#### :hammer_and_wrench: Others

## [6.0.0](https://github.com/eea/volto-object-widget/compare/5.2.0...6.0.0) - 8 December 2023

#### :hammer_and_wrench: Others

Expand Down
Loading

0 comments on commit 9b92d2b

Please sign in to comment.