Skip to content

Commit

Permalink
Merge pull request #24 from eea/develop
Browse files Browse the repository at this point in the history
Release 1.0.0 - Volto 17 support
  • Loading branch information
avoinea committed Apr 22, 2024
2 parents 58fadf3 + 7788444 commit 4d57a1e
Show file tree
Hide file tree
Showing 13 changed files with 471 additions and 224 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.

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

### [0.4.3](https://github.com/eea/volto-widget-dataprovenance/compare/0.4.2...0.4.3) - 19 October 2023
### [1.0.0](https://github.com/eea/volto-widget-dataprovenance/compare/0.4.3...1.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 1.0.0 - Volto 17 support [alin - [`1b3e759`](https://github.com/eea/volto-widget-dataprovenance/commit/1b3e75925040c06dc7f255c35fecc1348cdb1527)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`6341e47`](https://github.com/eea/volto-widget-dataprovenance/commit/6341e4741e8aab0b37abec2f22f9c1fcaf5d7072)]

#### :house: Internal changes


#### :hammer_and_wrench: Others

### [0.4.3](https://github.com/eea/volto-widget-dataprovenance/compare/0.4.2...0.4.3) - 22 October 2023

#### :house: Internal changes

Expand Down Expand Up @@ -38,7 +50,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- test: Fix package.json scripts to use makefile [Alin Voinea - [`9f9b308`](https://github.com/eea/volto-widget-dataprovenance/commit/9f9b3087025f313b34f75162923e4b2c85a70c82)]
- i18n: Add en [Alin Voinea - [`08c5dde`](https://github.com/eea/volto-widget-dataprovenance/commit/08c5dde9bd73f219a9b35f2806e1168cad7d1763)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`5539b65`](https://github.com/eea/volto-widget-dataprovenance/commit/5539b651a7d841663b85c2a0d45eee3c21a6aeba)]
- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`701a41f`](https://github.com/eea/volto-widget-dataprovenance/commit/701a41f1f23dac4c97153961df04d6013c5e27ac)]
### [0.4.0](https://github.com/eea/volto-widget-dataprovenance/compare/0.3.3...0.4.0) - 15 August 2023

#### :nail_care: Enhancements
Expand Down Expand Up @@ -69,20 +80,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
#### :hammer_and_wrench: Others

- test: Fix test config, coverage Refs #253277 [valentinab25 - [`6ec3f22`](https://github.com/eea/volto-widget-dataprovenance/commit/6ec3f222da9112c3a721d8a39ec5926400a06863)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`eed0083`](https://github.com/eea/volto-widget-dataprovenance/commit/eed0083cc0dd618028334874fbe00fcdef277b8f)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`7e058d0`](https://github.com/eea/volto-widget-dataprovenance/commit/7e058d06b1daaa142ecb82ffbc5c2969266e455e)]
### [0.3.0](https://github.com/eea/volto-widget-dataprovenance/compare/0.2.1...0.3.0) - 27 March 2023

#### :hammer_and_wrench: Others

- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`01854fa`](https://github.com/eea/volto-widget-dataprovenance/commit/01854fa55af7377ff97b8112f7c5688a70c92907)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`5c9e9cd`](https://github.com/eea/volto-widget-dataprovenance/commit/5c9e9cd9707b1c952bdf23dc16fae155241de2c1)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`c63f1bf`](https://github.com/eea/volto-widget-dataprovenance/commit/c63f1bf239245e6808ad30013569f4560b084608)]
- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`6a23e8b`](https://github.com/eea/volto-widget-dataprovenance/commit/6a23e8bf3906c56b1cac91108c6288f6cbbc5583)]
- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`1ea5d6e`](https://github.com/eea/volto-widget-dataprovenance/commit/1ea5d6e33d8e541cfd26de0c91f186221bb15496)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`263717f`](https://github.com/eea/volto-widget-dataprovenance/commit/263717fd40985ec0ee74fa29ef0f1748435c2024)]
- yarn 3 [Alin Voinea - [`9123df9`](https://github.com/eea/volto-widget-dataprovenance/commit/9123df9c7eb69d595e9786c456c01cd492983621)]
- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`78e2ba7`](https://github.com/eea/volto-widget-dataprovenance/commit/78e2ba79207d6705231c1c638ccbf81062ff8b92)]
### [0.2.1](https://github.com/eea/volto-widget-dataprovenance/compare/0.2.0...0.2.1) - 16 November 2022

#### :house: Internal changes
Expand All @@ -99,8 +101,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

- Prepare 0.2.0 release [Miu Razvan - [`38018d6`](https://github.com/eea/volto-widget-dataprovenance/commit/38018d6d9b9acd660a35706f22eb5be3ae53a16e)]
- Update dependencies [Alin Voinea - [`683786f`](https://github.com/eea/volto-widget-dataprovenance/commit/683786f502d19ba83f62cf10c800f61b5fdaed3e)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`86ae1f1`](https://github.com/eea/volto-widget-dataprovenance/commit/86ae1f1ebe080dc851af85e4de1f33c51c3b643b)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`7b38f5f`](https://github.com/eea/volto-widget-dataprovenance/commit/7b38f5fa80a095b5c9529fd63a8cc09cbbf9067c)]
### [0.1.7](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.6...0.1.7) - 15 September 2022

#### :hammer_and_wrench: Others
Expand All @@ -116,13 +116,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- FIX CYPRESS [Dobricean Ioan Dorian - [`61002d4`](https://github.com/eea/volto-widget-dataprovenance/commit/61002d46536297cde9d3d19c1937e4a4e05209a2)]
- FIX CYPRESS [Dobricean Ioan Dorian - [`bba26d8`](https://github.com/eea/volto-widget-dataprovenance/commit/bba26d88ea38288fd8d45431a2af56feef6cb718)]
- FIX Jenkins test [Dobricean Ioan Dorian - [`2f94bdc`](https://github.com/eea/volto-widget-dataprovenance/commit/2f94bdcc5eeee4306e592e95d5869992e234d17e)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`e3cafb5`](https://github.com/eea/volto-widget-dataprovenance/commit/e3cafb546cd846364cdb9e65f60aa07ec03217a4)]
- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`dcc61bb`](https://github.com/eea/volto-widget-dataprovenance/commit/dcc61bb61060a9d5227df46d21dfb591ad1a14cd)]
### [0.1.4](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.3...0.1.4) - 30 June 2022

#### :hammer_and_wrench: Others

- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`c2e6cc8`](https://github.com/eea/volto-widget-dataprovenance/commit/c2e6cc8e1b1d33c59b57516e213d6d2c0bdcb794)]
### [0.1.3](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.2...0.1.3) - 21 June 2022

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

- fix organisations widget and title [nileshgulia1 - [`1921866`](https://github.com/eea/volto-widget-dataprovenance/commit/1921866f01a0c2543bb9cd34d42d7aa93c9675f4)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`0be7871`](https://github.com/eea/volto-widget-dataprovenance/commit/0be7871ec0b8dc8dbb328604aa0c59e92c116951)]
- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`75a4bac`](https://github.com/eea/volto-widget-dataprovenance/commit/75a4baca82c4be52df0dfd8927a26ff2fcd868e2)]
- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`ead018f`](https://github.com/eea/volto-widget-dataprovenance/commit/ead018fbae9cc80468e489199b8df1573b343394)]
### [0.1.1](https://github.com/eea/volto-widget-dataprovenance/compare/0.1.0...0.1.1) - 9 June 2022

#### :bug: Bug Fixes
Expand All @@ -153,5 +147,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- yarn bootstrap [nileshgulia1 - [`93352f9`](https://github.com/eea/volto-widget-dataprovenance/commit/93352f99891aaef0da8b16c32328f0914c3f2e91)]
- Initial commit [Nilesh - [`bdfc4d5`](https://github.com/eea/volto-widget-dataprovenance/commit/bdfc4d54dcd8673838e81c362e8872d4b7530643)]
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 4d57a1e

Please sign in to comment.