Skip to content

Commit 585194f

Browse files
authored
Merge pull request #121 from reactjs/sync-9000e6e0
2 parents 3810e91 + 0241a5e commit 585194f

File tree

5 files changed

+35
-3
lines changed

5 files changed

+35
-3
lines changed

.github/workflows/discord_notify.yml

+21
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/MDX/TerminalBlock.tsx

+1-1
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

+5
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

+6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@ Recimo da imate postojeći veb sajt na `example.com` napravljen sa nekom drugom
2020

2121
Evo kako preporučujemo da to uradite:
2222

23+
<<<<<<< HEAD
2324
1. **Napravite React deo vaše aplikacije** koristeći jedan od [React-based framework-a](/learn/start-a-new-react-project).
2425
2. **Specifikujte `/some-app` kao *base path*** u konfiguraciji vašeg framework-a (evo kako: [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/)).
2526
3. **Konfigurišite vaš server ili proxy** tako da sve rute ispod `/some-app/` budu obrađene od strane vaše React aplikacije.
27+
=======
28+
1. **Build the React part of your app** using one of the [React-based frameworks](/learn/start-a-new-react-project).
29+
2. **Specify `/some-app` as the *base path*** in your framework's configuration (here's how: [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/)).
30+
3. **Configure your server or a proxy** so that all requests under `/some-app/` are handled by your React app.
31+
>>>>>>> 9000e6e003854846c4ce5027703b5ce6f81aad80
2632
2733
Ovo će omogućiti React delu vaše aplikacije da [koristi najbolje prakse](/learn/start-a-new-react-project#can-i-use-react-without-a-framework) koje su ugrađene u te framework-e.
2834

src/content/reference/rsc/server-functions.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ export async function createNote() {
8282

8383
```
8484

85-
When the bundler builds the `EmptyNote` Client Component, it will create a reference to the `createNoteAction` function in the bundle. When the `button` is clicked, React will send a request to the server to execute the `createNoteAction` function using the reference provided:
85+
When the bundler builds the `EmptyNote` Client Component, it will create a reference to the `createNote` function in the bundle. When the `button` is clicked, React will send a request to the server to execute the `createNote` function using the reference provided:
8686

8787
```js [[1, 2, "createNote"], [1, 5, "createNote"], [1, 7, "createNote"]]
8888
"use client";
8989
import {createNote} from './actions';
9090

9191
function EmptyNote() {
9292
console.log(createNote);
93-
// {$$typeof: Symbol.for("react.server.reference"), $$id: 'createNoteAction'}
93+
// {$$typeof: Symbol.for("react.server.reference"), $$id: 'createNote'}
9494
<button onClick={() => createNote()} />
9595
}
9696
```

0 commit comments

Comments
 (0)