merge with fb upstream cra 4.0

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 packages/ @ianschmitz @iansu @mrmckeb @petetnt
-docusaurus/ @amyrlam @iansu
+docusaurus/ @ianschmitz @iansu @mrmckeb

.github/ISSUE_TEMPLATE/question.md

@@ -4,7 +4,7 @@ about: Get help with Create React App
 labels: 'needs triage'
 ---
 
-If you have a general question about Create React App or about building an app with Create React App we encourage you to post on our Spectrum community instead of this issue tracker. The maintainers and other community members can provide help and answer your questions there: https://spectrum.chat/create-react-app
+If you have a general question about Create React App or about building an app with Create React App we encourage you to post in GitHub Discussions instead of this issue tracker. The maintainers and other community members can provide help and answer your questions there: https://github.com/facebook/create-react-app/discussions
 
 If you're looking for general information on using React, the React docs have a list of resources: https://reactjs.org/community/support.html
 

.github/stale.yml

@@ -9,20 +9,20 @@ daysUntilClose: 5
 
 # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
 exemptLabels:
-  - "contributions: claimed"
-  - "contributions: up for grabs!"
-  - "good first issue"
-  - "issue: announcement"
-  - "issue: bug"
-  - "issue: needs investigation"
-  - "issue: proposal"
-  - "tag: breaking change"
-  - "tag: bug fix"
-  - "tag: documentation"
-  - "tag: enhancement"
-  - "tag: internal"
-  - "tag: new feature"
-  - "tag: underlying tools"
+  - 'contributions: claimed'
+  - 'contributions: up for grabs!'
+  - 'good first issue'
+  - 'issue: announcement'
+  - 'issue: bug'
+  - 'issue: needs investigation'
+  - 'issue: proposal'
+  - 'tag: breaking change'
+  - 'tag: bug fix'
+  - 'tag: documentation'
+  - 'tag: enhancement'
+  - 'tag: internal'
+  - 'tag: new feature'
+  - 'tag: underlying tools'
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true

.prettierrc

