Skip to content

Commit

Permalink
Merge pull request #29 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 62e8b10 + 7ec27d2 commit 84c5f16
Show file tree
Hide file tree
Showing 20 changed files with 535 additions and 292 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.

27 changes: 13 additions & 14 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.8](https://github.com/eea/volto-nextcloud-video-block/compare/0.4.7...0.4.8) - 20 October 2023
### [1.0.0](https://github.com/eea/volto-nextcloud-video-block/compare/0.4.8...1.0.0) - 22 April 2024

#### :rocket: New Features

- feat: Release 1.0.0 - Volto 17 support [alin - [`3880a35`](https://github.com/eea/volto-nextcloud-video-block/commit/3880a35ccc3814d81b028b16d7b7eaa9562dff32)]
- feat: Volto 17 support - refs #264527 [EEA Jenkins - [`519895c`](https://github.com/eea/volto-nextcloud-video-block/commit/519895c5c9cb6dff969075f01e5eb9c977947115)]

#### :house: Internal changes


#### :hammer_and_wrench: Others

### [0.4.8](https://github.com/eea/volto-nextcloud-video-block/compare/0.4.7...0.4.8) - 22 October 2023

#### :house: Internal changes

Expand Down Expand Up @@ -37,12 +49,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`b3fe0a2`](https://github.com/eea/volto-nextcloud-video-block/commit/b3fe0a2cf89d9fd8e2f65c1b4206a1f9a5b8bb74)]
- test: EN locales, pre-commit fix, feature PRs checks Refs #257193 [valentinab25 - [`f768b7c`](https://github.com/eea/volto-nextcloud-video-block/commit/f768b7ccda394e8f260c95f3f1a71819ea4bba88)]
- test: Fix eslint and yarn i18n [Alin Voinea - [`7412fe7`](https://github.com/eea/volto-nextcloud-video-block/commit/7412fe7de8a8697f2bfd9dd1b0bf7ef8c949c88b)]
- i18n: Add en [Alin Voinea - [`9d01288`](https://github.com/eea/volto-nextcloud-video-block/commit/9d0128842887d397d8115fa075d27d8e66b4cbf5)]
- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`2962d47`](https://github.com/eea/volto-nextcloud-video-block/commit/2962d476c1e82f59dd2698161ea953305a750538)]
- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`31a4525`](https://github.com/eea/volto-nextcloud-video-block/commit/31a4525b41d98112ef036034f35990d58c86d367)]
### [0.4.4](https://github.com/eea/volto-nextcloud-video-block/compare/0.4.3...0.4.4) - 4 August 2023

#### :house: Documentation changes
Expand All @@ -59,7 +68,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### :hammer_and_wrench: Others

- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`bb12e9d`](https://github.com/eea/volto-nextcloud-video-block/commit/bb12e9d24878cd347e35590a609ed7fc4140d195)]
- test: Fix issues identified by Sonarqube - refs #254220 [dana-cfc4 - [`c959a61`](https://github.com/eea/volto-nextcloud-video-block/commit/c959a61fe15781ee0a500c688ade813495107039)]
### [0.4.1](https://github.com/eea/volto-nextcloud-video-block/compare/0.4.0...0.4.1) - 16 June 2023

Expand Down Expand Up @@ -94,24 +102,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- test: Fix test config, coverage Refs #253277 [valentinab25 - [`983cc70`](https://github.com/eea/volto-nextcloud-video-block/commit/983cc701d747b05300c838f69c79242fda3349af)]
- clean up [Miu Razvan - [`5f7892a`](https://github.com/eea/volto-nextcloud-video-block/commit/5f7892aef352facb7f3552c6bf9f5219b1426c8f)]
- refactor code [tedw87 - [`372d579`](https://github.com/eea/volto-nextcloud-video-block/commit/372d57993276386befa998a237cef5910d30a32f)]
- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`03dd210`](https://github.com/eea/volto-nextcloud-video-block/commit/03dd210b6e7f2d997bd8f80e76294797953f71e5)]
- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`1c80e48`](https://github.com/eea/volto-nextcloud-video-block/commit/1c80e48e0605cc33ce3c4f047031bb59777c3522)]
- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`9b396fb`](https://github.com/eea/volto-nextcloud-video-block/commit/9b396fbd8a57052a0406c442c0a460c940bae40d)]
- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`c857e0a`](https://github.com/eea/volto-nextcloud-video-block/commit/c857e0a19ddd101ed1953582591b7cd53b269111)]
### [0.3.1](https://github.com/eea/volto-nextcloud-video-block/compare/0.3.0...0.3.1) - 29 March 2023

#### :hammer_and_wrench: Others

- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`651eb88`](https://github.com/eea/volto-nextcloud-video-block/commit/651eb88fb27cf0e51c0b75aa5ab082b3fbda0f90)]
### [0.3.0](https://github.com/eea/volto-nextcloud-video-block/compare/0.2.0...0.3.0) - 15 March 2023

#### :hammer_and_wrench: Others

- Release 0.3.0 [Alin Voinea - [`6dfd307`](https://github.com/eea/volto-nextcloud-video-block/commit/6dfd307b49edcc6ac9aa32fe8d89527c75a0e31c)]
- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`240b696`](https://github.com/eea/volto-nextcloud-video-block/commit/240b696ce279dcfd68b44cb6918776b3fa97147a)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`0f94a58`](https://github.com/eea/volto-nextcloud-video-block/commit/0f94a58ea918675b2a775eebd8a4fa1b4fcdbb62)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`a720438`](https://github.com/eea/volto-nextcloud-video-block/commit/a7204382b8a891d172a3086142319af3771acd49)]
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`002119c`](https://github.com/eea/volto-nextcloud-video-block/commit/002119cf10ce0a56cec89187659a976571a5936e)]
### [0.2.0](https://github.com/eea/volto-nextcloud-video-block/compare/0.1.0...0.2.0) - 1 March 2023

#### :rocket: New Features
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 84c5f16

Please sign in to comment.