merging all conflicts

Author: react-translations-bot

.github/ISSUE_TEMPLATE/3-framework.yml

@@ -8,11 +8,11 @@ body:
       value: |
         ## Apply to be included as a recommended React framework
 
-        _This form is for framework authors to apply to be included as a recommended [React framework](https://react.dev/learn/start-a-new-react-project). If you are not a framework author, please contact the authors before submitting._
+        _This form is for framework authors to apply to be included as a recommended [React framework](https://react.dev/learn/creating-a-react-app). If you are not a framework author, please contact the authors before submitting._
         
         Our goal when recommending a framework is to start developers with a React project that solves common problems like code splitting, data fetching, routing, and HTML generation without any extra work later. We believe this will allow users to get started quickly with React, and scale their app to production.
         
-        While we understand that many frameworks may want to be featured, this page is not a place to advertise every possible React framework or all frameworks that you can add React to. There are many great frameworks that offer support for React that are not listed in our guides. The frameworks we recommend have invested significantly in the React ecosystem, and collaborated with the React team to be compatible with our [full-stack React architecture vision](https://react.dev/learn/start-a-new-react-project#which-features-make-up-the-react-teams-full-stack-architecture-vision).
+        While we understand that many frameworks may want to be featured, this page is not a place to advertise every possible React framework or all frameworks that you can add React to. There are many great frameworks that offer support for React that are not listed in our guides. The frameworks we recommend have invested significantly in the React ecosystem, and collaborated with the React team to be compatible with our [full-stack React architecture vision](https://react.dev/learn/creating-a-react-app#which-features-make-up-the-react-teams-full-stack-architecture-vision).
         
         To be included, frameworks must meet the following criteria:
         

plugins/remark-smartypants.js

@@ -14,12 +14,24 @@ const visit = require('unist-util-visit');
 const retext = require('retext');
 const smartypants = require('retext-smartypants');
 
-function check(parent) {
+function check(node, parent) {
+  if (node.data?.skipSmartyPants) return false;
   if (parent.tagName === 'script') return false;
   if (parent.tagName === 'style') return false;
   return true;
 }
 
+function markSkip(node) {
+  if (!node) return;
+  node.data ??= {};
+  node.data.skipSmartyPants = true;
+  if (Array.isArray(node.children)) {
+    for (const child of node.children) {
+      markSkip(child);
+    }
+  }
+}
+
 module.exports = function (options) {
   const processor = retext().use(smartypants, {
     ...options,
@@ -43,8 +55,14 @@ module.exports = function (options) {
     let startIndex = 0;
     const textOrInlineCodeNodes = [];
 
+    visit(tree, 'mdxJsxFlowElement', (node) => {
+      if (['TerminalBlock'].includes(node.name)) {
+        markSkip(node); // Mark all children to skip smarty pants
+      }
+    });
+
     visit(tree, ['text', 'inlineCode'], (node, _, parent) => {
-      if (check(parent)) {
+      if (check(node, parent)) {
         if (node.type === 'text') allText += node.value;
         // for the case when inlineCode contains just one part of quote: `foo'bar`
         else allText += 'A'.repeat(node.value.length);

src/components/Layout/HomeContent.js

@@ -270,7 +270,7 @@ export function HomeContent() {
               <CTA
                 color="gray"
                 icon="framework"
-                href="/learn/start-a-new-react-project">
+                href="/learn/creating-a-react-app">
                 Get started with a framework
               </CTA>
             </div>

src/components/MDX/TerminalBlock.tsx

@@ -79,13 +79,19 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
           </div>
         </div>
       </div>
+<<<<<<< HEAD
       <div
+=======
+      <pre
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
         className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-auto"
         translate="no"
         dir="ltr">
-        <LevelText type={level} />
-        {message}
-      </div>
+        <code>
+          <LevelText type={level} />
+          {message}
+        </code>
+      </pre>
     </div>
   );
 }

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

@@ -5,7 +5,11 @@ 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)
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 
 ---
 

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

@@ -131,4 +131,8 @@ 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.
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0

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

@@ -69,17 +69,29 @@ 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
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </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
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </TerminalBlock>
 
 yarn
 <TerminalBlock>
+<<<<<<< HEAD
 {`yarn add --dev --exact babel-plugin-react-compiler@latest`}
+=======
+yarn add --dev --exact babel-plugin-react-compiler@latest
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </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.
@@ -101,17 +113,29 @@ To install:
 
 npm
 <TerminalBlock>
+<<<<<<< HEAD
 {`npm install --save-dev eslint-plugin-react-hooks@latest`}
+=======
+npm install --save-dev eslint-plugin-react-hooks@latest
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </TerminalBlock>
 
 pnpm
 <TerminalBlock>
+<<<<<<< HEAD
 {`pnpm add --save-dev eslint-plugin-react-hooks@latest`}
+=======
+pnpm add --save-dev eslint-plugin-react-hooks@latest
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </TerminalBlock>
 
 yarn
 <TerminalBlock>
+<<<<<<< HEAD
 {`yarn add --dev eslint-plugin-react-hooks@latest`}
+=======
+yarn add --dev eslint-plugin-react-hooks@latest
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </TerminalBlock>
 
 ```js {6}
@@ -153,19 +177,31 @@ 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
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </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
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </TerminalBlock>
 
 <br />
 
 <TerminalBlock>
+<<<<<<< HEAD
 {`npx create-next-app@latest`}
+=======
+npx create-next-app@latest
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 </TerminalBlock>
 
 ## Adopt React Compiler incrementally {/*adopt-react-compiler-incrementally*/}

src/content/blog/index.md

@@ -4,27 +4,88 @@ 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.
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 
 </Intro>
 
 <div className="sm:-mx-5 flex flex-col gap-5 mt-12">
 
 <BlogCard title="React Conf 2025 Recap" date="October 16, 2025" url="/blog/2025/10/16/react-conf-2025-recap">
+<<<<<<< HEAD
+=======
+
+Last week we hosted React Conf 2025. In this post, we summarize the talks and announcements from the event...
+
+</BlogCard>
+
+<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">
+
+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">
+
+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">
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 
 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">
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0
 
 Today, we're announcing our plans to create the React Foundation and a new technical governance structure ...
 

src/content/community/index.md

@@ -33,4 +33,8 @@ title: من أين تحصل على المساعدة
 
 ## الأخبار {/*news*/}
 
+<<<<<<< HEAD
 لمتابعة آخر الأخبار حول React، [تابع **@reactjs** على Twitter](https://twitter.com/reactjs) و [**@react.dev** في Bluesky](https://bsky.app/profile/react.dev) وكذلك [مدوّنة React الرسمة](/blog/) على هذا الموقع.
+=======
+For the latest news about React, [follow **@reactjs** on Twitter](https://twitter.com/reactjs), [**@react.dev** on Bluesky](https://bsky.app/profile/react.dev) and the [official React blog](/blog/) on this website.
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0

src/content/errors/index.md

@@ -7,4 +7,8 @@ In the minified production build of React, we avoid sending down full error mess
 
 We highly recommend using the development build locally when debugging your app since it tracks additional debug info and provides helpful warnings about potential problems in your apps, but if you encounter an exception while using the production build, the error message will include just a link to the docs for the error.
 
+<<<<<<< HEAD
 For an example, see: [https://ar.react.dev/errors/149](/errors/149).
+=======
+For an example, see: [https://react.dev/errors/149](/errors/149).
+>>>>>>> 2534424ec6c433cc2c811d5a0bd5a65b75efa5f0