Move beta to top level

.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/labeler.yml

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

.github/workflows/analyze.yml

@@ -20,8 +20,6 @@ jobs:
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1.7.10
-        with:
-          working-directory: 'beta'
 
       - name: Restore next build
         uses: actions/cache@v2
@@ -29,25 +27,23 @@ jobs:
         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/beta_site_lint.yml → .github/workflows/site_lint.yml

@@ -1,4 +1,4 @@
-name: Beta Site Lint / Heading ID check
+name: Site Lint / Heading ID check
 
 on:
   push:
@@ -22,9 +22,6 @@ jobs:
 
       - name: Install deps and build (with cache)
         uses: bahmutov/npm-install@v1.7.10
-        with:
-          working-directory: 'beta'
-
 
       - name: Lint codebase
-        run: cd beta && yarn ci-check
+        run: yarn ci-check

beta/CONTRIBUTING.md → CONTRIBUTING.md

@@ -18,9 +18,9 @@ This is a [good summary](https://medium.com/@kvosswinkel/coding-like-a-journalis
 
 The documentation is divided into sections to cater to different learning styles and use cases. When editing an article, try to match the surrounding text in tone and style. When creating a new article, try to match the tone of the other articles in the same section. Learn about the motivation behind each section below.
 
-**[Learn React](https://beta.reactjs.org/learn)** is designed to introduce fundamental concepts in a step-by-step way. Each individual article in Learn React builds on the knowledge from the previous ones, so make sure not to add any "cyclical dependencies" between them. It is important that the reader can start with the first article and work their way to the last Learn React article without ever having to "look ahead" for a definition. This explains some ordering choices (e.g. that state is explained before events, or that "thinking in React" doesn't use refs). Learn React also serves as a reference manual for React concepts, so it is important to be very strict about their definitions and relationships between them.
+**[Learn React](https://react.dev/learn)** is designed to introduce fundamental concepts in a step-by-step way. Each individual article in Learn React builds on the knowledge from the previous ones, so make sure not to add any "cyclical dependencies" between them. It is important that the reader can start with the first article and work their way to the last Learn React article without ever having to "look ahead" for a definition. This explains some ordering choices (e.g. that state is explained before events, or that "thinking in React" doesn't use refs). Learn React also serves as a reference manual for React concepts, so it is important to be very strict about their definitions and relationships between them.
 
-**[API Reference](https://reactjs.org/apis/react)** is organized by APIs rather than concepts. It is intended to be exhaustive. Any corner cases or recommendations that were skipped for brevity in Learn React should be mentioned in the reference documentation for the corresponding APIs.
+**[API Reference](https://react.dev/reference/react)** is organized by APIs rather than concepts. It is intended to be exhaustive. Any corner cases or recommendations that were skipped for brevity in Learn React should be mentioned in the reference documentation for the corresponding APIs.
 
 **Try to follow your own instructions.**
 

beta/README.md → README.md

@@ -1,7 +1,6 @@
-# reactjs.org
+# react.dev
-
-This repo contains the source code and documentation powering [beta.reactjs.org](https://beta.reactjs.org/).
 
+This repo contains the source code and documentation powering [react.dev](https://react.dev/).
 
 ## Getting started
 
@@ -15,13 +14,11 @@ This repo contains the source code and documentation powering [beta.reactjs.org]
 
 ### Installation
 
-1. `cd reactjs.org` to go into the project root
+1. `cd react.dev` to go into the project root
-1. `cd beta` to open the beta website
 3. `yarn` to install the website's npm dependencies
 
 ### Running locally
 
-1. Make sure you're in the `beta` folder
 1. `yarn dev` to start the development server (powered by [Next.js](https://nextjs.org/))
 1. `open http://localhost:3000` to open the site in your favorite browser
 
@@ -48,26 +45,19 @@ The documentation is divided into several sections with a different tone and pur
 ### Test the change
 
 1. If possible, test any visual changes in all latest versions of common browsers, on both desktop and mobile.
-2. Run `yarn check-all` from the `beta` folder. (This will run Prettier, ESLint and validate types.)
+2. Run `yarn check-all`. (This will run Prettier, ESLint and validate types.)
 
 ### Push it
 
 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. Go to the [react.dev repo](https://github.com/reactjs/react.dev) 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.
 
 ## Translation
 
-If you are interested in translating `reactjs.org`, please see the current translation efforts at [translations.reactjs.org](https://translations.reactjs.org/).
+If you are interested in translating `react.dev`, please see the current translation efforts [here](https://github.com/reactjs/react.dev/issues/4135).
-
-
-If your language does not have a translation and you would like to create one, please follow the instructions at [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg).
-
-## 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](https://github.com/open-source-explorer/reactjs.org/blob/master/LICENSE-DOCS.md) file.
+Content submitted to [react.dev](https://react.dev/) is CC-BY-4.0 licensed, as found in the [LICENSE-DOCS.md](https://github.com/reactjs/react.dev/blob/master/LICENSE-DOCS.md) file.

beta/package.json → package.json

@@ -1,5 +1,5 @@
 {
-  "name": "react-website",
+  "name": "react-dev",
   "version": "1.0.0",
   "private": true,
   "license": "CC",
@@ -18,7 +18,7 @@
     "ci-check": "npm-run-all prettier:diff --parallel lint tsc lint-heading-ids",
     "tsc": "tsc --noEmit",
     "start": "next start",
-    "postinstall": "patch-package && (is-ci || (cd .. && husky install beta/.husky))",
+    "postinstall": "patch-package && (is-ci || (cd .. && husky install .husky))",
     "check-all": "npm-run-all prettier lint:fix tsc"
   },
   "dependencies": {