Merge branch 'main' into release-next

Author: brophdawg11

contributors.yml

@@ -216,6 +216,7 @@
 - maruffahmed
 - marvinruder
 - mathpaquette
+- matmilbury
 - matt-harro
 - matthewlynch
 - maximevtush
@@ -242,6 +243,7 @@
 - mtliendo
 - namoscato
 - ned-park
+- nenene3
 - nikeee
 - nilubisan
 - Nismit
@@ -303,6 +305,7 @@
 - SimenB
 - SkayuX
 - skratchdot
+- smff
 - smithki
 - soartec-lab
 - sorokya

docs/api/hooks/useNavigate.md

@@ -27,7 +27,7 @@ function SomeComponent() {
 }
 ```
 
-It's often better to use [redirect](../Utils/redirect) in [ActionFunction](../Other/ActionFunction) and [LoaderFunction](../Other/LoaderFunction) than this hook.
+It's often better to use [redirect](../utils/redirect) in [ActionFunction](../Other/ActionFunction) and [LoaderFunction](../Other/LoaderFunction) than this hook.
 
 ## Signature
 

docs/explanation/sessions-and-cookies.md

@@ -72,7 +72,7 @@ export async function action({
 }
 ```
 
-See the [Session API][session-api] for more all the methods available on the session object.
+See the [Session API][session-api] for all methods available on the session object.
 
 ### Login form example
 

docs/how-to/security.md

@@ -0,0 +1,25 @@
+---
+title: Security
+---
+
+# Security
+
+This is by no means a comprehensive guide, but React Router provides features to help address a few aspects under the _very large_ umbrella that is _Security_.
+
+## `Content-Security-Policy`
+
+If you are implementing a [Content-Security-Policy (CSP)][csp] in your application, specifically one using the `unsafe-inline` directive, you will need to specify a [`nonce`][nonce] attribute on the inline `<script>` elements rendered in your HTML. This must be specified on any API that generates inline scripts, including:
+
+- [`<Scripts nonce>`][scripts] (`root.tsx`)
+- [`<ScrollRestoration nonce>`][scrollrestoration] (`root.tsx`)
+- [`<ServerRouter nonce>`][serverrouter] (`entry.server.tsx`)
+- [`renderToPipeableStream(..., { nonce })`][renderToPipeableStream] (`entry.server.tsx`)
+- [`renderToReadableStream(..., { nonce })`][renderToReadableStream] (`entry.server.tsx`)
+
+[csp]: https://developer.mozilla.org/en-US/docs/Web/HTTP/Guides/CSP
+[nonce]: https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/nonce
+[renderToPipeableStream]: https://react.dev/reference/react-dom/server/renderToPipeableStream
+[renderToReadableStream]: https://react.dev/reference/react-dom/server/renderToReadableStream
+[scripts]: ../api/components/Scripts
+[scrollrestoration]: ../api/components/ScrollRestoration
+[serverrouter]: ../api/components/ServerRouter

docs/start/data/data-loading.md

@@ -38,3 +38,7 @@ function MyRoute() {
 ```
 
 As the user navigates between routes, the loaders are called before the route component is rendered.
+
+---
+
+Next: [Actions](./actions)

docs/start/data/route-object.md

@@ -181,6 +181,6 @@ createBrowserRouter([
 
 ---
 
-Next: [Rendering Strategies](./rendering)
+Next: [Data Loading](./data-loading)
 
 [loader-params]: https://api.reactrouter.com/v7/interfaces/react_router.LoaderFunctionArgs

docs/start/declarative/navigating.md

@@ -127,3 +127,7 @@ export function LoginPage() {
   );
 }
 ```
+
+---
+
+Next: [Url values](./url-values)

docs/start/declarative/routing.md

@@ -231,3 +231,7 @@ function Header() {
   );
 }
 ```
+
+---
+
+Next: [Navigating](./navigating)

docs/upgrading/component-routes.md

@@ -343,7 +343,7 @@ The first few routes you migrate are the hardest because you often have to acces
 
 ## Enable SSR and/or Pre-rendering
 
-If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server. See [Deploying][deploying] for more information.
+If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server.
 
 ```ts filename=react-router.config.ts
 import type { Config } from "@react-router/dev/config";
@@ -357,7 +357,6 @@ export default {
 ```
 
 [upgrade-router-provider]: ./router-provider
-[deploying]: ../start/deploying
 [configuring-routes]: ../start/framework/routing
 [route-modules]: ../start/framework/route-module
 [type-safety]: ../how-to/route-module-type-safety

docs/upgrading/router-provider.md

@@ -422,7 +422,7 @@ You can checkout [Type Safety][type-safety] to learn how to fully setup and use
 
 ## Enable SSR and/or Pre-rendering
 
-If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server. See [Deploying][deploying] for more information.
+If you want to enable server rendering and static pre-rendering, you can do so with the `ssr` and `prerender` options in the bundler plugin. For SSR you'll need to also deploy the server build to a server.
 
 ```ts filename=react-router.config.ts
 import type { Config } from "@react-router/dev/config";
@@ -436,7 +436,6 @@ export default {
 ```
 
 [upgrade-component-routes]: ./component-routes
-[deploying]: ../start/deploying
 [configuring-routes]: ../start/framework/routing
 [route-modules]: ../start/framework/route-module
 [type-safety]: ../how-to/route-module-type-safety