Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into truncate
Browse files Browse the repository at this point in the history
  • Loading branch information
endiliey committed Aug 2, 2018
2 parents 4b759ba + 609e1b4 commit 7a6ad43
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 35 deletions.
36 changes: 36 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,42 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a

## [Unreleased]

Welcome to our newest user, [atalaya](https://atalaya.io/) and [Reaction Commerce](https://docs.reactioncommerce.com/)

Thank you to the following contributors who helped with this release:

- @endiliey
- @joelmarcey
- @yangshun
- @dballance
- @helloworld
- @jreese
- @machikoyasuda
- @parano
- @steevehook
- @theletterf

**Added**
- Add autoprefixing to CSS pipeline [\#867](https://github.com/facebook/Docusaurus/pull/867)
- Add documentation regarding usage of nested docs/ subdirectory [\#860](https://github.com/facebook/Docusaurus/pull/860)
- Support `text` language for code block style without any highlighting [\#875](https://github.com/facebook/Docusaurus/pull/875)

**Fixed/Changed**
- Fix wrong CSS language prefix for fenced blocks [\#842](https://github.com/facebook/Docusaurus/pull/842) [\#870](https://github.com/facebook/Docusaurus/pull/870)
- Fix table of contents documentation typo [\#873](https://github.com/facebook/Docusaurus/pull/873)
- Don't replace static assets linking in fenced code blocks [\#864](https://github.com/facebook/Docusaurus/pull/864)
- Improve baseUrl documentation with an example [\#863](https://github.com/facebook/Docusaurus/pull/863)
- Docusaurus own search will now search the docs in the correct language & version [\#859](https://github.com/facebook/Docusaurus/pull/859)
- Fix phrase emphasis not italicized [\#850](https://github.com/facebook/Docusaurus/pull/850)

**Chores**
- Remove unused files [\#881](https://github.com/facebook/Docusaurus/pull/881)
- Add prerelease script for Docusaurus [\#876](https://github.com/facebook/Docusaurus/pull/876)
- Improve readme [\#866](https://github.com/facebook/Docusaurus/pull/866)
- Refactor & add more tests for Docusaurus [\#839](https://github.com/facebook/Docusaurus/pull/839) [\#847](https://github.com/facebook/Docusaurus/pull/847) [\#854](https://github.com/facebook/Docusaurus/pull/854) [\#856](https://github.com/facebook/Docusaurus/pull/856)
- Add ESLint [\#836](https://github.com/facebook/Docusaurus/pull/836) [\#837](https://github.com/facebook/Docusaurus/pull/837) [\#841](https://github.com/facebook/Docusaurus/pull/841) [\#846](https://github.com/facebook/Docusaurus/pull/846)
- Update [code of conduct.md](https://github.com/facebook/Docusaurus/commit/3c1363da1bd445029d7034b0575f69a7077321c3)

## [1.3.2] - 2018-07-06

This version mainly includes bug fixes found in 1.3.1 that improves stability and UX improvements.
Expand Down
27 changes: 27 additions & 0 deletions admin/prerelease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Prereleasing New Version of Docusaurus

[![asciicast](https://asciinema.org/a/hZ7NNJPcgtdvzm5tMLLfHflMD.png)](https://asciinema.org/a/hZ7NNJPcgtdvzm5tMLLfHflMD)

# Steps

1. Ensure that `origin` remote is your Docusaurus fork and `upstream` is Docusaurus original repository.

```bash
$ git remote -v
origin https://github.com/endiliey/Docusaurus.git (fetch)
origin https://github.com/endiliey/Docusaurus.git (push)
upstream https://github.com/facebook/Docusaurus.git (fetch)
upstream https://github.com/facebook/Docusaurus.git (push)
```

2. Pull latest changes from Docusaurus repository.

```bash
$ git fetch upstream && git checkout master && git merge upstream/master
```

2. Modify `CHANGELOG.md` and other necessary files. Do not commit the changes.
3. Run `bash scripts/prerelease.sh`.
4. Create your pull request on GitHub.

<img width="629" alt="pull request" src="https://user-images.githubusercontent.com/17883920/43393765-ccb050ac-942a-11e8-94e8-d585034fa064.PNG">
33 changes: 0 additions & 33 deletions lib/generate-feed.js

This file was deleted.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@
"docusaurus-examples": "./lib/copy-examples.js",
"docusaurus-write-translations": "./lib/write-translations.js",
"docusaurus-version": "./lib/version.js",
"docusaurus-rename-version": "./lib/rename-version.js",
"docusaurus-feed": "./lib/generate-feed.js"
"docusaurus-rename-version": "./lib/rename-version.js"
},
"dependencies": {
"autoprefixer": "^9.0.0",
Expand Down
48 changes: 48 additions & 0 deletions scripts/prerelease.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/bash

DOCS_VERSION_COMMAND="run version"

echo "Select an option for release:"
echo

select VERSION in patch minor major "Specific Version"
do
echo
if [[ $REPLY =~ ^[1-4]$ ]]; then
if [[ $REPLY == 4 ]]; then
read -p "Enter a specific version: " -r VERSION
echo
if [[ -z $REPLY ]]; then
VERSION=$REPLY
fi
fi

read -p "Create $VERSION commit - Are you sure ... (y/n) " -n 1 -r
echo

if [[ $REPLY =~ ^[Yy]$ || -z $REPLY ]]; then
# bump version
yarn version --new-version $VERSION --no-git-tag-version
NEW_VERSION=$(node -p "require('./package.json').version")

# create new branch
git checkout -b $NEW_VERSION master

# cut docusaurus docs version
cd website && yarn $DOCS_VERSION_COMMAND $NEW_VERSION

# Create commit
git add .
git commit -m "v$NEW_VERSION"
git push origin $NEW_VERSION
echo "Finished"
else
echo Cancelled
fi
break
else
echo Invalid \"${REPLY}\"
echo "To continue, please enter one of the options (1-4):"
echo
fi
done

0 comments on commit 7a6ad43

Please sign in to comment.