Skip to content

Commit

Permalink
Merge pull request #33 from eea/develop
Browse files Browse the repository at this point in the history
Release 4.0.0 - Volto 17 support
  • Loading branch information
avoinea authored Apr 22, 2024
2 parents 63b564e + 43d77ca commit 1a12b71
Show file tree
Hide file tree
Showing 10 changed files with 238 additions and 139 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.

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

### [4.0.0](https://github.com/eea/volto-banner/compare/3.1.5...4.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 4.0.0 - Volto 17 support [alin - [`f8be4f9`](https://github.com/eea/volto-banner/commit/f8be4f977de3b5aed6517b363d570d633ad45a93)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`30c69bb`](https://github.com/eea/volto-banner/commit/30c69bbf56b91bf2c3deb7080482ba8c65e5edf3)]

#### :house: Internal changes

- chore: package.json [Alin Voinea - [`9dde542`](https://github.com/eea/volto-banner/commit/9dde5428713b0a274b7368189ff9627907a4bf48)]

#### :hammer_and_wrench: Others

- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`3491392`](https://github.com/eea/volto-banner/commit/3491392f4f6c042a12836962cd429b983ad54750)]
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`213726e`](https://github.com/eea/volto-banner/commit/213726e87aaa01c7b1b2785a1b4f416a12671b7c)]
- test: Update jest,Jenkinsfile,lint to volto-addons-template PR30 [valentinab25 - [`ca5dcd0`](https://github.com/eea/volto-banner/commit/ca5dcd001c027a57773e7fe64317e5fb0c045d61)]
### [3.1.5](https://github.com/eea/volto-banner/compare/3.1.4...3.1.5) - 16 January 2024

#### :bug: Bug Fixes
Expand All @@ -12,21 +28,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Refactor automated testing [valentinab25 - [`f2b4abd`](https://github.com/eea/volto-banner/commit/f2b4abd953a72ff27beb2245f658956aed526183)]
- chore: husky, lint-staged use fixed versions [valentinab25 - [`b747b25`](https://github.com/eea/volto-banner/commit/b747b2545096a9f8eaad3596d181892a454b0473)]
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`380a7f3`](https://github.com/eea/volto-banner/commit/380a7f3010c489b741bc2cfda83c809b34591ded)]

#### :hammer_and_wrench: Others

- test: fix jest tests [ana-oprea - [`246d7cc`](https://github.com/eea/volto-banner/commit/246d7cc08df79b385aa7a10f0f5502d33f0b37e0)]
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`23afa55`](https://github.com/eea/volto-banner/commit/23afa55690ab5a6606f5cf5c07e7aca506cf4401)]
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`c299c27`](https://github.com/eea/volto-banner/commit/c299c27e2894fcb618e089fd36d126316697e7ec)]
- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`b62902f`](https://github.com/eea/volto-banner/commit/b62902f3e32ac3768929a949e73a7f9b88d5b45d)]
- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`519d284`](https://github.com/eea/volto-banner/commit/519d28474579117d60f30456518db9a51075d0c9)]
- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`efb3623`](https://github.com/eea/volto-banner/commit/efb362342abaf616e2823e59a971bf8ee2aadd03)]
- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`bf17a22`](https://github.com/eea/volto-banner/commit/bf17a22f2b5680efc7bf7ecc9b0a8aa85fd9a515)]
- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`a1eb60d`](https://github.com/eea/volto-banner/commit/a1eb60da953e699fae34594b98c3d8c6526a30c5)]
- test: [JENKINS] Improve cypress time [valentinab25 - [`3661a39`](https://github.com/eea/volto-banner/commit/3661a39ead0079a8d8b49aa6410754e88ed9cb4e)]
### [3.1.4](https://github.com/eea/volto-banner/compare/3.1.3...3.1.4) - 29 September 2023

#### :house: Internal changes
Expand Down Expand Up @@ -54,24 +61,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`33c33b9`](https://github.com/eea/volto-banner/commit/33c33b981148439172c054cd112b96f3fb9d7aef)]

#### :hammer_and_wrench: Others

- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`189e3d6`](https://github.com/eea/volto-banner/commit/189e3d60824b5e52956e779f77a4da734deb6d6c)]
- test: Fix test config, coverage Refs #253277 [valentinab25 - [`5ef16e6`](https://github.com/eea/volto-banner/commit/5ef16e6676578e577bb28fbe1d25e4d95df973f2)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`8124767`](https://github.com/eea/volto-banner/commit/812476720c84dd1d3eaabb51ab890fb1efdf1e45)]
### [3.1.0](https://github.com/eea/volto-banner/compare/3.0.1...3.1.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`62a383a`](https://github.com/eea/volto-banner/commit/62a383a278e63d8dc219447322383c9028c0a523)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`666d1c8`](https://github.com/eea/volto-banner/commit/666d1c8533e957fe847ae750b2d7e0956c3a8945)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`17cec27`](https://github.com/eea/volto-banner/commit/17cec27800b08a2412d522b238355f54502752a5)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`f31ec21`](https://github.com/eea/volto-banner/commit/f31ec21aadc185bdde6c603c5a4b5db92c6e40dd)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`4c53c8d`](https://github.com/eea/volto-banner/commit/4c53c8de0bdda9408a5961c4498d59d20ff89d18)]
- yarn 3 [Alin Voinea - [`f41893c`](https://github.com/eea/volto-banner/commit/f41893c5926a48ee7503addc2cb49cbe3844cd56)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`589d16a`](https://github.com/eea/volto-banner/commit/589d16ab26ce034002050afddb7a0ba1ca09aff7)]
### [3.0.1](https://github.com/eea/volto-banner/compare/3.0.0...3.0.1) - 16 November 2022

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

#### :hammer_and_wrench: Others

- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`c3aa9a4`](https://github.com/eea/volto-banner/commit/c3aa9a497db7cd976cb83029ac12b877175e43f0)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`831a521`](https://github.com/eea/volto-banner/commit/831a5211b7381de884c436404559959519668851)]
- update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`3156197`](https://github.com/eea/volto-banner/commit/31561978030af1dd294b2f5f5a671d69c8ff0cb9)]
### [2.2.1](https://github.com/eea/volto-banner/compare/2.2.0...2.2.1) - 30 June 2022

#### :hammer_and_wrench: Others

- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`5a818f5`](https://github.com/eea/volto-banner/commit/5a818f5ab409e0b67ffb820e03c5f440a2b51e16)]
### [2.2.0](https://github.com/eea/volto-banner/compare/2.1.0...2.2.0) - 8 April 2022

#### :hammer_and_wrench: Others

- Bumped to version 2.2 [kreafox - [`e1043a1`](https://github.com/eea/volto-banner/commit/e1043a1727fb717690f20b106508207ea83f2781)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`f5c8af2`](https://github.com/eea/volto-banner/commit/f5c8af266788ae1778d23fc36da9f1b4a274edf7)]
### [2.1.0](https://github.com/eea/volto-banner/compare/2.0.0...2.1.0) - 9 March 2022

#### :hammer_and_wrench: Others
Expand All @@ -103,7 +98,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- [Feature #146857] Separate close behaviour for static and dynamic banner [Mihai Slobozeanu - [`6a29aa2`](https://github.com/eea/volto-banner/commit/6a29aa2ed162ffdd354f7d9cc5708b7233972442)]
- [Feature #146857] Add banner close button - code review fix [Mihai Slobozeanu - [`3274f93`](https://github.com/eea/volto-banner/commit/3274f935b5d21f87ed1e15ebe9a117847200a811)]
- [Feature #146857] Add banner close button [Mihai Slobozeanu - [`8844b17`](https://github.com/eea/volto-banner/commit/8844b17c691f9602d6d0121025a5d79cebe7bceb)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`2b36633`](https://github.com/eea/volto-banner/commit/2b36633d382bf77a2ff6b5b6e2455b1192e7bc81)]
## [2.0.0](https://github.com/eea/volto-banner/compare/1.0.4...2.0.0) - 16 February 2022

#### :hammer_and_wrench: Others
Expand All @@ -121,30 +115,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`9d69833`](https://github.com/eea/volto-banner/commit/9d69833392946512eeae3226d20527c60b3cc604)]
### [1.0.2](https://github.com/eea/volto-banner/compare/1.0.1...1.0.2) - 10 December 2021

#### :hammer_and_wrench: Others

- Correct one comment [Silviu Bogan - [`6ff7654`](https://github.com/eea/volto-banner/commit/6ff76545a1aca6a9b5e7b1e0586fd251f7ce02c8)]
- Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`34f7c8e`](https://github.com/eea/volto-banner/commit/34f7c8e82d6cd37f500ad58b600fb170074b5628)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`fd21e21`](https://github.com/eea/volto-banner/commit/fd21e2133b7f9877871f7cf7f38227395acfaf84)]
### [1.0.1](https://github.com/eea/volto-banner/compare/1.0.0...1.0.1) - 10 November 2021

#### :hammer_and_wrench: Others

- Refs #141204 added has-banner class to the body when volto-banner is rendered: [David Ichim - [`c91db3c`](https://github.com/eea/volto-banner/commit/c91db3cf8ee1630c14262b6d0a8bf41442932466)]
- Removed container padding override, you can add your own override of the semantic ui classes: [David Ichim - [`994a82e`](https://github.com/eea/volto-banner/commit/994a82eabd9f966c96889beb4d9473cfca5a467a)]
- Padding variable [Miu Razvan - [`336046e`](https://github.com/eea/volto-banner/commit/336046e49d6edcf98cf24911bf71084b32f5be67)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`66fd1ca`](https://github.com/eea/volto-banner/commit/66fd1caa3c3e6fbedf48aaafe48286d770afb2fb)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`0a85dc7`](https://github.com/eea/volto-banner/commit/0a85dc76aef1d3c6ccac40f5a64bb9c2fd1417a3)]
- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`97bba71`](https://github.com/eea/volto-banner/commit/97bba71301c37c21a2bfd46b90f7cba48c774428)]
- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`0aad1ab`](https://github.com/eea/volto-banner/commit/0aad1ab13f6911a4d75e6fdb92a328cfb5ffa6cf)]
## [1.0.0](https://github.com/eea/volto-banner/compare/0.1.7...1.0.0) - 29 September 2021

#### :hammer_and_wrench: Others

- yarn stylelint:fix [Alin Voinea - [`8799866`](https://github.com/eea/volto-banner/commit/879986634cd2776a3dff40273ef18cc1c5cb6ef7)]
- Fix padding when resolution is between 760 and 1400px [Alin Voinea - [`850706a`](https://github.com/eea/volto-banner/commit/850706a208f15ebaf61483ecba49cc96b84fbaf1)]
- Allow HTML with bannerMessahe [Alin Voinea - [`6ab587d`](https://github.com/eea/volto-banner/commit/6ab587d66f0aebc0500d33a734b370631e98984f)]
### [0.1.7](https://github.com/eea/volto-banner/compare/0.1.6...0.1.7) - 28 September 2021
Expand All @@ -153,8 +140,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- cosmetics [nileshgulia1 - [`414ed83`](https://github.com/eea/volto-banner/commit/414ed830c1e4fbc8db45480016e6afa17a9982a1)]
- make icon, header and content customizable [nileshgulia1 - [`74a5c8c`](https://github.com/eea/volto-banner/commit/74a5c8c15dc4610c41883e71a2244a0edb66c7a4)]
- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`0cd24e7`](https://github.com/eea/volto-banner/commit/0cd24e7a124b18c82b37ccd0655ee10ffe2d7087)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`fbe6228`](https://github.com/eea/volto-banner/commit/fbe622843226b96e00d41ac974be7ff47354e4f7)]
### [0.1.6](https://github.com/eea/volto-banner/compare/0.1.5...0.1.6) - 26 August 2021

#### :hammer_and_wrench: Others
Expand Down
Loading

0 comments on commit 1a12b71

Please sign in to comment.