Skip to content

Commit

Permalink
Merge branch 'master' into refactor/const
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasbueschel committed Jan 4, 2021
2 parents c6655fd + 282c03f commit eba6ce1
Show file tree
Hide file tree
Showing 66 changed files with 8,006 additions and 6,629 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
packages/ @ianschmitz @iansu @mrmckeb @petetnt
docusaurus/ @amyrlam @iansu
docusaurus/ @ianschmitz @iansu @mrmckeb
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
open_collective: create-react-app
1 change: 0 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"arrowParens": "avoid",
"trailingComma": "es5",
"singleQuote": true,
"semi": true
}
1,324 changes: 1,324 additions & 0 deletions CHANGELOG-3.x.md

Large diffs are not rendered by default.

1,474 changes: 275 additions & 1,199 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Create a project, and you’re good to go.

## Creating an App

**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.
**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.

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

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

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.

## Supporting Create React App

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).

## Credits

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

## License

Create React App is open source software [licensed as MIT](https://github.com/facebook/create-react-app/blob/master/LICENSE).
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/).
39 changes: 20 additions & 19 deletions docusaurus/docs/advanced-configuration.md

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions docusaurus/docs/debugging-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ sidebar_label: Debugging Tests

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/).

> Note: debugging tests requires Node 8 or higher.
## Debugging Tests in Chrome

Add the following to the `scripts` section in your project's `package.json`
Expand Down
4 changes: 2 additions & 2 deletions docusaurus/docs/deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ service worker navigation routing can be configured or disabled by
[`eject`ing](available-scripts.md#npm-run-eject) and then modifying the
[`navigateFallback`](https://github.com/GoogleChrome/sw-precache#navigatefallback-string)
and [`navigateFallbackWhitelist`](https://github.com/GoogleChrome/sw-precache#navigatefallbackwhitelist-arrayregexp)
options of the `SWPrecachePlugin` [configuration](../config/webpack.config.prod.js).
options of the `SWPrecachePlugin` configuration.

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:
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:

```js
"start_url": ".",
Expand Down
1 change: 1 addition & 0 deletions docusaurus/docs/running-tests.md
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,7 @@ To help you make up your mind, here is a list of APIs that **need jsdom**:
- [`ReactDOM.render()`](https://facebook.github.io/react/docs/top-level-api.html#reactdom.render)
- [`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)
- [`mount()`](https://airbnb.io/enzyme/docs/api/mount.html) in [Enzyme](https://airbnb.io/enzyme/index.html)
- [`render()`](https://testing-library.com/docs/react-testing-library/api/#render) in [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/)

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

Expand Down
2 changes: 1 addition & 1 deletion docusaurus/website/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const siteConfig = {
alt: 'Create React App Logo',
src: 'img/logo.svg',
},
links: [
items: [
{ to: 'docs/getting-started', label: 'Docs', position: 'right' },
{
href: 'https://reactjs.org/community/support.html',
Expand Down
6 changes: 3 additions & 3 deletions docusaurus/website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"deploy": "docusaurus deploy"
},
"dependencies": {
"@docusaurus/core": "^2.0.0-alpha.39",
"@docusaurus/preset-classic": "^2.0.0-alpha.39",
"classnames": "^2.2.6",
"@docusaurus/core": "^2.0.0-alpha.64",
"@docusaurus/preset-classic": "^2.0.0-alpha.64",
"clsx": "^1.1.1",
"react": "^16.12.0",
"react-dom": "^16.12.0"
},
Expand Down
11 changes: 4 additions & 7 deletions docusaurus/website/src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import useBaseUrl from '@docusaurus/useBaseUrl';
import Layout from '@theme/Layout';
import CodeBlock from '@theme/CodeBlock';

import classnames from 'classnames';
import clsx from 'clsx';

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

Expand Down Expand Up @@ -44,10 +44,10 @@ function Home() {
permalink={'/'}
description={'Set up a modern web app by running one command.'}
>
<div className={classnames('hero hero--dark', styles.heroBanner)}>
<div className={clsx('hero hero--dark', styles.heroBanner)}>
<div className="container">
<img
className={classnames(styles.heroBannerLogo, 'margin-vert--md')}
className={clsx(styles.heroBannerLogo, 'margin-vert--md')}
alt="Create React App logo"
src={useBaseUrl('img/logo.svg')}
/>
Expand All @@ -68,10 +68,7 @@ function Home() {
<div className="container">
<div className="row">
{features.map(({ title, content }, idx) => (
<div
key={idx}
className={classnames('col col--4', styles.feature)}
>
<div key={idx} className={clsx('col col--4', styles.feature)}>
<h2>{title}</h2>
<p>{content}</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docusaurus/website/static/img/docusaurus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docusaurus/website/static/img/logo-og.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docusaurus/website/static/img/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docusaurus/website/static/img/update.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit eba6ce1

Please sign in to comment.