From 4b0935b8c119d03278f709681c63ad8a940b22b5 Mon Sep 17 00:00:00 2001 From: Jordan Thomson Date: Mon, 20 Oct 2025 23:15:38 +1100 Subject: [PATCH 1/3] Add `` bullet to built-in components section (#8087) --- src/content/reference/react/components.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/content/reference/react/components.md b/src/content/reference/react/components.md index 7ce3fab63..081f206c0 100644 --- a/src/content/reference/react/components.md +++ b/src/content/reference/react/components.md @@ -16,6 +16,7 @@ React exposes a few built-in components that you can use in your JSX. * [``](/reference/react/Profiler) lets you measure rendering performance of a React tree programmatically. * [``](/reference/react/Suspense) lets you display a fallback while the child components are loading. * [``](/reference/react/StrictMode) enables extra development-only checks that help you find bugs early. +* [``](/reference/react/Activity) lets you hide and restore the UI and internal state of its children. --- From 2c7798dcc51fbd07ebe41f49e5ded4839a029f72 Mon Sep 17 00:00:00 2001 From: lauren Date: Mon, 20 Oct 2025 13:31:58 -0400 Subject: [PATCH 2/3] Fix typo in react compiler blog post date (#8091) Fix a small typo --- src/sidebarBlog.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sidebarBlog.json b/src/sidebarBlog.json index 56aa0ee2c..7bcd4a000 100644 --- a/src/sidebarBlog.json +++ b/src/sidebarBlog.json @@ -22,7 +22,7 @@ "title": "React Compiler v1.0", "titleForHomepage": "React Compiler v1.0", "icon": "blog", - "date": "October 8, 2025", + "date": "October 7, 2025", "path": "/blog/2025/10/07/react-compiler-1" }, { From f829b762012449c5114b269d4f0b923005d05edf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=A3=A8=EB=B0=80LuMir?= Date: Fri, 31 Oct 2025 18:06:06 +0900 Subject: [PATCH 3/3] docs: resolve conflicts --- src/content/reference/react/components.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/content/reference/react/components.md b/src/content/reference/react/components.md index 0c91be301..5e17162d2 100644 --- a/src/content/reference/react/components.md +++ b/src/content/reference/react/components.md @@ -12,18 +12,11 @@ React는 JSX에서 사용할 수 있는 몇 가지 내장 컴포넌트를 제공 ## 내장 컴포넌트 {/*built-in-components*/} -<<<<<<< HEAD * [``](/reference/react/Fragment) 또는 `<>...` 로 표기하며, 여러 JSX 노드를 함께 그룹화할 수 있습니다. * [``](/reference/react/Profiler)를 통해 React 트리의 렌더링 성능을 프로그래밍 방식으로 측정할 수 있습니다. * [``](/reference/react/StrictMode)를 통해 초기에 버그를 찾는 데 도움이 되는 추가 개발 전용 검사를 사용할 수 있습니다. * [``](/reference/react/Suspense)를 통해 자식 컴포넌트를 로딩하는 동안 Fallback을 표시할 수 있습니다. -======= -* [``](/reference/react/Fragment), alternatively written as `<>...`, lets you group multiple JSX nodes together. -* [``](/reference/react/Profiler) lets you measure rendering performance of a React tree programmatically. -* [``](/reference/react/Suspense) lets you display a fallback while the child components are loading. -* [``](/reference/react/StrictMode) enables extra development-only checks that help you find bugs early. * [``](/reference/react/Activity) lets you hide and restore the UI and internal state of its children. ->>>>>>> 2c7798dcc51fbd07ebe41f49e5ded4839a029f72 ---