Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
* upstream/master: (55 commits)
  Fix minor typo (facebook#2679)
  Bootstrap with Yarn when available (facebook#2673)
  Add more info about apache client side routing (facebook#2666)
  Test Node 8 on Travis (facebook#2659)
  Add json and css to lint-staged in template README (facebook#2671)
  Add a note about fixed vulnerability in 1.0.8
  Publish
  Changelog for 1.0.8 (facebook#2664)
  Reformat source code with Prettier 1.5.2
  Update Prettier to v1 (facebook#2465)
  Update ISSUE_TEMPLATE.md
  Local testing docker links (facebook#2662)
  Better React Native Web support (facebook#2511)
  Bump dependencies (facebook#2658)
  Minor code style edits to user guide (facebook#2660)
  Don't ask to install webpack for using Styleguidist (facebook#2656)
  Put react-scripts in dependencies, not devDependencies (facebook#2657)
  Razzle added to the alternatives (facebook#2517)
  Warn about large bundle sizes (facebook#2648)
  Add instructions to use source-map-explorer (facebook#1641)
  ...

# Conflicts:
#	packages/react-dev-utils/package.json
#	packages/react-scripts/config/webpack.config.dev.js
#	packages/react-scripts/config/webpack.config.prod.js
#	packages/react-scripts/package.json
  • Loading branch information
zangrafx committed Jun 29, 2017
2 parents 6eb3066 + 7b5a589 commit 1368b90
Show file tree
Hide file tree
Showing 74 changed files with 1,590 additions and 509 deletions.
161 changes: 131 additions & 30 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,59 +1,160 @@
If you are reporting a bug, please fill in below. Otherwise feel free to remove this template entirely.
<!--
PLEASE READ THE FIRST SECTION :-)
-->

### Can you reproduce the problem with latest npm?
### Is this a bug report?

Many errors, especially related to "missing modules", are due to npm bugs.
(write your answer here)

If you're using Windows, [follow these instructions to update npm](https://github.com/npm/npm/wiki/Troubleshooting#upgrading-on-windows).
<!--
If you answered "Yes":
Please note that your issue will be fixed much faster if you spend about
half an hour preparing it, including the exact reproduction steps and a demo.
If you're in a hurry or don't feel confident, it's fine to report bugs with
less details, but this makes it less likely they'll get fixed soon.
If you're using OS X or Linux, run this to update npm:
In either case, please fill as many fields below as you can.
```
npm install -g npm@latest
If you answered "No":
cd your_project_directory
rm -rf node_modules
npm install
```
If this is a question or a discussion, you may delete this template and write in a free form.
Note that we don't provide help for webpack questions after ejecting.
You can find webpack docs at https://webpack.js.org/.
-->

Then try to reproduce the issue again.

Can you still reproduce it?
### Can you also reproduce the problem with npm 4.x?

### Description
<!--
Many errors, especially related to "missing modules", are due to npm bugs.
Which version of npm are you running? You can find out by checking:
What are you reporting?
npm -v
### Expected behavior
If it is 5.x, please be aware that it has more than 50 known bugs, and
is not guaranteed to work with Create React App.
Tell us what you think should happen.
If it's not starting with 4, try to install npm 4.x:
### Actual behavior
npm install -g npm@4
cd your_project_directory
rm -rf node_modules
npm cache clear
npm install
Then try to reproduce the issue again.
Can you still reproduce it?
Note: Please try this even if you are using Yarn so that we know whether it's a Yarn-only bug.
-->

(Write your answer here.)


### Which terms did you search for in User Guide?

<!--
There are a few common documented problems, such as watcher not detecting changes, or build failing.
They are described in the Troubleshooting section of the User Guide:
https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
Please scan these few sections for common problems.
Additionally, you can search the User Guide itself for something you're having issues with:
https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.me
If you didn't find the solution, please share which words you searched for.
This helps us improve documentation for future readers who might encounter the same problem.
-->

(Write your answer here if relevant.)

Tell us what actually happens.

### Environment

Run these commands in the project folder and fill in their results:
<!--
Please fill in all the relevant fields by running these commands in terminal.
-->

1. `npm ls react-scripts` (if you haven鈥檛 ejected):
2. `node -v`:
3. `npm -v`:
1. `node -v`:
2. `npm -v`:
4. `yarn --version` (if you use Yarn):
3. `npm ls react-scripts` (if you haven鈥檛 ejected):

Then, specify:

1. Operating system:
2. Browser and version:
2. Browser and version (if relevant):


### Steps to Reproduce

<!--
How would you describe your issue to someone who doesn鈥檛 know you or your project?
Try to write a sequence of steps that anybody can repeat to see the issue.
-->

(Write your steps here:)

1.
2.
3.


### Expected Behavior

<!--
How did you expect the tool to behave?
It鈥檚 fine if you鈥檙e not sure your understanding is correct.
Just write down what you thought would happen.
-->

(Write what you thought would happen.)


### Actual Behavior

<!--
Did something go wrong?
Is something broken, or not behaving as you expected?
Please attach screenshots if possible! They are extremely helpful for diagnosing issues.
-->

(Write what happened. Please add screenshots!)


### Reproducible Demo

Please take the time to create a new app that reproduces the issue.
<!--
If you can, please share a project that reproduces the issue.
This is the single most effective way to get an issue fixed soon.
There are two ways to do it:
* Create a new app and try to reproduce the issue in it.
This is useful if you roughly know where the problem is, or can鈥檛 share the real code.
* Or, copy your app and remove things until you鈥檙e left with the minimal reproducible demo.
This is useful for finding the root cause. You may then optionally create a new project.
Alternatively, you could copy your app that experiences the problem and start removing things until you鈥檙e left with the minimal reproducible demo.
This is a good guide to creating bug demos: https://stackoverflow.com/help/mcve
Once you鈥檙e done, push the project to GitHub and paste the link to it below:
-->

(Accidentally, you might get to the root of your problem during that process.)
(Paste the link to an example project and exact instructions to reproduce the issue.)

Push to GitHub and paste the link here.
<!--
What happens if you skip this step?
We will try to help you, but in many cases it is impossible because crucial
information is missing. In that case we'll tag an issue as having a low priority,
and eventually close it if there is no clear direction.
We still appreciate the report though, as eventually somebody else might
create a reproducible example for it.
By doing this, you're helping the Create React App contributors a big time!
Demonstrable issues gets fixed faster.
Thanks for helping us help you!
-->
3 changes: 1 addition & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<!--
Thank you for sending the PR!
If you changed any code, there are just two more things to do:
* Provide us with clear instructions on how you verified your changes work. Bonus points for screenshots!
If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots!
Happy contributing!
-->
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
language: node_js
node_js:
- 6
- 7
- 8
cache:
directories:
- node_modules
Expand Down

0 comments on commit 1368b90

Please sign in to comment.