Skip to content
This repository was archived by the owner on Jan 26, 2019. It is now read-only.

Merge facebook master #23

Merged
merged 49 commits into from
Feb 14, 2017
Merged

Merge facebook master #23

Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
7d66ba1
Downgrading to compatible version of SockJS-Client (#1274)
holloway Dec 21, 2016
ac6a4c8
Updated react-scripts babel-jest && jest packages to 18.0.0 (#1311)
lopezator Dec 23, 2016
e45b087
Fixes duplicate "is" typo (#1306)
jmagrippis Dec 30, 2016
a90e2b2
fix readme: remove double 'we' (#1312)
Chris-R3 Dec 30, 2016
4d7b754
Use npm script hooks to avoid && in deploy script (#1324)
zpao Dec 30, 2016
2548027
Bump babel-loader version (#1009) (#1309)
frontsideair Jan 8, 2017
1b645e2
Use yarnpkg alias to run Yarn (#1365)
fson Jan 9, 2017
24abc5e
Use yarnpkg alias to run Yarn (#1365)
fson Jan 9, 2017
ad86746
Update changelog for 0.8.5
fson Jan 9, 2017
a5b8389
Publish
fson Jan 9, 2017
11cc5ae
Merge pull request #1367 from facebookincubator/0.8.x
fson Jan 9, 2017
d29fb00
Add missing import in react-dev-utils README.md (#1369)
pedronauck Jan 11, 2017
3f6937c
Change console.log for errors and warnings (#1375)
jimmyhmiller Jan 11, 2017
17bb8d4
webpack-dev-server patch for 'still-ok' success status (#1377)
Jan 12, 2017
7cd03f9
Document Flow support (#1384)
dschep Jan 12, 2017
9099570
Use a more sophisticated template for end-to-end testing. (#1187)
EnoahNetzach Jan 23, 2017
adce379
replace two space syntax with <br> tag (#1393)
carlsagan21 Jan 23, 2017
65bde54
Add causes of dev server not detecting changes (#1422)
jetpackpony Jan 23, 2017
3bb31cc
Added links to tutorials for integrating cra with an api backend (#1437)
alexdriaguine Jan 24, 2017
dbb7ffe
Added babel-runtime dependency to deduplicate dependencies when using…
jkimbo Jan 24, 2017
da321b2
Bump Jest version (#1432)
gaearon Jan 24, 2017
dd788b6
Readme: Removes experimental from Jest snapshot (#1453)
frehner Jan 26, 2017
bc2fc80
eject: Additionally remove `react-scripts` from dependencies (#1458)
creynders Jan 27, 2017
1d586aa
E2e jsdom fix (#1470)
EnoahNetzach Jan 30, 2017
8964dd6
- import expect and expect flow (#1463)
tuchk4 Jan 30, 2017
6424232
Reflect websocket proxy support on README (#1013) (#1483)
frontsideair Feb 4, 2017
65e6340
Edit User Guide: Add ESLint config for VS Code users (#1482)
Feb 4, 2017
adab23f
e2e: Reduce complexity of e2e and improve Jest coverage (#1484)
Timer Feb 4, 2017
9e0e18f
UX: Explain why build is failing (#1352)
jayphelps Jan 5, 2017
0ac0d11
Update comments for webpack loaders
ro-savage Feb 8, 2017
c811a31
Change "OS X" references to "macOS" (#1511)
RodrigoHahn Feb 9, 2017
de6e059
corrected minor typo (#1514)
Feb 9, 2017
160d8d1
clarifying the use of custom environment variables (#1513)
calweb Feb 9, 2017
b999405
Add missing '\n' to the end of `package.json` file (#1510)
pd4d10 Feb 9, 2017
1d9159d
Make all react app vars accessible in index.html (#1440)
jihchi Feb 10, 2017
613b584
Add `PUBLIC_URL` env variable for advanced use (#937) (#1504)
Timer Feb 10, 2017
8e127aa
Support relative asset paths for special case (#1489)
tibdex Feb 10, 2017
7a02f9a
readme: Add Advanced Configuration (#1515)
Timer Feb 10, 2017
e19b0f6
Make build exit with error code when interrupted (#1496)
brandones Feb 11, 2017
ac39a46
Bump lerna
gaearon Feb 11, 2017
b9d679a
Add test cases for PUBLIC_URL and relative path (#1519)
Timer Feb 11, 2017
5211141
Add an annoying nit
gaearon Feb 11, 2017
354fce0
Upgrade babel dependencies
Timer Feb 11, 2017
7556997
Don't run CI on Node 0.10 (#1521)
gaearon Feb 11, 2017
b0b0e6d
fix: add yarn gitignores (#1507)
AndersDJohnson Feb 11, 2017
15e0b98
Upgrade dependencies (#1522)
Timer Feb 11, 2017
84be4dd
Add CHANGELOG
Timer Feb 11, 2017
49ed54f
Merge commit '84be4dd0bdf6155c075f9e9bee9f075d8982d0cd' into merge-fa…
wmonk Feb 12, 2017
42446dc
Remove merge conflicts, and Flow
wmonk Feb 14, 2017
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
Prev Previous commit
Next Next commit
fix readme: remove double 'we' (#1312)
  • Loading branch information
@Chris-R3 @fson
Chris-R3 authored and fson committed Dec 30, 2016
commit a90e2b2eea49a6727013bc9b1ae071e86f88cd21
2 changes: 1 addition & 1 deletion packages/react-scripts/template/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ The `<script>` tag with the compiled code will be added to it automatically duri

You can also add other assets to the `public` folder.

Note that we normally we encourage you to `import` assets in JavaScript files instead.
Note that we normally encourage you to `import` assets in JavaScript files instead.
For example, see the sections on [adding a stylesheet](#adding-a-stylesheet) and [adding images and fonts](#adding-images-and-fonts).
This mechanism provides a number of benefits:

Expand Down