merging all conflicts

.eslintignore

@@ -1,5 +1,8 @@
 node_modules/*
 
+# Skip beta
+beta/*
+
 # Ignore markdown files and examples
 content/*
 

.flowconfig

@@ -1,5 +1,6 @@
 [ignore]
 
+<PROJECT_ROOT>/beta/.*
 <PROJECT_ROOT>/content/.*
 <PROJECT_ROOT>/node_modules/.*
 <PROJECT_ROOT>/public/.*

.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/master/CONTRIBUTING.md
+https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md
 
 If your PR references an existing issue, please add the issue number below
 

.github/labeler.yml

@@ -0,0 +1,2 @@
+beta:
+- beta/**/*

.github/workflows/analyze.yml

@@ -0,0 +1,96 @@
+name: Analyze Bundle
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main # change this if your default branch is named differently
+  workflow_dispatch:
+
+jobs:
+  analyze:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up node
+        uses: actions/setup-node@v1
+        with:
+          node-version: "14.x"
+
+      - 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
+          # 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
+          name: bundle_analysis.json
+
+      - name: Download base branch bundle stats
+        uses: dawidd6/action-download-artifact@v2
+        if: success() && github.event.number
+        with:
+          workflow: analyze.yml
+          branch: ${{ github.event.pull_request.base.ref }}
+          name: bundle_analysis.json
+          path: beta/.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.
+      # There are two configurable arguments that come from package.json:
+      #
+      # - budget: optional, set a budget (bytes) against which size changes are measured
+      #           it's set to 350kb here by default, as informed by the following piece:
+      #           https://infrequently.org/2021/03/the-performance-inequality-gap/
+      #
+      # - red-status-percentage: sets the percent size increase where you get a red
+      #                          status indicator, defaults to 20%
+      #
+      # Either of these arguments can be changed or removed by editing the `nextBundleAnalysis`
+      # entry in your package.json file.
+      - 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
+
+      - name: Save PR number
+        run: echo ${{ github.event.number }} > ./pr_number
+
+      - name: Upload PR number
+        uses: actions/upload-artifact@v2
+        with:
+          name: pr_number
+          path: ./pr_number
+
+      # The actual commenting happens in the other action, matching the guidance in
+      # https://securitylab.github.com/research/github-actions-preventing-pwn-requests/

.github/workflows/analyze_comment.yml

