Merge branch 'main' into master

.eslintignore

@@ -1,6 +1,4 @@
 node_modules/
-build
-my-app*
-packages/react-scripts/template
-packages/react-scripts/fixtures
-fixtures/
+build/
+test/fixtures/webpack-message-formatting/src/AppBabel.js
+packages/react-error-overlay/lib/

.eslintrc.json

@@ -4,7 +4,8 @@
     "browser": true,
     "commonjs": true,
     "node": true,
-    "es6": true
+    "es6": true,
+    "jest": true
   },
   "parserOptions": {
     "ecmaVersion": 2018
@@ -13,5 +14,39 @@
     "no-console": "off",
     "strict": ["error", "global"],
     "curly": "warn"
-  }
+  },
+  "overrides": [
+    {
+      "files": [
+        "docusaurus/website/src/**/*.js",
+        "packages/cra-template/**/*.js",
+        "packages/react-error-overlay/**/*.js",
+        "packages/react-scripts/fixtures/kitchensink/template/{src,integration}/**/*.js",
+        "test/fixtures/*/src/*.js"
+      ],
+      "excludedFiles": ["packages/react-error-overlay/*.js"],
+      "extends": ["react-app", "react-app/jest"]
+    },
+    {
+      "files": [
+        "test/fixtures/webpack-message-formatting/src/{AppLintError,AppLintWarning,AppUnknownFile}.js"
+      ],
+      "rules": {
+        "no-unused-vars": "off",
+        "no-undef": "off"
+      }
+    },
+    {
+      "files": ["test/fixtures/webpack-message-formatting/src/Export5.js"],
+      "rules": {
+        "import/no-anonymous-default-export": "off"
+      }
+    },
+    {
+      "files": ["test/fixtures/issue-5176-flow-class-properties/src/App.js"],
+      "rules": {
+        "no-dupe-class-members": "off"
+      }
+    }
+  ]
 }

.github/CODEOWNERS

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -32,7 +32,7 @@ labels: 'issue: bug report, needs triage'
     * yarn.lock
 
   Then you need to decide which package manager you prefer to use.
-  We support both npm (https://npmjs.com) and yarn (http://yarnpkg.com/).
+  We support both npm (https://npmjs.com) and yarn (https://yarnpkg.com/).
   However, **they can't be used together in one project** so you need to pick one.
 
   If you decided to use npm, run this in your project directory:

.github/workflows/build-and-test.yml

@@ -0,0 +1,76 @@
+name: 'Build & Test'
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: 'Build (${{ matrix.os }}, Node ${{ matrix.node }})'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - 'ubuntu-latest'
+        node:
+          - '16'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci --prefer-offline
+      - name: Build
+        run: npm run build
+
+  integration:
+    name: 'Integration Tests (${{ matrix.os }}, Node ${{ matrix.node }})'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - 'ubuntu-latest'
+          - 'macos-latest'
+          - 'windows-latest'
+        node:
+          - '16'
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm'
+      - name: Install dependencies
+        run: npm ci --prefer-offline
+      # The integration tests are run with yarn, so we need to install it.
+      - name: Install yarn
+        run: npm i -g yarn
+      - name: Run integration tests
+        run: npm run test:integration
+
+  e2e-simple:
+    name: E2E Simple
+    uses: ./.github/workflows/e2e-base.yml
+    with:
+      testScript: 'tasks/e2e-simple.sh'
+
+  e2e-installs:
+    name: E2E Installs
+    uses: ./.github/workflows/e2e-base.yml
+    with:
+      testScript: 'tasks/e2e-installs.sh'
+
+  e2e-kitchensink:
+    name: E2E Kitchensink
+    uses: ./.github/workflows/e2e-base.yml
+    with:
+      testScript: 'tasks/e2e-kitchensink.sh'

.github/workflows/e2e-base.yml

@@ -0,0 +1,35 @@
+on:
+  workflow_call:
+    inputs:
+      testScript:
+        required: true
+        type: string
+
+name: E2E
+
+jobs:
+  test:
+    name: 'Test (${{ matrix.os }}, Node ${{ matrix.node }})'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - 'ubuntu-latest'
+        node:
+          - '16'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: 'npm'
+      - name: Install
+        run: npm ci --prefer-offline
+      - name: Initialize Global Git config
+        run: |
+          git config --global core.autocrlf false
+          git config --global user.name "Create React App"
+          git config --global user.email "cra@email.com"
+      - name: Run tests
+        run: ${{ inputs.testScript }}

.github/workflows/lint.yml

@@ -1,13 +1,21 @@
 name: Lint
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+          cache: 'npm'
       - name: Install
-        run: yarn --no-progress --non-interactive --no-lockfile
+        run: npm ci --prefer-offline
       - name: Alex
-        run: yarn alex
+        run: npm run alex
+      - name: Prettier
+        run: npm run prettier -- --list-different
+      - name: Eslint
+        run: npm run eslint -- --max-warnings 0

.gitignore

@@ -1,7 +1,7 @@
 .idea/
 .vscode/
 node_modules/
-build
+build/
 .DS_Store
 *.tgz
 my-app*
@@ -12,4 +12,3 @@ yarn-debug.log*
 yarn-error.log*
 /.changelog
 .npm/
-yarn.lock

.prettierignore

@@ -0,0 +1,9 @@
+build/
+package-lock.json
+test/fixtures/webpack-message-formatting/src/AppBabel.js
+test/fixtures/webpack-message-formatting/src/AppCss.css
+packages/react-error-overlay/fixtures/bundle*
+packages/react-error-overlay/fixtures/inline*
+packages/react-error-overlay/fixtures/junk*
+packages/react-error-overlay/lib/
+packages/react-error-overlay/coverage/