Skip to content

Commit 00fc07a

Browse files
merging all conflicts
2 parents 5aa677b + f8c81a0 commit 00fc07a

22 files changed

+293
-13
lines changed

src/components/Layout/HomeContent.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,12 +274,20 @@ export function HomeContent() {
274274
<Br /> 풀스택으로 만들기
275275
</Header>
276276
<Para>
277+
<<<<<<< HEAD
277278
React는 라이브러리입니다. 컴포넌트를 조합할 있도록 도와주지만,
278279
라우팅이나 데이터를 가져오는 방법을 규정하지는 않습니다. React로
279280
완전한 앱을 만들려면,{' '}
280281
<Link href="https://nextjs.org">Next.js</Link> 또는{' '}
281282
<Link href="https://remix.run">Remix</Link> 같은 풀스택 React
282283
프레임워크를 추천합니다.
284+
=======
285+
React is a library. It lets you put components together, but it
286+
doesn’t prescribe how to do routing and data fetching. To build an
287+
entire app with React, we recommend a full-stack React framework
288+
like <Link href="https://nextjs.org">Next.js</Link> or{' '}
289+
<Link href="https://reactrouter.com">React Router</Link>.
290+
>>>>>>> f8c81a0f4f8e454c850f0c854ad054b32313345c
283291
</Para>
284292
</Center>
285293
<FullBleed>

src/components/Layout/Page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {useRouter} from 'next/router';
1515
import {SidebarNav} from './SidebarNav';
1616
import {Footer} from './Footer';
1717
import {Toc} from './Toc';
18-
import SocialBanner from '../SocialBanner';
18+
// import SocialBanner from '../SocialBanner';
1919
import {DocsPageFooter} from 'components/DocsFooter';
2020
import {Seo} from 'components/Seo';
2121
import PageHeading from 'components/PageHeading';
@@ -142,7 +142,7 @@ export function Page({
142142
/>
143143
</Head>
144144
)}
145-
<SocialBanner />
145+
{/* <SocialBanner /> */}
146146
<TopNav
147147
section={section}
148148
routeTree={routeTree}

src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ React Labs 게시글에는 활발히 연구 개발 중인 프로젝트에 대한
1515

1616
</Intro>
1717

18+
<<<<<<< HEAD
1819
<Note>
1920

2021
React Conf 2024가 5월 15일부터 16일까지 네바다주 헨더슨에서 개최됩니다! React Conf에 직접 참석하고 싶으시다면 2월 28일까지 [티켓 추첨에 등록하세요](https://forms.reform.app/bLaLeE/react-conf-2024-ticket-lottery/1aRQLK).
@@ -23,6 +24,8 @@ React Conf 2024가 5월 15일부터 16일까지 네바다주 헨더슨에서 개
2324

2425
</Note>
2526

27+
=======
28+
>>>>>>> f8c81a0f4f8e454c850f0c854ad054b32313345c
2629
---
2730

2831
## React 컴파일러 {/*react-compiler*/}

src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ React Labs 게시글에는 활발히 연구 개발 중인 프로젝트에 대한
1616
</Intro>
1717

1818

19+
<<<<<<< HEAD
1920
<Note>
2021

2122
React Conf 2025 is scheduled for October 7–8 in Henderson, Nevada!
@@ -25,6 +26,9 @@ Watch the livestream on [the React Conf website](https://conf.react.dev).
2526
</Note>
2627

2728
오늘 저희는 테스트할 준비가 완료된 두 가지 새로운 실험적 기능에 대한 문서를 공개하게 되어 기쁩니다.
29+
=======
30+
Today, we're excited to release documentation for two new experimental features that are ready for testing:
31+
>>>>>>> f8c81a0f4f8e454c850f0c854ad054b32313345c
2832
2933
- [View Transitions](#view-transitions)
3034
- [Activity](#activity)
@@ -40,7 +44,19 @@ Watch the livestream on [the React Conf website](https://conf.react.dev).
4044

4145
# 새로운 실험적 기능 {/*new-experimental-features*/}
4246

47+
<<<<<<< HEAD
4348
View Transitions와 Activity는 이제 `react@experimental`에서 테스트할 준비가 되었습니다. 이러한 기능들은 프로덕션에서 테스트되었으며 안정적이지만, 피드백을 반영하는 과정에서 최종 API가 여전히 변경될 수 있습니다.
49+
=======
50+
<Note>
51+
52+
`<Activity />` has shipped in `react@19.2`.
53+
54+
`<ViewTransition />` and `addTransitionType` are now available in `react@canary`.
55+
56+
</Note>
57+
58+
View Transitions and Activity are now ready for testing in `react@experimental`. These features have been tested in production and are stable, but the final API may still change as we incorporate feedback.
59+
>>>>>>> f8c81a0f4f8e454c850f0c854ad054b32313345c
4460
4561
가장 최신 실험적 버전으로 React 패키지를 업그레이드하여 사용해볼 수 있습니다.
4662

@@ -11543,7 +11559,7 @@ function App() {
1154311559
<Sandpack>
1154411560

1154511561
```js src/App.js
11546-
import { ViewTransition } from "react"; import Details from "./Details"; import Home from "./Home"; import { useRouter } from "./router"; import { unstable_Activity, Activity as ActivityStable} from 'react'; let Activity = ActivityStable ?? unstable_Activity;
11562+
import { Activity, ViewTransition } from "react"; import Details from "./Details"; import Home from "./Home"; import { useRouter } from "./router";
1154711563

1154811564
export default function App() {
1154911565
const { url } = useRouter();
@@ -12880,7 +12896,7 @@ root.render(
1288012896
<Sandpack>
1288112897

1288212898
```js src/App.js
12883-
import { ViewTransition, use } from "react"; import Details from "./Details"; import Home from "./Home"; import { useRouter } from "./router"; import {fetchVideos} from './data'; import { unstable_Activity, Activity as ActivityStable} from 'react'; let Activity = ActivityStable ?? unstable_Activity;
12899+
import { Activity, ViewTransition, use } from "react"; import Details from "./Details"; import Home from "./Home"; import { useRouter } from "./router"; import {fetchVideos} from './data';
1288412900

1288512901
export default function App() {
1288612902
const { url } = useRouter();
Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
---
2+
title: "React Conf 2025 Recap"
3+
author: Matt Carroll and Ricky Hanlon
4+
date: 2025/10/16
5+
description: Last week we hosted React Conf 2025, in this post, we summarize the talks and announcements from the event...
6+
---
7+
8+
Oct 16, 2025 by [Matt Carroll](https://x.com/mattcarrollcode) and [Ricky Hanlon](https://bsky.app/profile/ricky.fm)
9+
10+
---
11+
12+
<Intro>
13+
14+
Last week we hosted React Conf 2025 where we announced the [React Foundation](/blog/2025/10/07/introducing-the-react-foundation) and showcased new features coming to React and React Native.
15+
16+
</Intro>
17+
18+
---
19+
20+
React Conf 2025 was held on October 7-8, 2025, in Henderson, Nevada.
21+
22+
The entire [day 1](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=1067s) and [day 2](https://www.youtube.com/watch?v=p9OcztRyDl0&t=2299s) streams are available online, and you can view photos from the event [here](https://conf.react.dev/photos).
23+
24+
In this post, we'll summarize the talks and announcements from the event.
25+
26+
27+
## Day 1 Keynote {/*day-1-keynote*/}
28+
29+
_Watch the full day 1 stream [here.](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=1067s)_
30+
31+
In the day 1 keynote, Joe Savona shared the updates from the team and community since the last React Conf and highlights from React 19.0 and 19.1.
32+
33+
Mofei Zhang highlighted the new features in React 19.2 including:
34+
* [`<Activity />`](https://react.dev/reference/react/Activity) — a new component to manage visibility.
35+
* [`useEffectEvent`](https://react.dev/reference/react/useEffectEvent) to fire events from Effects.
36+
* [Performance Tracks](https://react.dev/reference/dev-tools/react-performance-tracks) — a new profiling tool in DevTools.
37+
* [Partial Pre-Rendering](https://react.dev/blog/2025/10/01/react-19-2#partial-pre-rendering) to pre-render part of an app ahead of time, and resume rendering it later.
38+
39+
Jack Pope announced new features in Canary including:
40+
41+
* [`<ViewTransition />`](https://react.dev/reference/react/ViewTransition) — a new component to animate page transitions.
42+
* [Fragment Refs](https://react.dev/reference/react/Fragment#fragmentinstance) — a new way to interact with the DOM nodes wrapped by a Fragment.
43+
44+
Lauren Tan announced [React Compiler v1.0](https://react.dev/blog/2025/10/07/react-compiler-1) and recommended all apps use React Compiler for benefits like:
45+
* [Automatic memoization](/learn/react-compiler/introduction#what-does-react-compiler-do) that understands React code.
46+
* [New lint rules](/learn/react-compiler/installation#eslint-integration) powered by React Compiler to teach best practices.
47+
* [Default support](/learn/react-compiler/installation#basic-setup) for new apps in Vite, Next.js, and Expo.
48+
* [Migration guides](/learn/react-compiler/incremental-adoption) for existing apps migrating to React Compiler.
49+
50+
Finally, Seth Webster announced the [React Foundation](/blog/2025/10/07/introducing-the-react-foundation) to steward React's open source development and community.
51+
52+
Watch day 1 here:
53+
54+
<YouTubeIframe src="https://www.youtube.com/embed/zyVRg2QR6LA?si=z-8t_xCc12HwGJH_&t=1067s" />
55+
56+
## Day 2 Keynote {/*day-2-keynote*/}
57+
58+
_Watch the full day 2 stream [here.](https://www.youtube.com/watch?v=p9OcztRyDl0&t=2299s)_
59+
60+
Jorge Cohen and Nicola Corti kicked off day 2 highlighting React Native’s incredible growth with 4M weekly downloads (100% growth YoY), and some notable app migrations from Shopify, Zalando, and HelloFresh, award-winning apps like RISE, RUNNA, and Partyful, and AI apps from Mistral, Replit, and v0.
61+
62+
Riccardo Cipolleschi shared two major announcements for React Native:
63+
- [React Native 0.82 will be New Architecture only](https://reactnative.dev/blog/2025/10/08/react-native-0.82#new-architecture-only)
64+
- [Experimental Hermes V1 support](https://reactnative.dev/blog/2025/10/08/react-native-0.82#experimental-hermes-v1)
65+
66+
Ruben Norte and Alex Hunt finished out the keynote by announcing:
67+
- [New web-aligned DOM APIs](https://reactnative.dev/blog/2025/10/08/react-native-0.82#dom-node-apis) for improved compatibility with React on the web.
68+
- [New Performance APIs](https://reactnative.dev/blog/2025/10/08/react-native-0.82#web-performance-apis-canary) with a new network panel and desktop app.
69+
70+
Watch day 2 here:
71+
72+
<YouTubeIframe src="https://www.youtube.com/embed/p9OcztRyDl0?si=qPTHftsUE07cjZpS&t=2299s" />
73+
74+
75+
## React team talks {/*react-team-talks*/}
76+
77+
Throughout the conference, there were talks from the React team including:
78+
* [Async React Part I](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=10907s) and [Part II](https://www.youtube.com/watch?v=p9OcztRyDl0&t=29073s) [(Ricky Hanlon)](https://x.com/rickhanlonii) showed what's possible using the last 10 years of innovation.
79+
* [Exploring React Performance](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=20274s) [(Joe Savona)](https://x.com/en_js) showed the results of our React performance research.
80+
* [Reimagining Lists in React Native](https://www.youtube.com/watch?v=p9OcztRyDl0&t=10382s) [(Luna Wei)](https://x.com/lunaleaps) introduced Virtual View, a new primitive for lists that manages visibility with mode-based rendering (hidden/pre-render/visible).
81+
* [Profiling with React Performance tracks](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=8276s) [(Ruslan Lesiutin)](https://x.com/ruslanlesiutin) showed how to use the new React Performance Tracks to debug performance issues and build great apps.
82+
* [React Strict DOM](https://www.youtube.com/watch?v=p9OcztRyDl0&t=9026s) [(Nicolas Gallagher)](https://nicolasgallagher.com/) talked about Meta's approach to using web code on native.
83+
* [View Transitions and Activity](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=4870s) [(Chance Strickland)](https://x.com/chancethedev) — Chance worked with the React team to showcase how to use `<Activity />` and `<ViewTransition />` to build fast, native-feeling animations.
84+
* [In case you missed the memo](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=9525s) [(Cody Olsen)](https://bsky.app/profile/codey.bsky.social) - Cody worked with the React team to adopt the Compiler at Sanity Studio, and shared how it went.
85+
## React framework talks {/*react-framework-talks*/}
86+
87+
The second half of day 2 had a series of talks from React Framework teams including:
88+
89+
* [React Native, Amplified](https://www.youtube.com/watch?v=p9OcztRyDl0&t=5737s) by [Giovanni Laquidara](https://x.com/giolaq) and [Eric Fahsl](https://x.com/efahsl).
90+
* [React Everywhere: Bringing React Into Native Apps](https://www.youtube.com/watch?v=p9OcztRyDl0&t=18213s) by [Mike Grabowski](https://x.com/grabbou).
91+
* [How Parcel Bundles React Server Components](https://www.youtube.com/watch?v=p9OcztRyDl0&t=19538s) by [Devon Govett](https://x.com/devonovett).
92+
* [Designing Page Transitions](https://www.youtube.com/watch?v=p9OcztRyDl0&t=20640s) by [Delba de Oliveira](https://x.com/delba_oliveira).
93+
* [Build Fast, Deploy Faster — Expo in 2025](https://www.youtube.com/watch?v=p9OcztRyDl0&t=21350s) by [Evan Bacon](https://x.com/baconbrix).
94+
* [The React Router's take on RSC](https://www.youtube.com/watch?v=p9OcztRyDl0&t=22367s) by [Kent C. Dodds](https://x.com/kentcdodds).
95+
* [RedwoodSDK: Web Standards Meet Full-Stack React](https://www.youtube.com/watch?v=p9OcztRyDl0&t=24992s) by [Peter Pistorius](https://x.com/appfactory) and [Aurora Scharff](https://x.com/aurorascharff).
96+
* [TanStack Start](https://www.youtube.com/watch?v=p9OcztRyDl0&t=26065s) by [Tanner Linsley](https://x.com/tannerlinsley).
97+
98+
## Q&A {/*q-and-a*/}
99+
There were three Q&A panels during the conference:
100+
101+
* [React Team at Meta Q&A](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=26304s) hosted by [Shruti Kapoor](https://x.com/shrutikapoor08)
102+
* [React Frameworks Q&A](https://www.youtube.com/watch?v=p9OcztRyDl0&t=26812s) hosted by [Jack Herrington](https://x.com/jherr)
103+
* [React and AI Panel](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=18741s) hosted by [Lee Robinson](https://x.com/leerob)
104+
105+
## And more... {/*and-more*/}
106+
107+
We also heard talks from the community including:
108+
* [Building an MCP Server](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=24204s) by [James Swinton](https://x.com/JamesSwintonDev) ([AG Grid](https://www.ag-grid.com/?utm_source=react-conf&utm_medium=react-conf-homepage&utm_campaign=react-conf-sponsorship-2025))
109+
* [Modern Emails using React](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=25521s) by [Zeno Rocha](https://x.com/zenorocha) ([Resend](https://resend.com/))
110+
* [Why React Native Apps Make All the Money](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=24917s) by [Perttu Lähteenlahti](https://x.com/plahteenlahti) ([RevenueCat](https://www.revenuecat.com/))
111+
* [The invisible craft of great UX](https://www.youtube.com/watch?v=zyVRg2QR6LA&t=23400s) by [Michał Dudak](https://x.com/michaldudak) ([MUI](https://mui.com/))
112+
113+
## Thanks {/*thanks*/}
114+
115+
Thank you to all the staff, speakers, and participants, who made React Conf 2025 possible. There are too many to list, but we want to thank a few in particular.
116+
117+
Thank you to [Matt Carroll](https://x.com/mattcarrollcode) for planning the entire event and building the conference website.
118+
119+
Thank you to [Michael Chan](https://x.com/chantastic) for MCing React Conf with incredible dedication and energy, delivering thoughtful speaker intros, fun jokes, and genuine enthusiasm throughout the event. Thank you to [Jorge Cohen](https://x.com/JorgeWritesCode) for hosting the livestream, interviewing each speaker, and bringing the in-person React Conf experience online.
120+
121+
Thank you to [Mateusz Kornacki](https://x.com/mat_kornacki), [Mike Grabowski](https://x.com/grabbou), [Kris Lis](https://www.linkedin.com/in/krzysztoflisakakris/) and the team at [Callstack](https://www.callstack.com/) for co-organizing React Conf and providing design, engineering, and marketing support. Thank you to the [ZeroSlope team](https://zeroslopeevents.com/contact-us/): Sunny Leggett, Tracey Harrison, Tara Larish, Whitney Pogue, and Brianne Smythia for helping to organize the event.
122+
123+
Thank you to [Jorge Cabiedes Acosta](https://github.com/jorge-cab), [Gijs Weterings](https://x.com/gweterings), [Tim Yung](https://x.com/yungsters), and [Jason Bonta](https://x.com/someextent) for bringing questions from the Discord to the livestream. Thank you to [Lynn Yu](https://github.com/lynnshaoyu) for leading the moderation of the Discord. Thank you to [Seth Webster](https://x.com/sethwebster) for welcoming us each day; and to [Christopher Chedeau](https://x.com/vjeux), [Kevin Gozali](https://x.com/fkgozali), and [Pieter De Baets](https://x.com/Javache) for joining us with a special message during the after-party.
124+
125+
Thank you to [Kadi Kraman](https://x.com/kadikraman), [Beto](https://x.com/betomoedano) and [Nicolas Solerieu](https://www.linkedin.com/in/nicolas-solerieu/) for building the conference mobile app. Thank you [Wojtek Szafraniec](https://x.com/wojteg1337) for help with the conference website. Thank you to [Mustache](https://www.mustachepower.com/) & [Cornerstone](https://cornerstoneav.com/) for the visuals, stage, and sound; and to the Westin Hotel for hosting us.
126+
127+
Thank you to all the sponsors who made the event possible: [Amazon](https://www.developer.amazon.com), [MUI](https://mui.com/), [Vercel](https://vercel.com/), [Expo](https://expo.dev/), [RedwoodSDK](https://rwsdk.com), [Ag Grid](https://www.ag-grid.com), [RevenueCat](https://www.revenuecat.com/), [Resend](https://resend.com), [Mux](https://www.mux.com/), [Old Mission](https://www.oldmissioncapital.com/), [Arcjet](https://arcjet.com), [Infinite Red](https://infinite.red/), and [RenderATL](https://renderatl.com).
128+
129+
Thank you to all the speakers who shared their knowledge and experience with the community.
130+
131+
Finally, thank you to everyone who attended in person and online to show what makes React, React. React is more than a library, it is a community, and it was inspiring to see everyone come together to share and learn together.
132+
133+
See you next time!

src/content/blog/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ title: React 블로그
1010

1111
<div className="sm:-mx-5 flex flex-col gap-5 mt-12">
1212

13+
<BlogCard title="React Conf 2025 Recap" date="October 16, 2025" url="/blog/2025/10/16/react-conf-2025-recap">
14+
15+
Last week we hosted React Conf 2025. In this post, we summarize the talks and announcements from the event...
16+
17+
</BlogCard>
18+
1319
<BlogCard title="React Compiler v1.0" date="October 7, 2025" url="/blog/2025/10/07/react-compiler-1">
1420

1521
We're releasing the compiler's first stable release today, plus linting and tooling improvements to make adoption easier.

src/content/community/conferences.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,15 @@ October 31 - November 01, 2025. In-person in Goa, India (hybrid event) + Oct 15
3434

3535
[Website](https://www.reactindia.io) - [Twitter](https://twitter.com/react_india) - [Facebook](https://www.facebook.com/ReactJSIndia) - [Youtube](https://www.youtube.com/channel/UCaFbHCBkPvVv1bWs_jwYt3w)
3636

37+
<<<<<<< HEAD
3738

3839
### CityJS New Delhi 2025 {/*cityjs-newdelhi*/}
3940
November 6-7, 2025. In-person in New Delhi, India
4041

4142
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
4243

44+
=======
45+
>>>>>>> f8c81a0f4f8e454c850f0c854ad054b32313345c
4346
### React Summit US 2025 {/*react-summit-us-2025*/}
4447
November 18 - 21, 2025. In-person in New York, USA + remote (hybrid event)
4548

@@ -50,12 +53,29 @@ November 28 & December 1, 2025. In-person in London, UK + online (hybrid event)
5053

5154
[Website](https://reactadvanced.com/) - [Twitter](https://x.com/reactadvanced)
5255

56+
### CityJS Singapore 2026 {/*cityjs-singapore-2026*/}
57+
February 4-6, 2026. In-person in Singapore
58+
59+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
60+
61+
### CityJS New Delhi 2026 {/*cityjs-newdelhi-2026*/}
62+
February 12-13, 2026. In-person in New Delhi, India
63+
64+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
65+
66+
5367
### React Paris 2026 {/*react-paris-2026*/}
5468
March 26 - 27, 2026. In-person in Paris, France (hybrid event)
5569

5670
[Website](https://react.paris/) - [Twitter](https://x.com/BeJS_)
5771

5872

73+
### CityJS London 2026 {/*cityjs-london-2026*/}
74+
April 14-17, 2026. In-person in London
75+
76+
[Website](https://india.cityjsconf.org/) - [Twitter](https://x.com/cityjsconf) - [Bluesky](https://bsky.app/profile/cityjsconf.bsky.social)
77+
78+
5979
## Past Conferences {/*past-conferences*/}
6080

6181

0 commit comments

Comments
 (0)