@@ -1,4 +1,5 @@
 {
+  "arrowParens": "avoid",
   "trailingComma": "es5",
   "singleQuote": true,
   "semi": true

CONTRIBUTING.md

@@ -94,7 +94,7 @@ All functionality must be retained (and configuration given to the user) if they
 
 2. Run `yarn` in the root `create-react-app` folder.
 
-Once it is done, you can modify any file locally and run `yarn start`, `yarn test` or `yarn build` like you can in a generated project.
+Once it is done, you can modify any file locally and run `yarn start`, `yarn test` or `yarn build` like you can in a generated project. It will serve the application from the files located in `packages/cra-template/template`.
 
 If you want to try out the end-to-end flow with the global CLI, you can do this too:
 

README.md

@@ -1,13 +1,15 @@
 # Create React App [![Build Status](https://dev.azure.com/facebook/create-react-app/_apis/build/status/facebook.create-react-app?branchName=master)](https://dev.azure.com/facebook/create-react-app/_build/latest?definitionId=1&branchName=master) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg)](https://github.com/facebook/create-react-app/blob/master/CONTRIBUTING.md)
 
+<img alt="Logo" align="right" src="https://create-react-app.dev/img/logo.svg" width="20%" />
+
 Create React apps with no build configuration.
 
 - [Creating an App](#creating-an-app) – How to create a new app.
 - [User Guide](https://facebook.github.io/create-react-app/) – How to develop apps bootstrapped with Create React App.
 
 Create React App works on macOS, Windows, and Linux.<br>
 If something doesn’t work, please [file an issue](https://github.com/facebook/create-react-app/issues/new).<br>
-If you have questions or need help, please ask in our [Spectrum](https://spectrum.chat/create-react-app) community.
+If you have questions or need help, please ask in [GitHub Discussions](https://github.com/facebook/create-react-app/discussions).
 
 ## Quick Overview
 
@@ -17,7 +19,7 @@ cd my-app
 npm start
 ```
 
-If you've previously installed `create-react-app` globally via `npm install -g create-react-app`, we recommend you uninstall the package using `npm uninstall -g create-react-app` to ensure that npx always uses the latest version.
+If you've previously installed `create-react-app` globally via `npm install -g create-react-app`, we recommend you uninstall the package using `npm uninstall -g create-react-app` or `yarn global remove create-react-app` to ensure that npx always uses the latest version.
 
 _([npx](https://medium.com/@maybekatz/introducing-npx-an-npm-package-runner-55f7d4bd282b) comes with npm 5.2+ and higher, see [instructions for older npm versions](https://gist.github.com/gaearon/4064d3c23a77c74a3614c498a8bb1c5f))_
 
@@ -86,6 +88,7 @@ my-app
     ├── index.js
     ├── logo.svg
     └── serviceWorker.js
+    └── setupTests.js
 ```
 
 No configuration or complicated folder structures, only the files you need to build your app.<br>
@@ -174,9 +177,9 @@ Here are a few common cases where you might want to try something else:
 
 - If you need to **publish a React component**, [nwb](https://github.com/insin/nwb) can [also do this](https://github.com/insin/nwb#react-components-and-libraries), as well as [Neutrino's react-components preset](https://neutrino.js.org/packages/react-components/).
 
-- If you want to do **server rendering** with React and Node.js, check out [Next.js](https://github.com/zeit/next.js/) or [Razzle](https://github.com/jaredpalmer/razzle). Create React App is agnostic of the backend, and only produces static HTML/JS/CSS bundles.
+- If you want to do **server rendering** with React and Node.js, check out [Next.js](https://nextjs.org/) or [Razzle](https://github.com/jaredpalmer/razzle). Create React App is agnostic of the backend, and only produces static HTML/JS/CSS bundles.
 
-- If your website is **mostly static** (for example, a portfolio or a blog), consider using [Gatsby](https://www.gatsbyjs.org/) instead. Unlike Create React App, it pre-renders the website into HTML at the build time.
+- If your website is **mostly static** (for example, a portfolio or a blog), consider using [Gatsby](https://www.gatsbyjs.org/) or [Next.js](https://nextjs.org/). Unlike Create React App, Gatsby pre-renders the website into HTML at build time. Next.js supports both server rendering and pre-rendering.
 
 - Finally, if you need **more customization**, check out [Neutrino](https://neutrino.js.org/) and its [React preset](https://neutrino.js.org/packages/react/).
 
@@ -193,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>

SECURITY.md

@@ -0,0 +1,7 @@
+# Reporting Security Issues
+
+If you believe you have found a security vulnerability in Create React App, we encourage you to let us know right away. We will investigate all legitimate reports and do our best to quickly fix the problem.
+
+Please refer to the following page for our responsible disclosure policy, reward guidelines, and those things that should not be reported:
+
+https://www.facebook.com/whitehat

azure-pipelines-test-job.yml

@@ -1,40 +1,38 @@
-#
-# Azure Pipelines job for building and testing create-react-app on Linux, Windows, and macOS.
-#
-
-parameters:
-  name: ''
-  testScript: ''
-  configurations:
-    LinuxNode8: { vmImage: 'ubuntu-16.04', nodeVersion: 8.x }
-    LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
-    # WindowsNode8:  { vmImage: 'vs2017-win2016', nodeVersion: 8.x  }
-    # WindowsNode10: { vmImage: 'vs2017-win2016', nodeVersion: 10.x }
-
-jobs:
-  - job: ${{ parameters.name }}
-    strategy:
-      matrix:
-        ${{ insert }}: ${{ parameters.configurations }}
-    pool:
-      vmImage: $(vmImage)
-    steps:
-      - script: |
-          git config --global core.autocrlf false
-          git config --global user.name "Create React App"
-          git config --global user.email "cra@email.com"
-        displayName: 'Initialize Git config'
-
-      - checkout: self
-        path: create-react-app
-
-      - task: NodeTool@0
-        inputs:
-          versionSpec: $(nodeVersion)
-        displayName: 'Install Node.js'
-
-      - script: yarn --frozen-lockfile
-        displayName: 'Run yarn'
-
-      - bash: ${{ parameters.testScript }}
-        displayName: 'Run tests'
+#
+# Azure Pipelines job for building and testing create-react-app on Linux, Windows, and macOS.
+#
+
+parameters:
+  name: ''
+  testScript: ''
+  configurations:
+    LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
+    LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
+
+jobs:
+  - job: ${{ parameters.name }}
+    strategy:
+      matrix:
+        ${{ insert }}: ${{ parameters.configurations }}
+    pool:
+      vmImage: $(vmImage)
+    steps:
+      - script: |
+          git config --global core.autocrlf false
+          git config --global user.name "Create React App"
+          git config --global user.email "cra@email.com"
+        displayName: 'Initialize Git config'
+
+      - checkout: self
+        path: create-react-app
+
+      - task: NodeTool@0
+        inputs:
+          versionSpec: $(nodeVersion)
+        displayName: 'Install Node.js'
+
+      - script: yarn --frozen-lockfile
+        displayName: 'Run yarn'
+
+      - bash: ${{ parameters.testScript }}
+        displayName: 'Run tests'

azure-pipelines.yml

@@ -1,92 +1,77 @@
-#
-# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS.
-#
-
-trigger:
-  - master
-
-variables:
-  CI: true
-  # Overrides the Yarn and NPM cache directories so they are on the same drive as the source. This helps improve build performance on Windows hosted agents.
-  YARN_CACHE_FOLDER: $(Build.SourcesDirectory)/../yarn-cache
-  NPM_CONFIG_CACHE: $(Build.SourcesDirectory)/../npm-cache
-  # Sets TEMP to be on the same drive as the cloned source on Windows. This avoids test scripts that "cd" into a directory under TEMP from failing because this directory is on a different drive from the current directory.
-  VSTS_OVERWRITE_TEMP: True
-  # Override Verdaccio package to use. This is temporary and is needed to avoid socket timeouts on hosted Windows agent (on Azure). This also changes Verdaccio to return a 503 (service unavailable) instead of a 404 (not found) when the connection to the uplink timesout.
-  VERDACCIO_PACKAGE: https://github.com/willsmythe/verdaccio/releases/download/create-react-app/verdaccio-4.0.0-alpha.8.tgz
-  CRA_INTERNAL_TEST: true
-
-# ******************************************************************************
-# Simple test suite
-# ******************************************************************************
-jobs:
-  - template: azure-pipelines-test-job.yml
-    parameters:
-      name: Simple
-      testScript: tasks/e2e-simple.sh
-
-  # ******************************************************************************
-  # Installs test suite
-  # ******************************************************************************
-  - template: azure-pipelines-test-job.yml
-    parameters:
-      name: Installs
-      testScript: tasks/e2e-installs.sh
-
-  # ******************************************************************************
-  # Kitchensink test suite
-  # ******************************************************************************
-  - template: azure-pipelines-test-job.yml
-    parameters:
-      name: Kitchensink
-      testScript: tasks/e2e-kitchensink.sh
-
-  # ******************************************************************************
-  # Kitchensink Eject test suite
-  # ******************************************************************************
-  - template: azure-pipelines-test-job.yml
-    parameters:
-      name: KitchensinkEject
-      testScript: tasks/e2e-kitchensink-eject.sh
-
-  # ******************************************************************************
-  # Behavior test suite
-  # ******************************************************************************
-  - template: azure-pipelines-test-job.yml
-    parameters:
-      name: Behavior
-      testScript: tasks/e2e-behavior.sh
-      configurations:
-        LinuxNode8: { vmImage: 'ubuntu-18.04', nodeVersion: 8.x }
-        LinuxNode10: { vmImage: 'ubuntu-18.04', nodeVersion: 10.x }
-        # WindowsNode8:  { vmImage: 'vs2017-win2016', nodeVersion: 8.x  }
-        # WindowsNode10: { vmImage: 'vs2017-win2016', nodeVersion: 10.x }
-        MacNode8: { vmImage: 'macOS-10.15', nodeVersion: 8.x }
-        MacNode10: { vmImage: 'macOS-10.15', nodeVersion: 10.x }
-
-  # ******************************************************************************
-  # Old Node test suite
-  # ******************************************************************************
-  - job: OldNode
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: 6.x
-        displayName: 'Install Node.js 6.x'
-      - bash: tasks/e2e-old-node.sh
-        displayName: 'Run tests'
-  # ******************************************************************************
-  # Unsupported Node with TypeScript flag
-  # ******************************************************************************
-  - job: UnsupportedNodeWithTypeScript
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: 8.9.x
-        displayName: 'Install Node.js 8.9.x'
-      - bash: tasks/e2e-typescript-unsupported-node.sh
-        displayName: 'Run unsupported TypeScript test'
+#
+# Azure Pipelines configuration for building and testing create-react-app on Linux, Windows, and macOS.
+#
+
+trigger:
+  - master
+
+variables:
+  CI: true
+  # Overrides the Yarn and NPM cache directories so they are on the same drive as the source. This helps improve build performance on Windows hosted agents.
+  YARN_CACHE_FOLDER: $(Build.SourcesDirectory)/../yarn-cache
+  NPM_CONFIG_CACHE: $(Build.SourcesDirectory)/../npm-cache
+  # Sets TEMP to be on the same drive as the cloned source on Windows. This avoids test scripts that "cd" into a directory under TEMP from failing because this directory is on a different drive from the current directory.
+  VSTS_OVERWRITE_TEMP: True
+  CRA_INTERNAL_TEST: true
+
+# ******************************************************************************
+# Simple test suite
+# ******************************************************************************
+jobs:
+  - template: azure-pipelines-test-job.yml
+    parameters:
+      name: Simple
+      testScript: tasks/e2e-simple.sh
+
+  # ******************************************************************************
+  # Installs test suite
+  # ******************************************************************************
+  - template: azure-pipelines-test-job.yml
+    parameters:
+      name: Installs
+      testScript: tasks/e2e-installs.sh
+
+  # ******************************************************************************
+  # Kitchensink test suite
+  # ******************************************************************************
+  - template: azure-pipelines-test-job.yml
+    parameters:
+      name: Kitchensink
+      testScript: tasks/e2e-kitchensink.sh
+
+  # ******************************************************************************
+  # Kitchensink Eject test suite
+  # ******************************************************************************
+  - template: azure-pipelines-test-job.yml
+    parameters:
+      name: KitchensinkEject
+      testScript: tasks/e2e-kitchensink-eject.sh
+
+  # ******************************************************************************
+  # Behavior test suite
+  # ******************************************************************************
+  - template: azure-pipelines-test-job.yml
+    parameters:
+      name: Behavior
+      testScript: tasks/e2e-behavior.sh
+      configurations:
+        LinuxNode10: { vmImage: 'ubuntu-16.04', nodeVersion: 10.x }
+        LinuxNode12: { vmImage: 'ubuntu-16.04', nodeVersion: 12.x }
+        WindowsNode10: { vmImage: 'windows-2019', nodeVersion: 10.x }
+        WindowsNode12: { vmImage: 'windows-2019', nodeVersion: 12.x }
+        MacNode10: { vmImage: 'macOS-10.15', nodeVersion: 10.x }
+        MacNode12: { vmImage: 'macOS-10.15', nodeVersion: 12.x }
+
+  # ******************************************************************************
+  # Old Node test suite
+  # ******************************************************************************
+  - job: OldNode
+    pool:
+      vmImage: ubuntu-latest
+    steps:
+      - task: NodeTool@0
+        inputs:
+          versionSpec: 8.x
+        displayName: 'Install Node.js 8.x'
+      - bash: tasks/e2e-old-node.sh
+        displayName: 'Run tests'

docusaurus/docs/adding-css-reset.md

@@ -16,6 +16,8 @@ To start using it, add `@import-normalize;` anywhere in your CSS file(s). You on
 /* rest of app styles */
 ```
 
+> **Tip**: If you see an "_Unknown at rule @import-normalize css(unknownAtRules)_" warning in VSCode, change the `css.lint.unknownAtRules` setting to `ignore`.
+
 You can control which parts of [normalize.css] to use via your project's [browserslist].
 
 Results when [browserslist] is `last 3 versions`:

docusaurus/docs/adding-custom-environment-variables.md

@@ -132,8 +132,8 @@ REACT_APP_NOT_SECRET_CODE=abcdef
 
 Files on the left have more priority than files on the right:
 
-- `npm start`: `.env.development.local`, `.env.development`, `.env.local`, `.env`
-- `npm run build`: `.env.production.local`, `.env.production`, `.env.local`, `.env`
+- `npm start`: `.env.development.local`, `.env.local`, `.env.development`, `.env`
+- `npm run build`: `.env.production.local`, `.env.local`, `.env.production`, `.env`
 - `npm test`: `.env.test.local`, `.env.test`, `.env` (note `.env.local` is missing)
 
 These variables will act as the defaults if the machine does not explicitly set them.