@@ -0,0 +1,72 @@
+name: Analyze Bundle (Comment)
+
+on:
+  workflow_run:
+    workflows: ["Analyze Bundle"]
+    types:
+      - completed
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    if: >
+      ${{ github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success' }}
+    steps:
+      - name: Download base branch bundle stats
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: analyze.yml
+          run_id: ${{ github.event.workflow_run.id }}
+          name: analysis_comment.txt
+          path: analysis_comment.txt
+
+      - name: Download PR number
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          workflow: analyze.yml
+          run_id: ${{ github.event.workflow_run.id }}
+          name: pr_number
+          path: pr_number
+
+      - name: Get comment body
+        id: get-comment-body
+        if: success()
+        run: |
+          pr_number=$(cat pr_number/pr_number)
+          body=$(cat analysis_comment.txt/__bundle_analysis_comment.txt)
+          body="## Size Changes
+          <details>
+
+          ${body}
+          
+          </details>"
+          body="${body//'%'/'%25'}"
+          body="${body//$'\n'/'%0A'}"
+          body="${body//$'\r'/'%0D'}"
+          echo ::set-output name=body::$body
+          echo ::set-output name=pr-number::$pr_number
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v1
+        if: success()
+        id: fc
+        with:
+          issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
+          body-includes: "<!-- __NEXTJS_BUNDLE -->"
+
+      - name: Create Comment
+        uses: peter-evans/[email protected]
+        if: success() && steps.fc.outputs.comment-id == 0
+        with:
+          issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
+          body: ${{ steps.get-comment-body.outputs.body }}
+
+      - name: Update Comment
+        uses: peter-evans/[email protected]
+        if: success() && steps.fc.outputs.comment-id != 0
+        with:
+          issue-number: ${{ steps.get-comment-body.outputs.pr-number }}
+          body: ${{ steps.get-comment-body.outputs.body }}
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          edit-mode: replace

.github/workflows/beta_site_lint.yml

@@ -0,0 +1,30 @@
+name: Beta 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/[email protected]
+        with:
+          working-directory: 'beta'
+
+
+      - name: Lint codebase
+        run: cd beta && yarn ci-check

.github/workflows/label.yml

@@ -0,0 +1,22 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler
+
+name: Labeler
+on: [pull_request_target]
+
+jobs:
+  label:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+    - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/nodejs.yml

@@ -0,0 +1,27 @@
+name: Lint / Flow 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/[email protected]
+
+      - name: Lint codebase
+        run: yarn ci-check

.gitignore

@@ -2,5 +2,5 @@
 .DS_STORE
 .idea
 node_modules
-public
+/public
 yarn-error.log

.nvmrc

@@ -1 +1 @@
-12.16.1
+12.22.0

README.md

@@ -7,10 +7,17 @@ Aquest repositori conté tant el codi font com la documentació necessària per
 ### Requisits previs
 
 1. Git
+<<<<<<< HEAD
 1. Node: qualsevol versió 12.x començant per v12.0.0 o superior
 1. Yarn: Veure [Lloc web de Yarn amb instruccions d'instal·lació](https://yarnpkg.com/lang/en/docs/install/)
 1. Un fork del repositori (per a contribucions)
 1. Un clon de [reactjs.org repo](https://github.com/reactjs/reactjs.org) a la teva màquina local
+=======
+1. Node: any 12.x version starting with v12.0.0 or greater
+1. Yarn v1: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
+1. A fork of the repo (for any contributions)
+1. A clone of the [reactjs.org repo](https://github.com/reactjs/reactjs.org) on your local machine
+>>>>>>> 38bf76a4a7bec6072d086ce8efdeef9ebb7af227
 
 ### Instal·lació
 
@@ -26,13 +33,23 @@ Aquest repositori conté tant el codi font com la documentació necessària per
 
 ### Directrius
 
+<<<<<<< HEAD
 La documentació està dividida en diferents seccions amb diferent to i propòsit. Si planeja en fer una traducció extensa, pot trobar útil estar familiaritzat amb les directrius de contribució [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/master/CONTRIBUTING.md#guidelines-for-text) per a la secció apropiada.
+=======
+The documentation is divided into several sections with a different tone and purpose. If you plan to write more than a few sentences, you might find it helpful to get familiar with the [contributing guidelines](https://github.com/reactjs/reactjs.org/blob/main/CONTRIBUTING.md#guidelines-for-text) for the appropriate sections.
+>>>>>>> 38bf76a4a7bec6072d086ce8efdeef9ebb7af227
 
 ### Crear una branca
 
+<<<<<<< HEAD
 1. `git checkout master` des de qualsevol directori dins del teu repositori local de `reactjs.org`
 2. `git pull origin master` per a assegurar que el codi està actualitzat amb els canvis més recents
 3. `git checkout -b nom-de-la-meva-branca` (reemplaça `nom-de-la-meva-branca` amb el nom adient) per a crear una nova branca
+=======
+1. `git checkout main` from any folder in your local `reactjs.org` repository
+1. `git pull origin main` to ensure you have the latest main code
+1. `git checkout -b the-name-of-my-branch` (replacing `the-name-of-my-branch` with a suitable name) to create a branch
+>>>>>>> 38bf76a4a7bec6072d086ce8efdeef9ebb7af227
 
 ### Fer canvis
 
@@ -49,19 +66,40 @@ La documentació està dividida en diferents seccions amb diferent to i propòsi
 
 ### Afegeix els canvis
 
+<<<<<<< HEAD
 1. `git add -A && git commit -m "El meu missatge"` (canviï `El meu missatge` amb un missatge de commit, tal com `Solucionar logotip en Android`) per a afegir i actualitzar el repositori
 1. `git push el-meu-fork nom-de-la-meva-branca`
 1. Vagi a [reactjs.org repo](https://github.com/reactjs/reactjs.org) i podrà veure els canvis mes recents a qualsevol de les branques actualitzades.
 1. Segueixi les instruccions de GitHub.
 1. A ser possible, inclogui captures de pantalla dels canvis visuals. Una build de [Netlify](https://www.netlify.com/) es crearà automàticament quan enviï la PR per tal que altra gent pugui visualitzar els canvis.
+=======
+1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes
+1. `git push my-fork-name the-name-of-my-branch`
+1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches.
+1. Follow GitHub's instructions.
+1. If possible, include screenshots of visual changes. A preview build is triggered after your changes are pushed to GitHub.
+>>>>>>> 38bf76a4a7bec6072d086ce8efdeef9ebb7af227
 
 ## Traduccions
 
+<<<<<<< HEAD
 Si està interessat a traduir `reactjs.org`, si us plau, comprovi l'estat actual de la traducció a [isreacttranslatedyet.com](https://www.isreacttranslatedyet.com/).
+=======
+If you are interested in translating `reactjs.org`, please see the current translation efforts at [translations.reactjs.org](https://translations.reactjs.org/).
+>>>>>>> 38bf76a4a7bec6072d086ce8efdeef9ebb7af227
 
 ## Resolució de problemes
 
 - `yarn reset` per a buidar la caché local
 
+<<<<<<< HEAD
 ## Llicència
 Content submitted to [reactjs.org](https://reactjs.org/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/open-source-explorer/reactjs.org/blob/master/LICENSE-DOCS.md) file.
+=======
+## Troubleshooting
+
+- `yarn reset` to clear the local cache
+
+## License
+Content submitted to [reactjs.org](https://reactjs.org/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](LICENSE-DOCS.md) file.
+>>>>>>> 38bf76a4a7bec6072d086ce8efdeef9ebb7af227

beta/.env.development

@@ -0,0 +1 @@
+SANDPACK_BARE_COMPONENTS=true