chore(sync): handle all merge conflicts

Author: tdd

src/components/Layout/Feedback.tsx

@@ -2,9 +2,9 @@
  * Copyright (c) Facebook, Inc. and its affiliates.
  */
 
-import {useState} from 'react';
-import {useRouter} from 'next/router';
 import cn from 'classnames';
+import {useRouter} from 'next/router';
+import {useState} from 'react';
 
 export function Feedback({onSubmit = () => {}}: {onSubmit?: () => void}) {
   const {asPath} = useRouter();
@@ -66,23 +66,13 @@ function SendFeedback({onSubmit}: {onSubmit: () => void}) {
         'max-w-custom-xs w-80 lg:w-auto py-3 shadow-lg rounded-lg m-4 bg-wash dark:bg-gray-95 px-4 flex',
         {exit: isSubmitted}
       )}>
-<<<<<<< HEAD
-      <p className="w-full font-bold text-primary dark:text-primary-dark text-lg me-4">
+      <p className="w-full text-lg font-bold text-primary dark:text-primary-dark me-4">
         {isSubmitted ? 'Merci pour votre retour !' : 'Cette page est utile ?'}
       </p>
       {!isSubmitted && (
         <button
           aria-label="Oui"
-          className="bg-secondary-button dark:bg-secondary-button-dark rounded-lg text-primary dark:text-primary-dark px-3 me-2"
-=======
-      <p className="w-full text-lg font-bold text-primary dark:text-primary-dark me-4">
-        {isSubmitted ? 'Thank you for your feedback!' : 'Is this page useful?'}
-      </p>
-      {!isSubmitted && (
-        <button
-          aria-label="Yes"
           className="px-3 rounded-lg bg-secondary-button dark:bg-secondary-button-dark text-primary dark:text-primary-dark me-2"
->>>>>>> 3563d95efe8719bdae8bbd258e6ab4134753348b
           onClick={() => {
             setIsSubmitted(true);
             onSubmit();
@@ -93,13 +83,8 @@ function SendFeedback({onSubmit}: {onSubmit: () => void}) {
       )}
       {!isSubmitted && (
         <button
-<<<<<<< HEAD
           aria-label="Non"
-          className="bg-secondary-button dark:bg-secondary-button-dark rounded-lg text-primary dark:text-primary-dark px-3"
-=======
-          aria-label="No"
           className="px-3 rounded-lg bg-secondary-button dark:bg-secondary-button-dark text-primary dark:text-primary-dark"
->>>>>>> 3563d95efe8719bdae8bbd258e6ab4134753348b
           onClick={() => {
             setIsSubmitted(true);
             onSubmit();

src/components/Layout/Page.tsx

@@ -2,25 +2,26 @@
  * Copyright (c) Facebook, Inc. and its affiliates.
  */
 
-import {Suspense} from 'react';
 import * as React from 'react';
-import {useRouter} from 'next/router';
-import {SidebarNav} from './SidebarNav';
-import {Footer} from './Footer';
-import {Toc} from './Toc';
-import SocialBanner from '../SocialBanner';
-import {DocsPageFooter} from 'components/DocsFooter';
-import {Seo} from 'components/Seo';
+
 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 PageHeading from 'components/PageHeading';
-import {getRouteMeta} from './getRouteMeta';
+import type {RouteItem} from 'components/Layout/getRouteMeta';
+import {Seo} from 'components/Seo';
+import {SidebarNav} from './SidebarNav';
+import SocialBanner from '../SocialBanner';
+import {Suspense} from 'react';
+import {Toc} from './Toc';
 import {TocContext} from '../MDX/TocContext';
 import type {TocItem} from 'components/MDX/TocContext';
-import type {RouteItem} from 'components/Layout/getRouteMeta';
-import {HomeContent} from './HomeContent';
 import {TopNav} from './TopNav';
 import cn from 'classnames';
+import {getRouteMeta} from './getRouteMeta';
+import {useRouter} from 'next/router';
 
 import(/* webpackPrefetch: true */ '../MDX/CodeBlock/CodeBlock');
 
@@ -159,15 +160,9 @@ export function Page({children, toc, routeTree, meta, section}: PageProps) {
                   }
                   {showSurvey && (
                     <>
-<<<<<<< HEAD
-                      <div className="flex flex-col items-center m-4 p-4">
-                        <p className="font-bold text-primary dark:text-primary-dark text-lg mb-4">
-                          Comment trouvez-vous ces docs ?
-=======
                       <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">
-                          How do you like these docs?
->>>>>>> 3563d95efe8719bdae8bbd258e6ab4134753348b
+                          Comment trouvez-vous ces docs ?
                         </p>
                         <div>
                           <ButtonLink

src/components/Layout/TopNav/TopNav.tsx

@@ -4,7 +4,6 @@
 
 import * as React from 'react';
 
-import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock';
 import {
   Suspense,
   startTransition,
@@ -13,18 +12,19 @@ import {
   useRef,
   useState,
 } from 'react';
+import {disableBodyScroll, enableBodyScroll} from 'body-scroll-lock';
 
-import cn from 'classnames';
+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 NextLink from 'next/link';
-import {useRouter} from 'next/router';
 import {Logo} from '../../Logo';
-import {Feedback} from '../Feedback';
-import {SidebarRouteTree} from '../Sidebar/SidebarRouteTree';
+import NextLink from 'next/link';
 import type {RouteItem} from '../getRouteMeta';
+import {Search} from 'components/Search';
+import {SidebarRouteTree} from '../Sidebar/SidebarRouteTree';
+import cn from 'classnames';
+import {useRouter} from 'next/router';
 
 declare global {
   interface Window {
@@ -268,15 +268,9 @@ export default function TopNav({
                   'flex 3xl:w-[56rem] 3xl:mx-0 relative ps-4 pe-1 py-1 h-10 bg-gray-30/20 dark:bg-gray-40/20 outline-none focus:outline-link betterhover:hover:bg-opacity-80 pointer items-center text-start w-full text-gray-30 rounded-full align-middle text-base'
                 )}
                 onClick={onOpenSearch}>
-<<<<<<< HEAD
-                <IconSearch className="me-3 align-middle text-gray-30 shrink-0 group-betterhover:hover:text-gray-70" />
-                Recherche
-                <span className="ms-auto hidden sm:flex item-center me-1">
-=======
                 <IconSearch className="align-middle me-3 text-gray-30 shrink-0 group-betterhover:hover:text-gray-70" />
-                Search
+                Recherche
                 <span className="hidden ms-auto sm:flex item-center me-1">
->>>>>>> 3563d95efe8719bdae8bbd258e6ab4134753348b
                   <Kbd data-platform="mac">⌘</Kbd>
                   <Kbd data-platform="win" wide>
                     Ctrl

src/components/MDX/TeamMember.tsx

@@ -3,13 +3,14 @@
  */
 
 import * as React from 'react';
-import Image from 'next/image';
-import {IconTwitter} from '../Icon/IconTwitter';
-import {IconThreads} from '../Icon/IconThreads';
-import {IconGitHub} from '../Icon/IconGitHub';
+
 import {ExternalLink} from '../ExternalLink';
 import {H3} from './Heading';
+import {IconGitHub} from '../Icon/IconGitHub';
 import {IconLink} from 'components/Icon/IconLink';
+import {IconThreads} from '../Icon/IconThreads';
+import {IconTwitter} from '../Icon/IconTwitter';
+import Image from 'next/image';
 
 interface TeamMemberProps {
   name: string;
@@ -66,7 +67,7 @@ export function TeamMember({
             {twitter && (
               <div className="me-4">
                 <ExternalLink
-                  aria-label="React on Twitter"
+                  aria-label="Réagissez sur Twitter"
                   href={`https://twitter.com/${twitter}`}
                   className="hover:text-primary dark:text-primary-dark flex flex-row items-center">
                   <IconTwitter className="pe-1" />
@@ -77,7 +78,7 @@ export function TeamMember({
             {threads && (
               <div className="me-4">
                 <ExternalLink
-                  aria-label="React on Threads"
+                  aria-label="Réagissez sur Threads"
                   href={`https://threads.net/${threads}`}
                   className="hover:text-primary hover:underline dark:text-primary-dark flex flex-row items-center">
                   <IconThreads className="pe-1" />
@@ -88,7 +89,7 @@ export function TeamMember({
             {github && (
               <div className="me-4">
                 <ExternalLink
-                  aria-label="GitHub Profile"
+                  aria-label="Profil GitHub"
                   href={`https://github.com/${github}`}
                   className="hover:text-primary dark:text-primary-dark flex flex-row items-center">
                   <IconGitHub className="pe-1" /> {github}
@@ -97,7 +98,7 @@ export function TeamMember({
             )}
             {personal && (
               <ExternalLink
-                aria-label="Personal Site"
+                aria-label="Site personnel"
                 href={`https://${personal}`}
                 className="hover:text-primary dark:text-primary-dark flex flex-row items-center">
                 <IconLink className="pe-1" /> {personal}

src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md

@@ -8,11 +8,7 @@ Le 15 juin 2022 par [Andrew Clark](https://twitter.com/acdlite), [Dan Abramov](h
 
 <Intro>
 
-<<<<<<< HEAD
 [React 18](/blog/2022/03/29/react-v18) a pris des années, mais il était porteur de précieuses leçons pour l'équipe React.  Sa sortie était l'aboutissement de nombreuses années de recherche, en explorant de nouvelles voies.  Certaines de ces tentatives ont réussi ; mais bien davantage se sont révélées des impasses qui nous ont toutefois fourni de nouvelles pistes.  Une des leçons que nous en avons tirées, c'est qu'il est frustrant pour la communauté d'attendre la sortie de nouvelles fonctionnalités sans que nous communiquions sur nos travaux.
-=======
-[React 18](/blog/2022/03/29/react-v18) was years in the making, and with it brought valuable lessons for the React team. Its release was the result of many years of research and exploring many paths. Some of those paths were successful; many more were dead-ends that led to new insights. One lesson we’ve learned is that it’s frustrating for the community to wait for new features without having insight into these paths that we’re exploring.
->>>>>>> 3563d95efe8719bdae8bbd258e6ab4134753348b
 
 </Intro>
 

src/content/blog/2023/03/22/react-labs-what-we-have-been-working-on-march-2023.md

@@ -8,11 +8,7 @@ Le 22 mars 2023 par [Joseph Savona](https://twitter.com/en_JS), [Josh Story](htt
 
 <Intro>
 
-<<<<<<< HEAD
 Dans les billets React Labs, nous vous parlons de nos projets de recherche et développement actifs.  Depuis notre [dernier bulletin](/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022), nous avons fait des progrès significatifs et nous aimerions partager ce que nous avons appris.
-=======
-In React Labs posts, we write about projects in active research and development. We've made significant progress on them since our [last update](/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022), and we'd like to share what we learned.
->>>>>>> 3563d95efe8719bdae8bbd258e6ab4134753348b
 
 </Intro>
 

src/content/community/conferences.md

@@ -18,7 +18,7 @@ March 22, 2024. In-person in Paris, France + Remote (hybrid)
 ### React Miami 2024 {/*react-miami-2024*/}
 April 19 - 20, 2024. In-person in Miami, FL, USA
 
-[Website](https://reactmiami.com/) - [Twitter](https://twitter.com/ReactMiamiConf)
+[Site web](https://reactmiami.com/) - [Twitter](https://twitter.com/ReactMiamiConf)
 
 ### App.js Conf 2024 {/*appjs-conf-2024*/}
 May 22 - 24, 2024. In-person in Kraków, Poland + remote