merging all conflicts

.nvmrc

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

README.md

@@ -9,7 +9,7 @@
 =======
 1. Git
 1. Node: any 12.x version starting with v12.0.0 or greater
-1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
+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
 >>>>>>> 6bd09fe682e18ccd7747fcd7798fa8fb4d3edc42
@@ -111,6 +111,7 @@ If you are interested in translating `reactjs.org`, please see the current trans
 
 ### په‌ره‌یه‌ک هه‌ڵبژێره‌ بۆ وه‌رگێڕان
 
+<<<<<<< HEAD
 له‌ [بابه‌تی #١]( https://github.com/reactjs/ku.reactjs.org/issues/1)، ئه‌و په‌ڕانه‌ی که‌ پێویستییان به‌ وه‌رگێڕانه‌، ریزکراون. پێش هه‌موو شتێک، پێویسته‌ له‌ په‌ڕه‌کانی Core Pages ده‌ستپێبکه‌ین به‌و ریزبه‌ندییه‌ی ئاماژه‌ی پێکراوه‌. یه‌کێک له‌و په‌ڕانه‌ی که‌ حه‌زت لێیه‌و ئاشنای پێی، هه‌ڵبژێره‌.
 
 تێبینی: ئه‌و په‌ڕانه‌ی که‌ ئه‌م هێمایه‌یان [x] به‌ ته‌نیشته‌وه‌یه‌، وه‌رگێردراون. ئه‌گه‌ر ناوی هه‌رکه‌سێک له‌ ته‌نیشت په‌ڕه‌یه‌ک دانرابێت، ئه‌وا، ئه‌رکی وه‌رگێڕانی ئه‌و په‌ڕه‌یه‌ له‌ ئه‌ستۆی ئه‌و که‌سه‌دایه‌.
@@ -200,4 +201,8 @@ yarn check-all
 
 گۆرانکارییه‌کانت له‌ لایه‌ن تیمی مه‌ینته‌ینه‌ره‌وه‌، پێداچوونه‌وه‌یان بۆ ده‌کرێت و بۆچوونی خۆیان به‌ ئێوه‌ ده‌ڵێن. پاش په‌سه‌ند کردن، گۆرانکارییه‌کانتان زیاد ده‌کرێت. 
 
-</div>
+</div>
+=======
+## 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 

beta/.env.production

@@ -1 +1,2 @@
-NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'
+NEXT_PUBLIC_GA_TRACKING_ID = 'UA-41298772-4'
+SANDPACK_BARE_COMPONENTS=true 

beta/.eslintrc

@@ -1,8 +1,11 @@
 {
   "root": true,
   "extends": "next/core-web-vitals",
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
   "rules": {
-    "no-unused-vars": "warn"
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": "warn"
   },
   "env": {
     "node": true,

beta/.gitignore

@@ -33,3 +33,8 @@ yarn-error.log*
 
 # vercel
 .vercel
+
+# external fonts
+public/fonts/Optimistic_Display_W_Lt.woff2
+public/fonts/Optimistic_Display_W_Md.woff2
+public/fonts/Optimistic_Display_W_Bd.woff2

beta/.prettierignore

@@ -1,2 +1 @@
-src/pages/docs/**/*.md
-src/pages/blog/**/*.md
+src/content/**/*.md

beta/CONTRIBUTING.md

@@ -20,7 +20,7 @@ The documentation is divided into sections to cater to different learning styles
 
 **[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.
 
-**[API Reference](https://reactjs.org/apis)** 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://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.
 
 **Try to follow your own instructions.**
 

beta/README.md

@@ -1,6 +1,6 @@
 # reactjs.org
 
-This repo contains the source code and documentation powering [reactjs.org](https://reactjs.org/).
+This repo contains the source code and documentation powering [beta.reactjs.org](https://beta.reactjs.org/).
 
 
 ## Getting started