Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Upstream #4343

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2bf0929
pin envinfo version to 3.4.2 (#3853)
bondz Jan 18, 2018
034c6ad
1.5.1
gaearon Jan 18, 2018
bab2c29
Set the public path to the asset manifest entries (#2544)
robinvdvleuten Jan 20, 2018
eee2907
Include `{json,css}` files in prettier command (#3894)
reyronald Jan 22, 2018
e2e2b9e
Merge branch 'next' into update-upstream
tvalentius Feb 3, 2018
032ceba
Merge pull request #1 from tvalentius/update-upstream
tvalentius Feb 3, 2018
fdb0e77
Merge pull request #3 from facebook/next
tvalentius Feb 6, 2018
fc3e5f5
Merge pull request #4 from facebook/next
tvalentius Feb 7, 2018
882d5ef
Merge pull request #5 from facebook/next
tvalentius Feb 9, 2018
b7f2d96
Merge pull request #6 from facebook/next
tvalentius Feb 10, 2018
427b187
Merge pull request #7 from facebook/next
tvalentius Feb 11, 2018
ad7fd86
Merge pull request #8 from facebook/next
tvalentius Feb 11, 2018
37d9ec8
Merge pull request #9 from facebook/next
tvalentius Feb 13, 2018
3e1d4a9
Merge pull request #11 from facebook/next
tvalentius Mar 9, 2018
c4c558b
Merge pull request #12 from facebook/next
tvalentius Mar 12, 2018
78dc990
Merge pull request #13 from facebook/next
tvalentius Mar 16, 2018
7f6c37b
Merge pull request #14 from facebook/next
tvalentius Mar 20, 2018
2086f12
Merge pull request #15 from facebook/next
tvalentius Mar 21, 2018
aea4d14
Merge pull request #16 from facebook/next
tvalentius Mar 22, 2018
5e3d8a9
Merge pull request #17 from facebook/next
tvalentius Mar 23, 2018
73d7292
Merge pull request #18 from facebook/next
tvalentius Mar 25, 2018
2e9fcbb
Merge pull request #19 from facebook/next
tvalentius Mar 26, 2018
7c54a93
Merge pull request #20 from facebook/next
tvalentius Mar 27, 2018
241e7f4
Merge pull request #21 from facebook/next
tvalentius Apr 3, 2018
f482987
Merge pull request #22 from facebook/next
tvalentius Apr 4, 2018
f3b3360
Merge pull request #23 from facebook/next
tvalentius Apr 5, 2018
aebb0e3
Merge pull request #24 from facebook/next
tvalentius Apr 8, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/create-react-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"commander": "^2.9.0",
"cross-spawn": "^4.0.0",
"envinfo": "3.4.2",
"fs-extra": "^5.0.0",
"fs-extra": "^1.0.0",
"hyperquest": "^2.1.2",
"react-dev-utils": "^5.0.0",
"semver": "^5.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ Next we add a 'lint-staged' field to the `package.json`, for example:
"scripts": {
```

Now, whenever you make a commit, Prettier will format the changed files automatically. You can also run `./node_modules/.bin/prettier --single-quote --write "src/**/*.{js,jsx}"` to format your entire project for the first time.
Now, whenever you make a commit, Prettier will format the changed files automatically. You can also run `./node_modules/.bin/prettier --single-quote --write "src/**/*.{js,jsx,json,css}"` to format your entire project for the first time.

Next you might want to integrate Prettier in your favorite editor. Read the section on [Editor Integration](https://prettier.io/docs/en/editors.html) on the Prettier GitHub page.

Expand Down