Merge branch 'main' into release-next

pcattori · pcattori · commit 4e989f839a6a · 2025-06-03T16:19:06.000-04:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -8,6 +8,20 @@ body:
       value: |
         Thank you for helping to improve React Router!
 
+        - **All** bugs must have a **minimal** reproduction
+          - Minimal means that it is not just pointing to a deployed site or a branch in your existing application
+          - The preferred method is StackBlitz via [https://reactrouter.com/new](https://reactrouter.com/new)
+          - If Stackblitz is not an option, a Github repo based on a fresh `create-react-router` app is acceptable
+          - Only in extraordinary circumstances will code snippets or maximal reproductions be accepted
+        - Issue Review
+          - Issues not meeting the above criteria will be closed and pointed to this document
+          - Non-issues (feature requests, usage questions) will also be closed with a link to this document
+          - The SC will triage issues regularly
+        - Fixing Issues
+          - The SC will mark good community issues with an `Accepting PRs` label
+          - These issues will generally be ones that are likely to have a small surface area fix
+          - However, anyone can work on any issue but there's no guarantee the PR will be accepted if the surface area is too large for expedient review by a core team member
+
         ## Option 1: Submit a PR with a failing test
 
         🏆 The most helpful reproduction is to use our _bug report integration test_ template:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -51,7 +51,7 @@ jobs:
         # publish to npm.
       - name: 🚀 PR / Publish
         id: changesets
-        uses: changesets/action@v1.4.10
+        uses: changesets/action@v1.5.3
         with:
           version: pnpm run changeset:version
           commit: "chore: Update version for release"
diff --git a/.github/workflows/support.yml b/.github/workflows/support.yml
@@ -11,7 +11,7 @@ jobs:
   action:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/support-requests@v3
+      - uses: dessant/support-requests@v4
         with:
           issue-comment: >
             :wave: @{issue-author}, we use the issue tracker exclusively for bug reports
diff --git a/GOVERNANCE.md b/GOVERNANCE.md
diff --git a/contributors.yml b/contributors.yml
@@ -387,7 +387,9 @@
 - williamsdyyz
 - willsawyerrrr
 - willsmithte
+- Willvillegas
 - wkovacs64
+- woodywoodsta
 - xavier-lc
 - xcsnowcity
 - xdaxer
@@ -397,3 +399,4 @@
 - yuleicul
 - zeromask1337
 - zheng-chuang
+- zxTomw
diff --git a/docs/start/data/custom.md b/docs/start/data/custom.md
@@ -31,7 +31,7 @@ let router = createBrowserRouter([
         path: "shows/:showId",
         Component: Show,
         loader: ({ request, params }) =>
-          fetch(`/api/show/${params.id}.json`, {
+          fetch(`/api/show/${params.showId}.json`, {
             signal: request.signal,
           }),
       },
diff --git a/docs/start/framework/pending-ui.md b/docs/start/framework/pending-ui.md
@@ -63,7 +63,7 @@ function Navbar() {
 
 ## Pending Form Submission
 
-When a form is submitted, the UI should immediately respond to the user's actions with a pending state. This is easiest to do with a [fetcher][use_fetcher] form because it has it's own independent state (whereas normal forms cause a global navigation).
+When a form is submitted, the UI should immediately respond to the user's actions with a pending state. This is easiest to do with a [fetcher][use_fetcher] form because it has its own independent state (whereas normal forms cause a global navigation).
 
 ```tsx filename=app/project.tsx lines=[10-12]
 import { useFetcher } from "react-router";
diff --git a/docs/start/framework/route-module.md b/docs/start/framework/route-module.md
@@ -309,7 +309,7 @@ export default function Root() {
 
 ## `meta`
 
-Route meta defines meta tags to be rendered in the `<head>` of the document.
+Route meta defines meta tags to be rendered in the `<Meta />` component, usually placed in the `<head>`.
 
 <docs-warning>
 
@@ -335,7 +335,7 @@ export default function MyRoute() {
 
 </docs-warning>
 
-```tsx
+```tsx filename=app/product.tsx
 export function meta() {
   return [
     { title: "Very cool app" },
@@ -351,9 +351,7 @@ export function meta() {
 }
 ```
 
-All routes' meta will be aggregated and rendered through the `<Meta />` component, usually rendered in your app root:
-
-```tsx
+```tsx filename=app/root.tsx
 import { Meta } from "react-router";
 
 export default function Root() {
@@ -369,6 +367,8 @@ export default function Root() {
 }
 ```
 
+The meta of the last matching route is used, allowing you to override parent routes' meta. It's important to note that the entire meta descriptor array is replaced, not merged. This gives you the flexibility to build your own meta composition logic across pages at different levels.
+
 **See also**
 
 - [`meta` params][meta-params]
