Skip to content

Commit 5473c0b

Browse files
authored
Sync with react.dev @ 9000e6e (#1120)
This PR was automatically generated. Merge changes from [react.dev](https://github.com/reactjs/react.dev/commits/main) at 9000e6e The following files have conflicts and may need new translations: * [x] [src/content/learn/add-react-to-an-existing-project.md](/reactjs/react.dev/commits/main/src/content/learn/add-react-to-an-existing-project.md) * [x] [src/content/reference/rsc/server-functions.md](/reactjs/react.dev/commits/main/src/content/reference/rsc/server-functions.md) Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch. ## DO NOT SQUASH MERGE THIS PULL REQUEST! Doing so will "erase" the commits from main and cause them to show up as conflicts the next time we merge.
2 parents 6e8ae7f + 2d35bda commit 5473c0b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+616
-599
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Discord Notify
2+
3+
on:
4+
pull_request_target:
5+
types: [labeled]
6+
7+
jobs:
8+
notify:
9+
if: ${{ github.event.label.name == 'React Core Team' }}
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Discord Webhook Action
13+
uses: tsickert/[email protected]
14+
with:
15+
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
16+
embed-author-name: ${{ github.event.pull_request.user.login }}
17+
embed-author-url: ${{ github.event.pull_request.user.html_url }}
18+
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
19+
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
20+
embed-description: ${{ github.event.pull_request.body }}
21+
embed-url: ${{ github.event.pull_request.html_url }}

src/components/Layout/HomeContent.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,14 @@ export function HomeContent() {
164164
label="API Reference">
165165
API 참고서
166166
</ButtonLink>
167+
<ButtonLink
168+
href={'https://ko-react-exy5xcwjj-fbopensource.vercel.app/'}
169+
type="secondary"
170+
size="lg"
171+
className="w-full sm:w-auto justify-center"
172+
label="API Reference">
173+
React v18 한글
174+
</ButtonLink>
167175
</div>
168176
</div>
169177

src/components/Layout/TopNav/TopNav.tsx

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,22 @@ declare global {
3535
}
3636
}
3737

38+
const react18Icon = (
39+
<svg
40+
stroke="currentColor"
41+
fill="none"
42+
strokeWidth="2"
43+
viewBox="0 0 24 24"
44+
strokeLinecap="round"
45+
strokeLinejoin="round"
46+
height="200px"
47+
width="200px"
48+
xmlns="http://www.w3.org/2000/svg">
49+
<path d="M8 8h1v8"></path>
50+
<path d="M15 12h-1a1 1 0 0 1 -1 -1v-2a1 1 0 0 1 1 -1h2a1 1 0 0 1 1 1v2a1 1 0 0 1 -1 1zh-1a1 1 0 0 0 -1 1v2a1 1 0 0 0 1 1h2a1 1 0 0 0 1 -1v-2a1 1 0 0 0 -1 -1"></path>
51+
</svg>
52+
);
53+
3854
const darkIcon = (
3955
<svg
4056
xmlns="http://www.w3.org/2000/svg"
@@ -346,6 +362,14 @@ export default function TopNav({
346362
<IconSearch className="w-5 h-5 align-middle" />
347363
</button>
348364
</div>
365+
<div className="flex">
366+
<Link
367+
href="https://ko-react-exy5xcwjj-fbopensource.vercel.app/"
368+
aria-label="React version 18 Korean translation"
369+
className="active:scale-95 transition-transform flex w-12 h-12 rounded-full items-center justify-center hover:bg-primary/5 hover:dark:bg-primary-dark/5 outline-link">
370+
{react18Icon}
371+
</Link>
372+
</div>
349373
<div className="flex dark:hidden">
350374
<button
351375
type="button"

src/components/MDX/TerminalBlock.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
7171
</div>
7272
</div>
7373
<div
74-
className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-scroll"
74+
className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-auto"
7575
translate="no"
7676
dir="ltr">
7777
<LevelText type={level} />

src/content/community/conferences.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event)
2525

2626
[Website](https://reactsummit.com/) - [Twitter](https://x.com/reactsummit)
2727

28+
### React Universe Conf 2025 {/*react-universe-conf-2025*/}
29+
September 2-4, 2025. Wrocław, Poland.
30+
31+
[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)
32+
2833
## Past Conferences {/*past-conferences*/}
2934

3035
### React Africa 2024 {/*react-africa-2024*/}

src/content/learn/add-react-to-an-existing-project.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ title: 기존 프로젝트에 React 추가하기
2121
다음과 같이 설정하는 것을 추천합니다.
2222

2323
1. [React 기반 프레임워크](/learn/start-a-new-react-project) 중 하나를 사용하여 **앱의 React 부분을 빌드하세요.**
24-
2. 사용하는 프레임워크 설정에서 **`/some-app`*기본 경로*<sup>*Base Path*</sup>로 명시하세요**. (이때, [Next.js](https://nextjs.org/docs/api-reference/next.config.js/basepath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)를 사용하세요!)
25-
3. **서버 또는 프록시를 구성**하여 `/some-app/` 하위의 모든 요청이 React 애플리케이션에서 처리되도록 하세요.
24+
2. 사용하는 프레임워크 설정에서 **`/some-app`*기본 경로*<sup>*Base Path*</sup>로 명시하세요**. (이때, [Next.js](https://nextjs.org/docs/app/api-reference/config/next-config-js/basePath), [Gatsby](https://www.gatsbyjs.com/docs/how-to/previews-deploys-hosting/path-prefix/)를 사용하세요!)
25+
3. **서버 또는 프록시를 구성**하여 `/some-app/` 하위의 모든 요청이 React 앱에서 처리되도록 하세요.
2626

2727
이는 앱의 React 부분이 이러한 프레임워크에 내장된 [최고의 사례들<sup>Best Practices</sup>로부터 이점을 얻을 수 있습니다.](/learn/start-a-new-react-project#can-i-use-react-without-a-framework)
2828

0 commit comments

Comments
 (0)