Skip to content

Commit 0eefcd5

Browse files
hg-pyunhg-pyun
authored
Merge branch 'master' into master
2 parents 1db302a + 9e1b8a3 commit 0eefcd5

File tree

6 files changed

+46
-12
lines changed

6 files changed

+46
-12
lines changed

‎content/authors.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ keyanzhang:
4949
kmeht:
5050
name: Kunal Mehta
5151
url: https://github.com/kmeht
52+
laurentan:
53+
name: Lauren Tan
54+
url: https://twitter.com/sugarpirate_
5255
LoukaN:
5356
name: Lou Husson
5457
url: https://twitter.com/loukan42

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
title: "Introducing Zero-Bundle-Size React Server Components"
3+
author: [gaearon,laurentan,josephsavona,sebmarkbage]
4+
---
5+
6+
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**.
7+
8+
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.
9+
10+
<br>
11+
12+
<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>
13+
14+
**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!**
15+
16+
If you want to check them out, we recommend to go in the following order:
17+
18+
1. **Watch the talk** to learn about React Server Components and see the demo.
19+
20+
2. **[Clone the demo](http://github.com/reactjs/server-components-demo)** to play with React Server Components on your computer.
21+
22+
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.
23+
24+
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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ December 1-2, 2020 - remote event
1717

1818
[Website](https://react-next.com/) - [Twitter](https://twitter.com/reactnext) - [Facebook](https://www.facebook.com/ReactNext2016/)
1919

20+
### React Summit - Remote Edition 2021 {#react-summit-remote-2021}
21+
April 14-16, 2021, 7am PST / 10am EST / 4pm CEST - remote event
22+
23+
[Website](https://remote.reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
24+
2025
### render(ATL) 2021 {#render-atlanta-2021}
2126
September 13-15, 2021. Atlanta, GA, USA
2227

‎src/components/FeedbackForm/FeedbackForm.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ const FeedbackForm = () => {
5353
label: window.location.pathname,
5454
value: 0,
5555
});
56+
setFeedbackGiven(true);
5657
}}>
5758
<svg
5859
css={{

‎static/_redirects

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ http://en.reactjs.org/* https://reactjs.org/:splat 301!
33
https://en.reactjs.org/* https://reactjs.org/:splat 301!
44

55
/tips/controlled-input-null-value.html /docs/forms.html#controlled-input-null-value
6-
/concurrent /docs/concurrent-mode-intro.html
7-
/hooks /docs/hooks-intro.html
8-
/tutorial /tutorial/tutorial.html
9-
/your-story https://www.surveymonkey.co.uk/r/MVQV2R9 301
10-
/stories https://medium.com/react-community-stories 301
11-
/html-jsx.html https://magic.reactjs.net/htmltojsx.htm 301
6+
/concurrent /docs/concurrent-mode-intro.html
7+
/hooks /docs/hooks-intro.html
8+
/server-components /blog/2020/12/21/data-fetching-with-react-server-components.html
9+
/tutorial /tutorial/tutorial.html
10+
/your-story https://www.surveymonkey.co.uk/r/MVQV2R9 301
11+
/stories https://medium.com/react-community-stories 301
12+
/html-jsx.html https://magic.reactjs.net/htmltojsx.htm 301
1213

1314
/link/attribute-behavior /blog/2017/09/08/dom-attributes-in-react-16.html#changes-in-detail
1415
/link/controlled-components /docs/forms.html#controlled-components
@@ -22,7 +23,7 @@ https://en.reactjs.org/* https://reactjs.org/:splat 301!
2223
/link/invalid-hook-call /warnings/invalid-hook-call-warning.html
2324
/link/legacy-context /docs/legacy-context.html
2425
/link/legacy-factories /warnings/legacy-factories.html
25-
/link/mock-scheduler /docs/testing-environments.html#mocking-a-rendering-surface
26+
/link/mock-scheduler /docs/testing-environments.html#mocking-a-rendering-surface
2627
/link/perf-use-production-build /docs/optimizing-performance.html#use-the-production-build
2728
/link/react-devtools /blog/2015/09/02/new-react-developer-tools.html#installation
2829
/link/react-polyfills /docs/javascript-environment-requirements.html

‎yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8180,7 +8180,7 @@ has-symbol-support-x@^1.4.1:
81808180
resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
81818181
integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
81828182

8183-
has-symbols@^1.0.1:
8183+
has-symbols@^1.0.0, has-symbols@^1.0.1:
81848184
version "1.0.1"
81858185
resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
81868186
integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
@@ -11366,7 +11366,7 @@ object-is@^1.0.1:
1136611366
define-properties "^1.1.3"
1136711367
es-abstract "^1.17.5"
1136811368

11369-
object-keys@^1.0.12, object-keys@^1.1.1:
11369+
object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
1137011370
version "1.1.1"
1137111371
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
1137211372
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
@@ -16068,9 +16068,9 @@ uri-js@^4.2.2:
1606816068
punycode "^2.1.0"
1606916069

1607016070
urijs@^1.19.2:
16071-
version "1.19.2"
16072-
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.2.tgz#f9be09f00c4c5134b7cb3cf475c1dd394526265a"
16073-
integrity sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==
16071+
version "1.19.5"
16072+
resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.5.tgz#119683ab4b2fb0bd637e5ea6dd9117bcac68d3e4"
16073+
integrity sha512-48z9VGWwdCV5KfizHsE05DWS5fhK6gFlx5MjO7xu0Krc5FGPWzjlXEVV0nPMrdVuP7xmMHiPZ2HoYZwKOFTZOg==
1607416074

1607516075
urix@^0.1.0:
1607616076
version "0.1.0"

0 commit comments

Comments
 (0)