Skip to content

Commit

Permalink
Merge pull request #49 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 02db923 + 41cd34f commit 14de7be
Show file tree
Hide file tree
Showing 19 changed files with 371 additions and 244 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.

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

### [7.0.0](https://github.com/eea/volto-metadata-block/compare/6.0.6...7.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 7.0.0 - Volto 17 support [alin - [`8d59c59`](https://github.com/eea/volto-metadata-block/commit/8d59c591875c251e5ab0b93d96a0f4ce99ca173d)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`27a36bd`](https://github.com/eea/volto-metadata-block/commit/27a36bdde9ab0418320692c8a427d2d9f8402a7f)]

#### :hammer_and_wrench: Others

### [6.0.6](https://github.com/eea/volto-metadata-block/compare/6.0.5...6.0.6) - 8 December 2023

#### :bug: Bug Fixes
Expand All @@ -18,20 +27,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`1b03bcf`](https://github.com/eea/volto-metadata-block/commit/1b03bcff0ca18ea13ef5efe4cacb41ffe8990d97)]
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9376a3d`](https://github.com/eea/volto-metadata-block/commit/9376a3d9789f71cfdfc042cabfd5e1358f823ffa)]
### [6.0.4](https://github.com/eea/volto-metadata-block/compare/6.0.3...6.0.4) - 13 November 2023

#### :house: Internal changes

- chore: [JENKINS] Refactor automated testing [valentinab25 - [`9daf84d`](https://github.com/eea/volto-metadata-block/commit/9daf84d9dc45049dfa64b20ed2590ef03ac46690)]

#### :hammer_and_wrench: Others

- remove console.log [Miu Razvan - [`b7fb80a`](https://github.com/eea/volto-metadata-block/commit/b7fb80a1b3b92f2f42d767791731bd15139c0dce)]
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`3ae83cc`](https://github.com/eea/volto-metadata-block/commit/3ae83cc04ff3dfbf98f0440fffce08add28874fa)]
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`46e86b2`](https://github.com/eea/volto-metadata-block/commit/46e86b2c5aa12f16c3cac5f2ad60d44839fe8695)]
- test: [JENKINS] Improve cypress time [valentinab25 - [`ff6d11d`](https://github.com/eea/volto-metadata-block/commit/ff6d11d4b5c3326d34725c714c546b0e2b5da84a)]
### [6.0.3](https://github.com/eea/volto-metadata-block/compare/6.0.2...6.0.3) - 22 October 2023

#### :house: Internal changes
Expand Down Expand Up @@ -68,7 +71,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- test: delete volto.eea.europa.eu SonarQube tag in Jenkinsfile [ana-oprea - [`1c9164d`](https://github.com/eea/volto-metadata-block/commit/1c9164db6829f3d17218e97edf5e29c810ae37f2)]
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`a79a78c`](https://github.com/eea/volto-metadata-block/commit/a79a78c755bb59c4854f6e1652e0f118589995a8)]
- test: Add cypress test for metadata in DX Layout - refs #254894 [Crețu Mihaela - [`21b601d`](https://github.com/eea/volto-metadata-block/commit/21b601de25878d1c37a758f7cf69707e7b25bf2b)]
- test: Fix eslint and yarn i18n [Alin Voinea - [`de3aa7e`](https://github.com/eea/volto-metadata-block/commit/de3aa7ed26c84921ce11d09a568d5e318dd44baf)]
- i18n: Add en [Alin Voinea - [`b2b278c`](https://github.com/eea/volto-metadata-block/commit/b2b278c68c7e2588be4f11a75dc212df57a35fe9)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`4d23771`](https://github.com/eea/volto-metadata-block/commit/4d23771ddb839e9b8d0c8a60acb8045d08e7a11b)]
## [6.0.0](https://github.com/eea/volto-metadata-block/compare/5.1.2...6.0.0) - 25 July 2023
Expand All @@ -86,25 +88,17 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`627e18c`](https://github.com/eea/volto-metadata-block/commit/627e18c9e9a01a5c18fe72080a2786bab3703574)]

#### :hammer_and_wrench: Others

- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`480b427`](https://github.com/eea/volto-metadata-block/commit/480b427df460e59bcce9acd3c2f421610de73500)]
- test: Add unit tests for utils - refs #253277 [ana-oprea - [`07b2d3d`](https://github.com/eea/volto-metadata-block/commit/07b2d3d0d107e993a3f7f04e8126a0198afa1c6c)]
- test: Fix test config, coverage Refs #253277 [valentinab25 - [`8dc0e4f`](https://github.com/eea/volto-metadata-block/commit/8dc0e4fa505be0b13723ea41178c977c0e21c62a)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`7fd3a87`](https://github.com/eea/volto-metadata-block/commit/7fd3a8772cceadd4f14b2921f9d4c04b87efd71c)]
### [5.1.0](https://github.com/eea/volto-metadata-block/compare/5.0.1...5.1.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`e9134d5`](https://github.com/eea/volto-metadata-block/commit/e9134d5cefc98491be81f0560d255b3cbdbd510e)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`76365f7`](https://github.com/eea/volto-metadata-block/commit/76365f7f2f225b62851d82e9b5a7e4553ef6d8eb)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`681cf4c`](https://github.com/eea/volto-metadata-block/commit/681cf4ca129afc2d03e35e53bd896bfe3e3e7714)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`857cdb2`](https://github.com/eea/volto-metadata-block/commit/857cdb2fc1814112d1ca4a76abb864a70043f0e4)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`7436e2a`](https://github.com/eea/volto-metadata-block/commit/7436e2aaaa7963b14147e01336f49334790d50af)]
- yarn 3 [Alin Voinea - [`bd2959e`](https://github.com/eea/volto-metadata-block/commit/bd2959e524d05ce5e3ddaa284167d1229d7923cb)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`fe89613`](https://github.com/eea/volto-metadata-block/commit/fe896131f3629e1a64e7602018e6ed266e61eed4)]
### [5.0.1](https://github.com/eea/volto-metadata-block/compare/5.0.0...5.0.1) - 16 November 2022

#### :hammer_and_wrench: Others
Expand All @@ -120,16 +114,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Update dependencies [Alin Voinea - [`d71c3f7`](https://github.com/eea/volto-metadata-block/commit/d71c3f7c372f7e38af3b8a1ec029d00e99e759a8)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`c501a20`](https://github.com/eea/volto-metadata-block/commit/c501a209bd8f6908b45616b7f376088d481acb44)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`d6c43b2`](https://github.com/eea/volto-metadata-block/commit/d6c43b2e58d968e4ad2a0410baf05adfaa4353a1)]
- update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`223220c`](https://github.com/eea/volto-metadata-block/commit/223220cebc5c836a48c147db08f7b2e4832a050e)]
### [4.0.8](https://github.com/eea/volto-metadata-block/compare/4.0.7...4.0.8) - 1 July 2022

#### :hammer_and_wrench: Others

- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`4003281`](https://github.com/eea/volto-metadata-block/commit/40032819dd5cec0d74647e08833e1148824422ac)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`69e59f6`](https://github.com/eea/volto-metadata-block/commit/69e59f688570c6c140d3784a90028d838dacfdc3)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`2c832f9`](https://github.com/eea/volto-metadata-block/commit/2c832f9b5e0854f8902afae1842c36f20c5d3e98)]
### [4.0.7](https://github.com/eea/volto-metadata-block/compare/4.0.6...4.0.7) - 4 March 2022

### [4.0.6](https://github.com/eea/volto-metadata-block/compare/4.0.5...4.0.6) - 25 January 2022
Expand All @@ -140,7 +129,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`b3eabc9`](https://github.com/eea/volto-metadata-block/commit/b3eabc95e8cc2eb95551c76c62ce335d496f2ad0)]
### [4.0.3](https://github.com/eea/volto-metadata-block/compare/4.0.2...4.0.3) - 10 December 2021

#### :hammer_and_wrench: Others
Expand All @@ -151,18 +139,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- Refs #141204 added word-break to metadata block: [David Ichim - [`1641f1f`](https://github.com/eea/volto-metadata-block/commit/1641f1fd832bcd8eb2b5d265a4b3831351f7a5d4)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`00b421c`](https://github.com/eea/volto-metadata-block/commit/00b421c2ae124f6842ca9f9ece37a3b140ba9dd8)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`72e669a`](https://github.com/eea/volto-metadata-block/commit/72e669a3913a6f07f67ce8704d9dc05b14f2b408)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`7957334`](https://github.com/eea/volto-metadata-block/commit/79573345680fe9c41ce59bededc0c5c9c7ef677d)]
- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`544d384`](https://github.com/eea/volto-metadata-block/commit/544d384a1d519ada7ae74d34bb7574bd07fe18a7)]
### [4.0.1](https://github.com/eea/volto-metadata-block/compare/4.0.0...4.0.1) - 27 September 2021

## [4.0.0](https://github.com/eea/volto-metadata-block/compare/3.3.1...4.0.0) - 24 September 2021

#### :hammer_and_wrench: Others

- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`1f71008`](https://github.com/eea/volto-metadata-block/commit/1f71008a0801bb43fac9d38432738a00e55af2cf)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`8aba39a`](https://github.com/eea/volto-metadata-block/commit/8aba39a318fc6e6f282e059174f549f8cf4ae99b)]
### [3.3.1](https://github.com/eea/volto-metadata-block/compare/3.3.0...3.3.1) - 9 September 2021

#### :hammer_and_wrench: Others
Expand All @@ -183,7 +165,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- Release 3.1.0 [Alin Voinea - [`a77006c`](https://github.com/eea/volto-metadata-block/commit/a77006c8932c2b41560aceb760e34e29ebdabd90)]
- Add ErrorBoundary to Widgets [Alin Voinea - [`3b16de2`](https://github.com/eea/volto-metadata-block/commit/3b16de2a4632228931a7fa7fe5db83fb9e9d51ef)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`948f424`](https://github.com/eea/volto-metadata-block/commit/948f424bea3a39d32a869bd4a84b6aea985ea96d)]
### [3.0.2](https://github.com/eea/volto-metadata-block/compare/3.0.1...3.0.2) - 18 June 2021

### [3.0.1](https://github.com/eea/volto-metadata-block/compare/3.0.0...3.0.1) - 27 May 2021
Expand Down
Loading

0 comments on commit 14de7be

Please sign in to comment.