Merge branch 'main' into release-6.4.3

Author: brophdawg11

contributors.yml

@@ -1,10 +1,12 @@
 - abdallah-nour
 - abhi-kr-2100
+- adamdotjs
 - Ajayff4
 - alany411
 - alexlbr
 - AmRo045
 - andreiduca
+- arnassavickas
 - aroyan
 - avipatel97
 - awreese
@@ -28,6 +30,7 @@
 - dauletbaev
 - david-crespo
 - dokeet
+- Drishtantr
 - edwin177
 - ekaansharora
 - elanis
@@ -73,6 +76,7 @@
 - loun4
 - lqze
 - lukerSpringTree
+- Manc
 - manzano78
 - marc2332
 - markivancho
@@ -107,6 +111,7 @@
 - SkayuX
 - souzasmatheus
 - srmagura
+- stasundr
 - tanayv
 - theostavrides
 - thisiskartik

docs/hooks/use-route-loader-data.md

@@ -45,3 +45,5 @@ const user = useRouteLoaderData("root");
 ```
 
 The only data available is the routes that are currently rendered. If you ask for data from a route that is not currently rendered, the hook will return `undefined`.
+
+[pickingarouter]: ../routers/picking-a-router

docs/routers/picking-a-router.md

@@ -6,7 +6,7 @@ new: true
 
 # Picking a Router
 
-While your app will only use a single router, several routers are available depending on the environment you're app is running in. This document should help you figure out which one to use.
+While your app will only use a single router, several routers are available depending on the environment your app is running in. This document should help you figure out which one to use.
 
 ## Using v6.4 Data APIs
 
@@ -66,6 +66,15 @@ If you're not interested in the data APIs, you can continue to use [`<BrowserRou
 
 Testing components that use React Router APIs is easiest with [`createMemoryRouter`][creatememoryrouter] or [`<MemoryRouter>`][memoryrouter] instead of the routers you use in your app that require DOM history APIs.
 
+Some of the React Router APIs internally use `fetch`, which is only supported starting from Node.js v18. If your project uses v17 or lower, you should add a `fetch` polyfill manually. One way to do that, is to install [`whatwg-fetch`](https://www.npmjs.com/package/whatwg-fetch) and add it to your `jest.config.js` file like so:
+
+```js
+module.exports = {
+  setupFiles: ["whatwg-fetch"],
+  // ...rest of the config
+};
+```
+
 ## React Native
 
 You will use [`<NativeRouter>`][nativerouter] from React Native projects.

docs/start/tutorial.md

@@ -5,7 +5,7 @@ order: 2
 
 # Tutorial
 
-Welcome to the tutorial! We'll be building a small, but feature-rich app that let's you keep track of your contacts. We expect it to take between 30-60m if you're following along.
+Welcome to the tutorial! We'll be building a small, but feature-rich app that lets you keep track of your contacts. We expect it to take between 30-60m if you're following along.
 
 <img class="tutorial" src="/_docs/tutorial/15.webp" />
 
@@ -519,7 +519,7 @@ const router = createBrowserRouter([
 
 👉 **Access and render the data**
 
-```jsx filename=src/routes/root.jsx lines=[4,11,19-39]
+```jsx filename=src/routes/root.jsx lines=[4,11,19-40]
 import {
   Outlet,
   Link,