Skip to content

Commit 40eea69

Browse files
authored
Merge pull request #1 from facebook/master
update ma' fork
2 parents 11c9bdc + 209053b commit 40eea69

File tree

378 files changed

+106018
-3302
lines changed

Some content is hidden

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

378 files changed

+106018
-3302
lines changed

Diff for: .eslintignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
node_modules/
2+
build
3+
my-app*
4+
packages/react-scripts/template
5+
packages/react-scripts/fixtures
6+
fixtures/

Diff for: .eslintrc

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
11
{
2-
"extends": "react-app"
2+
"extends": "eslint:recommended",
3+
"env": {
4+
"browser": true,
5+
"commonjs": true,
6+
"node": true,
7+
"es6": true
8+
},
9+
"parserOptions": {
10+
"ecmaVersion": 2018
11+
},
12+
"rules": {
13+
"no-console": "off",
14+
"strict": ["error", "global"],
15+
"curly": "warn"
16+
}
317
}

Diff for: .github/ISSUE_TEMPLATE.md

+168
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,168 @@
1+
<!--
2+
PLEASE READ THE FIRST SECTION :-)
3+
-->
4+
5+
### Is this a bug report?
6+
7+
(write your answer here)
8+
9+
<!--
10+
If you answered "Yes":
11+
12+
Please note that your issue will be fixed much faster if you spend about
13+
half an hour preparing it, including the exact reproduction steps and a demo.
14+
15+
If you're in a hurry or don't feel confident, it's fine to report bugs with
16+
less details, but this makes it less likely they'll get fixed soon.
17+
18+
In either case, please fill as many fields below as you can.
19+
20+
If you answered "No":
21+
22+
If this is a question or a discussion, you may delete this template and write in a free form.
23+
Note that we don't provide help for webpack questions after ejecting.
24+
You can find webpack docs at https://webpack.js.org/.
25+
-->
26+
27+
### Did you try recovering your dependencies?
28+
29+
<!--
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:
32+
33+
* node_modules
34+
* package-lock.json
35+
* yarn.lock
36+
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:
42+
43+
npm install -g npm@latest
44+
npm install
45+
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
52+
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.
61+
-->
62+
63+
(Write your answer here.)
64+
65+
### Which terms did you search for in User Guide?
66+
67+
<!--
68+
There are a few common documented problems, such as watcher not detecting changes, or build failing.
69+
They are described in the Troubleshooting section of the User Guide:
70+
71+
https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md#troubleshooting
72+
73+
Please scan these few sections for common problems.
74+
Additionally, you can search the User Guide itself for something you're having issues with:
75+
76+
https://github.com/facebook/create-react-app/blob/master/packages/react-scripts/template/README.md
77+
78+
If you didn't find the solution, please share which words you searched for.
79+
This helps us improve documentation for future readers who might encounter the same problem.
80+
-->
81+
82+
(Write your answer here if relevant.)
83+
84+
85+
### Environment
86+
87+
<!--
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.
90+
91+
Run the following command in your React app's folder in terminal.
92+
Note: The result is copied to your clipboard directly.
93+
94+
`npx create-react-app --info`
95+
96+
Paste the output of the command in the section below.
97+
-->
98+
99+
(paste the output of the command here)
100+
101+
### Steps to Reproduce
102+
103+
<!--
104+
How would you describe your issue to someone who doesn’t know you or your project?
105+
Try to write a sequence of steps that anybody can repeat to see the issue.
106+
-->
107+
108+
(Write your steps here:)
109+
110+
1.
111+
2.
112+
3.
113+
114+
115+
### Expected Behavior
116+
117+
<!--
118+
How did you expect the tool to behave?
119+
It’s fine if you’re not sure your understanding is correct.
120+
Just write down what you thought would happen.
121+
-->
122+
123+
(Write what you thought would happen.)
124+
125+
126+
### Actual Behavior
127+
128+
<!--
129+
Did something go wrong?
130+
Is something broken, or not behaving as you expected?
131+
Please attach screenshots if possible! They are extremely helpful for diagnosing issues.
132+
-->
133+
134+
(Write what happened. Please add screenshots!)
135+
136+
137+
### Reproducible Demo
138+
139+
<!--
140+
If you can, please share a project that reproduces the issue.
141+
This is the single most effective way to get an issue fixed soon.
142+
143+
There are two ways to do it:
144+
145+
* Create a new app and try to reproduce the issue in it.
146+
This is useful if you roughly know where the problem is, or can’t share the real code.
147+
148+
* Or, copy your app and remove things until you’re left with the minimal reproducible demo.
149+
This is useful for finding the root cause. You may then optionally create a new project.
150+
151+
This is a good guide to creating bug demos: https://stackoverflow.com/help/mcve
152+
Once you’re done, push the project to GitHub and paste the link to it below:
153+
-->
154+
155+
(Paste the link to an example project and exact instructions to reproduce the issue.)
156+
157+
<!--
158+
What happens if you skip this step?
159+
160+
We will try to help you, but in many cases it is impossible because crucial
161+
information is missing. In that case we'll tag an issue as having a low priority,
162+
and eventually close it if there is no clear direction.
163+
164+
We still appreciate the report though, as eventually somebody else might
165+
create a reproducible example for it.
166+
167+
Thanks for helping us help you!
168+
-->

Diff for: .github/PULL_REQUEST_TEMPLATE.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<!--
2+
Thank you for sending the PR!
3+
4+
If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots!
5+
6+
Happy contributing!
7+
-->

Diff for: .gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1+
.idea/
2+
.vscode/
13
node_modules/
24
build
35
.DS_Store
46
*.tgz
57
my-app*
68
template/src/__tests__/__snapshots__/
79
lerna-debug.log
8-
npm-debug.log
10+
npm-debug.log*
11+
yarn-debug.log*
12+
yarn-error.log*
13+
/.changelog

Diff for: .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+
}

Diff for: .travis.yml

+30-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
11
---
2+
dist: trusty
23
language: node_js
34
node_js:
4-
- 4
5-
- 6
5+
- 8
6+
- 10
67
cache:
8+
yarn: true
79
directories:
8-
- node_modules
9-
- packages/create-react-app/node_modules
10-
- packages/react-scripts/node_modules
11-
script: tasks/e2e.sh
10+
- .npm
11+
before_install:
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --nightly
13+
- export PATH="$HOME/.yarn/bin:$PATH"
14+
install: true
15+
script:
16+
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
17+
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
18+
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
19+
- 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
20+
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
21+
- 'if [ $TEST_SUITE = "behavior" ]; then tasks/e2e-behavior.sh; fi'
22+
env:
23+
matrix:
24+
- TEST_SUITE=simple
25+
- TEST_SUITE=installs
26+
- TEST_SUITE=kitchensink
27+
- TEST_SUITE=kitchensink-eject
28+
- TEST_SUITE=behavior
29+
matrix:
30+
include:
31+
- os: osx
32+
node_js: 8
33+
env: TEST_SUITE=behavior
34+
- node_js: 4
35+
env: TEST_SUITE=old-node

0 commit comments

Comments
 (0)