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 authored Apr 22, 2024
2 parents a66b139 + 8c1c0c7 commit 74d5196
Show file tree
Hide file tree
Showing 20 changed files with 521 additions and 268 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.

34 changes: 15 additions & 19 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,21 @@ 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.3](https://github.com/eea/volto-quote-block/compare/1.2.2...1.2.3) - 5 October 2023
### [2.0.0](https://github.com/eea/volto-quote-block/compare/1.2.3...2.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 2.0.0 - Volto 17 support [alin - [`e0d8815`](https://github.com/eea/volto-quote-block/commit/e0d881552e0834862e693d6e6b92efa53981001b)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`36feaa4`](https://github.com/eea/volto-quote-block/commit/36feaa4e1dc31e2974d2f3a50e02a86e956de6da)]

#### :house: Internal changes

- chore: husky, lint-staged use fixed versions [valentinab25 - [`02cbcc3`](https://github.com/eea/volto-quote-block/commit/02cbcc36c0661a3d7a2376388487bd9733963109)]
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`171d246`](https://github.com/eea/volto-quote-block/commit/171d24654da51f1b560fc4d5ef6bc36448c32da0)]

#### :hammer_and_wrench: Others

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

#### :house: Internal changes

Expand Down Expand Up @@ -33,7 +47,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- i18n: Add en [Alin Voinea - [`04d46b7`](https://github.com/eea/volto-quote-block/commit/04d46b7fa0c5f7cab7da416e502fa52003b50297)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`bb82a02`](https://github.com/eea/volto-quote-block/commit/bb82a02399a690bbbfc001188dd6371d27c40fb3)]
- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`90ae9fb`](https://github.com/eea/volto-quote-block/commit/90ae9fb3871cc3b415da64739d14f70b7367b7e4)]
### [1.2.1](https://github.com/eea/volto-quote-block/compare/1.2.0...1.2.1) - 24 July 2023

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

#### :house: Internal changes

- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`5b8170d`](https://github.com/eea/volto-quote-block/commit/5b8170d33b19d7385f2024437f54360e93819fa6)]

#### :hammer_and_wrench: Others

Expand All @@ -54,30 +66,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- update getFieldURL function [Miu Razvan - [`49e4bd7`](https://github.com/eea/volto-quote-block/commit/49e4bd73b11d5f2a08444a4550d32fb243d79f97)]
- refactoring [tedw87 - [`fad035e`](https://github.com/eea/volto-quote-block/commit/fad035e7487e7e4b9190c2f85e425b0cfcc4ddd6)]
- use getFieldURL function for image source [tedw87 - [`f93b977`](https://github.com/eea/volto-quote-block/commit/f93b9771d609f4006142d481ecd817b088f91683)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`041c95c`](https://github.com/eea/volto-quote-block/commit/041c95cdc43a3befc039cc05f5db11dee4933a5e)]
### [1.1.0](https://github.com/eea/volto-quote-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 - [`70fad4a`](https://github.com/eea/volto-quote-block/commit/70fad4a7a53128504d49566d67b2e98d4f0e1c6e)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`c9f7dfb`](https://github.com/eea/volto-quote-block/commit/c9f7dfbf612351cb7fe1b410558871af4f44bdb0)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`dcb3120`](https://github.com/eea/volto-quote-block/commit/dcb3120733b3c66ab5ae780461de17874f9337cd)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`0e1a14b`](https://github.com/eea/volto-quote-block/commit/0e1a14b5c324285c5d34489920f833d0b4d8b722)]
- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`7107f41`](https://github.com/eea/volto-quote-block/commit/7107f415c429adee00650a87ec5874374e06916a)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`20470a4`](https://github.com/eea/volto-quote-block/commit/20470a452c91a7f8cee537958ddafa6481c5a098)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`335aed4`](https://github.com/eea/volto-quote-block/commit/335aed4cefaa41662faf2daf018c81ac5c0450fe)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`43c4789`](https://github.com/eea/volto-quote-block/commit/43c478928259ce1cf71dc64db71761ba5e738db0)]
- yarn 3 [Alin Voinea - [`1d91a66`](https://github.com/eea/volto-quote-block/commit/1d91a66e4efbf1585483dafe90e9233e37ef6907)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`b45d254`](https://github.com/eea/volto-quote-block/commit/b45d254ff2a4e8beecbe1dc233b844655bdfd156)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`edc3802`](https://github.com/eea/volto-quote-block/commit/edc380248dd51d8b795396eb9938076a64dd0302)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`8d4301f`](https://github.com/eea/volto-quote-block/commit/8d4301f87c4d9afacd3f760f83d4b4329eb4a49f)]
- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`d3927e7`](https://github.com/eea/volto-quote-block/commit/d3927e75ea0d002402df2e606f836b006636dd2f)]
### [1.0.1](https://github.com/eea/volto-quote-block/compare/1.0.0...1.0.1) - 16 November 2022

#### :hammer_and_wrench: Others

- test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`c9d6327`](https://github.com/eea/volto-quote-block/commit/c9d632748b3040478977699ca39c0e0f76ab840e)]
- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`e2c8b5c`](https://github.com/eea/volto-quote-block/commit/e2c8b5c0f76bb59411d944a8d431b882f7b5cec6)]
## [1.0.0](https://github.com/eea/volto-quote-block/compare/0.3.3...1.0.0) - 28 October 2022

#### :nail_care: Enhancements
Expand All @@ -92,7 +90,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Release 1.0.0 [Alin Voinea - [`4944731`](https://github.com/eea/volto-quote-block/commit/4944731b1c7b9b80620311909202bb75c894760c)]
- test(cypress): Cypress 10 / Razzle 4 [Alin Voinea - [`91262ed`](https://github.com/eea/volto-quote-block/commit/91262eddb7272d12686cdb71952c607846cecb5d)]
- Cleanup [Alin Voinea - [`9b70192`](https://github.com/eea/volto-quote-block/commit/9b7019284a8e2159248cfa6109c8c0f84c6273d8)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`57a87d3`](https://github.com/eea/volto-quote-block/commit/57a87d3474a6390b77c2b1b983cd932bf2dd824f)]
### [0.3.3](https://github.com/eea/volto-quote-block/compare/0.3.2...0.3.3) - 1 August 2022

### [0.3.2](https://github.com/eea/volto-quote-block/compare/0.3.1...0.3.2) - 30 June 2022
Expand All @@ -103,7 +100,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`cbbd44a`](https://github.com/eea/volto-quote-block/commit/cbbd44a578ddb6904ef1c7bb0053549029c7447b)]
### [0.2.0](https://github.com/eea/volto-quote-block/compare/0.1.2...0.2.0) - 19 May 2022

#### :nail_care: Enhancements
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 74d5196

Please sign in to comment.