Merge remote-tracking branch 'reactdev/main' into merge-react-dev

# Conflicts:
#	beta/package.json
#	beta/src/content/learn/add-react-to-a-website.md
#	beta/src/content/learn/start-a-new-react-project.md
#	beta/src/sidebarLearn.json
#	beta/yarn.lock
#	content/blog/2019-02-23-is-react-translated-yet.md
#	content/docs/accessibility.md
#	content/docs/add-react-to-a-website.md
#	content/docs/addons-shallow-renderer.md
#	content/docs/addons-test-utils.md
#	content/docs/cdn-links.md
#	content/docs/code-splitting.md
#	content/docs/components-and-props.md
#	content/docs/composition-vs-inheritance.md
#	content/docs/conditional-rendering.md
#	content/docs/create-a-new-react-app.md
#	content/docs/error-boundaries.md
#	content/docs/faq-ajax.md
#	content/docs/faq-build.md
#	content/docs/faq-state.md
#	content/docs/faq-structure.md
#	content/docs/faq-styling.md
#	content/docs/forms.md
#	content/docs/forwarding-refs.md
#	content/docs/fragments.md
#	content/docs/getting-started.md
#	content/docs/handling-events.md
#	content/docs/hello-world.md
#	content/docs/hooks-custom.md
#	content/docs/hooks-effect.md
#	content/docs/hooks-faq.md
#	content/docs/hooks-intro.md
#	content/docs/hooks-overview.md
#	content/docs/hooks-reference.md
#	content/docs/hooks-rules.md
#	content/docs/hooks-state.md
#	content/docs/introducing-jsx.md
#	content/docs/jsx-in-depth.md
#	content/docs/lifting-state-up.md
#	content/docs/lists-and-keys.md
#	content/docs/nav.yml
#	content/docs/portals.md
#	content/docs/react-without-es6.md
#	content/docs/react-without-jsx.md
#	content/docs/reconciliation.md
#	content/docs/reference-dom-elements.md
#	content/docs/reference-events.md
#	content/docs/reference-glossary.md
#	content/docs/reference-javascript-environment-requirements.md
#	content/docs/reference-react-component.md
#	content/docs/reference-react-dom-server.md
#	content/docs/reference-react-dom.md
#	content/docs/reference-react.md
#	content/docs/reference-test-renderer.md
#	content/docs/refs-and-the-dom.md
#	content/docs/render-props.md
#	content/docs/rendering-elements.md
#	content/docs/state-and-lifecycle.md
#	content/docs/strict-mode.md
#	content/docs/testing-environments.md
#	content/docs/testing.md
#	content/docs/thinking-in-react.md
#	content/docs/uncontrolled-components.md
#	content/docs/web-components.md
#	content/footerNav.yml
#	content/headerNav.yml
#	content/home/examples/a-component-using-external-plugins.md
#	content/home/examples/a-simple-component.md
#	content/home/examples/a-stateful-component.md
#	content/home/examples/an-application.md
#	content/home/marketing/component-based.md
#	content/home/marketing/declarative.md
#	content/home/marketing/learn-once-write-anywhere.md
#	content/tutorial/nav.yml
#	content/tutorial/tutorial.md
#	examples/introducing-jsx.js
#	src/components/LayoutHeader/DocSearch.js
#	src/content/learn/editor-setup.md
#	src/content/learn/javascript-in-jsx-with-curly-braces.md
#	src/html.js
#	src/pages/index.js
#	yarn.lock

Author: rickhanlonii

.babelrc

@@ -1,13 +1,3 @@
-node_modules/*
-
-# Skip beta
-beta/*
-
-# Ignore markdown files and examples
-content/*
-
-# Ignore built files
-public/*
-
-# Ignore examples
-examples/*
+scripts
+plugins
+next.config.js

beta/.env.development renamed to .env.development

@@ -1,18 +1,16 @@
 {
-  "extends": [
-    "fbjs"
-  ],
-  "plugins": [
-    "prettier",
-    "react"
-  ],
-  "parser": "babel-eslint",
+  "root": true,
+  "extends": "next/core-web-vitals",
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
   "rules": {
-    "relay/graphql-naming": 0,
-    "max-len": 0
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": "warn"
   },
   "env": {
     "node": true,
-    "browser": true
+    "commonjs": true,
+    "browser": true,
+    "es6": true
   }
 }

beta/.env.production renamed to .env.production

@@ -4,7 +4,7 @@ Thank you for the PR! Contributors like you keep React awesome!
 
 Please see the Contribution Guide for guidelines:
 
-https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md
+https://github.com/reactjs/react.dev/blob/main/CONTRIBUTING.md
 
 If your PR references an existing issue, please add the issue number below
 

.eslintignore

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    # Disable Dependabot. Doing it here so it propagates to translation forks.
+    open-pull-requests-limit: 0

.eslintrc

@@ -20,34 +20,30 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/[email protected]
-        with:
-          working-directory: 'beta'
 
       - name: Restore next build
         uses: actions/cache@v2
         id: restore-build-cache
         env:
           cache-name: cache-next-build
         with:
-          path: beta/.next/cache
+          path: .next/cache
           # change this if you prefer a more strict cache
           key: ${{ runner.os }}-build-${{ env.cache-name }}
 
       - name: Build next.js app
         # change this if your site requires a custom build command
         run: ./node_modules/.bin/next build
-        working-directory: beta
 
       # Here's the first place where next-bundle-analysis' own script is used
       # This step pulls the raw bundle stats for the current bundle
       - name: Analyze bundle
         run: npx -p nextjs-bundle-analysis report
-        working-directory: beta
 
       - name: Upload bundle
         uses: actions/upload-artifact@v2
         with:
-          path: beta/.next/analyze/__bundle_analysis.json
+          path: .next/analyze/__bundle_analysis.json
           name: bundle_analysis.json
 
       - name: Download base branch bundle stats
@@ -57,7 +53,7 @@ jobs:
           workflow: analyze.yml
           branch: ${{ github.event.pull_request.base.ref }}
           name: bundle_analysis.json
-          path: beta/.next/analyze/base/bundle
+          path: .next/analyze/base/bundle
 
       # And here's the second place - this runs after we have both the current and
       # base branch bundle stats, and will compare them to determine what changed.
@@ -75,13 +71,12 @@ jobs:
       - name: Compare with base branch bundle
         if: success() && github.event.number
         run: ls -laR .next/analyze/base && npx -p nextjs-bundle-analysis compare
-        working-directory: beta
 
       - name: Upload analysis comment
         uses: actions/upload-artifact@v2
         with:
           name: analysis_comment.txt
-          path: beta/.next/analyze/__bundle_analysis_comment.txt
+          path: .next/analyze/__bundle_analysis_comment.txt
 
       - name: Save PR number
         run: echo ${{ github.event.number }} > ./pr_number