Skip to content

Commit eba6ce1

Browse files
Merge branch 'master' into refactor/const
2 parents c6655fd + 282c03f commit eba6ce1

Some content is hidden

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

66 files changed

+8006
-6629
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
packages/ @ianschmitz @iansu @mrmckeb @petetnt
2-
docusaurus/ @amyrlam @iansu
2+
docusaurus/ @ianschmitz @iansu @mrmckeb

.github/FUNDING.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
open_collective: create-react-app

.prettierrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"arrowParens": "avoid",
3-
"trailingComma": "es5",
43
"singleQuote": true,
54
"semi": true
65
}

CHANGELOG-3.x.md

Lines changed: 1324 additions & 0 deletions
Large diffs are not rendered by default.

CHANGELOG.md

Lines changed: 275 additions & 1199 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Create a project, and you’re good to go.
3939

4040
## Creating an App
4141

42-
**You’ll need to have Node 8.16.0 or Node 10.16.0 or later version on your local development machine** (but it’s not required on the server). You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to switch Node versions between different projects.
42+
**You’ll need to have Node 10.16.0 or later version on your local development machine** (but it’s not required on the server). We recommend using the latest LTS version. You can use [nvm](https://github.com/creationix/nvm#installation) (macOS/Linux) or [nvm-windows](https://github.com/coreybutler/nvm-windows#node-version-manager-nvm-for-windows) to switch Node versions between different projects.
4343

4444
To create a new app, you may choose one of the following methods:
4545

@@ -196,6 +196,10 @@ Check out [Expo CLI](https://github.com/expo/expo-cli).
196196

197197
We'd love to have your helping hand on `create-react-app`! See [CONTRIBUTING.md](CONTRIBUTING.md) for more information on what we're looking for and how to get started.
198198

199+
## Supporting Create React App
200+
201+
Create React App is a community maintained project and all contributors are volunteers. If you'd like to support the future development of Create React App then please consider donating to our [Open Collective](https://opencollective.com/create-react-app).
202+
199203
## Credits
200204

201205
This project exists thanks to all the people who [contribute](CONTRIBUTING.md).<br>
@@ -213,4 +217,4 @@ We are grateful to the authors of existing related projects for their ideas and
213217

214218
## License
215219

216-
Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE).
220+
Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE). The Create React App logo is licensed under a [Creative Commons Attribution 4.0 International license](https://creativecommons.org/licenses/by/4.0/).

docusaurus/docs/advanced-configuration.md

Lines changed: 20 additions & 19 deletions
Large diffs are not rendered by default.

docusaurus/docs/debugging-tests.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ sidebar_label: Debugging Tests
66

77
There are various ways to setup a debugger for your Jest tests. We cover debugging in Chrome and [Visual Studio Code](https://code.visualstudio.com/).
88

9-
> Note: debugging tests requires Node 8 or higher.
10-
119
## Debugging Tests in Chrome
1210

1311
Add the following to the `scripts` section in your project's `package.json`

docusaurus/docs/deployment.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ service worker navigation routing can be configured or disabled by
9090
[`eject`ing](available-scripts.md#npm-run-eject) and then modifying the
9191
[`navigateFallback`](https://github.com/GoogleChrome/sw-precache#navigatefallback-string)
9292
and [`navigateFallbackWhitelist`](https://github.com/GoogleChrome/sw-precache#navigatefallbackwhitelist-arrayregexp)
93-
options of the `SWPrecachePlugin` [configuration](../config/webpack.config.prod.js).
93+
options of the `SWPrecachePlugin` configuration.
9494

95-
When users install your app to the homescreen of their device the default configuration will make a shortcut to `/index.html`. This may not work for client-side routers which expect the app to be served from `/`. Edit the web app manifest at [`public/manifest.json`](public/manifest.json) and change `start_url` to match the required URL scheme, for example:
95+
When users install your app to the homescreen of their device the default configuration will make a shortcut to `/index.html`. This may not work for client-side routers which expect the app to be served from `/`. Edit the web app manifest at `public/manifest.json` and change `start_url` to match the required URL scheme, for example:
9696

9797
```js
9898
"start_url": ".",

docusaurus/docs/running-tests.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ To help you make up your mind, here is a list of APIs that **need jsdom**:
321321
- [`ReactDOM.render()`](https://facebook.github.io/react/docs/top-level-api.html#reactdom.render)
322322
- [`TestUtils.renderIntoDocument()`](https://facebook.github.io/react/docs/test-utils.html#renderintodocument) ([a shortcut](https://github.com/facebook/react/blob/34761cf9a252964abfaab6faf74d473ad95d1f21/src/test/ReactTestUtils.js#L83-L91) for the above)
323323
- [`mount()`](https://airbnb.io/enzyme/docs/api/mount.html) in [Enzyme](https://airbnb.io/enzyme/index.html)
324+
- [`render()`](https://testing-library.com/docs/react-testing-library/api/#render) in [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/)
324325

325326
In contrast, **jsdom is not needed** for the following APIs:
326327

docusaurus/website/docusaurus.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const siteConfig = {
4343
alt: 'Create React App Logo',
4444
src: 'img/logo.svg',
4545
},
46-
links: [
46+
items: [
4747
{ to: 'docs/getting-started', label: 'Docs', position: 'right' },
4848
{
4949
href: 'https://reactjs.org/community/support.html',

docusaurus/website/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"deploy": "docusaurus deploy"
77
},
88
"dependencies": {
9-
"@docusaurus/core": "^2.0.0-alpha.39",
10-
"@docusaurus/preset-classic": "^2.0.0-alpha.39",
11-
"classnames": "^2.2.6",
9+
"@docusaurus/core": "^2.0.0-alpha.64",
10+
"@docusaurus/preset-classic": "^2.0.0-alpha.64",
11+
"clsx": "^1.1.1",
1212
"react": "^16.12.0",
1313
"react-dom": "^16.12.0"
1414
},

docusaurus/website/src/pages/index.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import useBaseUrl from '@docusaurus/useBaseUrl';
1313
import Layout from '@theme/Layout';
1414
import CodeBlock from '@theme/CodeBlock';
1515

16-
import classnames from 'classnames';
16+
import clsx from 'clsx';
1717

1818
import styles from './styles.module.css';
1919

@@ -44,10 +44,10 @@ function Home() {
4444
permalink={'/'}
4545
description={'Set up a modern web app by running one command.'}
4646
>
47-
<div className={classnames('hero hero--dark', styles.heroBanner)}>
47+
<div className={clsx('hero hero--dark', styles.heroBanner)}>
4848
<div className="container">
4949
<img
50-
className={classnames(styles.heroBannerLogo, 'margin-vert--md')}
50+
className={clsx(styles.heroBannerLogo, 'margin-vert--md')}
5151
alt="Create React App logo"
5252
src={useBaseUrl('img/logo.svg')}
5353
/>
@@ -68,10 +68,7 @@ function Home() {
6868
<div className="container">
6969
<div className="row">
7070
{features.map(({ title, content }, idx) => (
71-
<div
72-
key={idx}
73-
className={classnames('col col--4', styles.feature)}
74-
>
71+
<div key={idx} className={clsx('col col--4', styles.feature)}>
7572
<h2>{title}</h2>
7673
<p>{content}</p>
7774
</div>

docusaurus/website/static/img/docusaurus.svg

Lines changed: 1 addition & 1 deletion
Loading
-13.4 KB
Loading

docusaurus/website/static/img/logo.svg

Lines changed: 1 addition & 1 deletion
Loading
-24.3 KB
Loading

0 commit comments

Comments
 (0)