Merge branch 'main' into pr-605-cherry-pick

.eslintignore

@@ -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

.eslintrc

@@ -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
   }
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -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
 

.github/workflows/analyze.yml

@@ -20,34 +20,30 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1.7.10
-        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

.github/workflows/site_lint.yml

@@ -0,0 +1,27 @@
+name: Site Lint / Heading ID check
+
+on:
+  push:
+    branches:
+      - main # change this if your default branch is named differently
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    name: Lint on node 12.x and ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Use Node.js 12.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 12.x
+
+      - name: Install deps and build (with cache)
+        uses: bahmutov/npm-install@v1.7.10
+
+      - name: Lint codebase
+        run: yarn ci-check

.gitignore

@@ -1,6 +1,38 @@
-.cache
-.DS_STORE
-.idea
-node_modules
-/public
-yarn-error.log
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+tsconfig.tsbuildinfo
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# local env files
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+# vercel
+.vercel
+
+# external fonts
+public/fonts/Optimistic_*.woff2