Skip to content

Commit

Permalink
11.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
armandabric committed Jul 21, 2017
1 parent a97e5ea commit 8669751
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="11.0.1"></a>
## [11.0.1](https://github.com/algolia/react-element-to-jsx-string/compare/v11.0.0...v11.0.1) (2017-07-21)


### Bug Fixes

* **formatting:** fix an edge case where number and string childrens are not correctly merged ([47572e0](https://github.com/algolia/react-element-to-jsx-string/commit/47572e0))



<a name="11.0.0"></a>
# [11.0.0](https://github.com/algolia/react-element-to-jsx-string/compare/v10.1.0...v11.0.0) (2017-07-20)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-element-to-jsx-string",
"version": "11.0.0",
"version": "11.0.1",
"description": "Turn a ReactElement into the corresponding JSX string.",
"main": "dist/index.js",
"scripts": {
Expand Down
18 changes: 9 additions & 9 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@ if [ $currentBranch != 'master' ]; then
exit 1
fi

if [[ -n $(git status --porcelain) ]]; then
printf "Release: Working tree is not clean (git status)\n"
exit 1
fi
# if [[ -n $(git status --porcelain) ]]; then
# printf "Release: Working tree is not clean (git status)\n"
# exit 1
# fi

if [[ $# -eq 0 ]] ; then
printf "Release: use ``yarn release [major|minor|patch|x.x.x]``\n"
exit 1
fi

mversion $1

This comment has been minimized.

Copy link
@vvo

vvo Jul 24, 2017

Contributor

This works by default if you launch the script via npm run, as seen in the README.

conventional-changelog --infile CHANGELOG.md --same-file --preset angular
doctoc README.md
git commit -am "$(json -f package.json version)"
git tag v`json -f package.json version`
./node_modules/.bin/mversion $1
./node_modules/.bin/conventional-changelog --infile CHANGELOG.md --same-file --preset angular
./node_modules/.bin/doctoc README.md
git commit -am "$(./node_modules/.bin/json -f package.json version)"
git tag v`./node_modules/.bin/json -f package.json version`
git push
git push --tags
npm publish

0 comments on commit 8669751

Please sign in to comment.