Skip to content

Commit 362c78b

Browse files
authored
Sync with react.dev @ abe931a (#1498)
This PR was automatically generated. Merge changes from [react.dev](https://github.com/reactjs/react.dev/commits/main) at abe931a The following files have conflicts and may need new translations: * [ ] [src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.md](/reactjs/react.dev/commits/main/src/content/blog/2024/02/15/react-labs-what-we-have-been-working-on-february-2024.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/12/05/react-19.md](/reactjs/react.dev/commits/main/src/content/blog/2024/12/05/react-19.md) * [ ] [src/content/blog/2025/02/14/sunsetting-create-react-app.md](/reactjs/react.dev/commits/main/src/content/blog/2025/02/14/sunsetting-create-react-app.md) * [ ] [src/content/community/translations.md](/reactjs/react.dev/commits/main/src/content/community/translations.md) * [ ] [src/content/learn/build-a-react-app-from-scratch.md](/reactjs/react.dev/commits/main/src/content/learn/build-a-react-app-from-scratch.md) * [ ] [src/content/learn/choosing-the-state-structure.md](/reactjs/react.dev/commits/main/src/content/learn/choosing-the-state-structure.md) * [ ] [src/content/learn/creating-a-react-app.md](/reactjs/react.dev/commits/main/src/content/learn/creating-a-react-app.md) * [ ] [src/content/learn/describing-the-ui.md](/reactjs/react.dev/commits/main/src/content/learn/describing-the-ui.md) * [ ] [src/content/learn/editor-setup.md](/reactjs/react.dev/commits/main/src/content/learn/editor-setup.md) * [ ] [src/content/learn/escape-hatches.md](/reactjs/react.dev/commits/main/src/content/learn/escape-hatches.md) * [ ] [src/content/learn/javascript-in-jsx-with-curly-braces.md](/reactjs/react.dev/commits/main/src/content/learn/javascript-in-jsx-with-curly-braces.md) * [ ] [src/content/learn/keeping-components-pure.md](/reactjs/react.dev/commits/main/src/content/learn/keeping-components-pure.md) * [ ] [src/content/learn/lifecycle-of-reactive-effects.md](/reactjs/react.dev/commits/main/src/content/learn/lifecycle-of-reactive-effects.md) * [ ] [src/content/learn/passing-data-deeply-with-context.md](/reactjs/react.dev/commits/main/src/content/learn/passing-data-deeply-with-context.md) * [ ] [src/content/learn/preserving-and-resetting-state.md](/reactjs/react.dev/commits/main/src/content/learn/preserving-and-resetting-state.md) * [ ] [src/content/learn/queueing-a-series-of-state-updates.md](/reactjs/react.dev/commits/main/src/content/learn/queueing-a-series-of-state-updates.md) * [ ] [src/content/learn/referencing-values-with-refs.md](/reactjs/react.dev/commits/main/src/content/learn/referencing-values-with-refs.md) * [ ] [src/content/learn/removing-effect-dependencies.md](/reactjs/react.dev/commits/main/src/content/learn/removing-effect-dependencies.md) * [ ] [src/content/learn/render-and-commit.md](/reactjs/react.dev/commits/main/src/content/learn/render-and-commit.md) * [ ] [src/content/learn/responding-to-events.md](/reactjs/react.dev/commits/main/src/content/learn/responding-to-events.md) * [ ] [src/content/learn/sharing-state-between-components.md](/reactjs/react.dev/commits/main/src/content/learn/sharing-state-between-components.md) * [ ] [src/content/learn/state-a-components-memory.md](/reactjs/react.dev/commits/main/src/content/learn/state-a-components-memory.md) * [ ] [src/content/learn/thinking-in-react.md](/reactjs/react.dev/commits/main/src/content/learn/thinking-in-react.md) * [ ] [src/content/learn/tutorial-tic-tac-toe.md](/reactjs/react.dev/commits/main/src/content/learn/tutorial-tic-tac-toe.md) * [ ] [src/content/learn/updating-objects-in-state.md](/reactjs/react.dev/commits/main/src/content/learn/updating-objects-in-state.md) * [ ] [src/content/learn/writing-markup-with-jsx.md](/reactjs/react.dev/commits/main/src/content/learn/writing-markup-with-jsx.md) * [ ] [src/content/learn/your-first-component.md](/reactjs/react.dev/commits/main/src/content/learn/your-first-component.md) * [ ] [src/content/reference/dev-tools/react-performance-tracks.md](/reactjs/react.dev/commits/main/src/content/reference/dev-tools/react-performance-tracks.md) * [ ] [src/content/reference/react-dom/client/createRoot.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/client/createRoot.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/link.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/components/link.md) * [ ] [src/content/reference/react-dom/components/meta.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/components/meta.md) * [ ] [src/content/reference/react-dom/components/script.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/components/script.md) * [ ] [src/content/reference/react-dom/components/title.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/components/title.md) * [ ] [src/content/reference/react-dom/hooks/useFormStatus.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/hooks/useFormStatus.md) * [ ] [src/content/reference/react-dom/preconnect.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/preconnect.md) * [ ] [src/content/reference/react-dom/prefetchDNS.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/prefetchDNS.md) * [ ] [src/content/reference/react-dom/preinit.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/preinit.md) * [ ] [src/content/reference/react-dom/preinitModule.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/preinitModule.md) * [ ] [src/content/reference/react-dom/preload.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/preload.md) * [ ] [src/content/reference/react-dom/preloadModule.md](/reactjs/react.dev/commits/main/src/content/reference/react-dom/preloadModule.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/Activity.md](/reactjs/react.dev/commits/main/src/content/reference/react/Activity.md) * [ ] [src/content/reference/react/Children.md](/reactjs/react.dev/commits/main/src/content/reference/react/Children.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/act.md](/reactjs/react.dev/commits/main/src/content/reference/react/act.md) * [ ] [src/content/reference/react/addTransitionType.md](/reactjs/react.dev/commits/main/src/content/reference/react/addTransitionType.md) * [ ] [src/content/reference/react/cloneElement.md](/reactjs/react.dev/commits/main/src/content/reference/react/cloneElement.md) * [ ] [src/content/reference/react/createContext.md](/reactjs/react.dev/commits/main/src/content/reference/react/createContext.md) * [ ] [src/content/reference/react/experimental_taintUniqueValue.md](/reactjs/react.dev/commits/main/src/content/reference/react/experimental_taintUniqueValue.md) * [ ] [src/content/reference/react/use.md](/reactjs/react.dev/commits/main/src/content/reference/react/use.md) * [ ] [src/content/reference/react/useActionState.md](/reactjs/react.dev/commits/main/src/content/reference/react/useActionState.md) * [ ] [src/content/reference/react/useEffect.md](/reactjs/react.dev/commits/main/src/content/reference/react/useEffect.md) * [ ] [src/content/reference/react/useEffectEvent.md](/reactjs/react.dev/commits/main/src/content/reference/react/useEffectEvent.md) * [ ] [src/content/reference/react/useId.md](/reactjs/react.dev/commits/main/src/content/reference/react/useId.md) * [ ] [src/content/reference/react/useImperativeHandle.md](/reactjs/react.dev/commits/main/src/content/reference/react/useImperativeHandle.md) * [ ] [src/content/reference/react/useInsertionEffect.md](/reactjs/react.dev/commits/main/src/content/reference/react/useInsertionEffect.md) * [ ] [src/content/reference/react/useOptimistic.md](/reactjs/react.dev/commits/main/src/content/reference/react/useOptimistic.md) * [ ] [src/content/reference/react/useReducer.md](/reactjs/react.dev/commits/main/src/content/reference/react/useReducer.md) * [ ] [src/content/reference/react/useSyncExternalStore.md](/reactjs/react.dev/commits/main/src/content/reference/react/useSyncExternalStore.md) * [ ] [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 5523375 + be3252c commit 362c78b

File tree

91 files changed

+22566
-32391
lines changed

Some content is hidden

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

91 files changed

+22566
-32391
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"react-hooks/exhaustive-deps": "error",
1010
"react/no-unknown-property": ["error", {"ignore": ["meta"]}],
1111
"react-compiler/react-compiler": "error",
12-
"local-rules/lint-markdown-code-blocks": "error"
12+
"local-rules/lint-markdown-code-blocks": "error",
13+
"no-trailing-spaces": "error"
1314
},
1415
"env": {
1516
"node": true,

next.config.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,15 @@ const nextConfig = {
2222
async rewrites() {
2323
return {
2424
beforeFiles: [
25+
// Explicit .md extension also serves markdown
26+
{
27+
source: '/:path*.md',
28+
destination: '/api/md/:path*',
29+
},
2530
// Serve markdown when Accept header prefers text/markdown
2631
// Useful for LLM agents - https://www.skeptrune.com/posts/use-the-accept-header-to-serve-markdown-instead-of-html-to-llms/
2732
{
28-
source: '/:path((?!llms.txt).*)',
33+
source: '/:path((?!llms\\.txt|api/md).*)',
2934
has: [
3035
{
3136
type: 'header',
@@ -35,11 +40,6 @@ const nextConfig = {
3540
],
3641
destination: '/api/md/:path*',
3742
},
38-
// Explicit .md extension also serves markdown
39-
{
40-
source: '/:path*.md',
41-
destination: '/api/md/:path*',
42-
},
4343
],
4444
};
4545
},

0 commit comments

Comments
 (0)