Skip to content

Commit 89f79e9

Browse files
authored
Merge pull request #1570 from reactjs/sync-44b0b5f1
This PR was automatically generated. Merge changes from [react.dev](https://github.com/reactjs/react.dev/commits/main) at 44b0b5f The following files have conflicts and may need new translations: * [ ] [.github/workflows/discord_notify.yml](/reactjs/react.dev/commits/main/.github/workflows/discord_notify.yml) * [ ] [.github/workflows/label_core_team_prs.yml](/reactjs/react.dev/commits/main/.github/workflows/label_core_team_prs.yml) * [ ] [package.json](/reactjs/react.dev/commits/main/package.json) * [ ] [src/components/Layout/Footer.tsx](/reactjs/react.dev/commits/main/src/components/Layout/Footer.tsx) * [ ] [src/components/MDX/Sandpack/sandpack-rsc/sandbox-code/src/worker-bundle.dist.js](/reactjs/react.dev/commits/main/src/components/MDX/Sandpack/sandpack-rsc/sandbox-code/src/worker-bundle.dist.js) * [ ] [src/content/blog/2021/06/08/the-plan-for-react-18.md](/reactjs/react.dev/commits/main/src/content/blog/2021/06/08/the-plan-for-react-18.md) * [ ] [src/content/blog/2022/03/08/react-18-upgrade-guide.md](/reactjs/react.dev/commits/main/src/content/blog/2022/03/08/react-18-upgrade-guide.md) * [ ] [src/content/blog/2022/03/29/react-v18.md](/reactjs/react.dev/commits/main/src/content/blog/2022/03/29/react-v18.md) * [ ] [src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md](/reactjs/react.dev/commits/main/src/content/blog/2022/06/15/react-labs-what-we-have-been-working-on-june-2022.md) * [ ] [src/content/blog/2024/04/25/react-19-upgrade-guide.md](/reactjs/react.dev/commits/main/src/content/blog/2024/04/25/react-19-upgrade-guide.md) * [ ] [src/content/blog/2024/05/22/react-conf-2024-recap.md](/reactjs/react.dev/commits/main/src/content/blog/2024/05/22/react-conf-2024-recap.md) * [ ] [src/content/blog/2024/12/05/react-19.md](/reactjs/react.dev/commits/main/src/content/blog/2024/12/05/react-19.md) * [ ] [src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md](/reactjs/react.dev/commits/main/src/content/blog/2025/04/23/react-labs-view-transitions-activity-and-more.md) * [ ] [src/content/blog/2025/10/01/react-19-2.md](/reactjs/react.dev/commits/main/src/content/blog/2025/10/01/react-19-2.md) * [ ] [src/content/blog/2025/10/07/react-compiler-1.md](/reactjs/react.dev/commits/main/src/content/blog/2025/10/07/react-compiler-1.md) * [ ] [src/content/blog/index.md](/reactjs/react.dev/commits/main/src/content/blog/index.md) * [ ] [src/content/community/acknowledgements.md](/reactjs/react.dev/commits/main/src/content/community/acknowledgements.md) * [ ] [src/content/community/conferences.md](/reactjs/react.dev/commits/main/src/content/community/conferences.md) * [ ] [src/content/community/index.md](/reactjs/react.dev/commits/main/src/content/community/index.md) * [ ] [src/content/community/team.md](/reactjs/react.dev/commits/main/src/content/community/team.md) * [ ] [src/content/community/versioning-policy.md](/reactjs/react.dev/commits/main/src/content/community/versioning-policy.md) * [ ] [src/content/learn/react-compiler/debugging.md](/reactjs/react.dev/commits/main/src/content/learn/react-compiler/debugging.md) * [ ] [src/content/learn/react-compiler/installation.md](/reactjs/react.dev/commits/main/src/content/learn/react-compiler/installation.md) * [ ] [src/content/learn/tutorial-tic-tac-toe.md](/reactjs/react.dev/commits/main/src/content/learn/tutorial-tic-tac-toe.md) * [ ] [src/content/reference/eslint-plugin-react-hooks/lints/incompatible-library.md](/reactjs/react.dev/commits/main/src/content/reference/eslint-plugin-react-hooks/lints/incompatible-library.md) * [ ] [src/content/reference/react-dom/client/hydrateRoot.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/client/hydrateRoot.md) * [ ] [src/content/reference/react-dom/components/common.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/components/common.md) * [ ] [src/content/reference/react-dom/components/form.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/components/form.md) * [ ] [src/content/reference/react-dom/server/index.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/server/index.md) * [ ] [src/content/reference/react-dom/server/renderToPipeableStream.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/server/renderToPipeableStream.md) * [ ] [src/content/reference/react-dom/server/renderToReadableStream.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/server/renderToReadableStream.md) * [ ] [src/content/reference/react-dom/server/resume.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/server/resume.md) * [ ] [src/content/reference/react-dom/server/resumeToPipeableStream.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/server/resumeToPipeableStream.md) * [ ] [src/content/reference/react-dom/static/index.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/static/index.md) * [ ] [src/content/reference/react-dom/static/prerender.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/static/prerender.md) * [ ] [src/content/reference/react-dom/static/prerenderToNodeStream.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/static/prerenderToNodeStream.md) * [ ] [src/content/reference/react-dom/static/resumeAndPrerender.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/static/resumeAndPrerender.md) * [ ] [src/content/reference/react-dom/static/resumeAndPrerenderToNodeStream.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/static/resumeAndPrerenderToNodeStream.md) * [ ] [src/content/reference/react/Activity.md](/reactjs/react.dev/commits/main/src/content/reference/react/Activity.md) * [ ] [src/content/reference/react/Component.md](/reactjs/react.dev/commits/main/src/content/reference/react/Component.md) * [ ] [src/content/reference/react/Fragment.md](/reactjs/react.dev/commits/main/src/content/reference/react/Fragment.md) * [ ] [src/content/reference/react/Suspense.md](/reactjs/react.dev/commits/main/src/content/reference/react/Suspense.md) * [ ] [src/content/reference/react/ViewTransition.md](/reactjs/react.dev/commits/main/src/content/reference/react/ViewTransition.md) * [ ] [src/content/reference/react/addTransitionType.md](/reactjs/react.dev/commits/main/src/content/reference/react/addTransitionType.md) * [ ] [src/content/reference/react/apis.md](/reactjs/react.dev/commits/main/src/content/reference/react/apis.md) * [ ] [src/content/reference/react/startTransition.md](/reactjs/react.dev/commits/main/src/content/reference/react/startTransition.md) * [ ] [src/content/reference/react/use.md](/reactjs/react.dev/commits/main/src/content/reference/react/use.md) * [ ] [src/content/reference/react/useDeferredValue.md](/reactjs/react.dev/commits/main/src/content/reference/react/useDeferredValue.md) * [ ] [src/content/reference/react/useLayoutEffect.md](/reactjs/react.dev/commits/main/src/content/reference/react/useLayoutEffect.md) * [ ] [src/content/reference/react/useTransition.md](/reactjs/react.dev/commits/main/src/content/reference/react/useTransition.md) * [ ] [src/content/reference/rsc/server-components.md](/reactjs/react.dev/commits/main/src/content/reference/rsc/server-components.md) * [ ] [src/content/versions.md](/reactjs/react.dev/commits/main/src/content/versions.md) * [ ] [src/content/warnings/invalid-aria-prop.md](/reactjs/react.dev/commits/main/src/content/warnings/invalid-aria-prop.md) * [ ] [src/content/warnings/invalid-hook-call-warning.md](/reactjs/react.dev/commits/main/src/content/warnings/invalid-hook-call-warning.md) * [ ] [yarn.lock](/reactjs/react.dev/commits/main/yarn.lock) 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 1a06ee4 + febe963 commit 89f79e9

91 files changed

Lines changed: 6293 additions & 404 deletions

File tree

Some content is hidden

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

‎.claude/skills/docs-writer-blog/SKILL.md‎

Lines changed: 4 additions & 4 deletions

‎.claude/skills/react-expert/SKILL.md‎

Lines changed: 8 additions & 8 deletions

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
contact_links:
22
- name: 📃 Bugs in React
3-
url: https://github.com/facebook/react/issues/new/choose
3+
url: https://github.com/react/react/issues/new/choose
44
about: This issue tracker is not for bugs in React. Please file React issues here.
55
- name: 🤔 Questions and Help
66
url: https://reactjs.org/community/support.html
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Discord Notify
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, ready_for_review]
6+
7+
permissions: {}
8+
9+
jobs:
10+
check_maintainer:
11+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
12+
permissions:
13+
# Used by check_maintainer
14+
contents: read
15+
with:
16+
actor: ${{ github.event.pull_request.user.login }}
17+
18+
notify:
19+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
20+
needs: check_maintainer
21+
runs-on: ubuntu-latest
22+
steps:
23+
- name: Discord Webhook Action
24+
uses: tsickert/discord-webhook@v6.0.0
25+
with:
26+
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
27+
embed-author-name: ${{ github.event.pull_request.user.login }}
28+
embed-author-url: ${{ github.event.pull_request.user.html_url }}
29+
embed-author-icon-url: ${{ github.event.pull_request.user.avatar_url }}
30+
embed-title: '#${{ github.event.number }} (+${{github.event.pull_request.additions}} -${{github.event.pull_request.deletions}}): ${{ github.event.pull_request.title }}'
31+
embed-description: ${{ github.event.pull_request.body }}
32+
embed-url: ${{ github.event.pull_request.html_url }}
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Label Core Team PRs
2+
3+
on:
4+
pull_request_target:
5+
6+
permissions: {}
7+
8+
env:
9+
TZ: /usr/share/zoneinfo/America/Los_Angeles
10+
# https://github.com/actions/cache/blob/main/tips-and-workarounds.md#cache-segment-restore-timeout
11+
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 1
12+
13+
jobs:
14+
check_maintainer:
15+
uses: react/react/.github/workflows/shared_check_maintainer.yml@main
16+
permissions:
17+
# Used by check_maintainer
18+
contents: read
19+
with:
20+
actor: ${{ github.event.pull_request.user.login }}
21+
22+
label:
23+
if: ${{ needs.check_maintainer.outputs.is_core_team == 'true' }}
24+
runs-on: ubuntu-latest
25+
needs: check_maintainer
26+
permissions:
27+
# Used to add labels on issues
28+
issues: write
29+
# Used to add labels on PRs
30+
pull-requests: write
31+
steps:
32+
- name: Label PR as React Core Team
33+
uses: actions/github-script@v7
34+
with:
35+
script: |
36+
github.rest.issues.addLabels({
37+
owner: context.repo.owner,
38+
repo: context.repo.repo,
39+
issue_number: ${{ github.event.number }},
40+
labels: ['React Core Team']
41+
});

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ public/rss.xml
5151

