Skip to content

Commit

Permalink
Sync with react.dev @ 9000e6e (#1120)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
lumirlumir authored Jan 15, 2025
2 parents 6e8ae7f + 2d35bda commit 5473c0b
Show file tree
Hide file tree
Showing 42 changed files with 616 additions and 599 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/discord_notify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Discord Notify

on:
pull_request_target:
types: [labeled]

jobs:
notify:
if: ${{ github.event.label.name == 'React Core Team' }}
runs-on: ubuntu-latest
steps:
- name: Discord Webhook Action
uses: tsickert/[email protected]
with:
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
embed-author-name: ${{ github.event.pull_request.user.login }}
embed-author-url: ${{ github.event.pull_request.user.html_url }}
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
embed-description: ${{ github.event.pull_request.body }}
embed-url: ${{ github.event.pull_request.html_url }}
8 changes: 8 additions & 0 deletions src/components/Layout/HomeContent.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,14 @@ export function HomeContent() {
label="API Reference">
API 참고서
</ButtonLink>
<ButtonLink
href={'https://ko-react-exy5xcwjj-fbopensource.vercel.app/'}
type="secondary"
size="lg"
className="w-full sm:w-auto justify-center"
label="API Reference">
React v18 한글
</ButtonLink>
</div>
</div>

Expand Down
24 changes: 24 additions & 0 deletions src/components/Layout/TopNav/TopNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,22 @@ declare global {
}
}

const react18Icon = (
<svg
stroke="currentColor"
fill="none"
strokeWidth="2"
viewBox="0 0 24 24"
strokeLinecap="round"
strokeLinejoin="round"
height="200px"
width="200px"
xmlns="http://www.w3.org/2000/svg">
<path d="M8 8h1v8"></path>
<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>
</svg>
);

const darkIcon = (
<svg
xmlns="http://www.w3.org/2000/svg"
Expand Down Expand Up @@ -346,6 +362,14 @@ export default function TopNav({
<IconSearch className="w-5 h-5 align-middle" />
</button>
</div>
<div className="flex">
<Link
href="https://ko-react-exy5xcwjj-fbopensource.vercel.app/"
aria-label="React version 18 Korean translation"
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">
{react18Icon}
</Link>
</div>
<div className="flex dark:hidden">
<button
type="button"
Expand Down
2 changes: 1 addition & 1 deletion src/components/MDX/TerminalBlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function TerminalBlock({level = 'info', children}: TerminalBlockProps) {
</div>
</div>
<div
className="px-8 pt-4 pb-6 text-primary-dark dark:text-primary-dark font-mono text-code whitespace-pre overflow-x-scroll"
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} />
Expand Down
5 changes: 5 additions & 0 deletions src/content/community/conferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ June 13 - 17, 2025. In-person in Amsterdam, Netherlands + remote (hybrid event)

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

### React Universe Conf 2025 {/*react-universe-conf-2025*/}
September 2-4, 2025. Wrocław, Poland.

[Website](https://www.reactuniverseconf.com/) - [Twitter](https://twitter.com/react_native_eu) - [LinkedIn](https://www.linkedin.com/events/reactuniverseconf7163919537074118657/)

## Past Conferences {/*past-conferences*/}

### React Africa 2024 {/*react-africa-2024*/}
Expand Down
4 changes: 2 additions & 2 deletions src/content/learn/add-react-to-an-existing-project.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ title: 기존 프로젝트에 React 추가하기
다음과 같이 설정하는 것을 추천합니다.

1. [React 기반 프레임워크](/learn/start-a-new-react-project) 중 하나를 사용하여 **앱의 React 부분을 빌드하세요.**
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/)를 사용하세요!)
3. **서버 또는 프록시를 구성**하여 `/some-app/` 하위의 모든 요청이 React 애플리케이션에서 처리되도록 하세요.
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/)를 사용하세요!)
3. **서버 또는 프록시를 구성**하여 `/some-app/` 하위의 모든 요청이 React 앱에서 처리되도록 하세요.

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

Expand Down
Loading

0 comments on commit 5473c0b

Please sign in to comment.