Skip to content

Commit 70cc0b1

Browse files
authored
Merge pull request #18 from eea/develop
Develop
2 parents b886951 + ebaa039 commit 70cc0b1

File tree

7 files changed

+28
-19
lines changed

7 files changed

+28
-19
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
### [3.1.4](https://github.com/eea/volto-widget-toggle/compare/3.1.3...3.1.4) - 16 October 2023
8+
9+
#### :house: Internal changes
10+
11+
- chore:volto 16 in tests, update docs, fix stylelint overrides [valentinab25 - [`4eb68b6`](https://github.com/eea/volto-widget-toggle/commit/4eb68b6b81b0edb87b477e91cb758475f1d51ea2)]
12+
13+
#### :hammer_and_wrench: Others
14+
15+
- Update README [Cretu Mihaela - [`42d5a69`](https://github.com/eea/volto-widget-toggle/commit/42d5a6959d6b8f8679ceac063aa16a558096b62a)]
716
### [3.1.3](https://github.com/eea/volto-widget-toggle/compare/3.1.2...3.1.3) - 29 September 2023
817

918
#### :house: Internal changes

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pipeline {
66
NAMESPACE = "@eeacms"
77
SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,biodiversity.europa.eu,clms.land.copernicus.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"
88
DEPENDENCIES = ""
9-
VOLTO = ""
9+
VOLTO = "16"
1010
}
1111

1212
stages {

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ stylelint: ## Stylelint
9797

9898
.PHONY: stylelint-overrides
9999
stylelint-overrides:
100-
$(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'
100+
$(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides'
101101

102102
.PHONY: stylelint-fix
103103
stylelint-fix: ## Fix stylelint
104104
$(NODE_MODULES)/stylelint/bin/stylelint.js --allow-empty-input 'src/**/*.{css,less}' --fix
105-
$(NODE_MODULES)/.bin/stylelint --syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix
105+
$(NODE_MODULES)/.bin/stylelint --custom-syntax less --allow-empty-input 'theme/**/*.overrides' 'src/**/*.overrides' --fix
106106

107107
.PHONY: prettier
108108
prettier: ## Prettier

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
## Features
2020

21-
![Toogle Checkboxes](https://raw.githubusercontent.com/eea/volto-widget-toggle/docs/docs/volto-widget-toggle.gif)
21+
![Toogle Checkboxes](https://raw.githubusercontent.com/eea/volto-widget-toggle/master/docs/volto-widget-toggle.gif)
2222

2323
## Getting started
2424

RELEASE.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,55 +20,55 @@ You need to first install the [release-it](https://github.com/release-it/release
2020
```
2121
npm install -g release-it
2222
```
23-
23+
2424
Release-it uses the configuration written in the [`.release-it.json`](./.release-it.json) file located in the root of the repository.
25-
25+
2626
Release-it is a tool that automates 4 important steps in the release process:
2727

2828
1. Version increase in `package.json` ( increased from the current version in `package.json`)
2929
2. `CHANGELOG.md` automatic generation from commit messages ( grouped by releases )
3030
3. GitHub release on the commit with the changelog and package.json modification on the develop branch
3131
4. NPM release ( by default it's disabled, but can be enabled in the configuration file )
3232

33-
To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
33+
To configure the authentification, you need to export GITHUB_TOKEN for [GitHub](https://github.com/settings/tokens)
3434

3535
```
3636
export GITHUB_TOKEN=XXX-XXXXXXXXXXXXXXXXXXXXXX
3737
```
38-
38+
3939
To configure npm, you can use the `npm login` command or use a configuration file with a TOKEN :
40-
40+
4141
```
4242
echo "//registry.npmjs.org/:_authToken=YYYYYYYYYYYYYYYYYYYYYYYYYYYYYY" > .npmrc
4343
```
4444

4545
#### Using release-it tool
46-
46+
4747
There are 3 yarn scripts that can be run to do the release
4848

4949
##### yarn release-beta
5050

51-
Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
51+
Automatically calculates and presents 3 beta versions - patch, minor and major for you to choose ( or Other for manual input).
5252

5353
```
54-
? Select increment (next version):
55-
❯ prepatch (0.1.1-beta.0)
56-
preminor (0.2.0-beta.0)
57-
premajor (1.0.0-beta.0)
58-
Other, please specify...
54+
? Select increment (next version):
55+
❯ prepatch (0.1.1-beta.0)
56+
preminor (0.2.0-beta.0)
57+
premajor (1.0.0-beta.0)
58+
Other, please specify...
5959
```
6060

6161
##### yarn release-major-beta
6262

6363
Same as `yarn release-beta`, but with premajor version pre-selected.
64-
64+
6565
##### yarn release
6666

6767
Generic command, does not automatically add the `beta` to version, but you can still manually write it if you choose Other.
6868

6969
#### Important notes
7070

71-
> 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.
71+
> 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.
7272
7373
> 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).
7474

docs/volto-widget-toggle.gif

21.8 KB
Loading

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@eeacms/volto-widget-toggle",
3-
"version": "3.1.3",
3+
"version": "3.1.4",
44
"description": "volto-widget-toggle: Volto add-on to replace checkboxes with toggle buttons",
55
"main": "src/index.js",
66
"author": "European Environment Agency: IDM2 A-Team",

0 commit comments

Comments
 (0)