Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: reactjs/vi.react.dev
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: reactjs/vi.react.dev
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sync-2a2e02f1
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 39 files changed
  • 2 contributors

Commits on Jul 8, 2024

  1. merging all conflicts

    @react-translations-bot
    react-translations-bot committed Jul 8, 2024
    Copy the full SHA
    31aa888 View commit details

Commits on May 10, 2025

  1. resolve conflict

    @ltmylinh
    ltmylinh committed May 10, 2025
    Copy the full SHA
    63a3c3c View commit details
Showing with 1,528 additions and 159 deletions.
  1. +1 −0 package.json
  2. +12 −0 public/images/brand/logo_dark.svg
  3. +10 −0 public/images/brand/logo_light.svg
  4. +15 −0 public/images/brand/wordmark_dark.svg
  5. +11 −0 public/images/brand/wordmark_light.svg
  6. +2 −2 src/components/Layout/Page.tsx
  7. +145 −0 src/components/Layout/TopNav/BrandMenu.tsx
  8. +35 −32 src/components/Layout/TopNav/TopNav.tsx
  9. +0 −6 src/components/PageHeading.tsx
  10. +104 −21 src/content/blog/2024/04/25/react-19-upgrade-guide.md
  11. +5 −12 src/content/blog/2024/04/25/react-19.md
  12. +124 −0 src/content/blog/2024/05/22/react-conf-2024-recap.md
  13. +10 −4 src/content/blog/index.md
  14. +58 −48 src/content/community/conferences.md
  15. +1 −1 src/content/community/meetups.md
  16. +1 −1 src/content/community/team.md
  17. +1 −1 src/content/learn/installation.md
  18. +410 −0 src/content/learn/react-compiler.md
  19. +1 −1 src/content/learn/reusing-logic-with-custom-hooks.md
  20. +1 −1 src/content/learn/separating-events-from-effects.md
  21. +1 −1 src/content/learn/synchronizing-with-effects.md
  22. +2 −2 src/content/reference/react-dom/components/form.md
  23. +3 −3 src/content/reference/react-dom/components/link.md
  24. +6 −6 src/content/reference/react-dom/components/script.md
  25. +2 −2 src/content/reference/react-dom/components/style.md
  26. +1 −1 src/content/reference/react-dom/preinit.md
  27. +177 −0 src/content/reference/react/act.md
  28. +1 −0 src/content/reference/react/apis.md
  29. +1 −1 src/content/reference/react/cache.md
  30. +3 −1 src/content/reference/react/useEffect.md
  31. +1 −1 src/content/reference/rsc/server-actions.md
  32. +1 −1 src/content/reference/rsc/server-components.md
  33. +1 −1 src/content/warnings/react-test-renderer.md
  34. +0 −1 src/pages/_document.tsx
  35. +11 −4 src/sidebarBlog.json
  36. +5 −0 src/sidebarLearn.json
  37. +7 −3 src/sidebarReference.json
  38. +5 −0 vercel.json
  39. +353 −1 yarn.lock
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -27,6 +27,7 @@
"@docsearch/css": "3.0.0-alpha.41",
"@docsearch/react": "3.0.0-alpha.41",
"@headlessui/react": "^1.7.0",
"@radix-ui/react-context-menu": "^2.1.5",
"body-scroll-lock": "^3.1.3",
"classnames": "^2.2.6",
"date-fns": "^2.16.1",
12 changes: 12 additions & 0 deletions public/images/brand/logo_dark.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions public/images/brand/logo_light.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading