Skip to content

Commit 2ba1444

Browse files
merging all conflicts
2 parents 9bcff55 + 3ee3a60 commit 2ba1444

22 files changed

+308
-17
lines changed
75.6 KB
Binary file not shown.
64.9 KB
Binary file not shown.
-168 KB
Binary file not shown.

src/components/Layout/HomeContent.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,8 @@ function ExampleLayout({
875875
</div>
876876
<div
877877
ref={contentRef}
878-
className="relative mt-0 lg:-my-20 w-full p-2.5 xs:p-5 lg:p-10 flex grow justify-center">
878+
className="relative mt-0 lg:-my-20 w-full p-2.5 xs:p-5 lg:p-10 flex grow justify-center"
879+
dir="ltr">
879880
{right}
880881
<div
881882
className={cn(

src/components/MDX/Sandpack/template.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const template = {
22
'/src/index.js': {
33
hidden: true,
4-
code: `import React, { StrictMode } from "react";
4+
code: `import { StrictMode } from "react";
55
import { createRoot } from "react-dom/client";
66
import "./styles.css";
77

src/components/PageHeading.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ function PageHeading({
2727
tags = [],
2828
breadcrumbs,
2929
}: PageHeadingProps) {
30-
console.log('version', version);
3130
return (
3231
<div className="px-5 sm:px-12 pt-3.5">
3332
<div className="max-w-4xl ms-0 2xl:mx-auto">

src/components/Seo.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,14 @@ export const Seo = withRouter(
124124
)}
125125
<link
126126
rel="preload"
127-
href="/fonts/Source-Code-Pro-Regular.woff2"
127+
href="https://react.dev/fonts/Source-Code-Pro-Regular.woff2"
128+
as="font"
129+
type="font/woff2"
130+
crossOrigin="anonymous"
131+
/>
132+
<link
133+
rel="preload"
134+
href="https://react.dev/fonts/Source-Code-Pro-Bold.woff2"
128135
as="font"
129136
type="font/woff2"
130137
crossOrigin="anonymous"

src/content/community/index.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ Cada comunidad está constituida por miles de usuarios de React.
2929

3030
## Noticias {/*news*/}
3131

32+
<<<<<<< HEAD
3233
Para conocer las últimas noticias sobre React, [sigue **@reactjs** en Twitter](https://twitter.com/reactjs) y el [blog oficial de React](/blog/) en este sitio web.
34+
=======
35+
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.
36+
>>>>>>> 3ee3a60a1bcc687c0b87039a3a6582e3b1d6887c

src/content/community/meetups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ title: Reuniones de React
3838

3939
## Canadá {/*canada*/}
4040
* [Halifax, NS](https://www.meetup.com/Halifax-ReactJS-Meetup/)
41-
* [Montreal, QC - React Native](https://www.meetup.com/fr-FR/React-Native-MTL/)
41+
* [Montreal, QC](https://guild.host/react-montreal/)
4242
* [Vancouver, BC](https://www.meetup.com/ReactJS-Vancouver-Meetup/)
4343
* [Ottawa, ON](https://www.meetup.com/Ottawa-ReactJS-Meetup/)
4444
* [Saskatoon, SK](https://www.meetup.com/saskatoon-react-meetup/)

src/content/learn/build-a-react-app-from-scratch.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,17 @@ De manera similar, si confías en que las aplicaciones usen tu framework para di
115115

116116
La división del código por rutas, cuando se integra con el empaquetamiento y la obtención de datos, puede reducir el tiempo de carga inicial de su aplicación y el tiempo que tarda en renderizarse el contenido visible más grande de la aplicación. ([Largest Contentful Paint](https://web.dev/articles/lcp?hl=es-419)).
117117

118+
<<<<<<< HEAD
118119
Para obtener instrucciones sobre cómo dividir el código, consulte la documentación de su herramienta de compilación:
119120
- [Optimizaciones de compilación](https://es.vite.dev/guide/features.html#optimizaciones-de-compilacion)
120121
- [División de código con Parcel](https://parceljs.org/features/code-splitting/)
121122
- [División de código con Rsbuild](https://rsbuild.dev/guide/optimization/code-splitting)
123+
=======
124+
For code-splitting instructions, see your build tool docs:
125+
- [Vite build optimizations](https://vite.dev/guide/features.html#build-optimizations)
126+
- [Parcel code splitting](https://parceljs.org/features/code-splitting/)
127+
- [Rsbuild code splitting](https://rsbuild.dev/guide/optimization/code-splitting)
128+
>>>>>>> 3ee3a60a1bcc687c0b87039a3a6582e3b1d6887c
122129
123130
### Mejorar el rendimiento de las aplicaciones {/*improving-application-performance*/}
124131

0 commit comments

Comments
 (0)