chore(sync): fix all upstream merge conflicts

Author: tdd

.gitignore

@@ -37,11 +37,9 @@ yarn-error.log*
 # external fonts
 public/fonts/**/Optimistic_*.woff2
 
-<<<<<<< HEAD
 # contributors likely have their own workspace settings and shouldn't
 # version them (e.g. markdownlint tweaks, etc.)
 .vscode/settings.json
-=======
+
 # rss
 public/rss.xml
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a

src/components/Layout/HomeContent.js

@@ -23,14 +23,11 @@ import BlogCard from 'components/MDX/BlogCard';
 import CodeBlock from 'components/MDX/CodeBlock';
 import Link from 'components/MDX/Link';
 import NextLink from 'next/link';
+import * as React from 'react';
+import Image from 'next/image';
 import sidebarBlog from '../../sidebarBlog.json';
-<<<<<<< HEAD
 import ButtonLink from '../ButtonLink';
 import {IconRestart} from '../Icon/IconRestart';
-=======
-import * as React from 'react';
-import Image from 'next/image';
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
 
 function Section({children, background = null}) {
   return (

src/components/Layout/Page.tsx

@@ -3,40 +3,23 @@
  */
 
 import * as React from 'react';
-<<<<<<< HEAD
-
-import ButtonLink from 'components/ButtonLink';
-import {DocsPageFooter} from 'components/DocsFooter';
 import {Footer} from './Footer';
 import {HomeContent} from './HomeContent';
-import {IconNavArrow} from 'components/Icon/IconNavArrow';
-=======
-import {useRouter} from 'next/router';
-import {SidebarNav} from './SidebarNav';
-import {Footer} from './Footer';
-import {Toc} from './Toc';
-// import SocialBanner from '../SocialBanner';
+import cn from 'classnames';
 import {DocsPageFooter} from 'components/DocsFooter';
-import {Seo} from 'components/Seo';
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
-import PageHeading from 'components/PageHeading';
 import type {RouteItem} from 'components/Layout/getRouteMeta';
+import type {TocItem} from 'components/MDX/TocContext';
+import PageHeading from 'components/PageHeading';
 import {Seo} from 'components/Seo';
-import {SidebarNav} from './SidebarNav';
-import SocialBanner from '../SocialBanner';
+import Head from 'next/head';
+import {useRouter} from 'next/router';
 import {Suspense} from 'react';
-import {Toc} from './Toc';
-import {TocContext} from '../MDX/TocContext';
 import {Languages, LanguagesContext} from '../MDX/LanguagesContext';
-import type {TocItem} from 'components/MDX/TocContext';
-import {TopNav} from './TopNav';
-import cn from 'classnames';
-<<<<<<< HEAD
+import {TocContext} from '../MDX/TocContext';
 import {getRouteMeta} from './getRouteMeta';
-import {useRouter} from 'next/router';
-=======
-import Head from 'next/head';
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
+import {SidebarNav} from './SidebarNav';
+import {Toc} from './Toc';
+import {TopNav} from './TopNav';
 
 import(/* webpackPrefetch: true */ '../MDX/CodeBlock/CodeBlock');
 
@@ -190,37 +173,7 @@ export function Page({
               )}>
               {!isHomePage && (
                 <div className="w-full px-5 pt-10 mx-auto sm:px-12 md:px-12 md:pt-12 lg:pt-10">
-<<<<<<< HEAD
-                  {
-                    <hr className="mx-auto max-w-7xl border-border dark:border-border-dark" />
-                  }
-                  {showSurvey && (
-                    <>
-                      <div className="flex flex-col items-center p-4 m-4">
-                        <p className="mb-4 text-lg font-bold text-primary dark:text-primary-dark">
-                          Comment trouvez-vous ces docs ?
-                        </p>
-                        <div>
-                          <ButtonLink
-                            href="https://www.surveymonkey.co.uk/r/PYRPF3X"
-                            className="mt-1"
-                            type="primary"
-                            size="md"
-                            target="_blank">
-                            Dites-nous tout !
-                            <IconNavArrow
-                              displayDirection="end"
-                              className="inline ms-1"
-                            />
-                          </ButtonLink>
-                        </div>
-                      </div>
-                      <hr className="mx-auto max-w-7xl border-border dark:border-border-dark" />
-                    </>
-                  )}
-=======
                   <hr className="mx-auto max-w-7xl border-border dark:border-border-dark" />
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
                 </div>
               )}
               <div

src/components/Layout/TopNav/BrandMenu.tsx

@@ -50,23 +50,23 @@ export default function BrandMenu({children}: {children: React.ReactNode}) {
           sideOffset={0}
           align="end">
           <ContextMenu.Label className="ps-4 pt-2 text-base text-tertiary dark:text-tertiary-dark">
-            Dark Mode
+            Mode sombre
           </ContextMenu.Label>
           <DownloadMenuItem
             fileName="react_logo_dark.svg"
             href="/images/brand/logo_dark.svg">
             <span className="w-8">
               <IconDownload />
             </span>
-            <span>Logo SVG</span>
+            <span>SVG du logo</span>
           </DownloadMenuItem>
           <DownloadMenuItem
             fileName="react_wordmark_dark.svg"
             href="/images/brand/wordmark_dark.svg">
             <span className="w-8">
               <IconDownload />
             </span>
-            <span>Wordmark SVG</span>
+            <span>SVG de la marque</span>
           </DownloadMenuItem>
           <MenuItem
             onSelect={async () => {
@@ -75,26 +75,26 @@ export default function BrandMenu({children}: {children: React.ReactNode}) {
             <span className="w-8">
               <IconCopy />
             </span>
-            <span>Copy dark mode color</span>
+            <span>Copier la couleur du mode sombre</span>
           </MenuItem>
           <ContextMenu.Label className="ps-4 text-base text-tertiary dark:text-tertiary-dark">
-            Light Mode
+            Mode clair
           </ContextMenu.Label>
           <DownloadMenuItem
             fileName="react_logo_light.svg"
             href="/images/brand/logo_light.svg">
             <span className="w-8">
               <IconDownload />
             </span>
-            <span>Logo SVG</span>
+            <span>SVG du logo</span>
           </DownloadMenuItem>
           <DownloadMenuItem
             fileName="react_wordmark_light.svg"
             href="/images/brand/wordmark_light.svg">
             <span className="w-8">
               <IconDownload />
             </span>
-            <span>Wordmark SVG</span>
+            <span>SVG de la marque</span>
           </DownloadMenuItem>
           <MenuItem
             onSelect={async () => {
@@ -103,7 +103,7 @@ export default function BrandMenu({children}: {children: React.ReactNode}) {
             <span className="w-8">
               <IconCopy />
             </span>
-            <span>Copy light mode color</span>
+            <span>Copier la couleur du mode clair</span>
           </MenuItem>
           <div className="uwu-visible flex flex-col">
             <ContextMenu.Separator className="" />
@@ -118,13 +118,13 @@ export default function BrandMenu({children}: {children: React.ReactNode}) {
               <span className="w-8">
                 <IconClose />
               </span>
-              <span>Turn off</span>
+              <span>Désactiver</span>
             </MenuItem>
             <DownloadMenuItem fileName="react_uwu_png" href="/images/uwu.png">
               <span className="w-8">
                 <IconDownload />
               </span>
-              <span>Logo PNG</span>
+              <span>PNG du logo</span>
             </DownloadMenuItem>
 
             <ExternalLink
@@ -134,7 +134,7 @@ export default function BrandMenu({children}: {children: React.ReactNode}) {
                 <span className="w-8">
                   <IconNewPage />
                 </span>
-                <span>Logo by @sawaratsuki1004</span>
+                <span>Logo par @sawaratsuki1004</span>
               </MenuItem>
             </ExternalLink>
           </div>

src/components/Layout/TopNav/TopNav.tsx

@@ -4,6 +4,11 @@
 
 import * as React from 'react';
 
+import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock';
+import cn from 'classnames';
+import Image from 'next/image';
+import NextLink from 'next/link';
+import {useRouter} from 'next/router';
 import {
   Suspense,
   startTransition,
@@ -12,32 +17,17 @@ import {
   useRef,
   useState,
 } from 'react';
-<<<<<<< HEAD
-=======
-import Image from 'next/image';
-import * as React from 'react';
-import cn from 'classnames';
-import NextLink from 'next/link';
-import {useRouter} from 'next/router';
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
-import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock';
 
-import {Feedback} from '../Feedback';
 import {IconClose} from 'components/Icon/IconClose';
 import {IconHamburger} from 'components/Icon/IconHamburger';
 import {IconSearch} from 'components/Icon/IconSearch';
+import {Search} from 'components/Search';
+import {siteConfig} from 'siteConfig';
 import {Logo} from '../../Logo';
-import NextLink from 'next/link';
+import {Feedback} from '../Feedback';
 import type {RouteItem} from '../getRouteMeta';
-<<<<<<< HEAD
-import {Search} from 'components/Search';
 import {SidebarRouteTree} from '../Sidebar/SidebarRouteTree';
-import cn from 'classnames';
-import {useRouter} from 'next/router';
-=======
-import {siteConfig} from 'siteConfig';
 import BrandMenu from './BrandMenu';
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
 
 declare global {
   interface Window {

src/components/SocialBanner.tsx

@@ -5,14 +5,10 @@
 
 import {useEffect, useRef} from 'react';
 
-<<<<<<< HEAD
 import {ExternalLink} from './ExternalLink';
 import cn from 'classnames';
 
 const bannerText = 'Rejoignez-nous à la React Conf les 15-16 mai.';
-=======
-const bannerText = 'Stream React Conf on May 15-16.';
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
 const bannerLink = 'https://conf.react.dev/';
 const bannerLinkText = 'En savoir plus';
 

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

@@ -1,12 +1,9 @@
 ---
-<<<<<<< HEAD
 title: "Découvrez les React Server Components qui n'impactent pas votre bundle"
-=======
-title: "Introducing Zero-Bundle-Size React Server Components"
-author: Dan Abramov, Lauren Tan, Joseph Savona, and Sebastian Markbage
+author: Dan Abramov, Lauren Tan, Joseph Savona et Sebastian Markbage
 date: 2020/12/21
-description: 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.
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
+description: 2020, c'était long.  Alors que l'année se termine, nous voulions vous partager une sorte de Bulletin Spécial Fêtes sur nos recherches liées aux React Server Components, qui n'occupent pas un seul octet dans vos bundles.
+
 ---
 
 Le 21 décembre 2020 par [Dan Abramov](https://twitter.com/dan_abramov), [Lauren Tan](https://twitter.com/potetotes), [Joseph Savona](https://twitter.com/en_JS) et [Sebastian Markbåge](https://twitter.com/sebmarkbage)

src/content/blog/2021/06/08/the-plan-for-react-18.md

@@ -1,12 +1,8 @@
 ---
-<<<<<<< HEAD
 title: "Nos plans pour React 18"
-=======
-title: "The Plan for React 18"
-author: Andrew Clark, Brian Vaughn, Christine Abernathy, Dan Abramov, Rachel Nabors, Rick Hanlon, Sebastian Markbage, and Seth Webster
+author: Andrew Clark, Brian Vaughn, Christine Abernathy, Dan Abramov, Rachel Nabors, Rick Hanlon, Sebastian Markbage et Seth Webster
 date: 2021/06/08
-description: The React team is excited to share a few updates. We’ve started work on the React 18 release, which will be our next major version. We’ve created a Working Group to prepare the community for gradual adoption of new features in React 18. We’ve published a React 18 Alpha so that library authors can try it and provide feedback...
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
+description: L'équipe React est ravie de vous donner quelques nouvelles. Nous avons commencé à travailler sur React 18, qui sera notre prochaine version majeure. Nous avons créé un groupe de travail pour préparer la communauté à l'adoption graduelle des nouvelles fonctionnalités de React 18. Nous avons publié une React 18 Alpha pour que les mainteneurs de bibliothèques puissent l'essayer et nous faire leurs retours…
 ---
 
 Le 8 juin 2021 par [Andrew Clark](https://twitter.com/acdlite), [Brian Vaughn](https://github.com/bvaughn), [Christine Abernathy](https://twitter.com/abernathyca), [Dan Abramov](https://twitter.com/dan_abramov), [Rachel Nabors](https://twitter.com/rachelnabors), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage) et [Seth Webster](https://twitter.com/sethwebster)

src/content/blog/2021/12/17/react-conf-2021-recap.md

@@ -1,12 +1,9 @@
 ---
-<<<<<<< HEAD
 title: "La React Conf 2021 en bref"
-=======
-title: "React Conf 2021 Recap"
-author: Jesslyn Tannady and Rick Hanlon
+author: Jesslyn Tannady et Rick Hanlon
 date: 2021/12/17
-description: Last week we hosted our 6th React Conf. In previous years, we've used the React Conf stage to deliver industry changing announcements such as React Native and React Hooks. This year, we shared our multi-platform vision for React, starting with the release of React 18 and gradual adoption of concurrent features.
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
+description: La semaine dernière nous avons hébergé notre 6e React Conf. Les années précédentes, nous avions utilisé la React Conf pour faire des annonces retentissantes telles que React Native ou les Hooks. Cette année, nous avons partagé notre vision multi-plateforme pour React, en commençant par React 18 et l'adoption graduelle des fonctionnalités concurrentes…
+
 ---
 
 Le 17 décembre 2021 par [Jesslyn Tannady](https://twitter.com/jtannady) et [Rick Hanlon](https://twitter.com/rickhanlonii)

src/content/blog/2022/03/08/react-18-upgrade-guide.md

@@ -1,12 +1,9 @@
 ---
-<<<<<<< HEAD
 title: "Comment migrer sur React 18"
-=======
-title: "How to Upgrade to React 18"
 author: Rick Hanlon
 date: 2022/03/08
-description: As we shared in the release post, React 18 introduces features powered by our new concurrent renderer, with a gradual adoption strategy for existing applications. In this post, we will guide you through the steps for upgrading to React 18.
->>>>>>> 4c91abc78b20be10e7d40cf57a80a6a6247e6e9a
+description: Comme nous l'avons annoncé dans le billet de sortie, React 18 introduit des fonctionnalités basées sur notre nouveau moteur de rendu concurrent, avec une statégie d'adoption graduelle pour les applications existantes. Dans ce billet, nous vous guidons étape par étape dans votre migration sur React 18.
+
 ---
 
 Le 8 mars 2022 par [Rick Hanlon](https://twitter.com/rickhanlonii)