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:
         

package.json

@@ -35,7 +35,11 @@
     "classnames": "^2.2.6",
     "debounce": "^1.2.1",
     "github-slugger": "^1.3.0",
+<<<<<<< HEAD
     "next": "15.4.8",
+=======
+    "next": "15.1.11",
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
     "next-remote-watch": "^1.0.0",
     "parse-numeric-range": "^1.2.0",
     "react": "^19.0.0",

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/Sandpack/template.ts

@@ -35,8 +35,13 @@ root.render(
           eject: 'react-scripts eject',
         },
         dependencies: {
+<<<<<<< HEAD
           react: '^19.2.0',
           'react-dom': '^19.2.0',
+=======
+          react: '^19.2.1',
+          'react-dom': '^19.2.1',
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
           'react-scripts': '^5.0.0',
         },
       },

src/components/MDX/SandpackWithHTMLOutput.tsx

@@ -56,8 +56,13 @@ export default function formatHTML(markup) {
 const packageJSON = `
 {
   "dependencies": {
+<<<<<<< HEAD
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
+=======
+    "react": "^19.2.1",
+    "react-dom": "^19.2.1",
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
     "react-scripts": "^5.0.0",
     "html-format": "^1.1.2"
   },

src/components/MDX/TerminalBlock.tsx

@@ -79,13 +79,19 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
           </div>
         </div>
       </div>
+<<<<<<< HEAD
       <div
+=======
+      <pre
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
         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)
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 
 ---
 

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.
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc

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
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </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
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </TerminalBlock>
 
 yarn
 <TerminalBlock>
+<<<<<<< HEAD
 {`yarn add --dev --exact babel-plugin-react-compiler@latest`}
+=======
+yarn add --dev --exact babel-plugin-react-compiler@latest
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </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
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </TerminalBlock>
 
 pnpm
 <TerminalBlock>
+<<<<<<< HEAD
 {`pnpm add --save-dev eslint-plugin-react-hooks@latest`}
+=======
+pnpm add --save-dev eslint-plugin-react-hooks@latest
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </TerminalBlock>
 
 yarn
 <TerminalBlock>
+<<<<<<< HEAD
 {`yarn add --dev eslint-plugin-react-hooks@latest`}
+=======
+yarn add --dev eslint-plugin-react-hooks@latest
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </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
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </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
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </TerminalBlock>
 
 <br />
 
 <TerminalBlock>
+<<<<<<< HEAD
 {`npx create-next-app@latest`}
+=======
+npx create-next-app@latest
+>>>>>>> 2da4f7fbd90ddc09835c9f85d61fd5644a271abc
 </TerminalBlock>
 
 ## Adopt React Compiler incrementally {/*adopt-react-compiler-incrementally*/}