5252
# worktrees
5353
.worktrees/
54+
55+
# Generated OG images (scripts/generateOgImages.mjs)
56+
public/images/og/
Lines changed: 3 additions & 0 deletions
Lines changed: 3 additions & 0 deletions
Lines changed: 7 additions & 0 deletions

‎eslint-local-rules/__tests__/lint-markdown-code-blocks.test.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,37 @@ async function run() {
110110
malformedFixed.output.includes("{expectedErrors: {'react-compiler': [4]}}"),
111111
'expected malformed metadata to be replaced with canonical form'
112112
);
113+
114+
const validHighlightResult = await lintFixture('valid-highlight.md');
115+
assert.strictEqual(
116+
validHighlightResult.messages.length,
117+
0,
118+
'expected a valid inline highlight to pass'
119+
);
120+
121+
const missingHighlightResult = await lintFixture('missing-highlight.md');
122+
assert.strictEqual(
123+
missingHighlightResult.messages.length,
124+
1,
125+
'expected a highlight with text missing from its line to fail'
126+
);
127+
assert.strictEqual(
128+
missingHighlightResult.messages[0].message,
129+
"Could not find 'submitAction' on highlighted line 1"
130+
);
131+
132+
const outOfBoundsHighlightResult = await lintFixture(
133+
'out-of-bounds-highlight.md'
134+
);
135+
assert.strictEqual(
136+
outOfBoundsHighlightResult.messages.length,
137+
1,
138+
'expected an out-of-bounds highlight line to fail'
139+
);
140+
assert.strictEqual(
141+
outOfBoundsHighlightResult.messages[0].message,
142+
'Code highlight line 3 is outside this code block'
143+
);
113144
}
114145

115146
run().catch((error) => {

0 commit comments

Comments
 (0)