Skip to content

Commit 3e1d4a9

Browse files
authored
Merge pull request #11 from facebook/next
Update Upstream
2 parents 37d9ec8 + 75f3fcc commit 3e1d4a9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ Make sure to test the released version! If you want to be extra careful, you can
129129

130130
------------
131131

132-
*Many thanks to [h5bp](https://github.com/h5bp/html5-boilerplate/blob/master/CONTRIBUTING.md) for the inspiration with this contributing guide*
132+
*Many thanks to [h5bp](https://github.com/h5bp/html5-boilerplate/blob/master/.github/CONTRIBUTING.md) for the inspiration with this contributing guide*

packages/react-scripts/template/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ In addition to [ES6](https://github.com/lukehoban/es6features) syntax features,
214214

215215
* [Exponentiation Operator](https://github.com/rwaldron/exponentiation-operator) (ES2016).
216216
* [Async/await](https://github.com/tc39/ecmascript-asyncawait) (ES2017).
217-
* [Object Rest/Spread Properties](https://github.com/sebmarkbage/ecmascript-rest-spread) (stage 3 proposal).
217+
* [Object Rest/Spread Properties](https://github.com/tc39/proposal-object-rest-spread) (ES2018).
218218
* [Dynamic import()](https://github.com/tc39/proposal-dynamic-import) (stage 3 proposal)
219219
* [Class Fields and Static Properties](https://github.com/tc39/proposal-class-public-fields) (part of stage 3 proposal).
220220
* [JSX](https://facebook.github.io/react/docs/introducing-jsx.html) and [Flow](https://flowtype.org/) syntax.
@@ -1099,7 +1099,7 @@ Create React App will add decorator support when the specification advances to a
10991099

11001100
React doesn't prescribe a specific approach to data fetching, but people commonly use either a library like [axios](https://github.com/axios/axios) or the [`fetch()` API](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) provided by the browser. Conveniently, Create React App includes a polyfill for `fetch()` so you can use it without worrying about the browser support.
11011101

1102-
The global `fetch` function allows to easily makes AJAX requests. It takes in a URL as an input and returns a `Promise` that resolves to a `Response` object. You can find more information about `fetch` [here](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch).
1102+
The global `fetch` function allows you to easily make AJAX requests. It takes in a URL as an input and returns a `Promise` that resolves to a `Response` object. You can find more information about `fetch` [here](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch).
11031103

11041104
This project also includes a [Promise polyfill](https://github.com/then/promise) which provides a full implementation of Promises/A+. A Promise represents the eventual result of an asynchronous operation, you can find more information about Promises [here](https://www.promisejs.org/) and [here](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise). Both axios and `fetch()` use Promises under the hood. You can also use the [`async / await`](https://davidwalsh.name/async-await) syntax to reduce the callback nesting.
11051105

@@ -1611,7 +1611,7 @@ Popular CI servers already set the environment variable `CI` by default but you
16111611
```
16121612
language: node_js
16131613
node_js:
1614-
- 6
1614+
- 8
16151615
cache:
16161616
directories:
16171617
- node_modules

0 commit comments

Comments
 (0)