resolve conflicts

Author: AhmedBaset

src/content/blog/2023/05/03/react-canaries.md

@@ -5,11 +5,7 @@ date: 2023/05/03
 description: We'd like to offer the React community an option to adopt individual new features as soon as their design is close to final, before they're released in a stable version--similar to how Meta has long used bleeding-edge versions of React internally. We are introducing a new officially supported [Canary release channel](/community/versioning-policy#canary-channel). It lets curated setups like frameworks decouple adoption of individual React features from the React release schedule.
 ---
 
-<<<<<<< HEAD
 في الثالث من مايو، 2023، كتبه [دان أبراموف](https://bsky.app/profile/danabra.mov)، [صوفي ألبرت](https://twitter.com/sophiebits)، [ريك هانلون](https://twitter.com/rickhanlonii)، [سيباستيان ماركباج](https://twitter.com/sebmarkbage)، و [أندرو كلارك](https://twitter.com/acdlite).
-=======
-May 3, 2023 by [Dan Abramov](https://bsky.app/profile/danabra.mov), [Sophie Alpert](https://twitter.com/sophiebits), [Rick Hanlon](https://twitter.com/rickhanlonii), [Sebastian Markbåge](https://twitter.com/sebmarkbage), and [Andrew Clark](https://twitter.com/acdlite)
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 ---
 

src/content/blog/2024/04/25/react-19-upgrade-guide.md

@@ -112,11 +112,7 @@ This will run the following codemods from `react-codemod`:
 - [`replace-reactdom-render`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-reactdom-render)
 - [`replace-string-ref`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-string-ref)
 - [`replace-act-import`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-act-import)
-<<<<<<< HEAD
-- [`replace-use-form-state`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-use-form-state) 
-=======
 - [`replace-use-form-state`](https://github.com/reactjs/react-codemod?tab=readme-ov-file#replace-use-form-state)
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 - [`prop-types-typescript`](https://github.com/reactjs/react-codemod#react-proptypes-to-prop-types)
 
 This does not include the TypeScript changes. See [TypeScript changes](#typescript-changes) below.

src/content/blog/2024/10/21/react-compiler-beta-release.md

@@ -131,8 +131,4 @@ Thanks to [Sathya Gunasekaran](https://twitter.com/_gsathya), [Joe Savona](https
 
 [^2]: Thanks [Vaishali Garg](https://www.linkedin.com/in/vaishaligarg09) for leading this study on React Compiler at Meta, and for reviewing this post.
 
-<<<<<<< HEAD
 [^3]: After controlling on author tenure, diff length/complexity, and other potential confounding factors.
-=======
-[^3]: After controlling on author tenure, diff length/complexity, and other potential confounding factors.
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87

src/content/blog/2024/12/05/react-19.md

@@ -330,11 +330,7 @@ We've added two new APIs to `react-dom/static` for static site generation:
 - [`prerender`](/reference/react-dom/static/prerender)
 - [`prerenderToNodeStream`](/reference/react-dom/static/prerenderToNodeStream)
 
-<<<<<<< HEAD
-These new APIs improve on `renderToString` by waiting for data to load for static HTML generation. They are designed to work with streaming environments like Node.js Streams and Web Streams. For example, in a Web Stream environment, you can prerender a React tree to static HTML with `prerender`: 
-=======
 These new APIs improve on `renderToString` by waiting for data to load for static HTML generation. They are designed to work with streaming environments like Node.js Streams and Web Streams. For example, in a Web Stream environment, you can prerender a React tree to static HTML with `prerender`:
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 ```js
 import { prerender } from 'react-dom/static';
@@ -359,22 +355,14 @@ For more information, see [React DOM Static APIs](/reference/react-dom/static).
 
 Server Components are a new option that allows rendering components ahead of time, before bundling, in an environment separate from your client application or SSR server. This separate environment is the "server" in React Server Components. Server Components can run once at build time on your CI server, or they can be run for each request using a web server.
 
-<<<<<<< HEAD
-React 19 includes all of the React Server Components features included from the Canary channel. This means libraries that ship with Server Components can now target React 19 as a peer dependency with a `react-server` [export condition](https://github.com/reactjs/rfcs/blob/main/text/0227-server-module-conventions.md#react-server-conditional-exports) for use in frameworks that support the [Full-stack React Architecture](/learn/creating-a-react-app#which-features-make-up-the-react-teams-full-stack-architecture-vision). 
-=======
 React 19 includes all of the React Server Components features included from the Canary channel. This means libraries that ship with Server Components can now target React 19 as a peer dependency with a `react-server` [export condition](https://github.com/reactjs/rfcs/blob/main/text/0227-server-module-conventions.md#react-server-conditional-exports) for use in frameworks that support the [Full-stack React Architecture](/learn/creating-a-react-app#which-features-make-up-the-react-teams-full-stack-architecture-vision).
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 
 <Note>
 
 #### How do I build support for Server Components? {/*how-do-i-build-support-for-server-components*/}
 
-<<<<<<< HEAD
-While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x. 
-=======
 While React Server Components in React 19 are stable and will not break between minor versions, the underlying APIs used to implement a React Server Components bundler or framework do not follow semver and may break between minors in React 19.x.
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 To support React Server Components as a bundler or framework, we recommend pinning to a specific React version, or using the Canary release. We will continue working with bundlers and frameworks to stabilize the APIs used to implement React Server Components in the future.
 

src/content/blog/2025/02/14/sunsetting-create-react-app.md

@@ -11,11 +11,7 @@ February 14, 2025 by [Matt Carroll](https://twitter.com/mattcarrollcode) and [Ri
 
 <Intro>
 
-<<<<<<< HEAD
-Today, we’re deprecating [Create React App](https://create-react-app.dev/) for new apps, and encouraging existing apps to migrate to a [framework](#how-to-migrate-to-a-framework), or to [migrate to a build tool](#how-to-migrate-to-a-build-tool) like Vite, Parcel, or RSBuild. 
-=======
 Today, we’re deprecating [Create React App](https://create-react-app.dev/) for new apps, and encouraging existing apps to migrate to a [framework](#how-to-migrate-to-a-framework), or to [migrate to a build tool](#how-to-migrate-to-a-build-tool) like Vite, Parcel, or RSBuild.
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 We’re also providing docs for when a framework isn’t a good fit for your project, you want to build your own framework, or you just want to learn how React works by [building a React app from scratch](/learn/build-a-react-app-from-scratch).
 
@@ -79,11 +75,7 @@ To help get started with Vite, Parcel or Rsbuild, we've added new docs for [Buil
 
 #### Do I need a framework? {/*do-i-need-a-framework*/}
 
-<<<<<<< HEAD
-Most apps would benefit from a framework, but there are valid cases to build a React app from scratch. A good rule of thumb is if your app needs routing, you would probably benefit from a framework. 
-=======
 Most apps would benefit from a framework, but there are valid cases to build a React app from scratch. A good rule of thumb is if your app needs routing, you would probably benefit from a framework.
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 Just like Svelte has Sveltekit, Vue has Nuxt, and Solid has SolidStart, [React recommends using a framework](#why-we-recommend-frameworks) that fully integrates routing into features like data-fetching and code-splitting out of the box. This avoids the pain of needing to write your own complex configurations and essentially build a framework yourself.
 

src/content/blog/2025/10/07/react-compiler-1.md

@@ -69,29 +69,17 @@ To install the compiler:
 
 npm
 <TerminalBlock>
-<<<<<<< HEAD
-{`npm install --save-dev --save-exact babel-plugin-react-compiler@latest`}
-=======
 npm install --save-dev --save-exact babel-plugin-react-compiler@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 pnpm
 <TerminalBlock>
-<<<<<<< HEAD
-{`pnpm add --save-dev --save-exact babel-plugin-react-compiler@latest`}
-=======
 pnpm add --save-dev --save-exact babel-plugin-react-compiler@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 yarn
 <TerminalBlock>
-<<<<<<< HEAD
-{`yarn add --dev --exact babel-plugin-react-compiler@latest`}
-=======
 yarn add --dev --exact babel-plugin-react-compiler@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 As part of the stable release, we've been making React Compiler easier to add to your projects and added optimizations to how the compiler generates memoization. React Compiler now supports optional chains and array indices as dependencies. These improvements ultimately result in fewer re-renders and more responsive UIs, while letting you keep writing idiomatic declarative code.
@@ -113,29 +101,17 @@ To install:
 
 npm
 <TerminalBlock>
-<<<<<<< HEAD
-{`npm install --save-dev eslint-plugin-react-hooks@latest`}
-=======
 npm install --save-dev eslint-plugin-react-hooks@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 pnpm
 <TerminalBlock>
-<<<<<<< HEAD
-{`pnpm add --save-dev eslint-plugin-react-hooks@latest`}
-=======
 pnpm add --save-dev eslint-plugin-react-hooks@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 yarn
 <TerminalBlock>
-<<<<<<< HEAD
-{`yarn add --dev eslint-plugin-react-hooks@latest`}
-=======
 yarn add --dev eslint-plugin-react-hooks@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 ```js {6}
@@ -177,31 +153,19 @@ We have partnered with the Expo, Vite, and Next.js teams to add the compiler to
 [Expo SDK 54](https://docs.expo.dev/guides/react-compiler/) and up has the compiler enabled by default, so new apps will automatically be able to take advantage of the compiler from the start.
 
 <TerminalBlock>
-<<<<<<< HEAD
-{`npx create-expo-app@latest`}
-=======
 npx create-expo-app@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 [Vite](https://vite.dev/guide/) and [Next.js](https://nextjs.org/docs/app/api-reference/cli/create-next-app) users can choose the compiler enabled templates in `create-vite` and `create-next-app`.
 
 <TerminalBlock>
-<<<<<<< HEAD
-{`npm create vite@latest`}
-=======
 npm create vite@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 <br />
 
 <TerminalBlock>
-<<<<<<< HEAD
-{`npx create-next-app@latest`}
-=======
 npx create-next-app@latest
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 </TerminalBlock>
 
 ## Adopt React Compiler incrementally {/*adopt-react-compiler-incrementally*/}

src/content/blog/index.md

@@ -4,23 +4,14 @@ title: مدونة React
 
 <Intro>
 
-<<<<<<< HEAD
 هذه المدونة هي المصدر الرسمي لتحديثات فريق React. سيتم نشر التحديثات المهمة هنا أولًا بأول، بما في ذلك ملاحظات الإصدار أو تحذيرات الإيقاف.
 
  يمكنك أيضًا متابعة حساب [<span dir="ltr">@reactjs</span>](https://twitter.com/reactjs) على تويتر، وحساب [@react.dev](https://bsky.app/profile/react.dev) في Bluesky، ولكن لن يفوتك أي شيء أساسي إذا قرأت هذه المدونة فقط.
-=======
-This blog is the official source for the updates from the React team. Anything important, including release notes or deprecation notices, will be posted here first.
-
-You can also follow the [@react.dev](https://bsky.app/profile/react.dev) account on Bluesky, or [@reactjs](https://twitter.com/reactjs) account on Twitter, but you won’t miss anything essential if you only read this blog.
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
 
 </Intro>
 
 <div className="sm:-mx-5 flex flex-col gap-5 mt-12">
 
-<<<<<<< HEAD
-<BlogCard title="React Conf 2025 Recap" date="October 16, 2025" url="/blog/2025/10/16/react-conf-2025-recap">
-=======
 <BlogCard title="The React Foundation: A New Home for React Hosted by the Linux Foundation" date="February 24, 2026" url="/blog/2026/02/24/the-react-foundation">
 
 The React Foundation has officially launched under the Linux Foundation.
@@ -29,7 +20,7 @@ The React Foundation has officially launched under the Linux Foundation.
 
 <BlogCard title="Denial of Service and Source Code Exposure in React Server Components" date="December 11, 2025" url="/blog/2025/12/11/denial-of-service-and-source-code-exposure-in-react-server-components">
 
-Security researchers have found and disclosed two additional vulnerabilities in React Server Components while attempting to exploit the patches in last week’s critical vulnerability...
+Security researchers have found and disclosed two additional vulnerabilities in React Server Components while attempting to exploit the patches in last week's critical vulnerability...
 
 </BlogCard>
 
@@ -57,89 +48,6 @@ Today, we're announcing our plans to create the React Foundation and a new techn
 
 </BlogCard>
 
-<BlogCard title="React 19.2" date="October 1, 2025" url="/blog/2025/10/01/react-19-2">
-
-React 19.2 adds new features like Activity, React Performance Tracks, useEffectEvent, and more. In this post ...
-
-</BlogCard>
-
-<BlogCard title="React Labs: View Transitions, Activity, and more" date="April 23, 2025" url="/blog/2025/04/23/react-labs-view-transitions-activity-and-more">
-
-In React Labs posts, we write about projects in active research and development. In this post, we're sharing two new experimental features that are ready to try today, and sharing other areas we're working on now ...
-
-</BlogCard>
-
-<BlogCard title="Sunsetting Create React App" date="February 14, 2025" url="/blog/2025/02/14/sunsetting-create-react-app">
-
-Today, we’re deprecating Create React App for new apps, and encouraging existing apps to migrate to a framework, or to migrate to a build tool like Vite, Parcel, or RSBuild. We’re also providing docs for when a framework isn’t a good fit for your project, you want to build your own framework, or you just want to learn how React works by building a React app from scratch ...
-
-</BlogCard>
-
-<BlogCard title="React v19 " date="December 5, 2024" url="/blog/2024/12/05/react-19">
-
-In the React 19 Upgrade Guide, we shared step-by-step instructions for upgrading your app to React 19. In this post, we'll give an overview of the new features in React 19, and how you can adopt them ...
-
-</BlogCard>
-
-<BlogCard title="React Compiler Beta Release" date="October 21, 2024" url="/blog/2024/10/21/react-compiler-beta-release">
-
-We announced an experimental release of React Compiler at React Conf 2024. We've made a lot of progress since then, and in this post we want to share what's next for React Compiler ...
-
-</BlogCard>
-
-<BlogCard title="React Conf 2024 Recap" date="May 22, 2024" url="/blog/2024/05/22/react-conf-2024-recap">
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
-
-Last week we hosted React Conf 2025. In this post, we summarize the talks and announcements from the event...
-
-</BlogCard>
-
-<<<<<<< HEAD
-<BlogCard title="React Compiler v1.0" date="October 7, 2025" url="/blog/2025/10/07/react-compiler-1">
-
-We're releasing the compiler's first stable release today, plus linting and tooling improvements to make adoption easier.
-
-</BlogCard>
-
-<BlogCard title="Introducing the React Foundation" date="October 7, 2025" url="/blog/2025/10/07/introducing-the-react-foundation">
-=======
-<BlogCard title="React 19 Upgrade Guide" date="April 25, 2024" url="/blog/2024/04/25/react-19-upgrade-guide">
->>>>>>> 6ec61348646040795fdaa9de14a9bec603260f87
-
-Today, we're announcing our plans to create the React Foundation and a new technical governance structure ...
-
-</BlogCard>
-
-<BlogCard title="React 19.2" date="October 1, 2025" url="/blog/2025/10/01/react-19-2">
-
-React 19.2 adds new features like Activity, React Performance Tracks, useEffectEvent, and more. In this post ...
-
-</BlogCard>
-
-<BlogCard title="React Labs: View Transitions, Activity, and more" date="April 23, 2025" url="/blog/2025/04/23/react-labs-view-transitions-activity-and-more">
-
-In React Labs posts, we write about projects in active research and development. In this post, we're sharing two new experimental features that are ready to try today, and sharing other areas we're working on now ...
-
-</BlogCard>
-
-<BlogCard title="Sunsetting Create React App" date="February 14, 2025" url="/blog/2025/02/14/sunsetting-create-react-app">
-
-Today, we’re deprecating Create React App for new apps, and encouraging existing apps to migrate to a framework, or to migrate to a build tool like Vite, Parcel, or RSBuild. We’re also providing docs for when a framework isn’t a good fit for your project, you want to build your own framework, or you just want to learn how React works by building a React app from scratch ...
-
-</BlogCard>
-
-<BlogCard title="React v19 " date="December 5, 2024" url="/blog/2024/12/05/react-19">
-
-In the React 19 Upgrade Guide, we shared step-by-step instructions for upgrading your app to React 19. In this post, we'll give an overview of the new features in React 19, and how you can adopt them ...
-
-</BlogCard>
-
-<BlogCard title="React Compiler Beta Release" date="October 21, 2024" url="/blog/2024/10/21/react-compiler-beta-release">
-
-أعلنّا عن إصدار تجريبي لـ React Compiler في مؤتمر React Conf 2024. لقد حقّقنا تقدمًا كبيرًا منذ ذلك الحين، وفي هذا المنشور نود مشاركة ما هو القادم لـ React Compiler ...
-
-</BlogCard>
-
 <BlogCard title="ملخص مؤتمر React 2024" date="22 مايو 2024" url="/blog/2024/05/22/react-conf-2024-recap">
 
 الأسبوع الماضي، استضفنا مؤتمر React 2024 الذي استمر ليومين في هندرسون، نيفادا حيث تجمع أكثر من 700 مشارك لمناقشة أحدث المستجدات في هندسة واجهة المستخدم. كان هذا أول مؤتمر حضوري لنا منذ عام 2019، وكنا متحمسين لالتقاء المجتمع معًا مرة أخرى...