Merge branch 'master' of https://github.com/reactjs/reactjs.org into sync-7a11d71b

Author: reactjs-translation-bot

content/authors.yml

@@ -49,6 +49,9 @@ keyanzhang:
 kmeht:
   name: Kunal Mehta
   url: https://github.com/kmeht
+laurentan:
+  name: Lauren Tan
+  url: https://twitter.com/sugarpirate_
 LoukaN:
   name: Lou Husson
   url: https://twitter.com/loukan42

content/blog/2020-12-21-data-fetching-with-react-server-components.md

@@ -0,0 +1,24 @@
+---
+title: "Introducing Zero-Bundle-Size React Server Components"
+author: [gaearon,laurentan,josephsavona,sebmarkbage]
+---
+
+2020 has been a long year. As it comes to an end we wanted to share a special Holiday Update on our research into zero-bundle-size **React Server Components**.
+
+To introduce React Server Components, we have prepared a talk and a demo. If you want, you can check them out during the holidays, or later when work picks back up in the new year.
+
+<br>
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/TQQPAU21ZUw" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+**React Server Components are still in research and development.** We are sharing this work in the spirit of transparency and to get initial feedback from the React community. There will be plenty of time for that, so **don't feel like you have to catch up right now!**
+
+If you want to check them out, we recommend to go in the following order:
+
+1. **Watch the talk** to learn about React Server Components and see the demo.
+
+2. **[Clone the demo](http://github.com/reactjs/server-components-demo)** to play with React Server Components on your computer.
+
+3. **[Read the RFC (with FAQ at the end)](https://github.com/reactjs/rfcs/pull/188)** for a deeper technical breakdown and to provide feedback.
+
+We are excited to hear from you on the RFC or in replies to the [@reactjs](https://twitter.com/reactjs) Twitter handle. Happy holidays, stay safe, and see you next year!

content/community/conferences.md

@@ -17,6 +17,11 @@ December 1-2, 2020 - remote event
 
 [Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
 
+### React Summit - Remote Edition 2021 {#react-summit-remote-2021}
+April 14-16, 2021, 7am PST / 10am EST / 4pm CEST - remote event
+
+[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
+
 ### render(ATL) 2021 {#render-atlanta-2021} 
 September 13-15, 2021. Atlanta, GA, USA
 

src/components/FeedbackForm/FeedbackForm.js

@@ -53,6 +53,7 @@ const FeedbackForm = () => {
               label: window.location.pathname,
               value: 0,
             });
+            setFeedbackGiven(true);
           }}>
           <svg
             css={{

static/_redirects

@@ -3,12 +3,13 @@ http://en.reactjs.org/* https://reactjs.org/:splat 301!
 https://en.reactjs.org/* https://reactjs.org/:splat 301!
 
 /tips/controlled-input-null-value.html  /docs/forms.html#controlled-input-null-value
-/concurrent     /docs/concurrent-mode-intro.html
-/hooks          /docs/hooks-intro.html
-/tutorial       /tutorial/tutorial.html
-/your-story     https://www.surveymonkey.co.uk/r/MVQV2R9    301
-/stories        https://medium.com/react-community-stories  301
-/html-jsx.html  https://magic.reactjs.net/htmltojsx.htm     301
+/concurrent           /docs/concurrent-mode-intro.html
+/hooks                /docs/hooks-intro.html
+/server-components    /blog/2020/12/21/data-fetching-with-react-server-components.html
+/tutorial             /tutorial/tutorial.html
+/your-story           https://www.surveymonkey.co.uk/r/MVQV2R9    301
+/stories              https://medium.com/react-community-stories  301
+/html-jsx.html        https://magic.reactjs.net/htmltojsx.htm     301
 
 /link/attribute-behavior            /blog/2017/09/08/dom-attributes-in-react-16.html#changes-in-detail
 /link/controlled-components         /docs/forms.html#controlled-components
@@ -22,7 +23,7 @@ https://en.reactjs.org/* https://reactjs.org/:splat 301!
 /link/invalid-hook-call             /warnings/invalid-hook-call-warning.html
 /link/legacy-context                /docs/legacy-context.html
 /link/legacy-factories              /warnings/legacy-factories.html
-/link/mock-scheduler                /docs/testing-environments.html#mocking-a-rendering-surface 
+/link/mock-scheduler                /docs/testing-environments.html#mocking-a-rendering-surface
 /link/perf-use-production-build     /docs/optimizing-performance.html#use-the-production-build
 /link/react-devtools                /blog/2015/09/02/new-react-developer-tools.html#installation
 /link/react-polyfills                /docs/javascript-environment-requirements.html