Skip to content

Commit

Permalink
Merge pull request #24 from eea/develop
Browse files Browse the repository at this point in the history
Release 2.0.0 - Volto 17 support
  • Loading branch information
avoinea committed Apr 22, 2024
2 parents 3da944c + 1c43922 commit 591971b
Show file tree
Hide file tree
Showing 19 changed files with 485 additions and 245 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.

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

### [1.2.4](https://github.com/eea/volto-description-block/compare/1.2.3...1.2.4) - 19 October 2023
### [2.0.0](https://github.com/eea/volto-description-block/compare/1.2.4...2.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 2.0.0 - Volto 17 support [alin - [`87c43f3`](https://github.com/eea/volto-description-block/commit/87c43f3f730f3b24bbcfbee0d3d39e1e018ecaef)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`7caec83`](https://github.com/eea/volto-description-block/commit/7caec83bd71b069fb6a287df015bb7fb75324f83)]

#### :house: Internal changes


#### :hammer_and_wrench: Others

- Update README.md [ana-oprea - [`d8a0101`](https://github.com/eea/volto-description-block/commit/d8a0101660c064e60a0eaf31897aee4b06e2b923)]
### [1.2.4](https://github.com/eea/volto-description-block/compare/1.2.3...1.2.4) - 22 October 2023

### [1.2.3](https://github.com/eea/volto-description-block/compare/1.2.2...1.2.3) - 17 October 2023

#### :house: Internal changes
Expand Down Expand Up @@ -47,14 +56,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`5ba7497`](https://github.com/eea/volto-description-block/commit/5ba74971be907f1a30c5af14bef816f4ec4d3888)]
- i18n: Add en [Alin Voinea - [`26ecbde`](https://github.com/eea/volto-description-block/commit/26ecbde5fe4fe6d0a7709a8bf39602f034036364)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`4e8d2b2`](https://github.com/eea/volto-description-block/commit/4e8d2b2ca65248f2e9e924f00fe89eb9c8ccb513)]
- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`3e0fdaa`](https://github.com/eea/volto-description-block/commit/3e0fdaab9a13e56dae4fe437d598e8a41c928335)]
### [1.1.3](https://github.com/eea/volto-description-block/compare/1.1.2...1.1.3) - 24 July 2023

### [1.1.2](https://github.com/eea/volto-description-block/compare/1.1.1...1.1.2) - 12 June 2023

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`5a4d802`](https://github.com/eea/volto-description-block/commit/5a4d80276c4b9474484236e371eec034d49d3381)]

#### :hammer_and_wrench: Others

Expand All @@ -66,30 +73,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`8aa5ced`](https://github.com/eea/volto-description-block/commit/8aa5ced5f4a21326059d86e1bd9c608b672569f1)]
### [1.1.0](https://github.com/eea/volto-description-block/compare/1.0.1...1.1.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`cae3333`](https://github.com/eea/volto-description-block/commit/cae3333ea521533d15b05401a831425751e5dc15)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`0e6b85a`](https://github.com/eea/volto-description-block/commit/0e6b85af26f7a68b737650fe43cb59ab9304a888)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`5b9f67a`](https://github.com/eea/volto-description-block/commit/5b9f67a41812aa0cd126ede14fd13b3cbd4f84ab)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`7095b4a`](https://github.com/eea/volto-description-block/commit/7095b4a17ba4ec6c5650cd6233dac8420accd1a8)]
- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`a58e1db`](https://github.com/eea/volto-description-block/commit/a58e1db4c880028780cda54a386a06d72bf89877)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`39d9f06`](https://github.com/eea/volto-description-block/commit/39d9f06e028c5006cf29e62984647e4fa8d4fc80)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`9058cd4`](https://github.com/eea/volto-description-block/commit/9058cd46e1922e46ce13038c0d9dbe4b39fa4354)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`da35440`](https://github.com/eea/volto-description-block/commit/da35440d53b6fbaf9462f2950791a473b674b67a)]
- yarn 3 [Alin Voinea - [`0c02df5`](https://github.com/eea/volto-description-block/commit/0c02df5f5c1a26656018d68927aa437ce37df8c3)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`aed1921`](https://github.com/eea/volto-description-block/commit/aed1921e2e0493afd2a7e8fe37428643069f9487)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0ca677e`](https://github.com/eea/volto-description-block/commit/0ca677e3732f5f7dba50dae8d60d43e95c7ecfb1)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`d829698`](https://github.com/eea/volto-description-block/commit/d82969855addee8478a43f1440b0dba003f5f9c2)]
- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`9b5d631`](https://github.com/eea/volto-description-block/commit/9b5d6310df3a32d8b29085eb843e727a5a19ceb7)]
### [1.0.1](https://github.com/eea/volto-description-block/compare/1.0.0...1.0.1) - 16 November 2022

#### :hammer_and_wrench: Others

- test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`18e06c3`](https://github.com/eea/volto-description-block/commit/18e06c387847079ba8dee0ac5c059e8bba7671e7)]
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`629f0f6`](https://github.com/eea/volto-description-block/commit/629f0f6867bc7b69f571eea5d61df57473c1f1c4)]
## [1.0.0](https://github.com/eea/volto-description-block/compare/0.3.1...1.0.0) - 28 October 2022

#### :nail_care: Enhancements
Expand All @@ -102,7 +95,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- test(scripts): Move scripts to Makefile [Alin Voinea - [`10b4eae`](https://github.com/eea/volto-description-block/commit/10b4eaec24009403b4100a29550d536c4e08d9a2)]
- test(cypress): Cypress 10 / Razzle 4 [Alin Voinea - [`36429b4`](https://github.com/eea/volto-description-block/commit/36429b4656333472038fd245623736042e9cc2ae)]
- Cleanup [Alin Voinea - [`5247e9c`](https://github.com/eea/volto-description-block/commit/5247e9cca2751495c91a52ce8cd0a3992a399df1)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`82652e5`](https://github.com/eea/volto-description-block/commit/82652e51b86f31d9a10e75c6986d3b44182b4931)]
### [0.3.1](https://github.com/eea/volto-description-block/compare/0.3.0...0.3.1) - 30 June 2022

### [0.3.0](https://github.com/eea/volto-description-block/compare/0.2.0...0.3.0) - 24 May 2022
Expand All @@ -112,7 +104,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release 0.3.0 [Alin Voinea - [`39df766`](https://github.com/eea/volto-description-block/commit/39df76639343b340bb8369342728a35a0a7260f7)]
- Update docs with demo gif [Alin Voinea - [`2b18328`](https://github.com/eea/volto-description-block/commit/2b183280ea637d53c1b20e933972d41bab0f08c8)]
- Remove callout install; Default className to documentDescription; Enabled by default [Alin Voinea - [`64ae975`](https://github.com/eea/volto-description-block/commit/64ae975fdfe05f3e87788d09735282b756be1559)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`032ff16`](https://github.com/eea/volto-description-block/commit/032ff162b8c89c951840f6ae020480e4ae68272c)]
### [0.2.0](https://github.com/eea/volto-description-block/compare/0.1.3...0.2.0) - 19 May 2022

### [0.1.3](https://github.com/eea/volto-description-block/compare/0.1.2...0.1.3) - 17 May 2022
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

0 comments on commit 591971b

Please sign in to comment.