Skip to content

Commit

Permalink
Merge pull request #71 from eea/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
nileshgulia1 authored Dec 20, 2022
2 parents afa8067 + 158d542 commit 20ac01f
Show file tree
Hide file tree
Showing 14 changed files with 27,644 additions and 316,502 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ npm-debug.log*
coverage
node_modules
build
cache
.env.local
.env.development.local
.env.test.local
Expand Down
Binary file added .yarn/install-state.gz
Binary file not shown.
147,155 changes: 0 additions & 147,155 deletions .yarn/releases/yarn-1.18.0.cjs

This file was deleted.

147,155 changes: 0 additions & 147,155 deletions .yarn/releases/yarn-1.18.0.js

This file was deleted.

807 changes: 807 additions & 0 deletions .yarn/releases/yarn-3.3.0.cjs

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions .yarnrc

This file was deleted.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
defaultSemverRangePrefix: ""

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.3.0.cjs
1,877 changes: 904 additions & 973 deletions CHANGELOG.md

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,70 +14,70 @@ pipeline {

stages {

stage('Integration tests') {
parallel {
stage('Cypress') {
when {
environment name: 'CHANGE_ID', value: ''
}
steps {
node(label: 'docker') {
script {
try {
sh '''docker pull plone; docker run -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
sh '''docker pull eeacms/volto-project-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/volto-project-ci cypress'''
} finally {
try {
sh '''rm -rf cypress-reports cypress-results'''
sh '''mkdir -p cypress-reports cypress-results'''
sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/videos cypress-reports/'''
sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/reports cypress-results/'''
archiveArtifacts artifacts: 'cypress-reports/videos/*.mp4', fingerprint: true
}
finally {
catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
}
sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true
}
}
}
}
}
}
// stage('Integration tests') {
// parallel {
// // stage('Cypress') {
// // when {
// // environment name: 'CHANGE_ID', value: ''
// // }
// // steps {
// // node(label: 'docker') {
// // script {
// // try {
// // sh '''docker pull plone; docker run -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
// // sh '''docker pull eeacms/volto-project-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/volto-project-ci cypress'''
// // } finally {
// // try {
// // sh '''rm -rf cypress-reports cypress-results'''
// // sh '''mkdir -p cypress-reports cypress-results'''
// // sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/videos cypress-reports/'''
// // sh '''docker cp $BUILD_TAG-cypress:/opt/frontend/my-volto-project/cypress/reports cypress-results/'''
// // archiveArtifacts artifacts: 'cypress-reports/videos/*.mp4', fingerprint: true
// // }
// // finally {
// // catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
// // junit testResults: 'cypress-results/**/*.xml', allowEmptyResults: true
// // }
// // sh script: "docker stop $BUILD_TAG-plone", returnStatus: true
// // sh script: "docker rm -v $BUILD_TAG-plone", returnStatus: true
// // sh script: "docker rm -v $BUILD_TAG-cypress", returnStatus: true
// // }
// // }
// // }
// // }
// // }
// // }

stage("Docker test build") {
when {
not {
environment name: 'CHANGE_ID', value: ''
}
not {
buildingTag()
}
environment name: 'CHANGE_TARGET', value: 'master'
}
environment {
IMAGE_NAME = BUILD_TAG.toLowerCase()
}
steps {
node(label: 'docker-host') {
script {
checkout scm
try {
dockerImage = docker.build("${IMAGE_NAME}", "--no-cache .")
} finally {
sh script: "docker rmi ${IMAGE_NAME}", returnStatus: true
}
}
}
}
}
// // stage("Docker test build") {
// // when {
// // not {
// // environment name: 'CHANGE_ID', value: ''
// // }
// // not {
// // buildingTag()
// // }
// // environment name: 'CHANGE_TARGET', value: 'master'
// // }
// // environment {
// // IMAGE_NAME = BUILD_TAG.toLowerCase()
// // }
// // steps {
// // node(label: 'docker-host') {
// // script {
// // checkout scm
// // try {
// // dockerImage = docker.build("${IMAGE_NAME}", "--no-cache .")
// // } finally {
// // sh script: "docker rmi ${IMAGE_NAME}", returnStatus: true
// // }
// // }
// // }
// // }
// // }


}
}
// }
// }


stage('Pull Request') {
Expand Down
24 changes: 24 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -132,3 +132,27 @@ try-production: ## Build production bundle
yarn build
./entrypoint-dev.sh
echo "Now run: node build/server.js"

.PHONY: install
install: ## Install the frontend
@echo "Install frontend"
$(MAKE) omelette
$(MAKE) preinstall
yarn install

.PHONY: preinstall
preinstall: ## Preinstall task, checks if missdev (mrs-developer) is present and runs it
if [ -f $$(pwd)/mrs.developer.json ]; then make develop; fi


.PHONY: develop
develop: ## Runs missdev in the local project (mrs.developer.json should be present)
npx -p mrs-developer missdev --config=jsconfig.json --output=addons --fetch-https

.PHONY: omelette
omelette: ## Creates the omelette folder that contains a link to the installed version of Volto (a softlink pointing to node_modules/@plone/volto)
if [ ! -d omelette ]; then ln -sf node_modules/@plone/volto omelette; fi

.PHONY: patches
patches:
/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/eea/climate-energy-frontend?sort=semver)](https://github.com/eea/climate-energy-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto/climate-energy-frontend/master&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/master/display/redirect)
[![Pipeline develop](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclimate-energy-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclimate-energy-frontend%2F2.22.0&build=last&subject=release%20v2.22.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/2.22.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fclimate-energy-frontend%2F2.23.0&build=last&subject=release%20v2.23.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/climate-energy-frontend/job/2.23.0/lastBuild/display/redirect/)



Expand Down
42 changes: 0 additions & 42 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,9 @@
{
"compilerOptions": {
"paths": {
"@eeacms/volto-matomo": ["develop/volto-matomo/src"],
"@eeacms/volto-sentry-rancher-config": [
"develop/volto-sentry-rancher-config/src"
],
"@eeacms/volto-corsproxy": ["develop/volto-corsproxy/src"],
"@eeacms/volto-depiction": ["develop/volto-depiction/src"],
"@eeacms/volto-taxonomy": ["develop/volto-taxonomy/src"],
"@eeacms/volto-object-widget": ["develop/volto-object-widget/src"],
"@eeacms/volto-widgets-view": ["develop/volto-widgets-view/src"],
"@eeacms/volto-widget-toggle": ["develop/volto-widget-toggle/src"],
"@eeacms/volto-widget-temporal-coverage": [
"develop/volto-widget-temporal-coverage/src"
],
"@eeacms/volto-widget-geolocation": [
"develop/volto-widget-geolocation/src"
],
"@eeacms/volto-climate-energy-policy": [
"develop/volto-climate-energy-policy/src"
],
"volto-slate": ["develop/volto-slate/src"],
"@eeacms/volto-slate-metadata-mentions": [
"develop/volto-slate-metadata-mentions/src"
],
"@eeacms/volto-slate-footnote": ["develop/volto-slate-footnote/src"],
"@eeacms/volto-slate-zotero": ["develop/volto-slate-zotero/src"],
"@eeacms/volto-accordion-block": ["develop/volto-accordion-block/src"],
"@eeacms/volto-block-toc": ["develop/volto-block-toc/src"],
"@eeacms/volto-block-divider": ["develop/volto-block-divider/src"],
"@eeacms/volto-listing-block": ["develop/volto-listing-block/src"],
"@eeacms/volto-metadata-block": ["develop/volto-metadata-block/src"],
"@eeacms/volto-group-block": ["develop/volto-group-block/src"],
"@eeacms/volto-columns-block": ["develop/volto-columns-block/src"],
"@eeacms/volto-tabs-block": ["develop/volto-tabs-block/src"],
"@eeacms/volto-block-image-cards": [
"develop/volto-block-image-cards/src"
],
"@eeacms/volto-banner": ["develop/volto-banner/src"],
"@eeacms/volto-resize-helper": ["develop/volto-resize-helper/src"],
"@eeacms/volto-block-style": ["develop/volto-block-style/src"],
"@eeacms/volto-eea-kitkat": ["develop/volto-eea-kitkat/src"],
"@eeacms/volto-plotlycharts": ["develop/volto-plotlycharts/src"],
"@eeacms/volto-embed": ["develop/volto-embed/src"],
"@eeacms/volto-datablocks": ["develop/volto-datablocks/src"],
"@eeacms/volto-tableau": ["develop/volto-tableau/src"],
"@eeacms/volto-pdf-block": ["develop/volto-pdf-block/src"],
"@eeacms/volto-energy-theme": ["develop/volto-energy-theme/src"]
},
"baseUrl": "src"
Expand Down
37 changes: 19 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "climate-energy-frontend",
"description": "Frontend component for the Climate Energy website.",
"license": "MIT",
"version": "2.22.0",
"version": "2.23.0",
"private": true,
"workspaces": [
"src/addons/*"
"src/develop/*"
],
"addons": [
"@eeacms/volto-eea-kitkat",
Expand All @@ -19,10 +19,7 @@
],
"scripts": {
"start": "razzle start",
"postinstall": "yarn omelette && yarn patches",
"omelette": "ln -sf node_modules/@plone/volto/ omelette",
"patches": "/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true",
"build": "razzle build",
"build": "razzle build --noninteractive",
"start:prod": "NODE_ENV=production node build/server.js",
"i18n": "NODE_ENV=production node node_modules/@plone/volto/src/i18n.js",
"develop:npx": "npx -p mrs-developer missdev --config=jsconfig.json --output=develop",
Expand All @@ -41,8 +38,7 @@
],
"transform": {
"^.+\\.js(x)?$": "babel-jest",
"^.+\\.css$": "jest-css-modules",
"^.+\\.scss$": "jest-css-modules",
"^.+\\.less$": "jest-css-modules",
"^.+\\.(png)$": "jest-file",
"^.+\\.(jpg)$": "jest-file",
"^.+\\.(svg)$": "./node_modules/@plone/volto/jest-svgsystem-transform.js"
Expand All @@ -55,7 +51,9 @@
"@plone/volto/(.*)$": "<rootDir>/node_modules/@plone/volto/src/$1",
"load-volto-addons": "<rootDir>/node_modules/@plone/volto/jest-addons-loader.js",
"@package/(.*)$": "<rootDir>/src/$1",
"~/(.*)$": "<rootDir>/src/$1"
"@plone/volto-slate": "<rootDir>/node_modules/@plone/volto/packages/volto-slate/src",
"~/(.*)$": "<rootDir>/src/$1",
"\\.(css|less|scss|sass)$": "identity-obj-proxy"
},
"coverageThreshold": {
"global": {
Expand Down Expand Up @@ -108,22 +106,24 @@
"ignoreFiles": "theme/themes/default/**/*.overrides"
},
"engines": {
"node": "^10 || ^12 || ^14"
"node": "^16 || ^14"
},
"dependencies": {
"@eeacms/volto-climate-energy-policy": "0.1.2",
"@eeacms/volto-datablocks": "3.0.12",
"@eeacms/volto-eea-kitkat": "6.0.0",
"@eeacms/volto-embed": "4.0.1",
"@eeacms/volto-energy-theme": "1.0.31",
"@eeacms/volto-datablocks": "4.0.2",
"@eeacms/volto-eea-kitkat": "10.3.0",
"@eeacms/volto-embed": "5.0.0",
"@eeacms/volto-energy-theme": "1.0.33",
"@eeacms/volto-pdf-block": "1.0.10",
"@eeacms/volto-plotlycharts": "3.0.4",
"@eeacms/volto-tableau": "1.2.4",
"@plone/volto": "15.5.0"
"@eeacms/volto-plotlycharts": "5.0.8",
"@eeacms/volto-tableau": "2.0.0",
"@plone/volto": "16.4.1"
},
"devDependencies": {
"@plone/scripts": "^2.1.2",
"eslint-plugin-prettier": "3.1.3",
"prettier": "2.0.5",
"razzle": "4.2.17",
"stylelint": "13.3.3",
"stylelint-config-idiomatic-order": "8.1.0",
"stylelint-config-prettier": "8.0.1",
Expand All @@ -135,5 +135,6 @@
"Firefox ESR",
"not ie 11",
"not dead"
]
],
"packageManager": "[email protected]"
}
Loading

0 comments on commit 20ac01f

Please sign in to comment.