Skip to content

Commit 6497d66

Browse files
authored
Merge branch 'master' into patch-1
2 parents 6acffd8 + ffb219d commit 6497d66

File tree

317 files changed

+29430
-6301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+29430
-6301
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ build
33
my-app*
44
packages/react-scripts/template
55
packages/react-scripts/fixtures
6+
fixtures/

.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"es6": true
88
},
99
"parserOptions": {
10-
"ecmaVersion": 6
10+
"ecmaVersion": 2018
1111
},
1212
"rules": {
1313
"no-console": "off",

.github/ISSUE_TEMPLATE.md

+36-28
Original file line numberDiff line numberDiff line change
@@ -24,47 +24,56 @@
2424
You can find webpack docs at https://webpack.js.org/.
2525
-->
2626

27-
28-
### Can you also reproduce the problem with npm 4.x?
27+
### Did you try recovering your dependencies?
2928

3029
<!--
31-
Many errors, especially related to "missing modules", are due to npm bugs.
32-
Which version of npm are you running? You can find out by checking:
33-
34-
npm -v
30+
Your module tree might be corrupted, and that might be causing the issues.
31+
Let's try to recover it. First, delete these files and folders in your project:
3532
36-
If it is 5.x, please be aware that it has more than 50 known bugs, and
37-
is not guaranteed to work with Create React App.
33+
* node_modules
34+
* package-lock.json
35+
* yarn.lock
3836
39-
If it's not starting with 4, try to install npm 4.x:
37+
Then you need to decide which package manager you prefer to use.
38+
We support both npm (https://npmjs.com) and yarn (http://yarnpkg.com/).
39+
However, **they can't be used together in one project** so you need to pick one.
40+
41+
If you decided to use npm, run this in your project directory:
4042
41-
npm install -g npm@4
42-
cd your_project_directory
43-
rm -rf node_modules
44-
npm cache clear
43+
npm install -g npm@latest
4544
npm install
4645
47-
Then try to reproduce the issue again.
48-
Can you still reproduce it?
46+
This should fix your project.
47+
48+
If you decided to use yarn, update it first (https://yarnpkg.com/en/docs/install).
49+
Then run in your project directory:
50+
51+
yarn
4952
50-
Note: Please try this even if you are using Yarn so that we know whether it's a Yarn-only bug.
53+
This should fix your project.
54+
55+
Importantly, **if you decided to use yarn, you should never run `npm install` in the project**.
56+
For example, yarn users should run `yarn add <library>` instead of `npm install <library>`.
57+
Otherwise your project will break again.
58+
59+
Have you done all these steps and still see the issue?
60+
Please paste the output of `npm --version` and/or `yarn --version` to confirm.
5161
-->
5262

5363
(Write your answer here.)
5464

55-
5665
### Which terms did you search for in User Guide?
5766

5867
<!--
5968
There are a few common documented problems, such as watcher not detecting changes, or build failing.
6069
They are described in the Troubleshooting section of the User Guide:
6170
62-
https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
71+
https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
6372
6473
Please scan these few sections for common problems.
6574
Additionally, you can search the User Guide itself for something you're having issues with:
6675
67-
https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md
76+
https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md
6877
6978
If you didn't find the solution, please share which words you searched for.
7079
This helps us improve documentation for future readers who might encounter the same problem.
@@ -76,19 +85,18 @@
7685
### Environment
7786

7887
<!--
79-
Please fill in all the relevant fields by running these commands in terminal.
80-
-->
88+
To help identify if a problem is specific to a platform, browser, or module version, information about your environment is required.
89+
This enables the maintainers quickly reproduce the issue and give feedback.
8190
82-
1. `node -v`:
83-
2. `npm -v`:
84-
3. `yarn --version` (if you use Yarn):
85-
4. `npm ls react-scripts` (if you haven’t ejected):
91+
Run the following command in your React app's folder in terminal.
92+
Note: The result is copied to your clipboard directly.
8693
87-
Then, specify:
94+
`npx create-react-app --info`
8895
89-
1. Operating system:
90-
2. Browser and version (if relevant):
96+
Paste the output of the command in the section below.
97+
-->
9198

99+
(paste the output of the command here)
92100

93101
### Steps to Reproduce
94102

.github/lock.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Configuration for lock-threads - https://github.com/dessant/lock-threads
2+
3+
# Number of days of inactivity before a closed issue or pull request is locked
4+
daysUntilLock: 5
5+
6+
# Do not comment when locking
7+
setLockReason: false
8+
lockComment: false

.github/stale.yml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 30
5+
6+
# Number of days of inactivity before a stale Issue or Pull Request is closed.
7+
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8+
daysUntilClose: 5
9+
10+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
11+
exemptLabels:
12+
- "issue: proposal"
13+
- "issue: announcement"
14+
15+
# Set to true to ignore issues in a project (defaults to false)
16+
exemptProjects: true
17+
18+
# Set to true to ignore issues in a milestone (defaults to false)
19+
exemptMilestones: true
20+
21+
# Label to use when marking as stale
22+
staleLabel: stale
23+
24+
# Limit the number of actions per hour, from 1-30. Default is 30
25+
limitPerRun: 30
26+
27+
issues:
28+
# Comment to post when marking Issues as stale.
29+
markComment: >
30+
This issue has been automatically marked as stale because it has not had any
31+
recent activity. It will be closed in 5 days if no further activity occurs.
32+
33+
# Comment to post when closing a stale Issue.
34+
closeComment: >
35+
This issue has been automatically closed because it has not had any recent
36+
activity. If you have a question or comment, please open a new issue.
37+
38+
pulls:
39+
# Comment to post when marking Pull Request as stale.
40+
markComment: >
41+
This pull request has been automatically marked as stale because it has not
42+
had any recent activity. It will be closed in 5 days if no further activity
43+
occurs.
44+
45+
# Comment to post when closing a stale Pull Request.
46+
closeComment: >
47+
This pull request has been automatically closed because it has not had any
48+
recent activity. If you have a question or comment, please open a new
49+
issue. Thank you for your contribution!

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ npm-debug.log*
1111
yarn-debug.log*
1212
yarn-error.log*
1313
/.changelog
14+
.npm/

.prettierrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"trailingComma": "es5",
3+
"singleQuote": true,
4+
"semi": true
5+
}

.travis.yml

+19-11
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,34 @@ dist: trusty
33
language: node_js
44
node_js:
55
- 8
6-
- 9
6+
- 10
7+
- node
78
cache:
9+
yarn: true
810
directories:
9-
- node_modules
10-
- packages/create-react-app/node_modules
11-
- packages/react-scripts/node_modules
11+
- .npm
12+
before_install:
13+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
14+
- export PATH="$HOME/.yarn/bin:$PATH"
1215
install: true
1316
script:
14-
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
15-
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
16-
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
17-
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
17+
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
18+
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
19+
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
20+
- 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
21+
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
22+
- 'if [ $TEST_SUITE = "behavior" ]; then tasks/e2e-behavior.sh; fi'
1823
env:
1924
matrix:
2025
- TEST_SUITE=simple
2126
- TEST_SUITE=installs
2227
- TEST_SUITE=kitchensink
28+
- TEST_SUITE=kitchensink-eject
29+
- TEST_SUITE=behavior
2330
matrix:
2431
include:
25-
- node_js: 0.10
26-
env: TEST_SUITE=old-node
32+
- os: osx
33+
node_js: 8
34+
env: TEST_SUITE=behavior
2735
- node_js: 6
28-
env: TEST_SUITE=kitchensink
36+
env: TEST_SUITE=old-node

.yarnrc

-3
This file was deleted.

0 commit comments

Comments
 (0)