Merge branch 'main' into release-next

Author: brophdawg11

README.md

@@ -1,6 +1,6 @@
 [![npm package][npm-badge]][npm] [![build][build-badge]][build]
 
-[npm-badge]: https://img.shields.io/npm/v/react-router-dom.svg?style=flat-square
+[npm-badge]: https://img.shields.io/npm/v/react-router-dom.svg
 [npm]: https://www.npmjs.org/package/react-router-dom
 [build-badge]: https://img.shields.io/github/actions/workflow/status/remix-run/react-router/test.yml?branch=dev&style=square
 [build]: https://github.com/remix-run/react-router/actions/workflows/test.yml

contributors.yml

@@ -97,11 +97,13 @@
 - emzoumpo
 - engpetermwangi
 - ericschn
+- esadek
 - faergeek
 - FilipJirsak
 - focusotter
 - foxscotch
 - frontsideair
+- fucancode
 - fyzhu
 - fz6m
 - gaspard
@@ -195,6 +197,7 @@
 - m-dad
 - m-shojaei
 - machour
+- majamarijan
 - Manc
 - manzano78
 - marc2332
@@ -307,6 +310,7 @@
 - TkDodo
 - tkindy
 - tlinhart
+- tobias-edwards
 - tom-sherman
 - tomasr8
 - tony-sn

docs/start/framework/navigating.md

@@ -126,7 +126,7 @@ Forms with `<Form method="post" />` will also navigate to the action prop but wi
 
 ## redirect
 
-Inside of route loaders and actions, you can `redirect` to another URL.
+Inside of route loaders and actions, you can return a `redirect` to another URL.
 
 ```tsx
 import { redirect } from "react-router";

docs/upgrading/component-routes.md

@@ -211,11 +211,11 @@ In general:
 
 Note that your `root.tsx` file will be statically generated and served as the entry point of your app, so just that module will need to be compatible with server rendering. This is where most of your trouble will come.
 
-## 6. Setup your routes
+## 6. Set up your routes
 
 The React Router Vite plugin uses a `routes.ts` file to configure your routes. For now we'll add a simple catchall route to get things going.
 
-**👉 Setup a `catchall.tsx` route**
+**👉 Set up a `catchall.tsx` route**
 
 ```shellscript nonumber
 touch src/routes.ts src/catchall.tsx
@@ -269,11 +269,11 @@ You will probably want to add `.react-router/` to your `.gitignore` file to avoi
 .react-router/
 ```
 
-You can checkout [Type Safety][type-safety] to learn how to fully setup and use autogenerated type safety for params, loader data, and more.
+You can check out [Type Safety][type-safety] to learn how to fully set up and use autogenerated type safety for params, loader data, and more.
 
 ## 8. Render your app
 
-To get back to rendering your app, we'll update the "catchall" route we setup earlier that matches all URLs so that your existing `<Routes>` get a chance to render.
+To get back to rendering your app, we'll update the "catchall" route we set up earlier that matches all URLs so that your existing `<Routes>` get a chance to render.
 
 **👉 Update the catchall route to render your app**
 
@@ -337,7 +337,7 @@ export default function Component({ loaderData }) {
 }
 ```
 
-See [Type Safety][type-safety] to setup autogenerated type safety for params, loader data, and more.
+See [Type Safety][type-safety] to set up autogenerated type safety for params, loader data, and more.
 
 The first few routes you migrate are the hardest because you often have to access various abstractions a bit differently than before (like in a loader instead of from a hook or context). But once the trickiest bits get dealt with, you get into an incremental groove.
 

tutorials/address-book/app/data.ts

@@ -311,6 +311,9 @@ export async function deleteContact(id: string) {
 ].forEach((contact) => {
   fakeContacts.create({
     ...contact,
-    id: `${contact.first.toLowerCase()}-${contact.last.toLocaleLowerCase()}`,
+    id: `${contact.first
+      .toLowerCase()
+      .split(" ")
+      .join("_")}-${contact.last.toLocaleLowerCase()}`,
   });
 });