From 046ce0d690c868bf881b682b31603d719ce2a56c Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 12 Nov 2020 19:02:22 +0200 Subject: [PATCH 1/5] Move docs images to dedicated docs folder --- screenshot.png => docs/screenshot.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename screenshot.png => docs/screenshot.png (100%) diff --git a/screenshot.png b/docs/screenshot.png similarity index 100% rename from screenshot.png rename to docs/screenshot.png From 50f524b70ef4ed9149e54cadd8fb83cd1de305eb Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Thu, 12 Nov 2020 19:02:40 +0200 Subject: [PATCH 2/5] Fix README screenshot path --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b5410f3..ac2c6d9 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Ideally it should be loaded as the last addon in Volto project configuration. ### -![Screenshot](./screenshot.png) +![Screenshot](https://github.com/eea/volto-block-style/raw/docs/docs/screenshot.png) ## Getting started From 773ff9c629198190e7da93e62792bbc0963ee33d Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Tue, 10 Oct 2023 06:54:24 +0300 Subject: [PATCH 3/5] chore:volto 16 in tests, update docs, fix stylelint overrides --- Jenkinsfile | 2 +- Makefile | 4 ++-- RELEASE.md | 28 ++++++++++++++-------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 565e7a7..83c86a1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { NAMESPACE = "@eeacms" SONARQUBE_TAGS = "volto.eea.europa.eu,climate-energy.eea.europa.eu,forest.eea.europa.eu,clms.land.copernicus.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,sustainability.eionet.europa.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en" DEPENDENCIES = "" - VOLTO = "" + VOLTO = "16" } stages { diff --git a/Makefile b/Makefile index 4a5cbed..f3614a8 100644 --- a/Makefile +++ b/Makefile @@ -97,12 +97,12 @@ stylelint: ## Stylelint .PHONY: stylelint-overrides stylelint-overrides: - $(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' + $(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' .PHONY: stylelint-fix stylelint-fix: ## Fix stylelint $(NODE_MODULES)/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}' --fix - $(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix + $(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix .PHONY: prettier prettier: ## Prettier diff --git a/RELEASE.md b/RELEASE.md index 24f98ee..4e311a0 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -20,9 +20,9 @@ You need to first install the [release-it](https://github.com/release-it/release ``` npm install -g release-it ``` - + Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository. - + Release-it is a tool that automates 4 important steps in the release process: 1. Version increase in `package.json` ( increased from the current version in `package.json`) @@ -30,45 +30,45 @@ Release-it is a tool that automates 4 important steps in the release process: 3. GitHub release on the commit with the changelog and package.json modification on the develop branch 4. NPM release ( by default it's disabled, but can be enabled in the configuration file ) -To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens) +To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens) ``` export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX ``` - + To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN : - + ``` echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc ``` #### Using release-it tool - + There are 3 yarn scripts that can be run to do the release ##### yarn release-beta -Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input). +Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input). ``` -? Select increment (next version): -❯ prepatch (0.1.1-beta.0) - preminor (0.2.0-beta.0) - premajor (1.0.0-beta.0) - Other, please specify... +? Select increment (next version): +❯ prepatch (0.1.1-beta.0) + preminor (0.2.0-beta.0) + premajor (1.0.0-beta.0) + Other, please specify... ``` ##### yarn release-major-beta Same as `yarn release-beta`, but with premajor version pre-selected. - + ##### yarn release Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other. #### Important notes -> Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST. +> Do not use release-it tool on master branch, the commit on CHANGELOG.md file and the version increase in the package.json file can't be done without a PULL REQUEST. > Do not keep Pull Requests from develop to master branches open when you are doing beta releases from the develop branch. As long as a PR to master is open, an automatic script will run on every commit and will update both the version and the changelog to a production-ready state - ( MAJOR.MINOR.PATCH mandatory format for version). From 7770f122cfbb9fe5df8000a8dfcdc3544b380a1d Mon Sep 17 00:00:00 2001 From: Cretu Mihaela Date: Fri, 13 Oct 2023 16:49:55 +0300 Subject: [PATCH 4/5] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e5060e..620c665 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ block types that you want to enable. By default it is enabled for all blocks. #### IMPORTANT! Because of the way it works, you should always load this addon as the last addon in Volto project configuration. -![Screenshot](https://github.com/eea/volto-block-style/raw/docs/docs/screenshot.png) +![Screenshot](https://github.com/eea/volto-block-style/raw/master/docs/screenshot.png) ## Getting started From e9d6192be33ee28f663662184a118507a12e6a98 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Fri, 13 Oct 2023 14:07:43 +0000 Subject: [PATCH 5/5] Automated release 5.2.5 --- CHANGELOG.md | 11 +++++++++++ package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 752aa8d..b58b585 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ 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). +### [5.2.5](https://github.com/eea/volto-block-style/compare/5.2.4...5.2.5) - 13 October 2023 + +#### :house: Internal changes + +- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`773ff9c`](https://github.com/eea/volto-block-style/commit/773ff9c629198190e7da93e62792bbc0963ee33d)] + +#### :hammer_and_wrench: Others + +- Update README [Cretu Mihaela - [`7770f12`](https://github.com/eea/volto-block-style/commit/7770f122cfbb9fe5df8000a8dfcdc3544b380a1d)] +- Fix README screenshot path [Alin Voinea - [`50f524b`](https://github.com/eea/volto-block-style/commit/50f524b70ef4ed9149e54cadd8fb83cd1de305eb)] +- Move docs images to dedicated docs folder [Alin Voinea - [`046ce0d`](https://github.com/eea/volto-block-style/commit/046ce0d690c868bf881b682b31603d719ce2a56c)] ### [5.2.4](https://github.com/eea/volto-block-style/compare/5.2.3...5.2.4) - 29 September 2023 #### :house: Documentation changes diff --git a/package.json b/package.json index 6aa144c..8781fe6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-block-style", - "version": "5.2.4", + "version": "5.2.5", "description": "volto-block-style: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",