Merge remote-tracking branch 'upstream/master'

Author: chrztoph

CHANGELOG-1.x.md

@@ -1,6 +1,6 @@
 ## 2.0.3 and Newer Versions
 
-**Please refer to [CHANGELOG.md](./CHANGELOG.md) for the newer versions.**
+**Please refer to [CHANGELOG-2.x.md](./CHANGELOG-2.x.md) for the 2.x range, and [CHANGELOG.md](CHANGELOG.md) for the newer versions.**
 
 ## 1.1.5 (August 24, 2018)
 

CHANGELOG-2.x.md

@@ -1,3 +1,7 @@
+## 3.0.0 and Newer Versions
+
+**Please refer to [CHANGELOG.md](./CHANGELOG.md) for the newer versions.**
+
 ## 2.1.8 (March 7, 2019)
 
 v2.1.8 is a maintenance release that reapplies the TypeScript speed improvements ([#6406](https://github.com/facebook/create-react-app/pull/6406)) in a new major version of `react-dev-utils`.

CHANGELOG.md

@@ -26,6 +26,8 @@ v3.1.1 is a maintenance release that includes minor bug fixes and documentation
 
 ### Migrating from 3.1.0 to 3.1.1
 
+Optionally remove `Disallow: /static/` from `public/robots.txt` if you want to allow your images and other static files to be indexed by search engines [#7508](https://github.com/facebook/create-react-app/pull/7508)
+
 Inside any created project that has not been ejected, run:
 
 ```sh

CODE_OF_CONDUCT.md

@@ -1,3 +1,76 @@
 # Code of Conduct
 
-Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <opensource-conduct@fb.com>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

docusaurus/docs/adding-flow.md

@@ -14,8 +14,15 @@ To add Flow to a Create React App project, follow these steps:
 3. Run `npm run flow init` (or `yarn flow init`) to create a [`.flowconfig` file](https://flow.org/en/docs/config/) in the root directory.
 4. Add `// @flow` to any files you want to type check (for example, to `src/App.js`).
 
-Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors.
-You can optionally use an IDE like [Nuclide](https://nuclide.io/docs/languages/flow/) for a better integrated experience.
-In the future we plan to integrate it into Create React App even more closely.
+Now you can run `npm run flow` (or `yarn flow`) to check the files for type errors.  
+You can optionally enable an extension for your IDE, such as [Flow Language Support](https://github.com/flowtype/flow-for-vscode) for Visual Studio Code, or leverage the Language Server Protocol standard (e.g. [vim LSP](https://github.com/prabirshrestha/vim-lsp/wiki/Servers-Flow)) to get hints while you type.
+
+If you'd like to use [absolute imports](/docs/importing-a-component#absolute-imports) with Flow,
+make sure to add the following line to your `.flowconfig` to make Flow aware of it:
+
+```diff
+  [options]
++ module.name_mapper='^\(.*\)$' -> '<PROJECT_ROOT>/src/\1'
+```
 
 To learn more about Flow, check out [its documentation](https://flow.org/).

docusaurus/docs/proxying-api-requests-in-development.md

@@ -96,7 +96,10 @@ You can now register proxies as you wish! Here's an example using the above `htt
 const proxy = require('http-proxy-middleware');
 
 module.exports = function(app) {
-  app.use(proxy('/api', { target: 'http://localhost:5000/' }));
+  app.use('/api', proxy({
+    target: 'http://localhost:5000',
+    changeOrigin: true,
+  }));
 };
 ```
 

docusaurus/docs/running-tests.md

@@ -191,8 +191,6 @@ Similar to `enzyme` you can create a `src/setupTests.js` file to avoid boilerpla
 
 ```js
 // react-testing-library renders your components to document.body,
-// this will ensure they're removed after each test.
-import '@testing-library/react/cleanup-after-each';
 // this adds jest-dom's custom assertions
 import '@testing-library/jest-dom/extend-expect';
 ```
@@ -206,7 +204,7 @@ import App from './App';
 
 it('renders welcome message', () => {
   const { getByText } = render(<App />);
-  expect(getByText('Welcome to React')).toBeInTheDocument();
+  expect(getByText('Learn React')).toBeInTheDocument();
 });
 ```
 

docusaurus/docs/setting-up-your-editor.md

@@ -163,13 +163,13 @@ Next we add a 'lint-staged' field to the `package.json`, for example:
   },
 + "lint-staged": {
 +   "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
-+     "prettier --single-quote --write",
++     "prettier --write",
 +     "git add"
 +   ]
 + },
   "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,ts,tsx,json,css,scss,md}"` 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 --write "src/**/*.{js,jsx,ts,tsx,json,css,scss,md}"` 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.

docusaurus/docs/troubleshooting.md

@@ -9,6 +9,7 @@ sidebar_label: Troubleshooting
 When you save a file while `npm start` is running, the browser should refresh with the updated code.<br>
 If this doesn’t happen, try one of the following workarounds:
 
+- Check that your file is imported by you entrypoint. TypeScript will show errors on any of your source files, but webpack only reloads your files if they are directly or indirectly imported by one of your entrypoints.
 - If your project is in a Dropbox folder, try moving it out.
 - If the watcher doesn’t see a file called `index.js` and you’re referencing it by the folder name, you [need to restart the watcher](https://github.com/facebook/create-react-app/issues/1164) due to a Webpack bug.
 - Some editors like Vim and IntelliJ have a “safe write” feature that currently breaks the watcher. You will need to disable it. Follow the instructions in [“Adjusting Your Text Editor”](https://webpack.js.org/guides/development/#adjusting-your-text-editor).

docusaurus/website/core/Footer.js

@@ -74,6 +74,13 @@ class Footer extends React.Component {
             >
               Twitter
             </a>
+            <a
+              href="https://www.contributor-covenant.org/version/1/4/code-of-conduct"
+              target="_blank"
+              rel="noreferrer noopener"
+            >
+              Contributor Covenant
+            </a>
           </div>
           <div>
             <h5>More</h5>

docusaurus/website/static/css/custom.css

@@ -33,6 +33,10 @@
   white-space: nowrap;
 }
 
+.projectLogo {
+  display: block;
+}
+
 @media only screen and (min-device-width: 360px) and (max-device-width: 736px) {
 }
 

package.json

@@ -19,13 +19,13 @@
     "compile:lockfile": "node tasks/compile-lockfile.js"
   },
   "devDependencies": {
-    "eslint": "6.1.0",
+    "eslint": "^6.1.0",
     "execa": "1.0.0",
     "fs-extra": "^7.0.1",
     "get-port": "^4.2.0",
     "globby": "^9.1.0",
     "husky": "^1.3.1",
-    "jest": "24.8.0",
+    "jest": "24.9.0",
     "lerna": "3.16.4",
     "lerna-changelog": "~0.8.2",
     "lint-staged": "^8.0.4",

packages/babel-plugin-named-asset-import/package.json

@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "babel-plugin-tester": "^6.0.1",
-    "jest": "24.8.0"
+    "jest": "24.9.0"
   },
   "scripts": {
     "test": "jest"

packages/babel-preset-react-app/package.json

@@ -21,19 +21,19 @@
     "test.js"
   ],
   "dependencies": {
-    "@babel/core": "7.5.5",
+    "@babel/core": "7.6.0",
     "@babel/plugin-proposal-class-properties": "7.5.5",
-    "@babel/plugin-proposal-decorators": "7.4.4",
+    "@babel/plugin-proposal-decorators": "7.6.0",
     "@babel/plugin-proposal-object-rest-spread": "7.5.5",
     "@babel/plugin-syntax-dynamic-import": "7.2.0",
-    "@babel/plugin-transform-destructuring": "7.5.0",
+    "@babel/plugin-transform-destructuring": "7.6.0",
     "@babel/plugin-transform-flow-strip-types": "7.4.4",
     "@babel/plugin-transform-react-display-name": "7.2.0",
-    "@babel/plugin-transform-runtime": "7.5.5",
-    "@babel/preset-env": "7.5.5",
+    "@babel/plugin-transform-runtime": "7.6.0",
+    "@babel/preset-env": "7.6.0",
     "@babel/preset-react": "7.0.0",
-    "@babel/preset-typescript": "7.3.3",
-    "@babel/runtime": "7.5.5",
+    "@babel/preset-typescript": "7.6.0",
+    "@babel/runtime": "7.6.0",
     "babel-plugin-dynamic-import-node": "2.3.0",
     "babel-plugin-macros": "2.6.1",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24"

packages/confusing-browser-globals/package.json

@@ -20,6 +20,6 @@
     "index.js"
   ],
   "devDependencies": {
-    "jest": "24.8.0"
+    "jest": "24.9.0"
   }
 }

packages/eslint-config-react-app/README.md

@@ -19,7 +19,7 @@ If you want to use this ESLint configuration in a project not built with Create
 First, install this package, ESLint and the necessary plugins.
 
 ```sh
-npm install --save-dev eslint-config-react-app @typescript-eslint/eslint-plugin@1.x @typescript-eslint/parser@1.x babel-eslint@10.x eslint@6.x eslint-plugin-flowtype@3.x eslint-plugin-import@2.x eslint-plugin-jsx-a11y@6.x eslint-plugin-react@7.x eslint-plugin-react-hooks@1.x
+npm install --save-dev eslint-config-react-app @typescript-eslint/eslint-plugin@2.x @typescript-eslint/parser@2.x babel-eslint@10.x eslint@6.x eslint-plugin-flowtype@3.x eslint-plugin-import@2.x eslint-plugin-jsx-a11y@6.x eslint-plugin-react@7.x eslint-plugin-react-hooks@1.x
 ```
 
 Then create a file named `.eslintrc.json` with following contents in the root folder of your project:

packages/eslint-config-react-app/index.js

@@ -78,7 +78,7 @@ module.exports = {
         'no-undef': 'off',
 
         // Add TypeScript specific rules (and turn off ESLint equivalents)
-        '@typescript-eslint/no-angle-bracket-type-assertion': 'warn',
+        '@typescript-eslint/consistent-type-assertions': 'warn',
         'no-array-constructor': 'off',
         '@typescript-eslint/no-array-constructor': 'warn',
         '@typescript-eslint/no-namespace': 'error',

packages/eslint-config-react-app/package.json

@@ -15,8 +15,8 @@
     "index.js"
   ],
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "1.x",
-    "@typescript-eslint/parser": "1.x",
+    "@typescript-eslint/eslint-plugin": "2.x",
+    "@typescript-eslint/parser": "2.x",
     "babel-eslint": "10.x",
     "eslint": "6.x",
     "eslint-plugin-flowtype": "3.x",

packages/react-app-polyfill/package.json

@@ -21,7 +21,7 @@
     "stable.js"
   ],
   "dependencies": {
-    "core-js": "3.1.4",
+    "core-js": "3.2.1",
     "object-assign": "4.1.1",
     "promise": "8.0.3",
     "raf": "3.4.1",

packages/react-dev-utils/package.json

@@ -51,8 +51,8 @@
   ],
   "dependencies": {
     "@babel/code-frame": "7.5.5",
-    "address": "1.1.0",
-    "browserslist": "4.6.6",
+    "address": "1.1.2",
+    "browserslist": "4.7.0",
     "chalk": "2.4.2",
     "cross-spawn": "6.0.5",
     "detect-port-alt": "1.1.6",
@@ -71,14 +71,14 @@
     "pkg-up": "2.0.0",
     "react-error-overlay": "^6.0.1",
     "recursive-readdir": "2.2.2",
-    "shell-quote": "1.6.1",
-    "sockjs-client": "1.3.0",
+    "shell-quote": "1.7.2",
+    "sockjs-client": "1.4.0",
     "strip-ansi": "5.2.0",
     "text-table": "0.2.0"
   },
   "devDependencies": {
     "cross-env": "^5.2.0",
-    "jest": "24.8.0"
+    "jest": "24.9.0"
   },
   "scripts": {
     "test": "cross-env FORCE_COLOR=true jest"

packages/react-error-overlay/flow/env.js

@@ -2,7 +2,7 @@ declare module 'anser' {
   declare module.exports: any;
 }
 
-declare module 'babel-code-frame' {
+declare module '@babel/code-frame' {
   declare module.exports: any;
 }
 

packages/react-error-overlay/package.json

@@ -35,15 +35,15 @@
   ],
   "devDependencies": {
     "@babel/code-frame": "7.5.5",
-    "@babel/core": "7.5.5",
+    "@babel/core": "7.6.0",
     "anser": "1.4.8",
-    "babel-eslint": "10.0.2",
-    "babel-jest": "^24.8.0",
+    "babel-eslint": "10.0.3",
+    "babel-jest": "^24.9.0",
     "babel-loader": "8.0.6",
     "babel-preset-react-app": "^9.0.1",
     "chalk": "^2.4.2",
     "chokidar": "^2.1.2",
-    "cross-env": "5.2.0",
+    "cross-env": "5.2.1",
     "eslint": "^6.1.0",
     "eslint-config-react-app": "^5.0.1",
     "eslint-plugin-flowtype": "3.13.0",
@@ -52,7 +52,7 @@
     "eslint-plugin-react": "7.14.3",
     "flow-bin": "^0.63.1",
     "html-entities": "1.2.1",
-    "jest": "24.8.0",
+    "jest": "24.9.0",
     "jest-fetch-mock": "2.1.2",
     "object-assign": "4.1.1",
     "promise": "8.0.3",

packages/react-error-overlay/src/index.js

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-/* @flow */
 import {
   listenToRuntimeErrors,
   crashWithFrames,

packages/react-error-overlay/src/listenToRuntimeErrors.js

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-/* @flow */
 import {
   register as registerError,
   unregister as unregisterError,

packages/react-scripts/config/env.js

@@ -23,7 +23,7 @@ if (!NODE_ENV) {
 }
 
 // https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
-var dotenvFiles = [
+const dotenvFiles = [
   `${paths.dotenv}.${NODE_ENV}.local`,
   `${paths.dotenv}.${NODE_ENV}`,
   // Don't include `.env.local` for `test` environment