Skip to content

Commit

Permalink
Merge pull request #43 from eea/develop
Browse files Browse the repository at this point in the history
Release 5.0.0 - Volto 17 support
  • Loading branch information
avoinea authored Apr 22, 2024
2 parents 439b0ff + 7484694 commit 7bdedc1
Show file tree
Hide file tree
Showing 14 changed files with 497 additions and 250 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.

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

### [5.0.0](https://github.com/eea/volto-matomo/compare/4.2.1...5.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 5.0.0 - Volto 17 support [alin - [`04e3030`](https://github.com/eea/volto-matomo/commit/04e30300bc899182736eaaa0d088202c5e2320e2)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`d4702ba`](https://github.com/eea/volto-matomo/commit/d4702ba500445a50505d2b533567c1fe488100a4)]

#### :house: Internal changes

- chore: husky, lint-staged use fixed versions [valentinab25 - [`6545c6f`](https://github.com/eea/volto-matomo/commit/6545c6fbbc25ff6248ee7b526424feb770fbf491)]
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`007ed2a`](https://github.com/eea/volto-matomo/commit/007ed2aae27fc7a4f32a44aace838f21fbe4438a)]

#### :hammer_and_wrench: Others

### [4.2.1](https://github.com/eea/volto-matomo/compare/4.2.0...4.2.1) - 29 September 2023

#### :house: Documentation changes
Expand All @@ -27,7 +41,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release 4.2.0 [Alin Voinea - [`b48cb1b`](https://github.com/eea/volto-matomo/commit/b48cb1b73ddf3e9aa455e25c463f05d65475ea8e)]
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`4c56777`](https://github.com/eea/volto-matomo/commit/4c56777f3f7b04738e278ba1cc86f6d9530f4321)]
- test: Fix package.json scripts to use makefile [Alin Voinea - [`fba423d`](https://github.com/eea/volto-matomo/commit/fba423d591013ab4d103ee131d962cb97deab23a)]
- test: Fix eslint and yarn i18n [Alin Voinea - [`12ad3fa`](https://github.com/eea/volto-matomo/commit/12ad3fafc0c09968dce04cdc36d4317dd73da081)]
- i18n: Add en [Alin Voinea - [`2e8679f`](https://github.com/eea/volto-matomo/commit/2e8679f008016640337ac345fd494af3f5a71974)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`7985da4`](https://github.com/eea/volto-matomo/commit/7985da429f9e8715dbf3616c1714b395642fe716)]
### [4.1.3](https://github.com/eea/volto-matomo/compare/4.1.2...4.1.3) - 24 July 2023
Expand Down Expand Up @@ -62,19 +75,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`812cd37`](https://github.com/eea/volto-matomo/commit/812cd3719f70b0a46775d27382720ac2ba78767b)]

#### :hammer_and_wrench: Others

- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`b4c4896`](https://github.com/eea/volto-matomo/commit/b4c4896c1f4c15c5c46b212726d6c3d65392ba05)]
- test: Fix test config, coverage Refs #253277 [valentinab25 - [`3cb6d88`](https://github.com/eea/volto-matomo/commit/3cb6d8867b079202167f5de3a354548615d3c409)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`bc48185`](https://github.com/eea/volto-matomo/commit/bc48185f405f724068d8cc1a9f1c2e736e79e3c1)]
### [4.1.0](https://github.com/eea/volto-matomo/compare/4.0.2...4.1.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Release 4.1.0 [Alin Voinea - [`2ae88c7`](https://github.com/eea/volto-matomo/commit/2ae88c7a379914c20fe7b79b832b5c2183f75540)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`445c1aa`](https://github.com/eea/volto-matomo/commit/445c1aa796abb79ecc67058816d6f10bf52aa0ad)]
### [4.0.2](https://github.com/eea/volto-matomo/compare/4.0.1...4.0.2) - 24 February 2023

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

#### :hammer_and_wrench: Others

- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`d06b7a1`](https://github.com/eea/volto-matomo/commit/d06b7a1859ab2e432b76a5114fcba3250f2efd27)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`85efbdc`](https://github.com/eea/volto-matomo/commit/85efbdcf20ecdb903e0f382f24844002c7f36ca6)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`2873b34`](https://github.com/eea/volto-matomo/commit/2873b34868b8baa6436b39faa9482928825317ee)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`67e235e`](https://github.com/eea/volto-matomo/commit/67e235e731dd3a858ab99461569737708fbafcc8)]
- yarn 3 [Alin Voinea - [`128a1bb`](https://github.com/eea/volto-matomo/commit/128a1bbb20b7af744fbe5f3198c28db2fb9cc41a)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`a50a736`](https://github.com/eea/volto-matomo/commit/a50a7367ef67703fe447ddd649292d485914c200)]
### [3.0.1](https://github.com/eea/volto-matomo/compare/3.0.0...3.0.1) - 16 November 2022

#### :hammer_and_wrench: Others
Expand All @@ -115,20 +120,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Update Jenkinsfile [Miu Razvan - [`c367213`](https://github.com/eea/volto-matomo/commit/c367213c8277f9f10d54909705561c8553ce27be)]
- Update Jenkinsfile [Miu Razvan - [`98de055`](https://github.com/eea/volto-matomo/commit/98de0556e3437b4c51cb46da6fd09b5432b656c1)]
- Update Jenkinsfile [Miu Razvan - [`07d3de9`](https://github.com/eea/volto-matomo/commit/07d3de952899c759f47008348f212864749e7976)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`de69c03`](https://github.com/eea/volto-matomo/commit/de69c036e8610e69a2a7cda1d292ac8fe6143c28)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`eb64203`](https://github.com/eea/volto-matomo/commit/eb642033fb489e1a4d75986b90bb695da0b26b70)]
- update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`5c67807`](https://github.com/eea/volto-matomo/commit/5c6780751621c3dbd08f0149f7a02eca248f301d)]
### [2.0.9](https://github.com/eea/volto-matomo/compare/2.0.8...2.0.9) - 30 June 2022

#### :hammer_and_wrench: Others

- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`6b14e86`](https://github.com/eea/volto-matomo/commit/6b14e865fe7c3f87dac0e947410aa76c4193108e)]
### [2.0.8](https://github.com/eea/volto-matomo/compare/2.0.7...2.0.8) - 12 May 2022

#### :hammer_and_wrench: Others

- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`8781c35`](https://github.com/eea/volto-matomo/commit/8781c35315a0a1e9bf8fa5289a4fa3667737ecf4)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`c0d9352`](https://github.com/eea/volto-matomo/commit/c0d935275d612ca995390a08057cb6df6ed37f54)]
### [2.0.7](https://github.com/eea/volto-matomo/compare/2.0.6...2.0.7) - 5 January 2022

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

#### :hammer_and_wrench: Others

- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`f97f629`](https://github.com/eea/volto-matomo/commit/f97f6297ebdca73afec7fb909210b0a465bbed6e)]
### [2.0.5](https://github.com/eea/volto-matomo/compare/2.0.4...2.0.5) - 16 December 2021

### [2.0.4](https://github.com/eea/volto-matomo/compare/2.0.3...2.0.4) - 10 December 2021

#### :hammer_and_wrench: Others

- Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`b7ebe5f`](https://github.com/eea/volto-matomo/commit/b7ebe5f0822da73bd73b291bff7e7857c34f0d14)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`c10373e`](https://github.com/eea/volto-matomo/commit/c10373e1f22153b9868c4767f9fdf6296a32e768)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`af3abb6`](https://github.com/eea/volto-matomo/commit/af3abb6cc9f449b53952f84d0a0bbdd93d9afd4f)]
### [2.0.3](https://github.com/eea/volto-matomo/compare/2.0.2...2.0.3) - 11 October 2021

#### :hammer_and_wrench: Others

- prettier fix [Daniela Mormocea - [`a082f73`](https://github.com/eea/volto-matomo/commit/a082f73ce77d1f91beed91f053e33be34582ad16)]
- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`72aeb21`](https://github.com/eea/volto-matomo/commit/72aeb214352585df2234ec0731c6c6d3e730b485)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`f68f336`](https://github.com/eea/volto-matomo/commit/f68f33612d7f761815a31d90e0461c5062abf417)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`29215d5`](https://github.com/eea/volto-matomo/commit/29215d5712976113908f712ce7becb1a56d0600d)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`28b10d4`](https://github.com/eea/volto-matomo/commit/28b10d42d95c38d6d8c67ef80bb32edfec36a8e4)]
- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`fbb75fe`](https://github.com/eea/volto-matomo/commit/fbb75feb826411c4d2d740b14bb62abd97aec49b)]
### [2.0.2](https://github.com/eea/volto-matomo/compare/2.0.1...2.0.2) - 14 June 2021

### [2.0.1](https://github.com/eea/volto-matomo/compare/2.0.0...2.0.1) - 2 June 2021
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
ARG VOLTO_VERSION
FROM plone/frontend-builder:${VOLTO_VERSION}
FROM eeacms/frontend-builder:${VOLTO_VERSION}

ARG ADDON_NAME
ARG ADDON_PATH
Expand Down
Loading

0 comments on commit 7bdedc1

Please sign in to comment.