Merge branch 'facebook:main' into merceyz/fix/dependency-issues

Author: merceyz

.github/workflows/build.yml

@@ -6,8 +6,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+          cache: 'npm'
+      - name: Install npm@7
+        run: npm i -g npm@7
       - name: Install
-        run: yarn --no-progress --non-interactive --no-lockfile
+        run: npm ci --prefer-offline
       - name: Build
-        run: yarn build
+        run: npm run build

.github/workflows/integration.yml

@@ -18,19 +18,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
-      - name: Cache dependencies
-        id: cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            node_modules
-            */*/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock', './yarn.lock') }}
+          cache: 'npm'
+      - name: Install npm@7
+        run: npm i -g npm@7
       - name: Install packages
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn --frozen-lockfile --prefer-offline
+        run: npm ci --prefer-offline
       - name: Run integration tests
-        run: yarn test:integration
+        run: npm run test:integration

.github/workflows/lint.yml

@@ -6,8 +6,14 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+          cache: 'npm'
+      - name: Install npm@7
+        run: npm i -g npm@7
       - name: Install
-        run: yarn --no-progress --non-interactive --no-lockfile
+        run: npm ci --prefer-offline
       - name: Alex
-        run: yarn alex
+        run: npm run alex

.gitignore

@@ -12,4 +12,3 @@ yarn-debug.log*
 yarn-error.log*
 /.changelog
 .npm/
-yarn.lock

CONTRIBUTING.md

@@ -90,24 +90,26 @@ All functionality must be retained (and configuration given to the user) if they
 
 ## Setting Up a Local Copy
 
+You will need `npm@7` and `yarn@1` in order to bootstrap and test a local copy of this repo.
+
 1. Clone the repo with `git clone https://github.com/facebook/create-react-app`
 
-2. Run `yarn` in the root `create-react-app` folder.
+2. Run `npm install` 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. It will serve the application from the files located in `packages/cra-template/template`.
+Once it is done, you can modify any file locally and run `npm start`, `npm test` or `npm run 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:
 
 ```sh
-yarn create-react-app my-app
+npx create-react-app my-app
 cd my-app
 ```
 
-and then run `yarn start` or `yarn build`.
+and then run `npm start` or `npm run build`.
 
 ## Contributing to E2E (end to end) tests
 
-**TL;DR** use the command `yarn e2e:docker` to run unit and e2e tests.
+**TL;DR** use the command `npm run e2e:docker` to run unit and e2e tests.
 
 More detailed information are in the dedicated [README](/test/README.md).
 
@@ -143,11 +145,11 @@ By default git would use `CRLF` line endings which would cause the scripts to fa
 2. Close the milestone and create a new one for the next release.
 3. In most releases, only `react-scripts` needs to be released. If you don’t have any changes to the `packages/create-react-app` folder, you don’t need to bump its version or publish it (the publish script will publish only changed packages).
 4. Note that files in `packages/create-react-app` should be modified with extreme caution. Since it’s a global CLI, any version of `create-react-app` (global CLI) including very old ones should work with the latest version of `react-scripts`.
-5. Run `yarn compile:lockfile`. The command will generate an updated lockfile in `packages/create-react-app` that should be committed.
+5. Run `npm run compile:lockfile`. The command will generate an updated lockfile in `packages/create-react-app` that should be committed.
 6. Create a change log entry for the release:
 
 - You'll need an [access token for the GitHub API](https://help.github.com/articles/creating-an-access-token-for-command-line-use/). Save it to this environment variable: `export GITHUB_AUTH="..."`
-- Run `yarn changelog`. The command will find all the labeled pull requests merged since the last release and group them by the label and affected packages, and create a change log entry with all the changes and links to PRs and their authors. Copy and paste it to `CHANGELOG.md`.
+- Run `npm run changelog`. The command will find all the labeled pull requests merged since the last release and group them by the label and affected packages, and create a change log entry with all the changes and links to PRs and their authors. Copy and paste it to `CHANGELOG.md`.
 - Add a four-space indented paragraph after each non-trivial list item, explaining what changed and why. For each breaking change also write who it affects and instructions for migrating existing code.
 - Maybe add some newlines here and there. Preview the result on GitHub to get a feel for it. Changelog generator output is a bit too terse for my taste, so try to make it visually pleasing and well grouped.
 
@@ -161,9 +163,9 @@ Make sure to test the released version! If you want to be extra careful, you can
 ## Releasing the Docs
 
 1. Go to the `docusaurus/website` directory
-2. Run `yarn build`
+2. Run `npm run build`
 3. You'll need an [access token for the GitHub API](https://help.github.com/articles/creating-an-access-token-for-command-line-use/). Save it to this environment variable: `export GITHUB_AUTH="..."`
-4. Run `GIT_USER=<GITHUB_USERNAME> CURRENT_BRANCH=main USE_SSH=true yarn deploy`
+4. Run `GIT_USER=<GITHUB_USERNAME> CURRENT_BRANCH=main USE_SSH=true npm run deploy`
 
 ---
 

azure-pipelines-test-job.yml

@@ -31,8 +31,11 @@ jobs:
           versionSpec: $(nodeVersion)
         displayName: 'Install Node.js'
 
-      - script: yarn --frozen-lockfile
-        displayName: 'Run yarn'
+      - script: npm i -g npm@7
+        displayName: 'Update npm to v7'
+
+      - script: npm ci
+        displayName: 'Run npm ci'
 
       - bash: ${{ parameters.testScript }}
         displayName: 'Run tests'

azure-pipelines.yml

@@ -26,10 +26,10 @@ jobs:
   # ******************************************************************************
   # Installs test suite
   # ******************************************************************************
-  # - template: azure-pipelines-test-job.yml
-  #   parameters:
-  #     name: Installs
-  #     testScript: tasks/e2e-installs.sh
+  - template: azure-pipelines-test-job.yml
+    parameters:
+      name: Installs
+      testScript: tasks/e2e-installs.sh
 
   # ******************************************************************************
   # Kitchensink test suite

docusaurus/docs/getting-started.md

@@ -90,10 +90,13 @@ If you already have a project and would like to add TypeScript, see our [Adding
 
 ### Selecting a package manager
 
-When you create a new app, the CLI will use [Yarn](https://yarnpkg.com/) to install dependencies (when available). If you have Yarn installed, but would prefer to use npm, you can append `--use-npm` to the creation command. For example:
+When you create a new app, the CLI will use [npm](https://docs.npmjs.com) or [Yarn](https://yarnpkg.com/) to install dependencies, depending on which tool you use to run `create-react-app`. For example:
 
 ```sh
-npx create-react-app my-app --use-npm
+# Run this to use npm
+npx create-react-app my-app
+# Or run this to use yarn
+yarn create react-app my-app
 ```
 
 ## Output

docusaurus/website/README.md

@@ -5,29 +5,29 @@ This website is built using Docusaurus 2, a modern static website generator.
 ### Installation
 
 ```
-$ yarn
+$ npm install
 ```
 
 ### Local Development
 
 ```
-$ yarn start
+$ npm start
 ```
 
 This command starts a local development server and open up a browser window. Most changes are reflected live without having to restart the server.
 
 ### Build
 
 ```
-$ yarn build
+$ npm run build
 ```
 
 This command generates static content into the `build` directory and can be served using any static contents hosting service.
 
 ### Deployment
 
 ```
-$ GIT_USER=<Your GitHub username> USE_SSH=1 yarn deploy
+$ GIT_USER=<Your GitHub username> USE_SSH=1 npm run deploy
 ```
 
 If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.