Merge pull request #14 from eea/develop

Release

CHANGELOG.md

@@ -4,17 +4,40 @@ 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.5.1](https://github.com/eea/volto-slate-label/compare/0.5.0...0.5.1) - 12 June 2023
+
+#### :house: Internal changes
+
+- chore: [JENKINS] Deprecate circularity website [valentinab25 - [`0d122e6`](https://github.com/eea/volto-slate-label/commit/0d122e663e43c46c3fced18727be0acd5a87c404)]
+
+#### :hammer_and_wrench: Others
+
+- test: jest should look for addons in node_modules Refs #253277 [valentinab25 - [`667fb86`](https://github.com/eea/volto-slate-label/commit/667fb860e064902b6db4efaffd3508217faec5cc)]
+- test: Fix test config, coverage Refs #253277 [valentinab25 - [`25b23db`](https://github.com/eea/volto-slate-label/commit/25b23dbe1574ef332340593accee6c91157adcaf)]
+- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`3f6b74d`](https://github.com/eea/volto-slate-label/commit/3f6b74d04eafec3cf0b46b781623f8b4d136c611)]
 ### [0.5.0](https://github.com/eea/volto-slate-label/compare/0.4.4...0.5.0) - 27 March 2023
 
 #### :hammer_and_wrench: Others
 
-- Release 0.5.0 [Alin Voinea - [`71dd148`](https://github.com/eea/volto-slate-label/commit/71dd148f55f3e3d601dd92bb7850b6f206d67069)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`fbf669a`](https://github.com/eea/volto-slate-label/commit/fbf669ab11aab1ae0a5cb056a9f1dcbfef2459e2)]
+- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`b8a123b`](https://github.com/eea/volto-slate-label/commit/b8a123bf98267d493ee5be52134719cde00eddee)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`3d7b7d4`](https://github.com/eea/volto-slate-label/commit/3d7b7d4ec275b8572fab5f45fc82dc00854ccede)]
+- Add Sonarqube tag using advisory-board-frontend addons list [EEA Jenkins - [`283e9db`](https://github.com/eea/volto-slate-label/commit/283e9dbae39d3113066c3a5da7f3555c344f4a65)]
+- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`a47f640`](https://github.com/eea/volto-slate-label/commit/a47f6404717b2162fbb69c3bf2f1be5046397950)]
 - test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`7287269`](https://github.com/eea/volto-slate-label/commit/7287269bc4e718a6b66025e37bea024565bb7306)]
+- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`847e792`](https://github.com/eea/volto-slate-label/commit/847e7928331e803e1c7b80aa662cfb21c3b2debb)]
+- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`886d07a`](https://github.com/eea/volto-slate-label/commit/886d07a8b396e6b9810c378fbfd2dc8b7e3c9472)]
+- yarn 3 [Alin Voinea - [`dad28ed`](https://github.com/eea/volto-slate-label/commit/dad28ed3f8225cda12ea1d8f059fe6b256fe6b5f)]
+- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`f7dafe5`](https://github.com/eea/volto-slate-label/commit/f7dafe55c237813269e15a64f5c65bf4d3ea7519)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`d30afde`](https://github.com/eea/volto-slate-label/commit/d30afde1b55457cabdcb51f016223d740ffb5518)]
+- Add Sonarqube tag using demo-kitkat-frontend addons list [EEA Jenkins - [`d0a0724`](https://github.com/eea/volto-slate-label/commit/d0a0724848cd9c90f15747dba4ddffbe923b71b8)]
+- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`5101f76`](https://github.com/eea/volto-slate-label/commit/5101f762987396651fb56504714a07754a8f76d0)]
 ### [0.4.4](https://github.com/eea/volto-slate-label/compare/0.4.3...0.4.4) - 16 November 2022
 
 #### :hammer_and_wrench: Others
 
 - test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`2744fc0`](https://github.com/eea/volto-slate-label/commit/2744fc024024a9daae33607564e61141b2777c03)]
+- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`97bcd60`](https://github.com/eea/volto-slate-label/commit/97bcd60866db1c9f956871e183b98f6d79fbcdc6)]
 ### [0.4.3](https://github.com/eea/volto-slate-label/compare/0.4.2...0.4.3) - 25 October 2022
 
 ### [0.4.2](https://github.com/eea/volto-slate-label/compare/0.4.1...0.4.2) - 24 October 2022
@@ -43,6 +66,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test(cypress): Fix volto version [Alin Voinea - [`511487e`](https://github.com/eea/volto-slate-label/commit/511487e39fdf88f2d32cff941c1c4bba19b2a6d6)]
 - Revert "refactor(volto-slate): use @plone/volto-slate, latest volto compatibility refs #153447  (#6)" [Alin Voinea - [`88d2ee6`](https://github.com/eea/volto-slate-label/commit/88d2ee6390143c89a22fdebc8289dcd135f0e42f)]
 - Release 0.3.0 [Alin Voinea - [`4f669e5`](https://github.com/eea/volto-slate-label/commit/4f669e538b962ea87a4b3a62a40b6e98c3a9adf2)]
+- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`438c326`](https://github.com/eea/volto-slate-label/commit/438c3265df1676a63ecdb378592bb2a1d48bf223)]
 ### [0.2.3](https://github.com/eea/volto-slate-label/compare/0.2.2...0.2.3) - 30 June 2022
 
 ### [0.2.2](https://github.com/eea/volto-slate-label/compare/0.2.1...0.2.2) - 13 April 2022
@@ -53,6 +77,7 @@ 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 - [`1cf44a6`](https://github.com/eea/volto-slate-label/commit/1cf44a6b9c62fadc06d73ea6f787c4720fdd5a7c)]
 ### [0.2.1](https://github.com/eea/volto-slate-label/compare/0.2.0...0.2.1) - 5 April 2022
 
 #### :house: Documentation changes
@@ -86,4 +111,5 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- yarn bootstrap [Alin Voinea - [`a1a0443`](https://github.com/eea/volto-slate-label/commit/a1a0443a38c213fa5a7b980e4ac1237d2d31192e)]
 - Initial commit [Alin Voinea - [`190dd4a`](https://github.com/eea/volto-slate-label/commit/190dd4ab6ef74a24cfb19af4d6eb6f76c32aca47)]

Jenkinsfile

@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-slate-label"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu,forest.eea.europa.eu,demo-kitkat.dev2aws.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,biodiversity.europa.eu,climate-adapt.eea.europa.eu,climate-energy.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-ims,www.eea.europa.eu-en"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,forest.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,biodiversity.europa.eu,climate-adapt.eea.europa.eu,climate-energy.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-ims,www.eea.europa.eu-en,industry.eea.europa.eu"
         DEPENDENCIES = ""
         VOLTO = ""
     }
@@ -188,6 +188,7 @@ pipeline {
             def nodeJS = tool 'NodeJS';
             withSonarQubeEnv('Sonarqube') {
               sh '''sed -i "s#/opt/frontend/my-volto-project/src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
+              sh '''sed -i "s#src/addons/${GIT_NAME}/##g" xunit-reports/coverage/lcov.info'''
               sh "export PATH=${scannerHome}/bin:${nodeJS}/bin:$PATH; sonar-scanner -Dsonar.javascript.lcov.reportPaths=./xunit-reports/coverage/lcov.info,./cypress-coverage/coverage/lcov.info -Dsonar.sources=./src -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER"
               sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done'''
             }

jest-addon.config.js

@@ -5,19 +5,19 @@ module.exports = {
     '!src/**/*.d.ts',
   ],
   moduleNameMapper: {
+    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
     '@package/(.*)$': '<rootDir>/src/$1',
     '@root/(.*)$': '<rootDir>/src/$1',
     '@plone/volto-quanta/(.*)$': '<rootDir>/src/addons/volto-quanta/src/$1',
-    '@eeacms/(.*?)/(.*)$': '<rootDir>/src/addons/$1/src/$2',
+    '@eeacms/(.*?)/(.*)$': '<rootDir>/node_modules/@eeacms/$1/src/$2',
     '@plone/volto-slate':
       '<rootDir>/node_modules/@plone/volto/packages/volto-slate/src',
     '~/(.*)$': '<rootDir>/src/$1',
     'load-volto-addons':
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
-    '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
   },
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-slate-label",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "@eeacms/volto-slate-label: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",