Skip to content

Commit

Permalink
Merge cde5f19 into f240f96
Browse files Browse the repository at this point in the history
  • Loading branch information
julienben committed Jul 11, 2019
2 parents f240f96 + cde5f19 commit ba8752f
Show file tree
Hide file tree
Showing 14 changed files with 174 additions and 114 deletions.
3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
@@ -1,15 +1,16 @@
---
name: Bug report
about: Create a report to help us improve

---

Before opening a new issue, please take a moment to review our [**community guidelines**](https://github.com/react-boilerplate/react-boilerplate/blob/master/CONTRIBUTING.md) to make the contribution process easy and effective for everyone involved.

## Description

A clear and concise description of what the bug is.

## Steps to reproduce

Steps to reproduce the behavior:

(Add link to a demo on https://jsfiddle.net or similar if possible)
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,6 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -10,7 +10,7 @@ on something that might not end up being merged into the project.
Before opening a pull request, please ensure:

- [ ] You have followed our [**contributing guidelines**](https://github.com/react-boilerplate/react-boilerplate/blob/master/CONTRIBUTING.md)
- [ ] Double-check your branch is based on `dev` and targets `dev`
- [ ] Double-check your branch is based on `dev` and targets `dev`
- [ ] Pull request has tests (we are going for 100% coverage!)
- [ ] Code is well-commented, linted and follows project conventions
- [ ] Documentation is updated (if necessary)
Expand Down
20 changes: 10 additions & 10 deletions CODE_OF_CONDUCT.md
Expand Up @@ -14,21 +14,21 @@ appearance, race, religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities
Expand Down
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Expand Up @@ -35,6 +35,7 @@ experience the problem? What would you expect to be the outcome? All these detai
Example:

> ## Description
>
> A clear and concise description of what the bug is.
>
> Any other information you want to share that is relevant to the issue being
Expand All @@ -43,6 +44,7 @@ Example:
> merits).
>
> ## Steps to reproduce
>
> Steps to reproduce the behavior:
>
> 1. This is the first step
Expand Down
1 change: 0 additions & 1 deletion README.md
Expand Up @@ -134,7 +134,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d

This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!


## Supporters

This project would not be possible without the support of these amazing folks. [**Become a sponsor**](https://opencollective.com/react-boilerplate) to get your company in front of thousands of engaged react developers and help us out!
Expand Down
4 changes: 2 additions & 2 deletions docs/forks/README.md
Expand Up @@ -20,6 +20,6 @@ This repo receives many requests for server-side rendering and there have been p

Since we don't support TypeScript out of the box, for those in need, we can direct you to a TypeScript implementation of this repo.

TS Fork: [react-boilerplate-typescript](https://github.com/Can-Sahin/react-boilerplate-typescript)
TS Fork: [react-boilerplate-typescript](https://github.com/Can-Sahin/react-boilerplate-typescript)

Details: [Docs](https://github.com/Can-Sahin/react-boilerplate-typescript/blob/master/docs/general/typescript.md)
Details: [Docs](https://github.com/Can-Sahin/react-boilerplate-typescript/blob/master/docs/general/typescript.md)
1 change: 0 additions & 1 deletion docs/general/debugging.md
Expand Up @@ -74,4 +74,3 @@ ESLint helps developers on a team follow the same coding format. It's highly rec
3. Click `Enable`

![Setting up ESLint](webstorm-eslint.png)

4 changes: 2 additions & 2 deletions docs/general/faq.md
Expand Up @@ -6,8 +6,8 @@
- [OS X / Linux:](#os-x--linux)
- [Windows](#windows)
- [Issue with local caching when running in production mode (F5 / ctrl+F5 / cmd+r weird behavior)](#issue-with-local-caching-when-running-in-production-mode-f5--ctrlf5--cmdr-weird-behavior)
- [Quick fix on your local browser:](#quick-fix-on-your-local-browser)
- [Full in-depth explanation](#full-in-depth-explanation)
- [Quick fix on your local browser:](#quick-fix-on-your-local-browser)
- [Full in-depth explanation](#full-in-depth-explanation)
- [Local webfonts not working for development](#local-webfonts-not-working-for-development)
- [Non-route containers](#non-route-containers)
- [Where do I put the reducer?](#where-do-i-put-the-reducer)
Expand Down
2 changes: 1 addition & 1 deletion docs/js/async-components.md
Expand Up @@ -23,6 +23,6 @@ export default loadable(() => import('./index'), {

This feature is built into the boilerplate using React's `lazy` and `Suspense` features.

If you need server-side rendering or are looking for more complex behaviors such as prefetching, loading multiple components in parallel, handling loading errors and more, we recommend [loadable-components](https://github.com/smooth-code/loadable-components).
If you need server-side rendering or are looking for more complex behaviors such as prefetching, loading multiple components in parallel, handling loading errors and more, we recommend [loadable-components](https://github.com/smooth-code/loadable-components).

You can read a comparison between our solution and that of `loadable-components` on [this page](https://www.smooth-code.com/open-source/loadable-components/docs/loadable-vs-react-lazy/).
6 changes: 3 additions & 3 deletions docs/js/reselect.md
Expand Up @@ -33,8 +33,9 @@ selectors and pass them to the `createSelector` call:
import { createSelector } from 'reselect';
import mySelector from 'mySelector';

const myComplexSelector = createSelector(mySelector, myState =>
myState.someNestedState,
const myComplexSelector = createSelector(
mySelector,
myState => myState.someNestedState,
);

export { myComplexSelector };
Expand All @@ -54,7 +55,6 @@ function MyContainer() {

// ...
}

```

### Adding a new selector
Expand Down
1 change: 1 addition & 0 deletions docs/testing/component-testing.md
Expand Up @@ -159,6 +159,7 @@ it('handles clicks', () => {
expect(onClickSpy).toHaveBeenCalledTimes(1);
});
```

Our finished test file looks like this:

```javascript
Expand Down

0 comments on commit ba8752f

Please sign in to comment.