Merge pull request #306 from reactjs/sync-19aa5b48

ph1p · awxiaoxian2020 · 0ldh · web-flow · commit de5e79349eed · 2023-03-21T10:40:11.000+01:00
* fix: correct prev link in `hello-world` (#5595) * fix typo (#5611) * Fix fonts * Update .gitignore * fix(beta): typo on renderToReadableStream assetMap (#5621) * Update legacy.md * fix og images * A typo (#5644) It should be `useContext(AuthContext)` whereas it's `useContext(AuthProvider)`. * Add React Norway to events pages (#5641) * Add React Norway to conferences page * Add React Norway to beta docs events * (tic-tac-toe) fix or-and in sentence (#5646) * 🐛 (tic-tac-toe) fix or-and in sentence * chore: use an just like previous para --------- Co-authored-by: Delphine Bugner <dbugner@tf1.fr> Co-authored-by: Strek <ssharishkumar@gmail.com> * Update react-redux connect documentation link on HOC page to updated react redux docs (#5624) * Update team page ghstack-source-id: fd330d5eeb1e050d792064492193dfbdabee24a5 Pull Request resolved: reactjs/react.dev#5658 * Docs: Fix `useEffect` link typo in `react/useLayoutEffect.md` (#5661) * fix typo * fix typo * chore: update text color of console block (#5666) * missing word: "in" (#5665) * Fix a misleading style in the example (#5660) * Make consistent * Update higher-order-components.md --------- Co-authored-by: Xavi Lee <awxiaoxian2020@163.com> Co-authored-by: 이동현 <ldh19971027@gmail.com> Co-authored-by: Dan Abramov <dan.abramov@gmail.com> Co-authored-by: Marcos Bérgamo <marcosvinicius_0305@hotmail.com> Co-authored-by: Sophie Alpert <git@sophiebits.com> Co-authored-by: Dan Lebo <dan.lebo@me.com> Co-authored-by: Ruokai Zhao <108767320+ruokaizhao@users.noreply.github.com> Co-authored-by: Sean Keegan <seanryankeegan@gmail.com> Co-authored-by: Delphine Bugner <delphineb@bam.tech> Co-authored-by: Delphine Bugner <dbugner@tf1.fr> Co-authored-by: Strek <ssharishkumar@gmail.com> Co-authored-by: Sami Lieberman <sami.lieberman@aexp.com> Co-authored-by: Joe Savona <joesavona@fb.com> Co-authored-by: Laube <75902023+LPAube@users.noreply.github.com> Co-authored-by: Kk Shinkai <i@shinkai.moe> Co-authored-by: Phil <me@ph1p.dev>
diff --git a/beta/.gitignore b/beta/.gitignore
@@ -35,6 +35,4 @@ yarn-error.log*
 .vercel
 
 # external fonts
-public/fonts/Optimistic_Display_W_Lt.woff2
-public/fonts/Optimistic_Display_W_Md.woff2
-public/fonts/Optimistic_Display_W_Bd.woff2
+public/fonts/Optimistic_*.woff2
diff --git a/beta/public/images/og-blog.png b/beta/public/images/og-blog.png
diff --git a/beta/public/images/og-community.png b/beta/public/images/og-community.png
diff --git a/beta/public/images/og-home.png b/beta/public/images/og-home.png
diff --git a/beta/public/images/og-learn.png b/beta/public/images/og-learn.png
diff --git a/beta/public/images/og-reference.png b/beta/public/images/og-reference.png
diff --git a/beta/public/images/og-unknown.png b/beta/public/images/og-unknown.png
diff --git a/beta/public/images/team/mengdi-chen.jpg b/beta/public/images/team/mengdi-chen.jpg
diff --git a/beta/scripts/downloadFonts.js b/beta/scripts/downloadFonts.js
@@ -15,3 +15,15 @@ execSync(
 execSync(
   'curl https://conf.reactjs.org/fonts/Optimistic_Display_W_Bd.woff2 --output public/fonts/Optimistic_Display_W_Bd.woff2'
 );
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Display_W_SBd.woff2 --output public/fonts/Optimistic_Display_W_SBd.woff2'
+);
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Text_W_Rg.woff2 --output public/fonts/Optimistic_Text_W_Rg.woff2'
+);
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Text_W_Md.woff2 --output public/fonts/Optimistic_Text_W_Md.woff2'
+);
+execSync(
+  'curl https://conf.reactjs.org/fonts/Optimistic_Text_W_Bd.woff2 --output public/fonts/Optimistic_Text_W_Bd.woff2'
+);
diff --git a/beta/src/components/MDX/ConsoleBlock.tsx b/beta/src/components/MDX/ConsoleBlock.tsx
@@ -44,7 +44,7 @@ function ConsoleBlock({level = 'error', children}: ConsoleBlockProps) {
           <Box className="bg-gray-300 dark:bg-gray-90" width="15px" />
         </div>
         <div className="flex text-sm px-4">
-          <div className="border-b-2 border-gray-300 dark:border-gray-90">
+          <div className="border-b-2 border-gray-300 dark:border-gray-90 dark:text-gray-30 text-gray-50">
             Console
           </div>
           <div className="px-4 py-2 flex">
diff --git a/beta/src/content/community/conferences.md b/beta/src/content/community/conferences.md
@@ -30,6 +30,11 @@ June 2 & 6, 2023. In-person in Amsterdam, Netherlands + remote first interactivi
 
 [Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
 
+### React Norway 2023 {/*react-norway-2023*/}
+June 16th, 2023. Larvik, Norway
+
+[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway/) - [Facebook](https://www.facebook.com/reactdaynorway/)
+
 ### ReactNext 2023 {/*reactnext-2023*/}
 June 27th, 2023. Tel Aviv, Israel
 
diff --git a/beta/src/content/community/team.md b/beta/src/content/community/team.md
@@ -14,7 +14,7 @@ The React Core team members work full time on the core component APIs, the engin
 
 Current members of the React team are listed in alphabetical order below.
 
-<TeamMember name="Andrew Clark" permalink="andrew-clark" photo="/images/team/acdlite.jpg" github="acdlite" twitter="acdlite" title="Engineer at Meta">
+<TeamMember name="Andrew Clark" permalink="andrew-clark" photo="/images/team/acdlite.jpg" github="acdlite" twitter="acdlite" title="Engineer at Vercel">
     Andrew got started with web development by making sites with WordPress, and eventually tricked himself into doing JavaScript. His favorite pastime is karaoke. Andrew is either a Disney villain or a Disney princess, depending on the day.
 </TeamMember>
 
@@ -38,10 +38,14 @@ Current members of the React team are listed in alphabetical order below.
     Lauren’s programming career peaked when she first discovered the `<marquee>` tag. She’s been chasing that high ever since. When she’s not adding bugs into React, she enjoys dropping cheeky memes in chat, and playing all too many video games with her partner, and her dog Zelda.
 </TeamMember>
 
-<TeamMember name="Luna Ruan" permalink="luna-ruan" photo="/images/team/lunaruan.jpg" github="lunaruan" twitter="lunaruan" title="Engineer at Meta">
+<TeamMember name="Luna Ruan" permalink="luna-ruan" photo="/images/team/lunaruan.jpg" github="lunaruan" twitter="lunaruan" title="Independent Engineer">
     Luna learned programming because she thought it meant creating video games. Instead, she ended up working on the Pinterest web app, and now on React itself. Luna doesn't want to make video games anymore, but she plans to do creative writing if she ever gets bored.
 </TeamMember>
 
+<TeamMember name="Mengdi Chen" permalink="mengdi-chen" photo="/images/team/mengdi-chen.jpg" github="mondaychen" twitter="mengdi_en" title="Engineer at Meta">
+    While working on his Digital Arts degree Mengdi was conceited about his front-end skills because his CSS worked perfectly even on IE6. But soon React opened a new door of programming for him, and he has been dreaming of joining the React team ever since. Outside of work, he is usually busy chasing his two kids around or collecting strange recipes.
+</TeamMember>
+
 <TeamMember name="Mofei Zhang" permalink="mofei-zhang" photo="/images/team/mofei-zhang.png" github="mofeiZ" title="Engineer at Meta">
     Mofei started programming when she realized it can help her cheat in video games. She focused on operating systems in undergrad / grad school, but now finds herself happily tinkering on React. Outside of work, she enjoys debugging bouldering problems and planning her next backpacking trip(s).
 </TeamMember>
diff --git a/beta/src/content/learn/conditional-rendering.md b/beta/src/content/learn/conditional-rendering.md
@@ -212,7 +212,7 @@ If you're coming from an object-oriented programming background, you might assum
 
 </DeepDive>
 
-Now let's say you want to wrap the completed item's text into another HTML tag, like `<del>` to strike it out. You can add even more newlines and parentheses so that it's easier to nest more JSX each of the cases:
+Now let's say you want to wrap the completed item's text into another HTML tag, like `<del>` to strike it out. You can add even more newlines and parentheses so that it's easier to nest more JSX in each of the cases:
 
 <Sandpack>
 
diff --git a/beta/src/content/learn/javascript-in-jsx-with-curly-braces.md b/beta/src/content/learn/javascript-in-jsx-with-curly-braces.md
@@ -469,7 +469,7 @@ export default function TodoList() {
 ```css
 body { padding: 0; margin: 0 }
 body > div > div { padding: 20px; }
-.avatar { border-radius: 50%; height: 90px; }
+.avatar { border-radius: 50%; }
 ```
 
 </Sandpack>
@@ -520,7 +520,7 @@ export default function TodoList() {
 ```css
 body { padding: 0; margin: 0 }
 body > div > div { padding: 20px; }
-.avatar { border-radius: 50%; height: 90px; }
+.avatar { border-radius: 50%; }
 ```
 
 </Sandpack>
@@ -575,7 +575,7 @@ export function getImageUrl(person) {
 ```css
 body { padding: 0; margin: 0 }
 body > div > div { padding: 20px; }
-.avatar { border-radius: 50%; height: 90px; }
+.avatar { border-radius: 50%; }
 ```
 
 </Sandpack>
@@ -584,4 +584,4 @@ Variables and functions can help you keep the markup simple!
 
 </Solution>
 
-</Challenges>
+</Challenges>
diff --git a/beta/src/content/learn/tutorial-tic-tac-toe.md b/beta/src/content/learn/tutorial-tic-tac-toe.md
@@ -1410,7 +1410,7 @@ But wait, there's a problem. Try clicking on the same square multiple times:
 
 The `X` is overwritten by an `O`! While this would add a very interesting twist to the game, we're going to stick to the original rules for now.
 
-When you mark a square with a `X` or a `O` you aren't first checking to see if the square already has a `X` or `O` value. You can fix this by *returning early*. You'll check to see if the square already has a `X` or and `O`. If the square is already filled, you will `return` in the `handleClick` function early--before it tries to update the board state.
+When you mark a square with a `X` or an `O` you aren't first checking to see if the square already has a `X` or `O` value. You can fix this by *returning early*. You'll check to see if the square already has a `X` or an `O`. If the square is already filled, you will `return` in the `handleClick` function early--before it tries to update the board state.
 
 ```js {2,3,4}
 function handleClick(i) {
diff --git a/beta/src/content/reference/react-dom/server/renderToReadableStream.md b/beta/src/content/reference/react-dom/server/renderToReadableStream.md
@@ -167,7 +167,7 @@ const assetMap = {
 
 async function handler(request) {
   const stream = await renderToReadableStream(<App assetMap={assetMap} />, {
-    bootstrapScripts: [assets['/main.js']]
+    bootstrapScripts: [assetMap['/main.js']]
   });
   return new Response(stream, {
     headers: { 'content-type': 'text/html' },
@@ -188,7 +188,7 @@ async function handler(request) {
   const stream = await renderToReadableStream(<App assetMap={assetMap} />, {
     // Careful: It's safe to stringify() this because this data isn't user-generated.
     bootstrapScriptContent: `window.assetMap = ${JSON.stringify(assetMap)};`,
-    bootstrapScripts: [assets['/main.js']],
+    bootstrapScripts: [assetMap['/main.js']],
   });
   return new Response(stream, {
     headers: { 'content-type': 'text/html' },
diff --git a/beta/src/content/reference/react/legacy.md b/beta/src/content/reference/react/legacy.md
@@ -4,7 +4,7 @@ title: "Legacy React APIs"
 
 <Intro>
 
-These APIs are exported from the `react` package, but they are not recommended for use in the newly written code. See the linked individual API pages for the suggested alternatives.
+These APIs are exported from the `react` package, but they are not recommended for use in newly written code. See the linked individual API pages for the suggested alternatives.
 
 </Intro>
 
@@ -31,4 +31,4 @@ These APIs will be removed in a future major version of React.
 
 </Deprecated>
 
-* [`createFactory`](/reference/react/createFactory) lets you create a function that produces React elements of a certain type.
+* [`createFactory`](/reference/react/createFactory) lets you create a function that produces React elements of a certain type.
diff --git a/beta/src/content/reference/react/useContext.md b/beta/src/content/reference/react/useContext.md
@@ -1337,7 +1337,7 @@ function MyApp() {
 }
 ```
 
-As a result of this change, even if `MyApp` needs to re-render, the components calling `useContext(AuthProvider)` won't need to re-render unless `currentUser` has changed. Read more about [`useMemo`](/reference/react/useMemo#skipping-re-rendering-of-components) and [`useCallback`.](/reference/react/useCallback#skipping-re-rendering-of-components)
+As a result of this change, even if `MyApp` needs to re-render, the components calling `useContext(AuthContext)` won't need to re-render unless `currentUser` has changed. Read more about [`useMemo`](/reference/react/useMemo#skipping-re-rendering-of-components) and [`useCallback`.](/reference/react/useCallback#skipping-re-rendering-of-components)
 
 ---
 
diff --git a/beta/src/content/reference/react/useLayoutEffect.md b/beta/src/content/reference/react/useLayoutEffect.md
@@ -65,7 +65,7 @@ function Tooltip() {
 
 * Effects **only run on the client.** They don't run during server rendering.
 
-* The code inside `useLayoutEffect` and all state updates scheduled from it **block the browser from repainting the screen.** When used excessively, this can make your app very slow. When possible, prefer [`useEffect`.](/reference/reac/useEffect)
+* The code inside `useLayoutEffect` and all state updates scheduled from it **block the browser from repainting the screen.** When used excessively, this can make your app very slow. When possible, prefer [`useEffect`.](/reference/react/useEffect)
 
 ---
 
diff --git a/beta/src/content/reference/react/useReducer.md b/beta/src/content/reference/react/useReducer.md
@@ -84,7 +84,7 @@ React will set the next state to the result of calling the `reducer` function yo
 
 * If the new value you provide is identical to the current `state`, as determined by an [`Object.is`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is) comparison, React will **skip re-rendering the component and its children.** This is an optimization. React may still need to call your component before ignoring the result, but it shouldn't affect your code.
 
-* React [batches state updates.](/learn/queueing-a-series-of-state-updates) It updates the screen **after all the event handlers have run** and have called their `set` functions. This prevents multiple re-renders during a single event. In the rare case that you need to force React to update the screen earlier, for example to access the DOM, you can use [`flushSync`.](/reference/react-dom/flushsync)
+* React [batches state updates.](/learn/queueing-a-series-of-state-updates) It updates the screen **after all the event handlers have run** and have called their `set` functions. This prevents multiple re-renders during a single event. In the rare case that you need to force React to update the screen earlier, for example to access the DOM, you can use [`flushSync`.](/reference/react-dom/flushSync)
 
 ---
 
diff --git a/content/community/conferences.md b/content/community/conferences.md
@@ -33,6 +33,11 @@ June 2 & 6, 2023. In-person in Amsterdam, Netherlands + remote first interactivi
 
 [Website](https://reactsummit.com) - [Twitter](https://twitter.com/reactsummit) - [Facebook](https://www.facebook.com/reactamsterdam) - [Videos](https://youtube.com/c/ReactConferences)
 
+### React Norway 2023 {#react-norway-2023}
+June 16th, 2023. Larvik, Norway
+
+[Website](https://reactnorway.com/) - [Twitter](https://twitter.com/ReactNorway/) - [Facebook](https://www.facebook.com/reactdaynorway/)
+
 ### ReactNext 2023 {#reactnext}
 June 27th, 2023. Tel Aviv, Israel
 
diff --git a/content/docs/hello-world.md b/content/docs/hello-world.md
@@ -2,7 +2,7 @@
 id: hello-world
 title: Hallo Welt
 permalink: docs/hello-world.html
-prev: cdn-links.html
+prev: release-channels.html
 next: introducing-jsx.html
 ---
 
diff --git a/content/docs/higher-order-components.md b/content/docs/higher-order-components.md
@@ -14,7 +14,7 @@ const EnhancedComponent = higherOrderComponent(WrappedComponent);
 
 Während eine Komponente alle Props in UI umwandelt, wandelt die Higher-Order-Komponente eine Komponente in eine andere Komponente um.
 
-HOCs finden sich häufig in React-Bibliotheken von Drittanbietern, als Beispiele dafür gelten [`connect`](https://github.com/reduxjs/react-redux/blob/master/docs/api/connect.md#connect) von Redux und [`createFragmentContainer`](https://relay.dev/docs/v10.1.3/fragment-container/#createfragmentcontainer) von Relay.
+HOCs finden sich häufig in React-Bibliotheken von Drittanbietern, als Beispiele dafür gelten [`connect`](https://react-redux.js.org/api/connect) von Redux und [`createFragmentContainer`](https://relay.dev/docs/v10.1.3/fragment-container/#createfragmentcontainer) von Relay.
 
 In diesem Dokument, werden wir erörtern, warum Higher-Order-Komponenten nützlich sind und wie du deine eigene schreiben kannst.
 
