From c8fd1384fa23d74d7dd72aad4915f20b00d7f35f Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 11:40:47 -0700
Subject: [PATCH 01/41] docs: adjusted READMEs for the api docs generator

---
 README.md                                  | 47 ++++++++--------------
 packages/create-react-router/README.md     |  2 -
 packages/react-router-architect/README.md  |  4 +-
 packages/react-router-cloudflare/README.md |  4 +-
 packages/react-router-dev/README.md        |  4 +-
 packages/react-router-dom/README.md        |  7 +++-
 packages/react-router-express/README.md    |  4 +-
 packages/react-router-fs-routes/README.md  |  4 +-
 packages/react-router-node/README.md       |  4 +-
 packages/react-router-serve/README.md      |  4 +-
 packages/react-router/README.md            |  8 +++-
 packages/react-router/tsup.config.ts       |  6 ++-
 12 files changed, 39 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index ebc5397c2b..1e910f7517 100644
--- a/README.md
+++ b/README.md
@@ -1,43 +1,28 @@
-# Welcome to React Router &middot; [![npm package][npm-badge]][npm] [![build][build-badge]][build]
+[![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]: 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
 
-React Router is a lightweight, fully-featured routing library for the [React](https://reactjs.org) JavaScript library. React Router runs anywhere React runs; on the web, on the server with node.js, or on any other Javascript platform that supports the [Web Fetch API][fetch-api].
+React Router is a multi-strategy router for React bridging the gap from React 18 to React 19. You can use it maximally as a React framework or minimally as a library with your own architecture.
 
-If you're new to React Router, we recommend you start with [the tutorial](https://reactrouter.com/en/main/start/tutorial).
-
-If you're migrating to v6 from v5 (or v4, which is the same as v5), check out [the migration guide](/docs/upgrading/v5.md). If you're migrating from Reach Router, check out [the migration guide for Reach Router](/docs/upgrading/reach.md). If you need to find the code for v5, [it is on the `v5` branch](https://github.com/remix-run/react-router/tree/v5).
-
-Documentation for v6 can be found [on our website](https://reactrouter.com/).
-
-## Contributing
-
-There are many different ways to contribute to React Router's development. If you're interested, check out [our contributing guidelines](CONTRIBUTING.md) to learn how you can get involved.
+- [Getting Started - Framework](https://reactrouter.com/start/framework/installation)
+- [Getting Started - Library](https://react.router.com/start/library/installation)
+- [Upgrade from v6](https://reactrouter.com/upgrading/v6)
+- [Upgrade from Remix](https://reactrouter.com/upgrading/remix)
+- [Changelog](https://github.com/remix-run/react-router/blob/main/CHANGELOG.md)
 
 ## Packages
 
-This repository is a monorepo containing the following packages:
-
-- [`@react-router/dev`](/packages/react-router-dev)
-- [`@react-router/express`](/packages/react-router-express)
-- [`@react-router/node`](/packages/react-router-node)
-- [`@react-router/serve`](/packages/react-router-serve)
-- [`react-router`](/packages/react-router)
-- [`react-router-dom`](/packages/react-router-dom)
-
-## Changes
-
-Detailed release notes for a given version can be found [on our releases page](https://github.com/remix-run/react-router/releases).
-
-## Funding
-
-You may provide financial support for this project by donating [via Open Collective](https://opencollective.com/react-router). Thank you for your support!
-
-## About
+- [react-router](./modules/react_router)
+- [@react-router/dev](./modules/_react_router_dev)
+- [@react-router/node](./modules/_react_router_node)
+- [@react-router/cloudflare](./modules/_react_router_cloudflare)
+- [@react-router/serve](./modules/_react_router_serve)
+- [@react-router/fs-routes](./modules/_react_router_fs_routes)
 
-React Router is developed and maintained by [Remix Software](https://remix.run) and many [amazing contributors](https://github.com/remix-run/react-router/graphs/contributors).
+## Previous Versions
 
-[fetch-api]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
+- [v6](https://reactrouter.com/v6)
+- [v5](https://v5.reactrouter.com/)
diff --git a/packages/create-react-router/README.md b/packages/create-react-router/README.md
index 8fcf3653e9..50f449f3b9 100644
--- a/packages/create-react-router/README.md
+++ b/packages/create-react-router/README.md
@@ -1,5 +1,3 @@
-# create-react-router
-
 Create a new React Router app.
 
 ```sh
diff --git a/packages/react-router-architect/README.md b/packages/react-router-architect/README.md
index 897dbdc8f1..f42337f1fb 100644
--- a/packages/react-router-architect/README.md
+++ b/packages/react-router-architect/README.md
@@ -1,6 +1,4 @@
-# @react-router/architect
-
-Architect server request handler for React Router.
+[Architect](https://arc.codes) server request handler for React Router.
 
 ```bash
 npm install @react-router/architect
diff --git a/packages/react-router-cloudflare/README.md b/packages/react-router-cloudflare/README.md
index 9c8b6b051b..6ecbecb41d 100644
--- a/packages/react-router-cloudflare/README.md
+++ b/packages/react-router-cloudflare/README.md
@@ -1,6 +1,4 @@
-# @react-router/cloudflare
-
-Cloudflare platform abstractions for [React Router.](https://reactrouter.com)
+Cloudflare platform abstractions for React Router
 
 ```bash
 npm install @react-router/cloudflare @cloudflare/workers-types
diff --git a/packages/react-router-dev/README.md b/packages/react-router-dev/README.md
index 9cb7bfc251..5629001a4e 100644
--- a/packages/react-router-dev/README.md
+++ b/packages/react-router-dev/README.md
@@ -1,6 +1,4 @@
-# @react-router/dev
-
-Dev tools and CLI for [React Router.](https://github.com/remix-run/react-router)
+Dev tools and CLI for React Router that enables framework features through bundler integration like server rendering, code splitting, HMR, etc.
 
 ```sh
 npm install @react-router/dev
diff --git a/packages/react-router-dom/README.md b/packages/react-router-dom/README.md
index bd8108f900..d7bfd79188 100644
--- a/packages/react-router-dom/README.md
+++ b/packages/react-router-dom/README.md
@@ -1,3 +1,6 @@
-# React Router DOM
+This package simply re-exports everything from `react-router` to smooth the upgrade path for v6 applications. Once upgraded you can change all of your imports and remove it from your dependencies:
 
-The `react-router-dom` package is deprecated and only kept around for backwards-compatibility. It re-exports everything from the `react-router` package - you should convert your applications to import everything from `react-router` in v7 and beyond.
+```diff
+-import { Routes } from "react-router-dom"
++import { Routes } from "react-router"
+```
diff --git a/packages/react-router-express/README.md b/packages/react-router-express/README.md
index b949e57465..63c3de6441 100644
--- a/packages/react-router-express/README.md
+++ b/packages/react-router-express/README.md
@@ -1,6 +1,4 @@
-# @react-router/express
-
-[Express](https://expressjs.com) server request handler for [React Router.](https://github.com/remix-run/react-router)
+[Express](https://expressjs.com) server request handler for React Router.
 
 ```sh
 npm install @react-router/express
diff --git a/packages/react-router-fs-routes/README.md b/packages/react-router-fs-routes/README.md
index d8f961b45b..a3fdebfd6e 100644
--- a/packages/react-router-fs-routes/README.md
+++ b/packages/react-router-fs-routes/README.md
@@ -1,6 +1,4 @@
-# @react-router/fs-routes
-
-File system routing conventions for [React Router](https://github.com/remix-run/react-router), for use within `routes.ts`.
+File system routing conventions for React Router
 
 ```sh
 npm install @react-router/fs-routes
diff --git a/packages/react-router-node/README.md b/packages/react-router-node/README.md
index 6478831278..f789859826 100644
--- a/packages/react-router-node/README.md
+++ b/packages/react-router-node/README.md
@@ -1,6 +1,4 @@
-# @react-router/node
-
-Node.js platform abstractions for [React Router.](https://github.com/remix-run/react-router)
+Node.js platform abstractions for React Router
 
 ```sh
 npm install @react-router/node
diff --git a/packages/react-router-serve/README.md b/packages/react-router-serve/README.md
index 7215d98987..fbee27bc9d 100644
--- a/packages/react-router-serve/README.md
+++ b/packages/react-router-serve/README.md
@@ -1,6 +1,4 @@
-# @react-router/serve
-
-Production application server for [React Router.](https://github.com/remix-run/react-router)
+Node.js application server for React Router
 
 ```sh
 npm install @react-router/serve
diff --git a/packages/react-router/README.md b/packages/react-router/README.md
index 33140afe94..b0d8de42df 100644
--- a/packages/react-router/README.md
+++ b/packages/react-router/README.md
@@ -1,3 +1,7 @@
-# React Router
+`react-router` is the primary package in the React Router project.
 
-The `react-router` package is the heart of [React Router](https://github.com/remix-run/react-router) and provides all the core functionality.
+## Installation
+
+```sh
+npm i react-router
+```
diff --git a/packages/react-router/tsup.config.ts b/packages/react-router/tsup.config.ts
index d673ae2657..5d93e3e81b 100644
--- a/packages/react-router/tsup.config.ts
+++ b/packages/react-router/tsup.config.ts
@@ -40,4 +40,8 @@ const config = (enableDevWarnings: boolean) =>
     },
   ]);
 
-export default defineConfig([...config(false), ...config(true)]);
+export default defineConfig([
+  // @ts-expect-error
+  ...config(false),
+  ...config(true),
+]);

From f664ea894dfaad794c5e98c791b2f8b9c1426424 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Tue, 19 Nov 2024 14:41:23 -0500
Subject: [PATCH 02/41] docs: update remix AppLoadContext migration (#12313)

* docs: update remix AppLoadContext migration

* tweak AppLoadContext section

---------

Co-authored-by: Brooks Lybrand <brookslybrand@gmail.com>
---
 docs/upgrading/remix.md | 55 ++++++++++++++++++++++++++++++++---------
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/docs/upgrading/remix.md b/docs/upgrading/remix.md
index 3e43df5a79..438e05f7d3 100644
--- a/docs/upgrading/remix.md
+++ b/docs/upgrading/remix.md
@@ -313,29 +313,60 @@ If you were using `remix-serve` you can skip this step. This is only applicable
 
 </docs-info>
 
-If you were using `getLoadContext` in your Remix app, then you'll notice that the `LoaderFunctionArgs`/`ActionFunctionArgs` types now type the `context` parameter incorrectly (optional and typed as `any`). These types accept a generic for the `context` type but even that still leaves the property as optional because it does not exist in React Router SPA apps.
+Since React Router can be used as both a React framework _and_ a stand-alone routing library, the `context` argument for `LoaderFunctionArgs` and `ActionFunctionArgs` is now optional and typed as `any` by default. You can register types for your load context to get type safety for your loaders and actions.
 
-The proper long term fix is to move to the new [`Route.LoaderArgs`][server-loaders]/[`Route.ActionArgs`][server-actions] types from the [new typegen in React Router v7][type-safety].
+👉 **Register types for your load context**
 
-However, the short-term solution to ease the upgrade is to use TypeScript's [module augmentation][ts-module-augmentation] feature to override the built in `LoaderFunctionArgs`/`ActionFunctionArgs` interfaces.
+Before you migrate to the new `Route.LoaderArgs` and `Route.ActionArgs` types, you can temporarily augment `LoaderFunctionArgs` and `ActionFunctionArgs` with your load context type to ease migration.
 
-You can do this with the following code in `react-router.config.ts` (just make sure it gets picked up by your `tsconfig.json`'s `include` paths):
+```ts filename=app/env.d.ts
+declare module "react-router" {
+  // Your AppLoadContext used in v2
+  interface AppLoadContext {
+    whatever: string;
+  }
+
+  // TODO: remove this once we've migrated to `Route.LoaderArgs` instead for our loaders
+  interface LoaderFunctionArgs {
+    context: AppLoadContext;
+  }
 
-```ts filename=react-router.config.ts
-// Your AppLoadContext used in v2
-interface AppLoadContext {
-  whatever: string;
+  // TODO: remove this once we've migrated to `Route.ActionArgs` instead for our actions
+  interface ActionFunctionArgs {
+    context: AppLoadContext;
+  }
 }
+```
+
+<docs-info>
 
-// Tell v7 the type of the context and that it is non-optional
+Using `declare module` to register types is a standard TypeScript technique called [module augmentation][ts-module-augmentation].
+You can do this in any TypeScript file covered by your `tsconfig.json`'s `include` field, but we recommend a dedicated `env.d.ts` within your app directory.
+
+</docs-info>
+
+👉 **Use the new types**
+
+Once you adopt the [new type generation][type-safety], you can remove the `LoaderFunctionArgs`/`ActionFunctionArgs` augmentations and use the `context` argument from [`Route.LoaderArgs`][server-loaders] and [`Route.ActionArgs`][server-actions] instead.
+
+```ts filename=app/env.d.ts
 declare module "react-router" {
-  interface LoaderFunctionArgs {
-    context: AppLoadContext;
+  // Your AppLoadContext used in v2
+  interface AppLoadContext {
+    whatever: string;
   }
 }
 ```
 
-This should allow you to upgrade and ship your application on React Router v7, and then you can incrementally migrate routes to the [new typegen approach][type-safety].
+```ts filename=app/routes/my-route.tsx
+import type { Route } from "./+types/my-route";
+
+export function loader({ context }: Route.LoaderArgs) {}
+// { whatever: string }  ^^^^^^^
+
+export function action({ context }: Route.ActionArgs) {}
+// { whatever: string }  ^^^^^^^
+```
 
 Congratulations! You are now on React Router v7. Go ahead and run your application to make sure everything is working as expected.
 

From 6819a737619eae9f62bfb6f8257217490cf3c274 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Wed, 20 Nov 2024 09:38:19 +1100
Subject: [PATCH 03/41] Update basic template to 7.0.0-pre.6 (#12316)

---
 templates/basic/app/routes.ts          | 2 +-
 templates/basic/package.json           | 8 ++++----
 templates/basic/react-router.config.ts | 5 +++++
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 templates/basic/react-router.config.ts

diff --git a/templates/basic/app/routes.ts b/templates/basic/app/routes.ts
index a28611ba20..102b402587 100644
--- a/templates/basic/app/routes.ts
+++ b/templates/basic/app/routes.ts
@@ -1,3 +1,3 @@
 import { type RouteConfig, index } from "@react-router/dev/routes";
 
-export const routes: RouteConfig = [index("routes/home.tsx")];
+export default [index("routes/home.tsx")] satisfies RouteConfig;
diff --git a/templates/basic/package.json b/templates/basic/package.json
index a22a499ca1..a4bd806fa2 100644
--- a/templates/basic/package.json
+++ b/templates/basic/package.json
@@ -9,15 +9,15 @@
     "typecheck": "react-router typegen && tsc"
   },
   "dependencies": {
-    "@react-router/node": "7.0.0-pre.5",
-    "@react-router/serve": "7.0.0-pre.5",
+    "@react-router/node": "7.0.0-pre.6",
+    "@react-router/serve": "7.0.0-pre.6",
     "isbot": "^5.1.17",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "7.0.0-pre.5"
+    "react-router": "7.0.0-pre.6"
   },
   "devDependencies": {
-    "@react-router/dev": "7.0.0-pre.5",
+    "@react-router/dev": "7.0.0-pre.6",
     "@types/react": "^18.3.9",
     "@types/react-dom": "^18.3.0",
     "autoprefixer": "^10.4.20",
diff --git a/templates/basic/react-router.config.ts b/templates/basic/react-router.config.ts
new file mode 100644
index 0000000000..9c6ea11734
--- /dev/null
+++ b/templates/basic/react-router.config.ts
@@ -0,0 +1,5 @@
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  // Config options...
+} satisfies Config;

From 50d8bf1e1bca3d38f6f22e63edb0cd00256d0d4c Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 15:48:49 -0700
Subject: [PATCH 04/41] docs: added SPA how-to

---
 docs/how-to/spa.md | 74 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 docs/how-to/spa.md

diff --git a/docs/how-to/spa.md b/docs/how-to/spa.md
new file mode 100644
index 0000000000..3aedcfc44c
--- /dev/null
+++ b/docs/how-to/spa.md
@@ -0,0 +1,74 @@
+---
+title: Single Page App (SPA)
+---
+
+# Single Page App (SPA)
+
+There are two ways to ship a single page app with React Router
+
+- **as a library** - Instead of using React Router's framework features, you can use it as a library in your own SPA architecture. Refer to [React Router as a Library](../start/library/installation) guides.
+- **as a framework** - This guide will focus here
+
+## 1. Disable Server Rendering
+
+Server rendering and enabled by default. Set the ssr flag to false in `react-router.config.ts` to disable it.
+
+```ts filename=react-router.config.ts lines=[4]
+import { type Config } from "@react-router/dev/config";
+
+export default {
+  ssr: false,
+} satisfies Config;
+```
+
+With this set to false, the server build will no longer be generated.
+
+## 2. Use client loaders and client actions
+
+With server rendering disabled, you can still use `clientLoader` and `clientAction` to manage route data and mutations.
+
+```tsx filename=some-route.tsx
+import { Route } from "./+types/some-route";
+
+export async function clientLoader(
+  _: Route.ClientLoaderArgs
+) {
+  let data = await fetch("/some/api/stuff");
+  return data;
+}
+
+export async function clientAction({
+  request,
+}: Route.ClientActionArgs) {
+  let formData = await request.formData();
+  return await processPayment(formData);
+}
+```
+
+## 3. Pre-rendering
+
+Pre-rendering can be configured for paths with static data known at build time for faster initial page loads. Refer to [Pre-rendering](./pre-rendering) to set it up.
+
+## 4. Serve all URLs to index.html
+
+After running `react-router build`, deploy the `build/client` directory to whatever static host you prefer.
+
+Common to deploying any SPA, you'll need to configure your host to direct all URLs to the `index.html` of the client build. Some hosts do this by default, but others don't. As an example, a host may support a `_redirects` file to do this:
+
+```
+/*    /index.html   200
+```
+
+If you're getting 404s at valid routes for your app, it's likely you need to configure your host.
+
+## Important Note
+
+Typical Single Pages apps send a mostly blank index.html template with little more than an empty `<div id="root"></div>`.
+
+In contrast `react-router build` (with server rendering disabled) pre-renders your root and index routes. This means you can:
+
+- Send more than an empty div
+- Use React components to generate the initial page users see
+- Re-enable server rendering later without changing anything about your UI
+
+This is also why your project still needs a dependency on `@react-router/node`.

From 2f45fd13af5a6f3a0cd55a42b9a746405ecfd19b Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 15:50:08 -0700
Subject: [PATCH 05/41] typo

---
 docs/how-to/spa.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/how-to/spa.md b/docs/how-to/spa.md
index 3aedcfc44c..cf8865c188 100644
--- a/docs/how-to/spa.md
+++ b/docs/how-to/spa.md
@@ -11,7 +11,7 @@ There are two ways to ship a single page app with React Router
 
 ## 1. Disable Server Rendering
 
-Server rendering and enabled by default. Set the ssr flag to false in `react-router.config.ts` to disable it.
+Server rendering is enabled by default. Set the ssr flag to false in `react-router.config.ts` to disable it.
 
 ```ts filename=react-router.config.ts lines=[4]
 import { type Config } from "@react-router/dev/config";

From 1259f9cae867149b330d2ab23d6123f17390c186 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 15:51:43 -0700
Subject: [PATCH 06/41] wordsmith

---
 docs/how-to/spa.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/how-to/spa.md b/docs/how-to/spa.md
index cf8865c188..1636d3ff19 100644
--- a/docs/how-to/spa.md
+++ b/docs/how-to/spa.md
@@ -49,7 +49,7 @@ export async function clientAction({
 
 Pre-rendering can be configured for paths with static data known at build time for faster initial page loads. Refer to [Pre-rendering](./pre-rendering) to set it up.
 
-## 4. Serve all URLs to index.html
+## 4. Direct all URLs to index.html
 
 After running `react-router build`, deploy the `build/client` directory to whatever static host you prefer.
 

From 618da2cf9f7e2fa383958f09fc586dff59d3a0f0 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 15:54:06 -0700
Subject: [PATCH 07/41] docs updates

---
 docs/start/framework/rendering.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/start/framework/rendering.md b/docs/start/framework/rendering.md
index d5e87bde31..687c701714 100644
--- a/docs/start/framework/rendering.md
+++ b/docs/start/framework/rendering.md
@@ -11,7 +11,17 @@ There are three rendering strategies in React Router:
 - Server Side Rendering
 - Static Pre-rendering
 
-All routes are always client side rendered as the user navigates around the app. However, you can control server rendering and static pre-rendering with the `ssr` and `prerender` config options.
+## Client Side Rendering
+
+All routes are always client side rendered as the user navigates around the app. If you're looking to build a Single Page App, disable server rendering:
+
+```ts filename=react-router.config.ts
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  ssr: false,
+} satisfies Config;
+```
 
 ## Server Side Rendering
 

From 51421084df14e01343beb83f56df061e2fbc9641 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 17:28:04 -0700
Subject: [PATCH 08/41] docs docs docs

---
 docs/how-to/error-boundary.md |   4 ++
 docs/how-to/headers.md        | 129 +++++++++++++++++++++-------------
 docs/how-to/status.md         |  58 +++++++++++++++
 3 files changed, 143 insertions(+), 48 deletions(-)
 create mode 100644 docs/how-to/error-boundary.md
 create mode 100644 docs/how-to/status.md

diff --git a/docs/how-to/error-boundary.md b/docs/how-to/error-boundary.md
new file mode 100644
index 0000000000..00d6c9dd70
--- /dev/null
+++ b/docs/how-to/error-boundary.md
@@ -0,0 +1,4 @@
+---
+title: Error Boundaries
+hidden: true
+---
diff --git a/docs/how-to/headers.md b/docs/how-to/headers.md
index 239f926bde..f28746f8e0 100644
--- a/docs/how-to/headers.md
+++ b/docs/how-to/headers.md
@@ -1,69 +1,102 @@
 ---
-title: Setting HTTP Headers and Status
-hidden: true
+title: HTTP Headers
 ---
 
-# HTTP Headers and Status
+# HTTP Headers
 
-<!-- look in the old route-module.md for some extra info here -->
+Headers are defined with the route module `headers` export.
 
-<!-- copy pasted from data-loading.md, go a bit more in depth, with multiple steps -->
+## From Route Modules
 
-If you need to return a custom HTTP status code or custom headers from your `loader`, use [`data`][data]:
+```tsx filename=some-route.tsx
+import { Route } from "./+types/some-route";
 
-```tsx filename=app/product.tsx lines=[3,6-8,14,17-21]
-// route("products/:pid", "./product.tsx");
-import type { Route } from "./+types/product";
-import { data } from "react-router";
-import { fakeDb } from "../db";
-
-export function headers({ loaderHeaders }: HeadersArgs) {
-  return loaderHeaders;
+export function headers(_: Route.HeadersArgs) {
+  return {
+    "Content-Security-Policy": "default-src 'self'",
+    "X-Frame-Options": "DENY",
+    "X-Content-Type-Options": "nosniff",
+    "Cache-Control": "max-age=3600, s-maxage=86400",
+  };
 }
+```
+
+You can return either a [`Headers`](https://developer.mozilla.org/en-US/docs/Web/API/Headers) instance or `HeadersInit`.
 
-export async function loader({ params }: Route.LoaderArgs) {
-  const product = await fakeDb.getProduct(params.pid);
+## From loaders and actions
 
-  if (!product) {
-    throw data(null, { status: 404 });
-  }
+When the header is dependent on loader data, loaders and actions can also set headers.
+
+### 1. Wrap your return value in `data`
+
+```tsx lines=[1,8]
+import { data } from "react-router";
 
-  return data(product, {
+export async function loader({ params }: LoaderArgs) {
+  let [page, ms] = await fakeTimeCall(
+    await getPage(params.id)
+  );
+
+  return data(page, {
     headers: {
-      "Cache-Control": "public; max-age=300",
+      "Server-Timing': `page;dur=${ms};desc=`Page query"',
     },
   });
 }
 ```
 
-<!-- copy pasted from actions.md -->
+### 2. Return from `headers` export
 
-If you need to return a custom HTTP status code or custom headers from your `action`, you can do so using the [`data`][data] utility:
+Headers from loaders and actions are not sent in a hidden way, you must return them from the `headers` export.
 
-```tsx filename=app/project.tsx lines=[3,11-14,19]
-// route('/projects/:projectId', './project.tsx')
-import type { Route } from "./+types/project";
-import { data } from "react-router";
-import { fakeDb } from "../db";
-
-export async function action({
-  request,
-}: Route.ActionArgs) {
-  let formData = await request.formData();
-  let title = await formData.get("title");
-  if (!title) {
-    throw data(
-      { message: "Invalid title" },
-      { status: 400 }
-    );
-  }
-
-  if (!projectExists(title)) {
-    let project = await fakeDb.createProject({ title });
-    return data(project, { status: 201 });
-  } else {
-    let project = await fakeDb.updateProject({ title });
-    return project;
-  }
+```tsx
+export function headers({
+  actionHeaders,
+  loaderHeaders,
+}: HeadersArgs) {
+  return actionHeaders ? actionHeaders : loaderHeaders;
+}
+```
+
+## Merging with parent headers
+
+Consider these nested routes
+
+```ts filename=routes.ts
+route("pages", "pages-layout-with-nav.tsx", [
+  route(":slug", "page.tsx"),
+]);
+```
+
+If both route modules want to set headers, the headers from the deepest matching route will be sent.
+
+When you need to keep both the parent and the child headers, you need to merge them in the child route.
+
+### Appending
+
+The easiest way is to simply append to the parent headers. This avoids overwriting a header the parent may have set and both are important.
+
+```tsx
+export function headers({ parentHeaders }: HeadersArgs) {
+  parentHeaders.append(
+    "Permissions-Policy: geolocation=()"
+  );
+  return parentHeaders;
 }
 ```
+
+### Setting
+
+Sometimes it's important to overwrite the parent header. Do this with `set` instead of `append`:
+
+```tsx
+export function headers({ parentHeaders }: HeadersArgs) {
+  parentHeaders.set(
+    "Cache-Control",
+    "max-age=3600, s-maxage=86400"
+  );
+  return parentHeaders;
+}
+```
+
+You can avoid the need to merge headers by only defining headers in "leaf routes" (index routes and child routes without children) and not in parent routes.
diff --git a/docs/how-to/status.md b/docs/how-to/status.md
new file mode 100644
index 0000000000..8d6cff1ca7
--- /dev/null
+++ b/docs/how-to/status.md
@@ -0,0 +1,58 @@
+---
+title: Status Codes
+---
+
+# Status Codes
+
+Set status codes from loaders and actions with `data`.
+
+```tsx filename=app/project.tsx lines=[3,12-15,20,23]
+// route('/projects/:projectId', './project.tsx')
+import type { Route } from "./+types/project";
+import { data } from "react-router";
+import { fakeDb } from "../db";
+
+export async function action({
+  request,
+}: Route.ActionArgs) {
+  let formData = await request.formData();
+  let title = await formData.get("title");
+  if (!title) {
+    return data(
+      { message: "Invalid title" },
+      { status: 400 }
+    );
+  }
+
+  if (!projectExists(title)) {
+    let project = await fakeDb.createProject({ title });
+    return data(project, { status: 201 });
+  } else {
+    let project = await fakeDb.updateProject({ title });
+    // the default status code is 200, no need for `data`
+    return project;
+  }
+}
+```
+
+See [Form Validation](./form-validation) for more information on rendering form errors like this.
+
+Another common status code is 404:
+
+```tsx
+// route('/projects/:projectId', './project.tsx')
+import type { Route } from "./+types/project";
+import { data } from "react-router";
+import { fakeDb } from "../db";
+
+export async function loader({ params }: Route.ActionArgs) {
+  let project = await fakeDb.getProject(params.id);
+  if (!project) {
+    // throw to ErrorBoundary
+    throw data(null, { status: 404 });
+  }
+  return project;
+}
+```
+
+See the [Error Boundaries](./error-boundary) for more information on thrown `data`.

From 7f0ef8fe82789a243697d079db2ab3eea6a88953 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Tue, 19 Nov 2024 17:31:03 -0700
Subject: [PATCH 09/41] docs wordsmithing

---
 docs/how-to/form-validation.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/how-to/form-validation.md b/docs/how-to/form-validation.md
index 68c48e7f88..7376c13f19 100644
--- a/docs/how-to/form-validation.md
+++ b/docs/how-to/form-validation.md
@@ -4,7 +4,7 @@ title: Form Validation
 
 # Form Validation
 
-This guide walks you through implementing form validation for a simple signup form. Here, we focus on capturing the fundamentals to help you understand the essential elements of form validation in Remix, including actions, action data, and rendering errors.
+This guide walks through a simple signup form implementation. You will likely want to pair these concepts with third-party validation libraries and error components, but this guide only focuses on the moving pieces for React Router.
 
 ## 1. Setting Up
 
@@ -113,7 +113,3 @@ export default function Signup(_: Route.ComponentProps) {
   );
 }
 ```
-
-## Conclusion
-
-And there you have it! You've successfully set up a basic form validation flow in Remix. The beauty of this approach is that the errors will automatically display based on the `action` data, and they will be updated each time the user re-submits the form. This reduces the amount of boilerplate code you have to write, making your development process more efficient.

From 06e98c3baf8af79543cfc82fa8978eeedbafdbd1 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Tue, 19 Nov 2024 21:05:16 -0500
Subject: [PATCH 10/41] typegen: headers (#12318)

---
 packages/react-router-dev/typegen/generate.ts   | 3 +++
 packages/react-router/lib/types/route-module.ts | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/packages/react-router-dev/typegen/generate.ts b/packages/react-router-dev/typegen/generate.ts
index 274dae4f52..bc291a1f38 100644
--- a/packages/react-router-dev/typegen/generate.ts
+++ b/packages/react-router-dev/typegen/generate.ts
@@ -55,6 +55,9 @@ export function generate(ctx: Context, route: RouteManifestEntry): string {
       export type MetaDescriptors = T.MetaDescriptors
       export type MetaFunction = (args: MetaArgs) => MetaDescriptors
 
+      export type HeadersArgs = T.HeadersArgs
+      export type HeadersFunction = (args: HeadersArgs) => Headers | HeadersInit
+
       export type LoaderArgs = T.CreateServerLoaderArgs<Info>
       export type ClientLoaderArgs = T.CreateClientLoaderArgs<Info>
       export type ActionArgs = T.CreateServerActionArgs<Info>
diff --git a/packages/react-router/lib/types/route-module.ts b/packages/react-router/lib/types/route-module.ts
index c801b75ab5..6514ca9778 100644
--- a/packages/react-router/lib/types/route-module.ts
+++ b/packages/react-router/lib/types/route-module.ts
@@ -10,6 +10,7 @@ type IsDefined<T> = Equal<T, undefined> extends true ? false : true;
 type RouteModule = {
   meta?: Func;
   links?: Func;
+  headers?: Func;
   loader?: Func;
   clientLoader?: Func;
   action?: Func;
@@ -58,6 +59,13 @@ export type CreateMetaArgs<T extends RouteInfo> = {
 };
 export type MetaDescriptors = MetaDescriptor[];
 
+export type HeadersArgs = {
+  loaderHeaders: Headers;
+  parentHeaders: Headers;
+  actionHeaders: Headers;
+  errorHeaders: Headers | undefined;
+};
+
 // prettier-ignore
 type IsHydrate<ClientLoader> =
   ClientLoader extends { hydrate: true } ? true :

From f41e9d8925499113ec6796f316718476cc4606fc Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Wed, 20 Nov 2024 09:34:07 -0700
Subject: [PATCH 11/41] docs: bit more on headers

---
 docs/how-to/headers.md | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/docs/how-to/headers.md b/docs/how-to/headers.md
index f28746f8e0..dc5bf1f393 100644
--- a/docs/how-to/headers.md
+++ b/docs/how-to/headers.md
@@ -4,7 +4,7 @@ title: HTTP Headers
 
 # HTTP Headers
 
-Headers are defined with the route module `headers` export.
+Headers are primarily defined with the route module `headers` export. You can also set headers in `entry.server.tsx`.
 
 ## From Route Modules
 
@@ -100,3 +100,34 @@ export function headers({ parentHeaders }: HeadersArgs) {
 ```
 
 You can avoid the need to merge headers by only defining headers in "leaf routes" (index routes and child routes without children) and not in parent routes.
+
+## From `entry.server.tsx`
+
+The `handleRequest` export receives the headers from the route module as an argument. You can append global headers here.
+
+```tsx
+export default function handleRequest(
+  request,
+  responseStatusCode,
+  responseHeaders,
+  routerContext,
+  loadContext
+) {
+  // set, append global headers
+  responseHeaders.set(
+    "X-App-Version",
+    routerContext.manifest.version
+  );
+
+  return new Response(await getStream(), {
+    headers: responseHeaders,
+    status: responseStatusCode,
+  });
+}
+```
+
+If you don't have an `entry.server.tsx` run the `reveal` command:
+
+```shellscript nonumber
+react-router reveal
+```

From eadc804ba39a6d7809860cb2f2c9249784dd9283 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Wed, 20 Nov 2024 11:08:28 -0600
Subject: [PATCH 12/41] Framework adoption guides (#12317)

* Update component routes guide

* Finish code and update language for component routes guide

* update route-provider doc to match component-routes doc
---
 docs/upgrading/component-routes.md | 235 ++++++++++++++++++++---------
 docs/upgrading/router-provider.md  | 214 +++++++++++++++++++++-----
 2 files changed, 335 insertions(+), 114 deletions(-)

diff --git a/docs/upgrading/component-routes.md b/docs/upgrading/component-routes.md
index 53b7c19665..0cf24714c0 100644
--- a/docs/upgrading/component-routes.md
+++ b/docs/upgrading/component-routes.md
@@ -2,15 +2,13 @@
 title: Framework Adoption from Component Routes
 ---
 
-<docs-warning>This guide is mostly a stub and in active development, it will be wrong about many things before the final v7 release</docs-warning>
+# Framework Adoption from Component Routes
 
-# Adopting Vite (Routes)
-
-If you are using `<RouterProvider>` please see [Adopting Route Modules from RouterProvider](./vite-router-provider) instead.
+If you are using `<RouterProvider>` please see [Framework Adoption from RouterProvider][upgrade-router-provider] instead.
 
 If you are using `<Routes>` this is the right place.
 
-The React Router vite plugin adds framework features to React Router. This document wil help you adopt the plugin in your app if you'd like.
+The React Router Vite plugin adds framework features to React Router. This guide will help you adopt the plugin in your app. If you run into any issues, please reach out for help on [Twitter](https://x.com/remix_run) or [Discord](https://rmx.as/discord).
 
 ## Features
 
@@ -18,24 +16,37 @@ The Vite plugin adds:
 
 - Route loaders, actions, and automatic data revalidation
 - Typesafe Routes Modules
-- Typesafe Route paths across your app
 - Automatic route code-splitting
 - Automatic scroll restoration across navigations
 - Optional Static pre-rendering
 - Optional Server rendering
-- Optional React Server Components
 
-The initial setup will likely be a bit of a pain, but once complete, adopting the new features is incremental, you can do one route at a time.
+The initial setup will require the most work, but once complete, adopting the new features is incremental, you can do one route at a time.
+
+## Prerequisites
+
+In order to use the Vite plugin, your project needs to be running
 
-## 1. Install Vite
+- Node.js 20+ (if using Node as your runtime)
+- Vite 5+
 
-First install the React Router vite plugin:
+## 1. Install the Vite plugin
+
+**👉 Install the React Router Vite plugin**
 
 ```shellscript nonumber
 npm install -D @react-router/dev
 ```
 
-Then swap out the React plugin for React Router.
+**👉 Install a runtime adapter**
+
+We will assume you are using Node as your runtime
+
+```shellscript nonumber
+npm install @react-router/node
+```
+
+**👉 Swap out the React plugin for React Router.**
 
 ```diff filename=vite.config.ts
 -import react from '@vitejs/plugin-react'
@@ -51,13 +62,34 @@ export default defineConfig({
 });
 ```
 
-## 2. Add the Root entry point
+## 2. Add the React Router config
+
+**👉 Create a `react-router.config.ts` file**
+
+Add the following to the root of your project. In this config you can tell React Router about your project, like where to find the app directory and to not use SSR (server-side rendering) for now.
+
+```shellscript nonumber
+touch react-router.config.ts
+```
+
+```ts filename=react-router.config.ts
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  appDirectory: "src",
+  ssr: false,
+} satisfies Config;
+```
+
+## 3. Add the Root entry point
 
 In a typical Vite app, the `index.html` file is the entry point for bundling. The React Router Vite plugin moves the entry point to a `root.tsx` file so you can use React to render the shell of your app instead of static HTML, and eventually upgrade to Server Rendering if you want.
 
+**👉 Move your existing `index.html` to `root.tsx`**
+
 For example, if your current `index.html` looks like this:
 
-```html filename="index.html"
+```html filename=index.html
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -77,76 +109,97 @@ For example, if your current `index.html` looks like this:
 
 You would move that markup into `src/root.tsx` and delete `index.html`:
 
+```shellscript nonumber
+touch src/root.tsx
+```
+
 ```tsx filename=src/root.tsx
 import {
-  Scripts,
+  Links,
+  Meta,
   Outlet,
+  Scripts,
   ScrollRestoration,
 } from "react-router";
 
-export default function Root() {
+export function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
   return (
     <html lang="en">
       <head>
-        <meta charset="UTF-8" />
+        <meta charSet="UTF-8" />
         <meta
           name="viewport"
           content="width=device-width, initial-scale=1.0"
         />
         <title>My App</title>
+        <Meta />
+        <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
       </body>
     </html>
   );
 }
+
+export default function Root() {
+  return <Outlet />;
+}
 ```
 
-## 3. Add client entry module
+## 4. Add client entry module
+
+In the typical Vite app the `index.html` file points to `src/main.tsx` as the client entry point. React Router uses a file named `src/entry.client.tsx` instead.
 
-In the typical Vite app setup the `index.html` file points to `src/main.tsx` as the client entry point. React Router uses a file named `src/entry.client.tsx` instead.
+**👉 Make `src/entry.client.tsx` your entry point**
 
 If your current `src/main.tsx` looks like this:
 
 ```tsx filename=src/main.tsx
-import "./index.css";
 import React from "react";
 import ReactDOM from "react-dom/client";
-import App from "./App.tsx";
+import { BrowserRouter } from "react-router";
+import "./index.css";
+import App from "./App";
 
 ReactDOM.createRoot(
   document.getElementById("root")!
 ).render(
   <React.StrictMode>
-    <App />
+    <BrowserRouter>
+      <App />
+    </BrowserRouter>
   </React.StrictMode>
 );
 ```
 
-You would rename it to `entry.client.tsx` and have it look like this:
+You would rename it to `entry.client.tsx` and change it to this:
 
 ```tsx filename=src/entry.client.tsx
-import "./index.css";
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { HydratedRouter } from "react-router/dom";
+import "./index.css";
 
 ReactDOM.hydrateRoot(
   document,
-  <StrictMode>
+  <React.StrictMode>
     <HydratedRouter />
-  </StrictMode>
+  </React.StrictMode>
 );
 ```
 
 - Use `hydrateRoot` instead of `createRoot`
 - Render a `<HydratedRouter>` instead of your `<App/>` component
-- Note that we stopped rendering the `<App/>` component, it'll come back in a later step, for now we want to simply get the app booting with the new entry points.
+- Note: we stopped rendering the `<App/>` component. We'll bring it back in a later step, but first we want to get the app to boot with the new entry point.
 
-## 4. Shuffle stuff around
+## 5. Shuffle stuff around
 
 Between `root.tsx` and `entry.client.tsx`, you may want to shuffle some stuff around between them.
 
@@ -154,41 +207,67 @@ In general:
 
 - `root.tsx` contains any rendering things like context providers, layouts, styles, etc.
 - `entry.client.tsx` should be as minimal as possible
-- Remember to _not_ try to render your existing `<App/>` component so isolate steps
+- Remember to _not_ try to render your existing `<App/>` component yet, we'll do that in a later step
 
 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.
 
-## 5. Boot the app
+## 6. Setup your routes
 
-At this point you should be able to to boot the app and see the root layout.
+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.
 
-```shellscript
-npx react-router dev
+**👉 Setup a `catchall.tsx` route**
+
+```shellscript nonumber
+touch src/routes.ts src/catchall.tsx
 ```
 
-- Search the [Upgrading Discussion](#TODO) category
-- Reach out for help on [Twitter](https://x.com/remix_run) or [Discord](https://rmx.as/discord)
+```ts filename=src/routes.ts
+import {
+  type RouteConfig,
+  route,
+} from "@react-router/dev/routes";
 
-Make sure you can boot your app at this point before moving on.
+export default [
+  // * matches all URLs, the ? makes it optional so it will match / as well
+  route("*?", "catchall.tsx"),
+] satisfies RouteConfig;
+```
 
-## 6. Configure Catchall Route
+**👉 Render a placeholder route**
 
-To get back to rendering your app, we'll configure a "catchall" route that matches all URLs so that your existing `<Routes>` get a chance to render.
+Eventually we'll replace this with our original `App` component, but for now we'll just render something simple to make sure we can boot the app.
 
-Create a file at `src/routes.ts` and add this:
+```tsx filename=src/catchall.tsx
+export default function Component() {
+  return <div>Hello, world!</div>;
+}
+```
 
-```ts filename=src/routes.ts
-import { type RouteConfig } from "@react-router/dev/routes";
+[View our guide on configuring routes][configuring-routes] to learn more about the `routes.ts` file.
 
-export default [
-  {
-    path: "*",
-    file: "src/catchall.tsx",
-  },
-] satisfies RouteConfig;
+## 7. Boot the app
+
+At this point you should be able to to boot the app and see the root layout.
+
+**👉 Add `dev` script and run the app**
+
+```json filename=package.json
+"scripts": {
+  "dev": "react-router dev"
+}
+```
+
+Now make sure you can boot your app at this point before moving on:
+
+```shellscript
+npm run dev
 ```
 
-And then create the catchall route module and render your existing root App component within it.
+## 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.
+
+**👉 Update the catchall route to render your app**
 
 ```tsx filename=src/catchall.tsx
 import App from "./App";
@@ -200,7 +279,13 @@ export default function Component() {
 
 Your app should be back on the screen and working as usual!
 
-## 6. Migrate a route to a Route Module
+<docs-warning>
+
+Note: You will get some warnings in your console about descendent routes. You can ignore these for now as it is caused by the temporary catchall route. Once you move all your routes to Route Modules this will go away.
+
+</docs-warning>
+
+## 9. Migrate a route to a Route Module
 
 You can now incrementally migrate your routes to route modules.
 
@@ -208,57 +293,55 @@ Given an existing route like this:
 
 ```tsx filename=src/App.tsx
 // ...
-import Page from "./containers/page";
+import About from "./containers/About";
 
 export default function App() {
   return (
     <Routes>
-      <Route path="/pages/:id" element={<Page />} />
+      <Route path="/about" element={<About />} />
     </Routes>
   );
 }
 ```
 
-You can move the definition to a `routes.ts` file:
+**👉 Add the route definition to `routes.ts`**
 
 ```tsx filename=src/routes.ts
-import { type RouteConfig } from "@react-router/dev/routes";
+import {
+  type RouteConfig,
+  route,
+} from "@react-router/dev/routes";
 
 export default [
-  {
-    path: "/pages/:id",
-    file: "./containers/page.tsx",
-  },
-  {
-    path: "*",
-    file: "src/catchall.tsx",
-  },
+  route("/about", "./pages/about.tsx"),
+  route("*?", "catchall.tsx"),
 ] satisfies RouteConfig;
 ```
 
-And then edit the route module to use the Route Module API:
+**👉 Add the route module**
 
-```tsx filename=src/pages/about.tsx
-import { useLoaderData } from "react-router";
+Edit the route module to use the [Route Module API][route-modules]:
 
-export async function clientLoader({ params }) {
-  let page = await getPage(params.id);
-  return page;
+```tsx filename=src/pages/about.tsx
+export async function clientLoader() {
+  // you can now fetch data here
+  return {
+    title: "About page",
+  };
 }
 
-export default function Component() {
-  let data = useLoaderData();
-  return <h1>{data.title}</h1>;
+export default function Component({ loaderData }) {
+  return <h1>{loaderData.title}</h1>;
 }
 ```
 
-You'll now get inferred type safety with params, loader data, and more.
+See [Type Safety][type-safety] to setup 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.
 
-## Enable SSR and Pre-rendering
+## 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.
+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.
 
 ```ts filename=vite.config.ts
 import type { Config } from "@react-router/dev/config";
@@ -271,6 +354,8 @@ export default {
 } satisfies Config;
 ```
 
-See [Deploying][deploying] for more information on deploying a server.
-
+[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
diff --git a/docs/upgrading/router-provider.md b/docs/upgrading/router-provider.md
index 95b2a21407..06aa951eb5 100644
--- a/docs/upgrading/router-provider.md
+++ b/docs/upgrading/router-provider.md
@@ -12,11 +12,11 @@ Checkout this <a href="https://github.com/brophdawg11/react-router-v6-to-v7-upgr
 
 </docs-warning>
 
-# Adopting Vite (RouterProvider)
+# Framework Adoption from RouterProvider
 
-If you are not using `<RouterProvider>` please see [Adopting Route Modules from Component Routes](./vite-component-routes) instead.
+If you are not using `<RouterProvider>` please see [Framework Adoption from Component Routes][upgrade-component-routes] instead.
 
-The React Router vite plugin adds framework features to React Router. This document wil help you adopt the plugin in your app if you'd like.
+The React Router Vite plugin adds framework features to React Router. This guide will help you adopt the plugin in your app. If you run into any issues, please reach out for help on [Twitter](https://x.com/remix_run) or [Discord](https://rmx.as/discord).
 
 ## Features
 
@@ -24,24 +24,37 @@ The Vite plugin adds:
 
 - Route loaders, actions, and automatic data revalidation
 - Typesafe Routes Modules
-- Typesafe Route paths across your app
 - Automatic route code-splitting
 - Automatic scroll restoration across navigations
 - Optional Static pre-rendering
 - Optional Server rendering
-- Optional React Server Components
 
-The initial setup will likely be a bit of a pain, but once complete, adopting the new features is incremental, you can do one route at a time.
+The initial setup will require the most work, but once complete, adopting the new features is incremental, you can do one route at a time.
 
-## 1. Install Vite
+## Prerequisites
 
-First install the React Router vite plugin:
+In order to use the Vite plugin, your project needs to be running
+
+- Node.js 20+ (if using Node as your runtime)
+- Vite 5+
+
+## 1. Install the Vite plugin
+
+**👉 Install the React Router Vite plugin**
 
 ```shellscript nonumber
 npm install -D @react-router/dev
 ```
 
-Then swap out the React plugin for React Router.
+**👉 Install a runtime adapter**
+
+We will assume you are using Node as your runtime
+
+```shellscript nonumber
+npm install @react-router/node
+```
+
+**👉 Swap out the React plugin for React Router**
 
 ```diff filename=vite.config.ts
 -import react from '@vitejs/plugin-react'
@@ -57,11 +70,32 @@ export default defineConfig({
 });
 ```
 
-## 2. Add the Root entry point
+## 2. Add the React Router config
+
+**👉 Create a `react-router.config.ts` file**
+
+Add the following to the root of your project. In this config you can tell React Router about your project, like where to find the app directory and to not use SSR (server-side rendering) for now.
+
+```shellscript nonumber
+touch react-router.config.ts
+```
+
+```ts filename=react-router.config.ts
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  appDirectory: "src",
+  ssr: false,
+} satisfies Config;
+```
+
+## 3. Add the Root entry point
+
+In a typical Vite app, the `index.html` file is the entry point for bundling. The React Router Vite plugin moves the entry point to a `root.tsx` file so you can use React to render the shell of your app instead of static HTML, and eventually upgrade to Server Rendering if you want.
 
-In a typical Vite app, the `index.html` file is the entry point for bundling. The React Router Vite plugin uses `root.tsx`. This let's you use React to render the shell instead of static HTML.
+**👉 Move your existing `index.html` to `root.tsx`**
 
-If your current `index.html` looks like this:
+For example, if your current `index.html` looks like this:
 
 ```html filename=index.html
 <!DOCTYPE html>
@@ -83,43 +117,63 @@ If your current `index.html` looks like this:
 
 You would move that markup into `src/root.tsx` and delete `index.html`:
 
+```shellscript nonumber
+touch src/root.tsx
+```
+
 ```tsx filename=src/root.tsx
 import {
-  Scripts,
+  Links,
+  Meta,
   Outlet,
+  Scripts,
   ScrollRestoration,
 } from "react-router";
 
-export default function Root() {
+export function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
   return (
     <html lang="en">
       <head>
-        <meta charset="UTF-8" />
+        <meta charSet="UTF-8" />
         <meta
           name="viewport"
           content="width=device-width, initial-scale=1.0"
         />
         <title>My App</title>
+        <Meta />
+        <Links />
       </head>
       <body>
-        <Outlet />
+        {children}
         <ScrollRestoration />
         <Scripts />
       </body>
     </html>
   );
 }
+
+export default function Root() {
+  return <Outlet />;
+}
 ```
 
-## 3. Add client entry module
+## 4. Add client entry module
+
+<!-- TODO: from here on out this is wrong, for Brooks to update -->
+
+In the typical Vite app the `index.html` file points to `src/main.tsx` as the client entry point. React Router uses a file named `src/entry.client.tsx` instead.
 
-In the typical Vite app setup the `index.html` file points to `src/main.tsx` as the client entry point. React Router uses a file named `src/entry.client.tsx`.
+**👉 Make `src/entry.client.tsx` your entry point**
 
 If your current `src/main.tsx` looks like this:
 
 ```tsx filename=src/main.tsx
-import * as React from "react";
-import * as ReactDOM from "react-dom";
+import React from "react";
+import ReactDOM from "react-dom/client";
 import {
   createBrowserRouter,
   RouterProvider,
@@ -127,31 +181,36 @@ import {
 
 const router = createBrowserRouter(YOUR_ROUTES);
 
-ReactDOM.createRoot(document.getElementById("root")).render(
-  <RouterProvider router={router} />
+ReactDOM.createRoot(
+  document.getElementById("root")!
+).render(
+  <React.StrictMode>
+    <RouterProvider router={router} />
+  </React.StrictMode>
 );
 ```
 
 You would rename it to `entry.client.tsx` and change it to this:
 
 ```tsx filename=src/entry.client.tsx
-import * as React from "react";
-import * as ReactDOM from "react-dom";
-import { HydratedRouter } from "react-router-dom";
+import React from "react";
+import ReactDOM from "react-dom/client";
+import { HydratedRouter } from "react-router/dom";
+import "./index.css";
 
 ReactDOM.hydrateRoot(
   document,
-  <StrictMode>
-    <HydratedRouter routes={YOUR_ROUTES} />
-  </StrictMode>
+  <React.StrictMode>
+    <HydratedRouter />
+  </React.StrictMode>
 );
 ```
 
 - Use `hydrateRoot` instead of `createRoot`
 - Use `<HydratedRouter>` instead of `<RouterProvider>`
-- Pass your routes to `<HydratedRouter>`
+- Note: we stopped passing the routes prop for now. We'll bring it back in a later step, but first we want to get the app to boot with the new entry point.
 
-## 4. Shuffle stuff around
+## 5. Shuffle stuff around
 
 Between `root.tsx` and `entry.client.tsx`, you may want to shuffle some stuff around between them.
 
@@ -159,17 +218,84 @@ In general:
 
 - `root.tsx` contains any rendering things like context providers, layouts, styles, etc.
 - `entry.client.tsx` should be as minimal as possible
+- Remember to _not_ try to pass your existing routes yet, we'll do that in a later step
 
 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.
 
-## 5. Boot the app
+## 6. Setup your routes
 
-At this point you should be able to to boot the app.
+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**
+
+```shellscript nonumber
+touch src/routes.ts src/catchall.tsx
+```
+
+```ts filename=src/routes.ts
+import {
+  type RouteConfig,
+  route,
+} from "@react-router/dev/routes";
+
+export default [
+  // * matches all URLs, the ? makes it optional so it will match / as well
+  route("*?", "catchall.tsx"),
+] satisfies RouteConfig;
+```
+
+**👉 Render a placeholder route**
+
+Eventually we'll replace this with our original routes, but for now we'll just render something simple to make sure we can boot the app.
+
+```tsx filename=src/catchall.tsx
+export default function Component() {
+  return <div>Hello, world!</div>;
+}
+```
+
+[View our guide on configuring routes][configuring-routes] to learn more about the `routes.ts` file.
+
+## 7. Boot the app
+
+At this point you should be able to to boot the app and see the root layout.
+
+**👉 Add `dev` script and run the app**
+
+```json filename=package.json
+"scripts": {
+  "dev": "react-router dev"
+}
+```
+
+Now make sure you can boot your app at this point before moving on:
 
 ```shellscript
-npx react-router dev
+npm run dev
 ```
 
+## 8. Add your routes
+
+To get back to rendering your routes, we'll update the `routes.ts` file to include your existing routes.
+
+**👉 Update routes.ts with your existing routes**
+
+```ts filename=src/routes.ts
+import {
+  type RouteConfig,
+  route,
+} from "@react-router/dev/routes";
+
+// Convert your existing routes to the new format
+export default [
+  route("/", "routes/index.tsx"),
+  route("/about", "routes/about.tsx"),
+  // ... other routes
+] satisfies RouteConfig;
+```
+
+Your app should be back on the screen and working as usual!
+
 If you're having trouble
 
 - Comment out the `routes` prop to `<HydratedRouter>` to isolate the problem to the new entry points
@@ -178,7 +304,7 @@ If you're having trouble
 
 Make sure you can boot your app at this point before moving on.
 
-## 6. Migrate a route to a Route Module
+## 9. Migrate a route to a Route Module
 
 You can now incrementally migrate your routes to route modules. First create a `routes.ts` file that exports your routes.
 
@@ -233,21 +359,31 @@ export default function Component() {
 }
 ```
 
-You'll now get inferred type safety with params, loader data, and more.
+See [Type Safety][type-safety] to setup autogenerated type safety for params, loader data, and more.
 
-The first few routes you migrate are the hardest because you often have to access the same 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.
+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.
 
 ## 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](../start/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. See [Deploying][deploying] for more information.
+
+## Enable SSR and Pre-rendering
 
-```ts filename=vite.config.ts
+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.
+
+```ts filename=react-router.config.ts
 import type { Config } from "@react-router/dev/config";
 
 export default {
   ssr: true,
   async prerender() {
-    return ["/", "/pages/about"];
+    return ["/", "/about", "/contact"];
   },
 } satisfies Config;
 ```
+
+[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

From 39630069d3780897eb04451e8d4f58b075b34462 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Wed, 20 Nov 2024 11:31:13 -0700
Subject: [PATCH 13/41] widen descendant route matching warning (#12324)

---
 packages/react-router/lib/hooks.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx
index d8c7771079..13027e2da9 100644
--- a/packages/react-router/lib/hooks.tsx
+++ b/packages/react-router/lib/hooks.tsx
@@ -479,7 +479,7 @@ export function useRoutesImpl(
     let parentPath = (parentRoute && parentRoute.path) || "";
     warningOnce(
       parentPathname,
-      !parentRoute || parentPath.endsWith("*"),
+      !parentRoute || parentPath.endsWith("*") || parentPath.endsWith("*?"),
       `You rendered descendant <Routes> (or called \`useRoutes()\`) at ` +
         `"${parentPathname}" (under <Route path="${parentPath}">) but the ` +
         `parent route path has no trailing "*". This means if you navigate ` +

From f79bf3df4d096bbd66ad451b2f3ed61dc7b69637 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Wed, 20 Nov 2024 12:45:58 -0600
Subject: [PATCH 14/41] docs: remove old routing conventions from file uploads
 doc (#12323)

---
 docs/how-to/file-uploads.md | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/docs/how-to/file-uploads.md b/docs/how-to/file-uploads.md
index 7a66ccb715..86ffd46ac0 100644
--- a/docs/how-to/file-uploads.md
+++ b/docs/how-to/file-uploads.md
@@ -1,17 +1,33 @@
 ---
 title: File Uploads
-# need to validate this guide and get rid of remixisms like file system routes
-hidden: true
 ---
 
 # File Uploads
 
 Handle file uploads in your React Router applications. This guide uses some packages from the [Remix The Web][remix-the-web] project to make file uploads easier.
 
-_Thank you to David Adams for [his original guide](https://programmingarehard.com/2024/09/06/remix-file-uploads-updated.html/) on how to implement file uploads in Remix. You can refer to it for even more examples._
+_Thank you to David Adams for [writing an original guide](https://programmingarehard.com/2024/09/06/remix-file-uploads-updated.html/) which this doc is based on. You can refer to it for even more examples._
 
 ## Basic File Upload
 
+👉 **Setup some routes**
+
+You can setup your routes however you like. This example uses the following structure:
+
+```ts filename=routes.ts
+import {
+  type RouteConfig,
+  route,
+} from "@react-router/dev/routes";
+
+export default [
+  // ... other routes
+  route("user/:id", "pages/user-profile.tsx", [
+    route("avatar", "api/upload-avatar.tsx"),
+  ]),
+] satisfies RouteConfig;
+```
+
 👉 **Add the form data parser**
 
 `form-data-parser` is a wrapper around `request.formData()` that provides streaming support for handling file uploads.
@@ -32,7 +48,7 @@ You must set the form's `enctype` to `multipart/form-data` for file uploads to w
 
 </docs-warning>
 
-```tsx filename=routes/user.$id.tsx
+```tsx filename=pages/user-profile.tsx
 import {
   type FileUpload,
   parseFormData,
@@ -57,10 +73,10 @@ export async function action({
 
 export default function Component() {
   return (
-    <Form method="post" encType="multipart/form-data">
+    <form method="post" encType="multipart/form-data">
       <input type="file" name="avatar" />
       <button>Submit</button>
-    </Form>
+    </form>
   );
 }
 ```
@@ -97,7 +113,7 @@ export function getStorageKey(userId: string) {
 
 Update the form's `action` to store files in the `fileStorage` instance.
 
-```tsx filename=routes/user.$id.tsx
+```tsx filename=pages/user-profile.tsx
 import {
   FileUpload,
   parseFormData,
@@ -106,7 +122,7 @@ import {
   fileStorage,
   getStorageKey,
 } from "~/avatar-storage.server";
-import type { Route } from "./+types/user";
+import type { Route } from "./+types/user-profile";
 
 export async function action({
   request,
@@ -165,11 +181,12 @@ export default function UserPage({
 
 Create a [resource route][resource-route] that streams the file as a response.
 
-```tsx filename=routes/user.$id.avatar.tsx
+```tsx filename=api/upload-avatar.tsx
 import {
   fileStorage,
   getStorageKey,
 } from "~/avatar-storage.server";
+import type { Route } from "./+types/upload-avatar";
 
 export async function loader({ params }: Route.LoaderArgs) {
   const storageKey = getStorageKey(params.id);
@@ -194,4 +211,4 @@ export async function loader({ params }: Route.LoaderArgs) {
 [form-data-parser]: https://github.com/mjackson/remix-the-web/tree/main/packages/form-data-parser
 [file-storage]: https://github.com/mjackson/remix-the-web/tree/main/packages/file-storage
 [file]: https://developer.mozilla.org/en-US/docs/Web/API/File
-[resource-route]: ../how-to/resource-routes.md
+[resource-route]: ../how-to/resource-routes

From 20899a09995b247dace2d31d6a1d6ddda1109df8 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Wed, 20 Nov 2024 12:52:58 -0600
Subject: [PATCH 15/41] docs: remove warning from component-routes.md

---
 docs/upgrading/component-routes.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/upgrading/component-routes.md b/docs/upgrading/component-routes.md
index 0cf24714c0..37dcb1ec7b 100644
--- a/docs/upgrading/component-routes.md
+++ b/docs/upgrading/component-routes.md
@@ -279,12 +279,6 @@ export default function Component() {
 
 Your app should be back on the screen and working as usual!
 
-<docs-warning>
-
-Note: You will get some warnings in your console about descendent routes. You can ignore these for now as it is caused by the temporary catchall route. Once you move all your routes to Route Modules this will go away.
-
-</docs-warning>
-
 ## 9. Migrate a route to a Route Module
 
 You can now incrementally migrate your routes to route modules.

From 811760695c1e682cb9103c6f27bea1be04ef4b31 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Wed, 20 Nov 2024 13:02:22 -0600
Subject: [PATCH 16/41] move ssr: true from vite.config to react-router.config
 in basic template

---
 templates/basic/react-router.config.ts | 2 ++
 templates/basic/vite.config.ts         | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/templates/basic/react-router.config.ts b/templates/basic/react-router.config.ts
index 9c6ea11734..6ff16f9177 100644
--- a/templates/basic/react-router.config.ts
+++ b/templates/basic/react-router.config.ts
@@ -2,4 +2,6 @@ import type { Config } from "@react-router/dev/config";
 
 export default {
   // Config options...
+  // Server-side render by default, to enable SPA mode set this to `false`
+  ssr: true,
 } satisfies Config;
diff --git a/templates/basic/vite.config.ts b/templates/basic/vite.config.ts
index b5a580145a..14fd055e30 100644
--- a/templates/basic/vite.config.ts
+++ b/templates/basic/vite.config.ts
@@ -3,11 +3,5 @@ import tsconfigPaths from "vite-tsconfig-paths";
 import { defineConfig } from "vite";
 
 export default defineConfig({
-  plugins: [
-    reactRouter({
-      // Server-side render by default, to enable SPA mode set this to `false`
-      ssr: true,
-    }),
-    tsconfigPaths(),
-  ],
+  plugins: [reactRouter(), tsconfigPaths()],
 });

From 11ae51284f505bc465fc6c25b0175db71174de73 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Wed, 20 Nov 2024 15:10:19 -0700
Subject: [PATCH 17/41] docs: error boundaries

---
 docs/how-to/error-boundary.md  | 113 ++++++++++++++++++++++++++++++++-
 docs/how-to/error-reporting.md |   4 ++
 2 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 docs/how-to/error-reporting.md

diff --git a/docs/how-to/error-boundary.md b/docs/how-to/error-boundary.md
index 00d6c9dd70..296b152237 100644
--- a/docs/how-to/error-boundary.md
+++ b/docs/how-to/error-boundary.md
@@ -1,4 +1,115 @@
 ---
 title: Error Boundaries
-hidden: true
 ---
+
+# Error Boundaries
+
+To avoid rendering an empty page to users, route modules will automatically catch errors in your code and render the closest `ErrorBoundary`.
+
+Error boundaries are not intended for error reporting or rendering form validation errors. Please see [Form Validation](./form-validation) and [Error Reporting](./error-reporting) instead.
+
+## 1. Add a root error boundary
+
+All applications should at a minimum export a root error boundary. This one handles the three main cases:
+
+- Thrown `data` with a status code and text
+- Instances of errors with a stack trace
+- Randomly thrown values
+
+```tsx filename=root.tsx
+import { Route } from "./+types/root";
+
+export function ErrorBoundary({
+  error,
+}: Route.ErrorBoundaryProps) {
+  console.error(error);
+  if (isRouteErrorResponse(error)) {
+    return (
+      <>
+        <h1>
+          {error.status} {error.statusText}
+        </h1>
+        <p>{error.data}</p>
+      </>
+    );
+  } else if (error instanceof Error) {
+    return (
+      <div>
+        <h1>Error</h1>
+        <p>{error.message}</p>
+        <p>The stack trace is:</p>
+        <pre>{error.stack}</pre>
+      </div>
+    );
+  } else {
+    return <h1>Unknown Error</h1>;
+  }
+}
+```
+
+## 2. Write a bug
+
+It's not recommended to intentionally throw errors to force the error boundary to render as a means of control flow. Error Boundaries are primarily for catching unintentional errors in your code.
+
+```tsx
+export async function loader() {
+  return undefined();
+}
+```
+
+This will render the `instanceof Error` branch of the UI from step 1.
+
+This is not just for loaders, but for all route module APIs: loaders, actions, components, headers, links, and meta.
+
+## 3. Throw data in loaders/actions
+
+There are exceptions to the rule in #2, especially 404s. You can intentionally `throw data()` (with a proper status code) to the closest error boundary when your loader can't find what it needs to render the page. Throw a 404 and move on.
+
+```tsx
+import { data } from "react-router";
+
+export async function loader({ params }) {
+  let record = await fakeDb.getRecord(params.id);
+  if (!record) {
+    throw data("Record Not Found", { status: 404 });
+  }
+  return record;
+}
+```
+
+This will render the `isRouteErrorResponse` branch of the UI from step 1.
+
+## 4. Nested error boundaries
+
+When an error is thrown, the "closest error boundary" will be rendered. Consider these nested routes:
+
+```tsx filename="routes.ts"
+// ✅ has error boundary
+route("/app", "app.tsx", [
+  // ❌ no error boundary
+  route("invoices", "invoices.tsx", [
+    // ✅ has error boundary
+    route("invoices/:id", "invoice-page.tsx", [
+      // ❌ no error boundary
+      route("payments", "payments.tsx"),
+    ]),
+  ]),
+]);
+```
+
+The following table shows which error boundary will render given the origin of the error:
+
+| error origin     | rendered boundary |
+| ---------------- | ----------------- |
+| app.tsx          | app.tsx           |
+| invoices.tsx     | app.tsx           |
+| invoice-page.tsx | invoice-page.tsx  |
+| payments.tsx     | invoice-page.tsx  |
+
+## Error Sanitization
+
+In production mode, any errors that happen on the server are automatically sanitized before being sent to the browser to prevent leaking any sensitive server information (like stack traces).
+
+This means that a thrown `Error` will have a generic message and no stack trace in production in the browser. The original error is untouched on the server.
+
+Also note that data sent with `throw data(yourData)` is not sanitized as the data there is intended to be rendered.
diff --git a/docs/how-to/error-reporting.md b/docs/how-to/error-reporting.md
new file mode 100644
index 0000000000..9dad8283b7
--- /dev/null
+++ b/docs/how-to/error-reporting.md
@@ -0,0 +1,4 @@
+---
+title: Error Reporting
+hidden: true
+---

From 43c53878abb97b9ade10a593f01b20624b503b3d Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Wed, 20 Nov 2024 15:38:07 -0700
Subject: [PATCH 18/41] docs: added error reporting

---
 docs/how-to/error-boundary.md  |  1 -
 docs/how-to/error-reporting.md | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/docs/how-to/error-boundary.md b/docs/how-to/error-boundary.md
index 296b152237..3bd4daa6e8 100644
--- a/docs/how-to/error-boundary.md
+++ b/docs/how-to/error-boundary.md
@@ -22,7 +22,6 @@ import { Route } from "./+types/root";
 export function ErrorBoundary({
   error,
 }: Route.ErrorBoundaryProps) {
-  console.error(error);
   if (isRouteErrorResponse(error)) {
     return (
       <>
diff --git a/docs/how-to/error-reporting.md b/docs/how-to/error-reporting.md
index 9dad8283b7..685d0ea0f6 100644
--- a/docs/how-to/error-reporting.md
+++ b/docs/how-to/error-reporting.md
@@ -1,4 +1,36 @@
 ---
 title: Error Reporting
-hidden: true
 ---
+
+# Error Reporting
+
+React Router catches errors in your route modules and sends them to [error boundaries](./error-boundary) to prevent blank pages when errors occur. However, ErrorBoundary isn't sufficient for logging and reporting errors. To access these caught errors, use the handleError export of the server entry module.
+
+## 1. Reveal the server entry
+
+If you don't see `entry.server.tsx` in your app directory, you're using a default entry. Reveal it with this cli command:
+
+```shellscript nonumber
+react-router reveal
+```
+
+## 2. Export your error handler
+
+This function is called whenever React Router catches an error in your application on the server.
+
+```tsx filename=entry.server.tsx
+import { type HandleErrorFunction } from "react-router";
+
+export const handleError: HandleErrorFunction = (
+  error,
+  { request }
+) => {
+  // React Router may abort some interrupted requests, don't log those
+  if (!request.signal.aborted) {
+    myReportError(error);
+
+    // make sure to still log the error so you can see it
+    console.error(error);
+  }
+};
+```

From 846800adb50e9c8511d76cbe1a13bcf20e5215ef Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Thu, 21 Nov 2024 11:28:01 +1100
Subject: [PATCH 19/41] Add decision doc for `react-router.config.ts` (#12330)

---
 decisions/0013-react-router-config-ts.md | 64 ++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 decisions/0013-react-router-config-ts.md

diff --git a/decisions/0013-react-router-config-ts.md b/decisions/0013-react-router-config-ts.md
new file mode 100644
index 0000000000..f2d112cd37
--- /dev/null
+++ b/decisions/0013-react-router-config-ts.md
@@ -0,0 +1,64 @@
+# `react-router.config.ts`
+
+Date: 2024-11-21
+
+Status: accepted
+
+## Context
+
+Previously in Remix and earlier pre-releases of React Router, framework config was passed directly to the Vite plugin as an options object. While this has worked well so far when limited to Vite-specific use cases or simple CLI commands, we've started to run into some limitations as our `react-router` CLI has become more advanced.
+
+Some key issues with the current approach:
+
+1. **Tight coupling with Vite**
+
+   Our CLI commands (`react-router routes` and `react-router typegen`) need access to framework config but have nothing to do with Vite. We previously worked around this by using Vite to resolve `vite.config.ts` and then extracting our React Router config from the resolved Vite config object, but this approach proved to be difficult as we added more features to our CLI.
+
+2. **Limited config watching capabilities**
+
+   The introduction of `react-router typegen --watch` in particular highlighted the limitations of our Vite-coupled approach. We needed to not only resolve our config but also watch for changes. Having this tied to the Vite config made implementing this functionality unnecessarily complex.
+
+3. **Heavy-handed config updates**
+
+   Changes to Vite plugin options are treated like any other change to the Vite config, triggering a full reload of the dev server. This takes away any ability for us to handle config updates more gracefully.
+
+4. **Difficulty with config documentation**
+
+   Documentation of our config options was difficult since we either had to show a complete Vite config file with a lot of extra noise, or only show a call to the `reactRouter` plugin which looked a bit confusing since it was labelled as a `vite.config.ts` file. Neither approach was ideal for clearly explaining our config options while keeping code snippets to a minimum.
+
+## Goals
+
+1. Decouple framework config from Vite
+2. Enable granular config watching for tools like `react-router typegen --watch`
+3. Avoid unnecessary dev server reloads when config changes
+4. Improve documentation by separating framework config from Vite config
+
+## Decisions
+
+### Introduce dedicated `react-router.config.ts` in the root of the project
+
+We will introduce a dedicated config file, `react-router.config.ts/js`.
+
+### Config is provided via a default export
+
+To maintain consistency with other JS build tool configuration patterns, we will export the config object as the default export of the `react-router.config.ts` file.
+
+### Change `app/routes.ts` API to use a default export rather than a named `routes` export
+
+Now that we have multiple config files (`react-router.config.ts` and `app/routes.ts`), we should be internally consistent and use default exports for all of our config files. Now is a good time to make this change since the `routes.ts` API hasn't yet had a stable release.
+
+### Any config APIs should be exported from `@react-router/dev/config`
+
+The exported config object should satisfy the `Config` type from `@react-router/dev/config`. This follows our established pattern of using `@react-router/dev/*` namespaces for dev-time APIs that are scoped to particular files, e.g. `@react-router/dev/routes` and `@react-router/dev/vite`.
+
+### Config file is optional but recommended
+
+While the lack of a config file won't be treated as an error, we should include a blank config file in all official templates to make the config options more discoverable and self-documenting.
+
+### Remove options from Vite plugin
+
+The Vite plugin will no longer accept config options. All framework options will be handled through the dedicated config file.
+
+### Improved config update handling
+
+Config changes should no longer trigger full dev server reloads. We may re-introduce this behavior in certain cases where it makes sense.

From af0acf1e843bcff84949a98c955e5e754b1bd916 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Thu, 21 Nov 2024 15:01:49 +1100
Subject: [PATCH 20/41] Rename `compiler` playgrounds to `framework` (#12329)

---
 .../.gitignore                                      |   0
 .../app/entry.client.tsx                            |   0
 .../app/entry.server.tsx                            |   0
 .../app/root.tsx                                    |   0
 .../app/routes.ts                                   |   0
 .../app/routes/_index.tsx                           |   0
 .../package.json                                    |   2 +-
 .../public/favicon.ico                              | Bin
 .../server.js                                       |   0
 .../tsconfig.json                                   |   0
 .../vite.config.ts                                  |   0
 .../{compiler-spa => framework-spa}/.gitignore      |   0
 .../app/entry.client.tsx                            |   0
 .../app/entry.server.tsx                            |   0
 .../{compiler-spa => framework-spa}/app/root.tsx    |   0
 .../{compiler-spa => framework-spa}/app/routes.ts   |   0
 .../app/routes/_index.tsx                           |   0
 .../{compiler-spa => framework-spa}/package.json    |   2 +-
 .../public/favicon.ico                              | Bin
 .../react-router.config.ts                          |   0
 .../{compiler-spa => framework-spa}/tsconfig.json   |   0
 .../{compiler-spa => framework-spa}/vite.config.ts  |   0
 playground/{compiler => framework}/.gitignore       |   0
 .../{compiler => framework}/app/entry.client.tsx    |   0
 .../{compiler => framework}/app/entry.server.tsx    |   0
 playground/{compiler => framework}/app/root.tsx     |   0
 playground/{compiler => framework}/app/routes.ts    |   0
 .../{compiler => framework}/app/routes/_index.tsx   |   0
 .../{compiler => framework}/app/routes/product.tsx  |   0
 playground/{compiler => framework}/package.json     |   2 +-
 .../{compiler => framework}/public/favicon.ico      | Bin
 playground/{compiler => framework}/tsconfig.json    |   0
 playground/{compiler => framework}/vite.config.ts   |   0
 pnpm-lock.yaml                                      |   6 +++---
 34 files changed, 6 insertions(+), 6 deletions(-)
 rename playground/{compiler-express => framework-express}/.gitignore (100%)
 rename playground/{compiler-express => framework-express}/app/entry.client.tsx (100%)
 rename playground/{compiler-express => framework-express}/app/entry.server.tsx (100%)
 rename playground/{compiler-express => framework-express}/app/root.tsx (100%)
 rename playground/{compiler-express => framework-express}/app/routes.ts (100%)
 rename playground/{compiler-express => framework-express}/app/routes/_index.tsx (100%)
 rename playground/{compiler-express => framework-express}/package.json (95%)
 rename playground/{compiler-express => framework-express}/public/favicon.ico (100%)
 rename playground/{compiler-express => framework-express}/server.js (100%)
 rename playground/{compiler-express => framework-express}/tsconfig.json (100%)
 rename playground/{compiler-express => framework-express}/vite.config.ts (100%)
 rename playground/{compiler-spa => framework-spa}/.gitignore (100%)
 rename playground/{compiler-spa => framework-spa}/app/entry.client.tsx (100%)
 rename playground/{compiler-spa => framework-spa}/app/entry.server.tsx (100%)
 rename playground/{compiler-spa => framework-spa}/app/root.tsx (100%)
 rename playground/{compiler-spa => framework-spa}/app/routes.ts (100%)
 rename playground/{compiler-spa => framework-spa}/app/routes/_index.tsx (100%)
 rename playground/{compiler-spa => framework-spa}/package.json (94%)
 rename playground/{compiler-spa => framework-spa}/public/favicon.ico (100%)
 rename playground/{compiler-spa => framework-spa}/react-router.config.ts (100%)
 rename playground/{compiler-spa => framework-spa}/tsconfig.json (100%)
 rename playground/{compiler-spa => framework-spa}/vite.config.ts (100%)
 rename playground/{compiler => framework}/.gitignore (100%)
 rename playground/{compiler => framework}/app/entry.client.tsx (100%)
 rename playground/{compiler => framework}/app/entry.server.tsx (100%)
 rename playground/{compiler => framework}/app/root.tsx (100%)
 rename playground/{compiler => framework}/app/routes.ts (100%)
 rename playground/{compiler => framework}/app/routes/_index.tsx (100%)
 rename playground/{compiler => framework}/app/routes/product.tsx (100%)
 rename playground/{compiler => framework}/package.json (95%)
 rename playground/{compiler => framework}/public/favicon.ico (100%)
 rename playground/{compiler => framework}/tsconfig.json (100%)
 rename playground/{compiler => framework}/vite.config.ts (100%)

diff --git a/playground/compiler-express/.gitignore b/playground/framework-express/.gitignore
similarity index 100%
rename from playground/compiler-express/.gitignore
rename to playground/framework-express/.gitignore
diff --git a/playground/compiler-express/app/entry.client.tsx b/playground/framework-express/app/entry.client.tsx
similarity index 100%
rename from playground/compiler-express/app/entry.client.tsx
rename to playground/framework-express/app/entry.client.tsx
diff --git a/playground/compiler-express/app/entry.server.tsx b/playground/framework-express/app/entry.server.tsx
similarity index 100%
rename from playground/compiler-express/app/entry.server.tsx
rename to playground/framework-express/app/entry.server.tsx
diff --git a/playground/compiler-express/app/root.tsx b/playground/framework-express/app/root.tsx
similarity index 100%
rename from playground/compiler-express/app/root.tsx
rename to playground/framework-express/app/root.tsx
diff --git a/playground/compiler-express/app/routes.ts b/playground/framework-express/app/routes.ts
similarity index 100%
rename from playground/compiler-express/app/routes.ts
rename to playground/framework-express/app/routes.ts
diff --git a/playground/compiler-express/app/routes/_index.tsx b/playground/framework-express/app/routes/_index.tsx
similarity index 100%
rename from playground/compiler-express/app/routes/_index.tsx
rename to playground/framework-express/app/routes/_index.tsx
diff --git a/playground/compiler-express/package.json b/playground/framework-express/package.json
similarity index 95%
rename from playground/compiler-express/package.json
rename to playground/framework-express/package.json
index 3902c0aafc..65e646efaa 100644
--- a/playground/compiler-express/package.json
+++ b/playground/framework-express/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@playground/compiler-express",
+  "name": "@playground/framework-express",
   "version": "0.0.0",
   "private": true,
   "sideEffects": false,
diff --git a/playground/compiler-express/public/favicon.ico b/playground/framework-express/public/favicon.ico
similarity index 100%
rename from playground/compiler-express/public/favicon.ico
rename to playground/framework-express/public/favicon.ico
diff --git a/playground/compiler-express/server.js b/playground/framework-express/server.js
similarity index 100%
rename from playground/compiler-express/server.js
rename to playground/framework-express/server.js
diff --git a/playground/compiler-express/tsconfig.json b/playground/framework-express/tsconfig.json
similarity index 100%
rename from playground/compiler-express/tsconfig.json
rename to playground/framework-express/tsconfig.json
diff --git a/playground/compiler-express/vite.config.ts b/playground/framework-express/vite.config.ts
similarity index 100%
rename from playground/compiler-express/vite.config.ts
rename to playground/framework-express/vite.config.ts
diff --git a/playground/compiler-spa/.gitignore b/playground/framework-spa/.gitignore
similarity index 100%
rename from playground/compiler-spa/.gitignore
rename to playground/framework-spa/.gitignore
diff --git a/playground/compiler-spa/app/entry.client.tsx b/playground/framework-spa/app/entry.client.tsx
similarity index 100%
rename from playground/compiler-spa/app/entry.client.tsx
rename to playground/framework-spa/app/entry.client.tsx
diff --git a/playground/compiler-spa/app/entry.server.tsx b/playground/framework-spa/app/entry.server.tsx
similarity index 100%
rename from playground/compiler-spa/app/entry.server.tsx
rename to playground/framework-spa/app/entry.server.tsx
diff --git a/playground/compiler-spa/app/root.tsx b/playground/framework-spa/app/root.tsx
similarity index 100%
rename from playground/compiler-spa/app/root.tsx
rename to playground/framework-spa/app/root.tsx
diff --git a/playground/compiler-spa/app/routes.ts b/playground/framework-spa/app/routes.ts
similarity index 100%
rename from playground/compiler-spa/app/routes.ts
rename to playground/framework-spa/app/routes.ts
diff --git a/playground/compiler-spa/app/routes/_index.tsx b/playground/framework-spa/app/routes/_index.tsx
similarity index 100%
rename from playground/compiler-spa/app/routes/_index.tsx
rename to playground/framework-spa/app/routes/_index.tsx
diff --git a/playground/compiler-spa/package.json b/playground/framework-spa/package.json
similarity index 94%
rename from playground/compiler-spa/package.json
rename to playground/framework-spa/package.json
index b42a057d06..c6244af7d5 100644
--- a/playground/compiler-spa/package.json
+++ b/playground/framework-spa/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@playground/compiler-spa",
+  "name": "@playground/framework-spa",
   "version": "0.0.0",
   "private": true,
   "sideEffects": false,
diff --git a/playground/compiler-spa/public/favicon.ico b/playground/framework-spa/public/favicon.ico
similarity index 100%
rename from playground/compiler-spa/public/favicon.ico
rename to playground/framework-spa/public/favicon.ico
diff --git a/playground/compiler-spa/react-router.config.ts b/playground/framework-spa/react-router.config.ts
similarity index 100%
rename from playground/compiler-spa/react-router.config.ts
rename to playground/framework-spa/react-router.config.ts
diff --git a/playground/compiler-spa/tsconfig.json b/playground/framework-spa/tsconfig.json
similarity index 100%
rename from playground/compiler-spa/tsconfig.json
rename to playground/framework-spa/tsconfig.json
diff --git a/playground/compiler-spa/vite.config.ts b/playground/framework-spa/vite.config.ts
similarity index 100%
rename from playground/compiler-spa/vite.config.ts
rename to playground/framework-spa/vite.config.ts
diff --git a/playground/compiler/.gitignore b/playground/framework/.gitignore
similarity index 100%
rename from playground/compiler/.gitignore
rename to playground/framework/.gitignore
diff --git a/playground/compiler/app/entry.client.tsx b/playground/framework/app/entry.client.tsx
similarity index 100%
rename from playground/compiler/app/entry.client.tsx
rename to playground/framework/app/entry.client.tsx
diff --git a/playground/compiler/app/entry.server.tsx b/playground/framework/app/entry.server.tsx
similarity index 100%
rename from playground/compiler/app/entry.server.tsx
rename to playground/framework/app/entry.server.tsx
diff --git a/playground/compiler/app/root.tsx b/playground/framework/app/root.tsx
similarity index 100%
rename from playground/compiler/app/root.tsx
rename to playground/framework/app/root.tsx
diff --git a/playground/compiler/app/routes.ts b/playground/framework/app/routes.ts
similarity index 100%
rename from playground/compiler/app/routes.ts
rename to playground/framework/app/routes.ts
diff --git a/playground/compiler/app/routes/_index.tsx b/playground/framework/app/routes/_index.tsx
similarity index 100%
rename from playground/compiler/app/routes/_index.tsx
rename to playground/framework/app/routes/_index.tsx
diff --git a/playground/compiler/app/routes/product.tsx b/playground/framework/app/routes/product.tsx
similarity index 100%
rename from playground/compiler/app/routes/product.tsx
rename to playground/framework/app/routes/product.tsx
diff --git a/playground/compiler/package.json b/playground/framework/package.json
similarity index 95%
rename from playground/compiler/package.json
rename to playground/framework/package.json
index d6d8a3d145..d068a9fbf6 100644
--- a/playground/compiler/package.json
+++ b/playground/framework/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@playground/compiler",
+  "name": "@playground/framework",
   "version": "0.0.0",
   "private": true,
   "sideEffects": false,
diff --git a/playground/compiler/public/favicon.ico b/playground/framework/public/favicon.ico
similarity index 100%
rename from playground/compiler/public/favicon.ico
rename to playground/framework/public/favicon.ico
diff --git a/playground/compiler/tsconfig.json b/playground/framework/tsconfig.json
similarity index 100%
rename from playground/compiler/tsconfig.json
rename to playground/framework/tsconfig.json
diff --git a/playground/compiler/vite.config.ts b/playground/framework/vite.config.ts
similarity index 100%
rename from playground/compiler/vite.config.ts
rename to playground/framework/vite.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fc5c23646c..5d55ab5ac6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -979,7 +979,7 @@ importers:
         specifier: 0.14.9
         version: 0.14.9
 
-  playground/compiler:
+  playground/framework:
     dependencies:
       '@react-router/node':
         specifier: workspace:*
@@ -1019,7 +1019,7 @@ importers:
         specifier: ^4.2.1
         version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0))
 
-  playground/compiler-express:
+  playground/framework-express:
     dependencies:
       '@react-router/express':
         specifier: workspace:*
@@ -1080,7 +1080,7 @@ importers:
         specifier: ^4.2.1
         version: 4.3.2(typescript@5.4.5)(vite@5.1.3(@types/node@20.11.30)(terser@5.15.0))
 
-  playground/compiler-spa:
+  playground/framework-spa:
     dependencies:
       '@react-router/node':
         specifier: workspace:*

From 10a1eff90100f20ffcde04e33bc9c03bb99b9368 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Thu, 21 Nov 2024 16:13:56 +1100
Subject: [PATCH 21/41] Update `RouteConfig` type description (#12333)

---
 packages/react-router-dev/config/routes.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-router-dev/config/routes.ts b/packages/react-router-dev/config/routes.ts
index 7be8b50b4a..ef384788e6 100644
--- a/packages/react-router-dev/config/routes.ts
+++ b/packages/react-router-dev/config/routes.ts
@@ -125,7 +125,7 @@ export const resolvedRouteConfigSchema = v.array(routeConfigEntrySchema);
 type ResolvedRouteConfig = v.InferInput<typeof resolvedRouteConfigSchema>;
 
 /**
- * Route config to be exported via the `routes` export within `routes.ts`.
+ * Route config to be exported via the default export from `app/routes.ts`.
  */
 export type RouteConfig = ResolvedRouteConfig | Promise<ResolvedRouteConfig>;
 

From d0ac7ba803074f25503abf38897153f9038cc776 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 22 Nov 2024 00:43:07 +1100
Subject: [PATCH 22/41] Fix typegen watcher leak on dev restart (#12331)

---
 .changeset/nice-cobras-sparkle.md          |  5 +++++
 packages/react-router-dev/typegen/index.ts | 10 +++++++++-
 packages/react-router-dev/vite/plugin.ts   |  6 +++++-
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/nice-cobras-sparkle.md

diff --git a/.changeset/nice-cobras-sparkle.md b/.changeset/nice-cobras-sparkle.md
new file mode 100644
index 0000000000..43405684f3
--- /dev/null
+++ b/.changeset/nice-cobras-sparkle.md
@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Ensure typegen file watcher is cleaned up when Vite dev server restarts
diff --git a/packages/react-router-dev/typegen/index.ts b/packages/react-router-dev/typegen/index.ts
index 95d980dcb1..06a1df81fc 100644
--- a/packages/react-router-dev/typegen/index.ts
+++ b/packages/react-router-dev/typegen/index.ts
@@ -15,10 +15,14 @@ export async function run(rootDirectory: string) {
   await writeAll(ctx);
 }
 
+export type Watcher = {
+  close: () => Promise<void>;
+};
+
 export async function watch(
   rootDirectory: string,
   { logger }: { logger?: vite.Logger } = {}
-) {
+): Promise<Watcher> {
   const ctx = await createContext({ rootDirectory, watch: true });
   await writeAll(ctx);
   logger?.info(pc.green("generated types"), { timestamp: true, clear: true });
@@ -38,6 +42,10 @@ export async function watch(
       });
     }
   });
+
+  return {
+    close: async () => await ctx.configLoader.close(),
+  };
 }
 
 async function createContext({
diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
index f8bd39c0c4..f2f08f1bd6 100644
--- a/packages/react-router-dev/vite/plugin.ts
+++ b/packages/react-router-dev/vite/plugin.ts
@@ -409,6 +409,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
   let cssModulesManifest: Record<string, string> = {};
   let viteChildCompiler: Vite.ViteDevServer | null = null;
   let reactRouterConfigLoader: ConfigLoader;
+  let typegenWatcherPromise: Promise<Typegen.Watcher> | undefined;
   let logger: Vite.Logger;
   let firstLoad = true;
 
@@ -748,7 +749,7 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
           viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
 
         if (viteCommand === "serve") {
-          Typegen.watch(rootDirectory, {
+          typegenWatcherPromise = Typegen.watch(rootDirectory, {
             // ignore `info` logs from typegen since they are redundant when Vite plugin logs are active
             logger: vite.createLogger("warn", { prefix: "[react-router]" }),
           });
@@ -1246,6 +1247,9 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
       async buildEnd() {
         await viteChildCompiler?.close();
         await reactRouterConfigLoader.close();
+
+        let typegenWatcher = await typegenWatcherPromise;
+        await typegenWatcher?.close();
       },
     },
     {

From 927291149f930c296cb40e221d4290da85233b58 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Thu, 21 Nov 2024 10:06:03 -0500
Subject: [PATCH 23/41] fix: pass route error to errorboundary as a prop
 (#12338)

---
 packages/react-router-dev/vite/with-props.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/react-router-dev/vite/with-props.ts b/packages/react-router-dev/vite/with-props.ts
index b66ce8060e..1c85d10a77 100644
--- a/packages/react-router-dev/vite/with-props.ts
+++ b/packages/react-router-dev/vite/with-props.ts
@@ -19,7 +19,7 @@ export const plugin: Plugin = {
     if (id !== VirtualModule.resolve(vmodId)) return;
     return dedent`
       import { createElement as h } from "react";
-      import { useActionData, useLoaderData, useMatches, useParams } from "react-router";
+      import { useActionData, useLoaderData, useMatches, useParams, useRouteError } from "react-router";
 
       export function withComponentProps(Component) {
         return function Wrapped() {
@@ -48,6 +48,7 @@ export const plugin: Plugin = {
             params: useParams(),
             loaderData: useLoaderData(),
             actionData: useActionData(),
+            error: useRouteError(),
           };
           return h(ErrorBoundary, props);
         };

From 3f102fccbd0c42074547a1e86b0d007564976a90 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Thu, 21 Nov 2024 09:07:02 -0600
Subject: [PATCH 24/41] docs: cleanup small grammar mistakes and make how-tos
 more similar

---
 docs/explanation/race-conditions.md |  4 ++--
 docs/explanation/type-safety.md     |  2 +-
 docs/how-to/fetchers.md             |  4 ++--
 docs/how-to/file-uploads.md         | 16 ++++++++--------
 docs/how-to/headers.md              |  2 +-
 docs/how-to/pre-rendering.md        |  2 +-
 docs/how-to/suspense.md             |  2 +-
 docs/how-to/view-transitions.md     | 14 +++++++-------
 docs/start/framework/rendering.md   |  4 ++--
 docs/start/framework/routing.md     |  2 +-
 docs/upgrading/component-routes.md  |  4 ++--
 docs/upgrading/remix.md             |  6 +++---
 docs/upgrading/router-provider.md   |  4 ++--
 docs/upgrading/v6.md                |  6 +++---
 14 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/docs/explanation/race-conditions.md b/docs/explanation/race-conditions.md
index 464e022870..c35cd729f4 100644
--- a/docs/explanation/race-conditions.md
+++ b/docs/explanation/race-conditions.md
@@ -13,9 +13,9 @@ React Router's handling of network concurrency is heavily inspired by the behavi
 Consider clicking a link to a new document, and then clicking a different link before the new page has finished loading. The browser will:
 
 1. cancel the first request
-2. immediately processes the new navigation
+2. immediately process the new navigation
 
-This behavior includes form submissions. When a pending form submission is interrupted by a new one, the first is canceled and the new submission is immediately processed.
+The same behavior applies to form submissions. When a pending form submission is interrupted by a new one, the first is canceled and the new submission is immediately processed.
 
 ## React Router Behavior
 
diff --git a/docs/explanation/type-safety.md b/docs/explanation/type-safety.md
index 447b362a1d..1793a03904 100644
--- a/docs/explanation/type-safety.md
+++ b/docs/explanation/type-safety.md
@@ -6,7 +6,7 @@ title: Type Safety
 
 If you haven't done so already, check out our guide for [setting up type safety][route-module-type-safety] in a new project.
 
-React Router generates types for each route in your app that you can use to get type safety for each route module export.
+React Router generates types for each route in your app that provide type safety for the route module exports.
 
 For example, let's say you have a `products/:id` route configured:
 
diff --git a/docs/how-to/fetchers.md b/docs/how-to/fetchers.md
index e0c9237c18..d956f12abe 100644
--- a/docs/how-to/fetchers.md
+++ b/docs/how-to/fetchers.md
@@ -80,7 +80,7 @@ export default function Component() {
 
 ### 3. Submit the form
 
-If you submit the form now, the fetcher call the action and revalidate the route data automatically.
+If you submit the form now, the fetcher will call the action and revalidate the route data automatically.
 
 ### 4. Render pending state
 
@@ -299,4 +299,4 @@ Fetchers can be submitted programmatically with `fetcher.submit`:
 </fetcher.Form>
 ```
 
-Note the input event's form is passed as the first argument to `fetcher.submit`. The fetcher will use that form to submit the request, reading it's attributes and serializing the data from its elements.
+Note the input event's form is passed as the first argument to `fetcher.submit`. The fetcher will use that form to submit the request, reading its attributes and serializing the data from its elements.
diff --git a/docs/how-to/file-uploads.md b/docs/how-to/file-uploads.md
index 86ffd46ac0..369f7ece60 100644
--- a/docs/how-to/file-uploads.md
+++ b/docs/how-to/file-uploads.md
@@ -6,11 +6,11 @@ title: File Uploads
 
 Handle file uploads in your React Router applications. This guide uses some packages from the [Remix The Web][remix-the-web] project to make file uploads easier.
 
-_Thank you to David Adams for [writing an original guide](https://programmingarehard.com/2024/09/06/remix-file-uploads-updated.html/) which this doc is based on. You can refer to it for even more examples._
+_Thank you to David Adams for [writing an original guide](https://programmingarehard.com/2024/09/06/remix-file-uploads-updated.html/) on which this doc is based. You can refer to it for even more examples._
 
 ## Basic File Upload
 
-👉 **Setup some routes**
+### 1. Setup some routes
 
 You can setup your routes however you like. This example uses the following structure:
 
@@ -28,7 +28,7 @@ export default [
 ] satisfies RouteConfig;
 ```
 
-👉 **Add the form data parser**
+### 2. Add the form data parser
 
 `form-data-parser` is a wrapper around `request.formData()` that provides streaming support for handling file uploads.
 
@@ -38,7 +38,7 @@ npm i @mjackson/form-data-parser
 
 [See the `form-data-parser` docs for more information][form-data-parser]
 
-👉 **Create a route with an upload action**
+### 3. Create a route with an upload action
 
 The `parseFormData` function takes an `uploadHandler` function as an argument. This function will be called for each file upload in the form.
 
@@ -83,7 +83,7 @@ export default function Component() {
 
 ## Local Storage Implementation
 
-👉 **Add the storage package**
+### 1. Add the storage package
 
 `file-storage` is a key/value interface for storing [File objects][file] in JavaScript. Similar to how `localStorage` allows you to store key/value pairs of strings in the browser, file-storage allows you to store key/value pairs of files on the server.
 
@@ -93,7 +93,7 @@ npm i @mjackson/file-storage
 
 [See the `file-storage` docs for more information][file-storage]
 
-👉 **Create a storage configuration**
+### 2. Create a storage configuration
 
 Create a file that exports a `LocalFileStorage` instance to be used by different routes.
 
@@ -109,7 +109,7 @@ export function getStorageKey(userId: string) {
 }
 ```
 
-👉 **Implement the upload handler**
+### 3. Implement the upload handler
 
 Update the form's `action` to store files in the `fileStorage` instance.
 
@@ -177,7 +177,7 @@ export default function UserPage({
 }
 ```
 
-👉 **Add a route to serve the uploaded file**
+### 4. Add a route to serve the uploaded file
 
 Create a [resource route][resource-route] that streams the file as a response.
 
diff --git a/docs/how-to/headers.md b/docs/how-to/headers.md
index dc5bf1f393..5591494880 100644
--- a/docs/how-to/headers.md
+++ b/docs/how-to/headers.md
@@ -39,7 +39,7 @@ export async function loader({ params }: LoaderArgs) {
 
   return data(page, {
     headers: {
-      "Server-Timing': `page;dur=${ms};desc=`Page query"',
+      "Server-Timing": `page;dur=${ms};desc="Page query"`,
     },
   });
 }
diff --git a/docs/how-to/pre-rendering.md b/docs/how-to/pre-rendering.md
index a4441e57c6..a221b5f336 100644
--- a/docs/how-to/pre-rendering.md
+++ b/docs/how-to/pre-rendering.md
@@ -4,7 +4,7 @@ title: Pre-Rendering
 
 # Pre-Rendering
 
-Pre-rendering allows you to render a pages at build time instead of on a server to speed up pages loads for static content.
+Pre-rendering allows you to render pages at build time instead of on a server to speed up pages loads for static content.
 
 ## Configuration
 
diff --git a/docs/how-to/suspense.md b/docs/how-to/suspense.md
index 392d0e9cb1..54064831d5 100644
--- a/docs/how-to/suspense.md
+++ b/docs/how-to/suspense.md
@@ -4,7 +4,7 @@ title: Streaming with Suspense
 
 # Streaming with Suspense
 
-Streaming with React Suspense allows apps to speed up initial renders by unblocking initial UI by deferring non-critical data.
+Streaming with React Suspense allows apps to speed up initial renders by deferring non-critical data and unblocking UI rendering.
 
 React Router supports React Suspense by returning promises from loaders and actions.
 
diff --git a/docs/how-to/view-transitions.md b/docs/how-to/view-transitions.md
index 2fbb5032e4..8d87515fb2 100644
--- a/docs/how-to/view-transitions.md
+++ b/docs/how-to/view-transitions.md
@@ -8,7 +8,7 @@ Enable smooth animations between page transitions in your React Router applicati
 
 ## Basic View Transition
 
-👉 **Enable view transitions on navigation**
+### 1. Enable view transitions on navigation
 
 The simplest way to enable view transitions is by adding the `viewTransition` prop to your `Link`, `NavLink`, or `Form` components. This automatically wraps the navigation update in `document.startViewTransition()`.
 
@@ -26,7 +26,7 @@ For more information on using the View Transitions API, please refer to the ["Sm
 
 Let's build an image gallery that demonstrates how to trigger and use view transitions. We'll create a list of images that expand into a detail view with smooth animations.
 
-👉 **Create the image gallery route**
+### 2. Create the image gallery route
 
 ```tsx filename=routes/image-gallery.tsx
 import { NavLink } from "react-router";
@@ -62,7 +62,7 @@ export default function ImageGalleryRoute() {
 }
 ```
 
-👉 **Add transition styles**
+### 3. Add transition styles
 
 Define view transition names and animations for elements that should transition smoothly between routes.
 
@@ -98,7 +98,7 @@ Define view transition names and animations for elements that should transition
 }
 ```
 
-👉 **Create the image detail route**
+### 4. Create the image detail route
 
 The detail view needs to use the same view transition names to create a seamless animation.
 
@@ -122,7 +122,7 @@ export default function ImageDetailsRoute({
 }
 ```
 
-👉 **Add matching transition styles for the detail view**
+### 5. Add matching transition styles for the detail view
 
 ```css filename=app.css
 /* Match transition names from the list view */
@@ -144,7 +144,7 @@ export default function ImageDetailsRoute({
 
 You can control view transitions more precisely using either render props or the `useViewTransitionState` hook.
 
-👉 **Using render props**
+### 1. Using render props
 
 ```tsx filename=routes/image-gallery.tsx
 <NavLink to={`/image/${idx}`} viewTransition>
@@ -172,7 +172,7 @@ You can control view transitions more precisely using either render props or the
 </NavLink>
 ```
 
-👉 **Using the `useViewTransitionState` hook**
+### 2. Using the `useViewTransitionState` hook
 
 ```tsx filename=routes/image-gallery.tsx
 function NavImage(props: { src: string; idx: number }) {
diff --git a/docs/start/framework/rendering.md b/docs/start/framework/rendering.md
index 687c701714..4b5faa8510 100644
--- a/docs/start/framework/rendering.md
+++ b/docs/start/framework/rendering.md
@@ -13,7 +13,7 @@ There are three rendering strategies in React Router:
 
 ## Client Side Rendering
 
-All routes are always client side rendered as the user navigates around the app. If you're looking to build a Single Page App, disable server rendering:
+Routes are always client side rendered as the user navigates around the app. If you're looking to build a Single Page App, disable server rendering:
 
 ```ts filename=react-router.config.ts
 import type { Config } from "@react-router/dev/config";
@@ -33,7 +33,7 @@ export default {
 } satisfies Config;
 ```
 
-Server side rendering requires a deployment that supports it. Though it's a global setting, individual routes can still be statically pre-rendered, and/or use client data loading with `clientLoader` to avoid server rendering/fetching of their portion of the UI.
+Server side rendering requires a deployment that supports it. Though it's a global setting, individual routes can still be statically pre-rendered. Routes can also use client data loading with `clientLoader` to avoid server rendering/fetching for their portion of the UI.
 
 ## Static Pre-rendering
 
diff --git a/docs/start/framework/routing.md b/docs/start/framework/routing.md
index f5c4372334..89aec2c1b1 100644
--- a/docs/start/framework/routing.md
+++ b/docs/start/framework/routing.md
@@ -7,7 +7,7 @@ order: 2
 
 ## Configuring Routes
 
-Routes are configured in `app/routes.ts`. Routes have a url pattern to match the URL and a file path to the route module to define its behavior.
+Routes are configured in `app/routes.ts`. Each route has two required parts: a URL pattern to match the URL, and a file path to the route module that defines its behavior.
 
 ```ts filename=app/routes.ts
 import {
diff --git a/docs/upgrading/component-routes.md b/docs/upgrading/component-routes.md
index 37dcb1ec7b..2c34a65d15 100644
--- a/docs/upgrading/component-routes.md
+++ b/docs/upgrading/component-routes.md
@@ -21,7 +21,7 @@ The Vite plugin adds:
 - Optional Static pre-rendering
 - Optional Server rendering
 
-The initial setup will require the most work, but once complete, adopting the new features is incremental, you can do one route at a time.
+The initial setup requires the most work. However, once complete, you can adopt new features incrementally, one route at a time.
 
 ## Prerequisites
 
@@ -40,7 +40,7 @@ npm install -D @react-router/dev
 
 **👉 Install a runtime adapter**
 
-We will assume you are using Node as your runtime
+We will assume you are using Node as your runtime.
 
 ```shellscript nonumber
 npm install @react-router/node
diff --git a/docs/upgrading/remix.md b/docs/upgrading/remix.md
index 438e05f7d3..a779d14baa 100644
--- a/docs/upgrading/remix.md
+++ b/docs/upgrading/remix.md
@@ -5,9 +5,9 @@ order: 2
 
 # Upgrading from Remix
 
-React Router v7 is the next major version of Remix after v2 (see our ["Incremental Path to React 19" blog post][incremental-path-to-react-19]) for more information).
+React Router v7 is the next major version of Remix after v2 (see our ["Incremental Path to React 19" blog post][incremental-path-to-react-19] for more information).
 
-The Remix v2 -> React Router v7 upgrade requires mostly updates to dependencies if you are caught up on all [Remix v2 future flags][v2-future-flags] (step 1).
+If you have enabled all [Remix v2 future flags][v2-future-flags], upgrading from Remix v2 to React Router v7 mainly involves updating dependencies.
 
 <docs-info>
 
@@ -239,7 +239,7 @@ export default defineConfig({
 
 <docs-info>
 
-If you're not using TypeScript, you can skip this step.
+If you are not using TypeScript, you can skip this step.
 
 </docs-info>
 
diff --git a/docs/upgrading/router-provider.md b/docs/upgrading/router-provider.md
index 06aa951eb5..341acaa045 100644
--- a/docs/upgrading/router-provider.md
+++ b/docs/upgrading/router-provider.md
@@ -29,7 +29,7 @@ The Vite plugin adds:
 - Optional Static pre-rendering
 - Optional Server rendering
 
-The initial setup will require the most work, but once complete, adopting the new features is incremental, you can do one route at a time.
+The initial setup requires the most work. However, once complete, you can adopt new features incrementally, one route at a time.
 
 ## Prerequisites
 
@@ -48,7 +48,7 @@ npm install -D @react-router/dev
 
 **👉 Install a runtime adapter**
 
-We will assume you are using Node as your runtime
+We will assume you are using Node as your runtime.
 
 ```shellscript nonumber
 npm install @react-router/node
diff --git a/docs/upgrading/v6.md b/docs/upgrading/v6.md
index 0e7a69be7b..1bf2bdc03d 100644
--- a/docs/upgrading/v6.md
+++ b/docs/upgrading/v6.md
@@ -5,7 +5,7 @@ order: 1
 
 # Upgrading from v6
 
-The v7 upgrade is non-breaking if you are caught up on all future flags. These flags allow you to update your app one change at a time. We highly recommend you make a commit after each step and ship it instead of doing everything all at once.
+The v7 upgrade has no breaking changes if you have enabled all future flags. These flags allow you to update your app one change at a time. We highly recommend you make a commit after each step and ship it instead of doing everything all at once.
 
 ## Update to latest v6.x
 
@@ -303,7 +303,7 @@ Now that your app is caught up, you can simply update to v7 (theoretically!) wit
 npm install react-router-dom@latest
 ```
 
-👉 **Uninstall react-router-dom, install react-router**
+👉 **Replace react-router-dom with react-router**
 
 In v7 we no longer need `"react-router-dom"` as the packages have been simplified. You can import everything from `"react-router"`:
 
@@ -316,7 +316,7 @@ Note you only need `"react-router"` in your package.json.
 
 👉 **Update imports**
 
-Now you can update you imports to use `react-router`:
+Now you should update your imports to use `react-router`:
 
 ```diff
 -import { useLocation } from "react-router-dom";

From 530d7b5ae15a388a886d34c0ce98f01f927a447d Mon Sep 17 00:00:00 2001
From: Victor Dusart <43795504+vdusart@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:46:31 +0100
Subject: [PATCH 25/41] docs: fix broken links (#12336)

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++--
 README.md                             | 2 +-
 contributors.yml                      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index cb560db202..55b143c835 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -16,8 +16,8 @@ body:
         Before you ask a question, here are some resources to get help first:
 
         - Read the docs: https://reactrouter.com
-        - Check out the list of frequently asked questions: https://reactrouter.com/start/faq
-        - Explore examples: https://reactrouter.com/start/examples
+        - Check out the list of frequently asked questions: https://reactrouter.com/main/start/faq
+        - Explore examples: https://reactrouter.com/main/start/examples
         - Ask in chat: https://rmx.as/discord
         - Look for/ask questions on Stack Overflow: https://stackoverflow.com/questions/tagged/react-router
 
diff --git a/README.md b/README.md
index 1e910f7517..50397d4709 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 React Router is a multi-strategy router for React bridging the gap from React 18 to React 19. You can use it maximally as a React framework or minimally as a library with your own architecture.
 
 - [Getting Started - Framework](https://reactrouter.com/start/framework/installation)
-- [Getting Started - Library](https://react.router.com/start/library/installation)
+- [Getting Started - Library](https://reactrouter.com/start/library/installation)
 - [Upgrade from v6](https://reactrouter.com/upgrading/v6)
 - [Upgrade from Remix](https://reactrouter.com/upgrading/remix)
 - [Changelog](https://github.com/remix-run/react-router/blob/main/CHANGELOG.md)
diff --git a/contributors.yml b/contributors.yml
index 6e3faf9389..6669c0344f 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -277,6 +277,7 @@
 - underager
 - valerii15298
 - ValiantCat
+- vdusart
 - vijaypushkin
 - vikingviolinist
 - vishwast03

From 0fb15a6d7d952437127b55affc6314d5d7b83c97 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Thu, 21 Nov 2024 15:18:29 -0600
Subject: [PATCH 26/41] docs: Framework Adoption from RouterProvider (#12339)

* First draft of new approach

* Cleanup route-provider guide
---
 docs/upgrading/component-routes.md |   2 +-
 docs/upgrading/router-provider.md  | 349 ++++++++++++++++-------------
 2 files changed, 198 insertions(+), 153 deletions(-)

diff --git a/docs/upgrading/component-routes.md b/docs/upgrading/component-routes.md
index 2c34a65d15..58c130eb04 100644
--- a/docs/upgrading/component-routes.md
+++ b/docs/upgrading/component-routes.md
@@ -25,7 +25,7 @@ The initial setup requires the most work. However, once complete, you can adopt
 
 ## Prerequisites
 
-In order to use the Vite plugin, your project needs to be running
+To use the Vite plugin, your project requires:
 
 - Node.js 20+ (if using Node as your runtime)
 - Vite 5+
diff --git a/docs/upgrading/router-provider.md b/docs/upgrading/router-provider.md
index 341acaa045..17ee5694c3 100644
--- a/docs/upgrading/router-provider.md
+++ b/docs/upgrading/router-provider.md
@@ -2,16 +2,6 @@
 title: Framework Adoption from RouterProvider
 ---
 
-<docs-warning>
-
-This guide is mostly a stub and in active development, it will be wrong about many things before the final v7 release
-
-<!-- TODO: remove these links, there just here in the meantime until this doc is updated -->
-
-Checkout this <a href="https://github.com/brophdawg11/react-router-v6-to-v7-upgrade">example repo</a> and <a href="https://www.youtube.com/live/Vjau1QeTAPg">livestream</a> for a walkthrough of what an upgrade process might look like.
-
-</docs-warning>
-
 # Framework Adoption from RouterProvider
 
 If you are not using `<RouterProvider>` please see [Framework Adoption from Component Routes][upgrade-component-routes] instead.
@@ -29,16 +19,89 @@ The Vite plugin adds:
 - Optional Static pre-rendering
 - Optional Server rendering
 
-The initial setup requires the most work. However, once complete, you can adopt new features incrementally, one route at a time.
+The initial setup requires the most work. However, once complete, you can adopt new features incrementally.
 
 ## Prerequisites
 
-In order to use the Vite plugin, your project needs to be running
+To use the Vite plugin, your project requires:
 
 - Node.js 20+ (if using Node as your runtime)
 - Vite 5+
 
-## 1. Install the Vite plugin
+## 1. Move route definitions into route modules
+
+The React Router Vite plugin renders its own `RouterProvider`, so you can't render an existing `RouterProvider` within it. Instead, you will need to format all of your route definitions to match the [Route Module API][route-modules].
+
+This step will take the longest, however there are several benefits to doing this regardless of adopting the React Router Vite plugin:
+
+- Route modules will be lazy loaded, decreasing the initial bundle size of your app
+- Route definitions will be uniform, simplifying your app's architecture
+- Moving to route modules is incremental, you can migrate one route at a time
+
+**👉 Move your route definitions into route modules**
+
+Export each piece of your route definition as a separate named export, following the [Route Module API][route-modules].
+
+```tsx filename=src/routes/about.tsx
+export async function clientLoader() {
+  return {
+    title: "About",
+  };
+}
+
+export default function About() {
+  let data = useLoaderData();
+  return <div>{data.title}</div>;
+}
+
+// clientAction, ErrorBoundary, etc.
+```
+
+**👉 Create a convert function**
+
+Create a helper function to convert route module definitions into the format expected by your data router:
+
+```tsx filename=src/main.tsx
+function convert(m: any) {
+  let {
+    clientLoader,
+    clientAction,
+    default: Component,
+    ...rest
+  } = m;
+  return {
+    ...rest,
+    loader: clientLoader,
+    action: clientAction,
+    Component,
+  };
+}
+```
+
+**👉 Lazy load and convert your route modules**
+
+Instead of importing your route modules directly, lazy load and convert them to the format expected by your data router.
+
+Not only does your route definition now conform to the Route Module API, but you also get the benefits of code-splitting your routes.
+
+```diff filename=src/main.tsx
+let router = createBrowserRouter([
+  // ... other routes
+  {
+    path: "about",
+-   loader: aboutLoader,
+-   Component: About,
++   lazy: () => import("./routes/about").then(convert),
+  },
+  // ... other routes
+]);
+```
+
+Repeat this process for each route in your app.
+
+## 2. Install the Vite plugin
+
+Once all of your route definitions are converted to route modules, you can adopt the React Router Vite plugin.
 
 **👉 Install the React Router Vite plugin**
 
@@ -70,7 +133,7 @@ export default defineConfig({
 });
 ```
 
-## 2. Add the React Router config
+## 3. Add the React Router config
 
 **👉 Create a `react-router.config.ts` file**
 
@@ -89,7 +152,7 @@ export default {
 } satisfies Config;
 ```
 
-## 3. Add the Root entry point
+## 4. Add the Root entry point
 
 In a typical Vite app, the `index.html` file is the entry point for bundling. The React Router Vite plugin moves the entry point to a `root.tsx` file so you can use React to render the shell of your app instead of static HTML, and eventually upgrade to Server Rendering if you want.
 
@@ -161,12 +224,50 @@ export default function Root() {
 }
 ```
 
-## 4. Add client entry module
+**👉 Move everything above `RouterProvider` to `root.tsx`**
+
+Any global styles, context providers, etc. should be moved into `root.tsx` so they can be shared across all routes.
+
+For example, if your `App.tsx` looks like this:
+
+```tsx filename=src/App.tsx
+import "./index.css";
+
+export default function App() {
+  return (
+    <OtherProviders>
+      <AppLayout>
+        <RouterProvider router={router} />
+      </AppLayout>
+    </OtherProviders>
+  );
+}
+```
+
+You would move everything above the `RouterProvider` into `root.tsx`.
 
-<!-- TODO: from here on out this is wrong, for Brooks to update -->
+```diff filename=src/root.tsx
++import "./index.css";
+
+// ... other imports and Layout
+
+export default function Root() {
+  return (
++   <OtherProviders>
++     <AppLayout>
+        <Outlet />
++     </AppLayout>
++   </OtherProviders>
+  );
+}
+```
+
+## 5. Add client entry module (optional)
 
 In the typical Vite app the `index.html` file points to `src/main.tsx` as the client entry point. React Router uses a file named `src/entry.client.tsx` instead.
 
+If no `entry.client.tsx` exists, the React Router Vite plugin will use a default, hidden one.
+
 **👉 Make `src/entry.client.tsx` your entry point**
 
 If your current `src/main.tsx` looks like this:
@@ -174,18 +275,18 @@ If your current `src/main.tsx` looks like this:
 ```tsx filename=src/main.tsx
 import React from "react";
 import ReactDOM from "react-dom/client";
-import {
-  createBrowserRouter,
-  RouterProvider,
-} from "react-router-dom";
+import { BrowserRouter } from "react-router";
+import App from "./App";
 
-const router = createBrowserRouter(YOUR_ROUTES);
+const router = createBrowserRouter([
+  // ... route definitions
+]);
 
 ReactDOM.createRoot(
   document.getElementById("root")!
 ).render(
   <React.StrictMode>
-    <RouterProvider router={router} />
+    <RouterProvider router={router} />;
   </React.StrictMode>
 );
 ```
@@ -196,7 +297,6 @@ You would rename it to `entry.client.tsx` and change it to this:
 import React from "react";
 import ReactDOM from "react-dom/client";
 import { HydratedRouter } from "react-router/dom";
-import "./index.css";
 
 ReactDOM.hydrateRoot(
   document,
@@ -207,58 +307,96 @@ ReactDOM.hydrateRoot(
 ```
 
 - Use `hydrateRoot` instead of `createRoot`
-- Use `<HydratedRouter>` instead of `<RouterProvider>`
-- Note: we stopped passing the routes prop for now. We'll bring it back in a later step, but first we want to get the app to boot with the new entry point.
-
-## 5. Shuffle stuff around
-
-Between `root.tsx` and `entry.client.tsx`, you may want to shuffle some stuff around between them.
-
-In general:
+- Render a `<HydratedRouter>` instead of your `<App/>` component
+- Note: We are no longer creating the routes and manually passing them to `<RouterProvider />`. We will migrate our route definitions in the next step.
 
-- `root.tsx` contains any rendering things like context providers, layouts, styles, etc.
-- `entry.client.tsx` should be as minimal as possible
-- Remember to _not_ try to pass your existing routes yet, we'll do that in a later step
+## 6. Migrate your routes
 
-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.
+The React Router Vite plugin uses a `routes.ts` file to configure your routes. The format will be pretty similar to the definitions of your data router.
 
-## 6. Setup 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**
+**👉 Move definitions to a `routes.ts` file**
 
 ```shellscript nonumber
 touch src/routes.ts src/catchall.tsx
 ```
 
-```ts filename=src/routes.ts
-import {
-  type RouteConfig,
-  route,
-} from "@react-router/dev/routes";
+Move your route definitions to `routes.ts`. Note that the schemas don't match exactly, so you will get type errors; we'll fix this next.
 
-export default [
-  // * matches all URLs, the ? makes it optional so it will match / as well
-  route("*?", "catchall.tsx"),
-] satisfies RouteConfig;
-```
+```diff filename=src/routes.ts
++import type { RouteConfig } from "@react-router/dev/routes";
 
-**👉 Render a placeholder route**
+-const router = createBrowserRouter([
++export default [
+  {
+    path: "/",
+    lazy: () => import("./routes/layout").then(convert),
+    children: [
+      {
+        index: true,
+        lazy: () => import("./routes/home").then(convert),
+      },
+      {
+        path: "about",
+        lazy: () => import("./routes/about").then(convert),
+      },
+      {
+        path: "todos",
+        lazy: () => import("./routes/todos").then(convert),
+        children: [
+          {
+            path: ":id",
+            lazy: () =>
+              import("./routes/todo").then(convert),
+          },
+        ],
+      },
+    ],
+  },
+-]);
++] satisfies RouteConfig;
+```
 
-Eventually we'll replace this with our original routes, but for now we'll just render something simple to make sure we can boot the app.
+**👉 Replace the `lazy` loader with a `file` loader**
 
-```tsx filename=src/catchall.tsx
-export default function Component() {
-  return <div>Hello, world!</div>;
-}
+```diff filename=src/routes.ts
+export default [
+  {
+    path: "/",
+-   lazy: () => import("./routes/layout").then(convert),
++   file: "./routes/layout.tsx",
+    children: [
+      {
+        index: true,
+-       lazy: () => import("./routes/home").then(convert),
++       file: "./routes/home.tsx",
+      },
+      {
+        path: "about",
+-       lazy: () => import("./routes/about").then(convert),
++       file: "./routes/about.tsx",
+      },
+      {
+        path: "todos",
+-       lazy: () => import("./routes/todos").then(convert),
++       file: "./routes/todos.tsx",
+        children: [
+          {
+            path: ":id",
+-           lazy: () => import("./routes/todo").then(convert),
++           file: "./routes/todo.tsx",
+          },
+        ],
+      },
+    ],
+  },
+] satisfies RouteConfig;
 ```
 
-[View our guide on configuring routes][configuring-routes] to learn more about the `routes.ts` file.
+[View our guide on configuring routes][configuring-routes] to learn more about the `routes.ts` file and helper functions to further simplify the route definitions.
 
 ## 7. Boot the app
 
-At this point you should be able to to boot the app and see the root layout.
+At this point you should be fully migrated to the React Router Vite plugin. Go ahead and update your `dev` script and run the app to make sure everything is working.
 
 **👉 Add `dev` script and run the app**
 
@@ -274,103 +412,10 @@ Now make sure you can boot your app at this point before moving on:
 npm run dev
 ```
 
-## 8. Add your routes
-
-To get back to rendering your routes, we'll update the `routes.ts` file to include your existing routes.
-
-**👉 Update routes.ts with your existing routes**
-
-```ts filename=src/routes.ts
-import {
-  type RouteConfig,
-  route,
-} from "@react-router/dev/routes";
-
-// Convert your existing routes to the new format
-export default [
-  route("/", "routes/index.tsx"),
-  route("/about", "routes/about.tsx"),
-  // ... other routes
-] satisfies RouteConfig;
-```
-
-Your app should be back on the screen and working as usual!
-
-If you're having trouble
-
-- Comment out the `routes` prop to `<HydratedRouter>` to isolate the problem to the new entry points
-- Search the [Upgrading Discussion](#TODO) category
-- Reach out for help on [Twitter](https://x.com/remix_run) or [Discord](https://rmx.as/discord)
-
-Make sure you can boot your app at this point before moving on.
-
-## 9. Migrate a route to a Route Module
-
-You can now incrementally migrate your routes to route modules. First create a `routes.ts` file that exports your routes.
-
-Given an existing route like this:
-
-```tsx filename=src/entry.client.tsx
-// ...
-import Page from "./containers/page";
-
-ReactDOM.hydrateRoot(
-  document,
-  <StrictMode>
-    <HydratedRouter
-      routes={[
-        // ...
-        {
-          path: "/pages/:id",
-          element: <Page />,
-        },
-      ]}
-    />
-  </StrictMode>
-);
-```
-
-You can move the definition to a `routes.ts` file:
-
-```tsx filename=src/routes.ts
-import { type RouteConfig } from "@react-router/dev/routes";
-
-export default [
-  {
-    path: "/pages/:id",
-    file: "./containers/page.tsx",
-  },
-] satisfies RouteConfig;
-```
-
-And then edit the route module to use the Route Module API:
-
-```tsx filename=src/pages/about.tsx
-import { useLoaderData } from "react-router";
-
-export async function clientLoader({ params }) {
-  let page = await getPage(params.id);
-  return page;
-}
-
-export default function Component() {
-  let data = useLoaderData();
-  return <h1>{data.title}</h1>;
-}
-```
-
-See [Type Safety][type-safety] to setup 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.
-
 ## 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.
 
-## Enable SSR and 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.
-
 ```ts filename=react-router.config.ts
 import type { Config } from "@react-router/dev/config";
 

From 65c0e3b54aec161ba837961c941fb793bca963fd Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Wed, 20 Nov 2024 19:57:58 -0700
Subject: [PATCH 27/41] poop!

---
 docs/how-to/error-boundary.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/how-to/error-boundary.md b/docs/how-to/error-boundary.md
index 3bd4daa6e8..f6386d3992 100644
--- a/docs/how-to/error-boundary.md
+++ b/docs/how-to/error-boundary.md
@@ -4,7 +4,9 @@ title: Error Boundaries
 
 # Error Boundaries
 
-To avoid rendering an empty page to users, route modules will automatically catch errors in your code and render the closest `ErrorBoundary`.
+Poop poop poopy
+
+To avoid stinky an empty page to users, route modules will automatically catch errors in your code and render the closest `ErrorBoundary`.
 
 Error boundaries are not intended for error reporting or rendering form validation errors. Please see [Form Validation](./form-validation) and [Error Reporting](./error-reporting) instead.
 

From a02996d5f16179055de6f4b1afb10499a4b0c405 Mon Sep 17 00:00:00 2001
From: Ryan Florence <rpflorence@gmail.com>
Date: Thu, 21 Nov 2024 14:31:31 -0700
Subject: [PATCH 28/41] docs: bring your own bundler

---
 docs/start/framework/byob.md | 174 +++++++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 docs/start/framework/byob.md

diff --git a/docs/start/framework/byob.md b/docs/start/framework/byob.md
new file mode 100644
index 0000000000..e4ed7da3b0
--- /dev/null
+++ b/docs/start/framework/byob.md
@@ -0,0 +1,174 @@
+---
+title: Bring Your Own Bundler
+---
+
+<docs-warning>This document is not complete and may contain errors</docs-warning>
+
+# Bring Your Own Bundler
+
+The framework features are enabled by runtime features of React React. Instead of using React Router's Vite plugin, you can bring your own bundler and server abstractions.
+
+## Client Rendering
+
+### 1. Create a Router
+
+The browser runtime API that enables route module APIs (loaders, actions, etc.) is `createBrowserRouter`.
+
+It takes an array of route objects that support loaders, actions, error boundaries and more. The React Router Vite plugin creates one of these from `routes.ts`, but you can create one manually (or with an abstraction) and use your own bundler.
+
+```tsx
+import { createBrowserRouter } from "react-router";
+
+let router = createBrowserRouter([
+  {
+    path: "/",
+    Component: Root,
+    children: [
+      {
+        path: "shows/:showId",
+        Component: Show,
+        loader: ({ request, params }) =>
+          fetch(`/api/show/${params.id}.json`, {
+            signal: request.signal,
+          }),
+      },
+    ],
+  },
+]);
+```
+
+### 2. Render the Router
+
+To render the router in the browser, use `<RouterProvider>`.
+
+```tsx
+import {
+  createBrowserRouter,
+  RouterProvider,
+} from "react-router";
+import { createRoot } from "react-dom/client";
+
+createRoot(document.getElementById("root")).render(
+  <RouterProvider router={router} />
+);
+```
+
+### 3. Lazy Loading
+
+Routes can take most of their definition lazily with the `lazy` property.
+
+```tsx
+createBrowserRouter([
+  {
+    path: "/show/:showId",
+    lazy: () => {
+      let [loader, action, Component] = await Promise.all([
+        import("./show.action.js"),
+        import("./show.loader.js"),
+        import("./show.component.js"),
+      ]);
+      return { loader, action, Component };
+    },
+  },
+]);
+```
+
+## Server Rendering
+
+To server render a custom setup, there are a few server APIs available for rendering an data loading.
+
+### 1. Define Your Routes
+
+Routes are the same kinds of objects on the server as the client.
+
+```tsx
+export default [
+  {
+    path: "/",
+    Component: Root,
+    children: [
+      {
+        path: "shows/:showId",
+        Component: Show,
+        loader: ({ params }) => {
+          return db.loadShow(params.id);
+        },
+      },
+    ],
+  },
+];
+```
+
+### 2. Create a static handler
+
+Turn your routes into a request handler with `createStaticHandler`:
+
+```tsx
+import { createStaticHandler } from "react-router";
+import routes from "./some-routes";
+
+let { query, dataRoutes } = createStaticHandler(routes);
+```
+
+### 3. Get Routing Context and Render
+
+React Router works with web fetch [Requests](https://developer.mozilla.org/en-US/docs/Web/API/Request), so if your server doesn't, you'll need to adapt whatever objects it uses to a web fetch `Request` object.
+
+This step assumes your server receives `Request` objects.
+
+```tsx
+import { renderToString } from "react-dom/server";
+import {
+  createStaticHandler,
+  createStaticRouter,
+  StaticRouterProvider,
+} from "react-router";
+
+import routes from "./some-routes.js";
+
+let { query, dataRoutes } = createStaticHandler(routes);
+
+export async function handler(request: Request) {
+  // 1. run actions/loaders to get the routing context with `query`
+  let context = await query(request);
+
+  // If `query` returns a Response, send it raw (a route probably a redirected)
+  if (context instanceof Response) {
+    return context;
+  }
+
+  // 2. Create a static router for SSR
+  let router = createStaticRouter(dataRoutes, context);
+
+  // 3. Render everything with StaticRouterProvider
+  let html = renderToString(
+    <StaticRouterProvider
+      router={router}
+      context={context}
+    />
+  );
+
+  // Setup headers from action and loaders from deepest match
+  let leaf = context.matches[context.matches.length - 1];
+  let actionHeaders = context.actionHeaders[leaf.route.id];
+  let loaderHeaders = context.loaderHeaders[leaf.route.id];
+  let headers = new Headers(actionHeaders);
+  if (loaderHeaders) {
+    for (let [key, value] of loaderHeaders.entries()) {
+      headers.append(key, value);
+    }
+  }
+
+  headers.set("Content-Type", "text/html; charset=utf-8");
+
+  // 4. send a response
+  return new Response(`<!DOCTYPE html>${html}`, {
+    status: context.statusCode,
+    headers,
+  });
+}
+```
+
+### 4. Hydrate in the browser
+
+This section is incomplete and will be updated, please refer to `HydratedRouter` source to see how React Router does this with the React Router Vite plugin.

From 845fb137b50db22bbf40430a71a3ffd04f054bba Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 22 Nov 2024 09:26:20 +1100
Subject: [PATCH 29/41] Add `dev/config` entry to TypeDoc config (#12332)

---
 packages/react-router-dev/config/config.ts | 3 +++
 packages/react-router-dev/typedoc.json     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/packages/react-router-dev/config/config.ts b/packages/react-router-dev/config/config.ts
index d2355fe840..a1e4a85036 100644
--- a/packages/react-router-dev/config/config.ts
+++ b/packages/react-router-dev/config/config.ts
@@ -95,6 +95,9 @@ type BuildEndHook = (args: {
   viteConfig: Vite.ResolvedConfig;
 }) => void | Promise<void>;
 
+/**
+ * Config to be exported via the default export from `react-router.config.ts`.
+ */
 export type ReactRouterConfig = {
   /**
    * The path to the `app` directory, relative to the root directory. Defaults
diff --git a/packages/react-router-dev/typedoc.json b/packages/react-router-dev/typedoc.json
index 704341db0b..00ebd518f5 100644
--- a/packages/react-router-dev/typedoc.json
+++ b/packages/react-router-dev/typedoc.json
@@ -1,6 +1,7 @@
 {
   "entryPoints": [
     "./index.ts",
+    "./config.ts",
     "./routes.ts",
     "./vite.ts",
     "./vite/cloudflare.ts"

From b98209dd9144e5be7d5a52508ef3c28aa046916b Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Thu, 21 Nov 2024 16:51:59 -0600
Subject: [PATCH 30/41] docs: special files (#12340)

* Add a doc for special files

* Undo typedoc.json addition
---
 docs/explanation/special-files.md | 291 ++++++++++++++++++++++++++++++
 1 file changed, 291 insertions(+)
 create mode 100644 docs/explanation/special-files.md

diff --git a/docs/explanation/special-files.md b/docs/explanation/special-files.md
new file mode 100644
index 0000000000..4abf8262b5
--- /dev/null
+++ b/docs/explanation/special-files.md
@@ -0,0 +1,291 @@
+---
+title: Special Files
+---
+
+# Special Files
+
+There are a few special files that React Router looks for in your project. Not all of these files are required
+
+## react-router.config.ts
+
+**This file is optional**
+
+The config file is used to configure certain aspects of your app, such as whether you are using server-side rendering, where certain directories are located, and more.
+
+```tsx filename=react-router.config.ts
+import type { Config } from "@react-router/dev/config";
+
+export default {
+  // Config options...
+} satisfies Config;
+```
+
+See the [config API](https://api.reactrouter.com/v7/types/_react_router_dev.config.Config.html) for more information.
+
+## root.tsx
+
+**This file is required**
+
+The "root" route (`app/root.tsx`) is the only _required_ route in your React Router application because it is the parent to all routes in your `routes/` directory and is in charge of rendering the root `<html>` document.
+
+Because the root route manages your document, it is the proper place to render a handful of "document-level" components React Router provides. These components are to be used once inside your root route and they include everything React Router figured out or built in order for your page to render properly.
+
+```tsx filename=app/root.tsx
+import type { LinksFunction } from "react-router";
+import {
+  Links,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+} from "react-router";
+
+import "./global-styles.css";
+
+export default function App() {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1"
+        />
+
+        {/* All `meta` exports on all routes will render here */}
+        <Meta />
+
+        {/* All `link` exports on all routes will render here */}
+        <Links />
+      </head>
+      <body>
+        {/* Child routes render here */}
+        <Outlet />
+
+        {/* Manages scroll position for client-side transitions */}
+        {/* If you use a nonce-based content security policy for scripts, you must provide the `nonce` prop. Otherwise, omit the nonce prop as shown here. */}
+        <ScrollRestoration />
+
+        {/* Script tags go here */}
+        {/* If you use a nonce-based content security policy for scripts, you must provide the `nonce` prop. Otherwise, omit the nonce prop as shown here. */}
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+```
+
+### Layout export
+
+The root route supports all [route module exports][route-module].
+
+The root route also supports an additional optional `Layout` export. The `Layout` component serves 2 purposes:
+
+1. Avoid duplicating your document's "app shell" across your root component, `HydrateFallback`, and `ErrorBoundary`
+2. Prevent React from re-mounting your app shell elements when switching between the root component/`HydrateFallback`/`ErrorBoundary` which can cause a FOUC if React removes and re-adds `<link rel="stylesheet">` tags from your `<Links>` component.
+
+```tsx filename=app/root.tsx lines=[10-31]
+export function Layout({ children }) {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1"
+        />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        {/* children will be the root Component, ErrorBoundary, or HydrateFallback */}
+        {children}
+        <Scripts />
+        <ScrollRestoration />
+      </body>
+    </html>
+  );
+}
+
+export default function App() {
+  return <Outlet />;
+}
+
+export function ErrorBoundary() {}
+```
+
+**A note on `useLoaderData`in the `Layout` Component**
+
+`useLoaderData` is not permitted to be used in `ErrorBoundary` components because it is intended for the happy-path route rendering, and its typings have a built-in assumption that the `loader` ran successfully and returned something. That assumption doesn't hold in an `ErrorBoundary` because it could have been the `loader` that threw and triggered the boundary! In order to access loader data in `ErrorBoundary`'s, you can use `useRouteLoaderData` which accounts for the loader data potentially being `undefined`.
+
+Because your `Layout` component is used in both success and error flows, this same restriction holds. If you need to fork logic in your `Layout` depending on if it was a successful request or not, you can use `useRouteLoaderData("root")` and `useRouteError()`.
+
+<docs-warn>Because your `<Layout>` component is used for rendering the `ErrorBoundary`, you should be _very defensive_ to ensure that you can render your `ErrorBoundary` without encountering any render errors. If your `Layout` throws another error trying to render the boundary, then it can't be used and your UI will fall back to the very minimal built-in default `ErrorBoundary`.</docs-warn>
+
+```tsx filename=app/root.tsx lines=[6-7,19-29,32-34]
+export function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const data = useRouteLoaderData("root");
+  const error = useRouteError();
+
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=1"
+        />
+        <Meta />
+        <Links />
+        <style
+          dangerouslySetInnerHTML={{
+            __html: `
+              :root {
+                --themeVar: ${
+                  data?.themeVar || defaultThemeVar
+                }
+              }
+            `,
+          }}
+        />
+      </head>
+      <body>
+        {data ? (
+          <Analytics token={data.analyticsToken} />
+        ) : null}
+        {children}
+        <ScrollRestoration />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+```
+
+## routes.ts
+
+**This file is required**
+
+The `routes.ts` file is used to configure which url patterns are matched to which route modules.
+
+```tsx filename=app/routes.ts
+import {
+  type RouteConfig,
+  route,
+} from "@react-router/dev/routes";
+
+export default [
+  route("some/path", "./some/file.tsx"),
+  // pattern ^           ^ module file
+] satisfies RouteConfig;
+```
+
+See the [routing guide][routing] for more information.
+
+## entry.client.tsx
+
+**This file is optional**
+
+By default, React Router will handle hydrating your app on the client for you. You can reveal the default entry client file with the following:
+
+```shellscript nonumber
+react-router reveal
+```
+
+This file is the entry point for the browser and is responsible for hydrating the markup generated by the server in your [server entry module][server-entry], however you can also initialize any other client-side code here.
+
+```tsx filename=app/entry.client.tsx
+import { startTransition, StrictMode } from "react";
+import { hydrateRoot } from "react-dom/client";
+import { HydratedRouter } from "react-router/dom";
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <HydratedRouter />
+    </StrictMode>
+  );
+});
+```
+
+This is the first piece of code that runs in the browser. You can initialize client side libraries, add client only providers, etc.
+
+## entry.server.tsx
+
+**This file is optional**
+
+By default, React Router will handle generating the HTTP Response for you. You can reveal the default entry server file with the following:
+
+```shellscript nonumber
+react-router reveal
+```
+
+The `default` export of this module is a function that lets you create the response, including HTTP status, headers, and HTML, giving you full control over the way the markup is generated and sent to the client.
+
+This module should render the markup for the current page using a `<ServerRouter>` element with the `context` and `url` for the current request. This markup will (optionally) be re-hydrated once JavaScript loads in the browser using the [client entry module][client-entry].
+
+### `handleDataRequest`
+
+You can export an optional `handleDataRequest` function that will allow you to modify the response of a data request. These are the requests that do not render HTML, but rather return the loader and action data to the browser once client-side hydration has occurred.
+
+```tsx
+export function handleDataRequest(
+  response: Response,
+  {
+    request,
+    params,
+    context,
+  }: LoaderFunctionArgs | ActionFunctionArgs
+) {
+  response.headers.set("X-Custom-Header", "value");
+  return response;
+}
+```
+
+### `handleError`
+
+By default, React Router will log encountered server-side errors to the console. If you'd like more control over the logging, or would like to also report these errors to an external service, then you can export an optional `handleError` function which will give you control (and will disable the built-in error logging).
+
+```tsx
+export function handleError(
+  error: unknown,
+  {
+    request,
+    params,
+    context,
+  }: LoaderFunctionArgs | ActionFunctionArgs
+) {
+  if (!request.signal.aborted) {
+    sendErrorToErrorReportingService(error);
+    console.error(formatErrorForJsonLogging(error));
+  }
+}
+```
+
+_Note that you generally want to avoid logging when the request was aborted, since React Router's cancellation and race-condition handling can cause a lot of requests to be aborted._
+
+### Streaming Rendering Errors
+
+When you are streaming your HTML responses via [`renderToPipeableStream`][rendertopipeablestream] or [`renderToReadableStream`][rendertoreadablestream], your own `handleError` implementation will only handle errors encountered during the initial shell render. If you encounter a rendering error during subsequent streamed rendering you will need to handle these errors manually since the React Router server has already sent the Response by that point.
+
+For `renderToPipeableStream`, you can handle these errors in the `onError` callback function. You will need to toggle a boolean in `onShellReady` so you know if the error was a shell rendering error (and can be ignored) or an async
+
+For an example, please refer to the default [`entry.server.tsx`][node-streaming-entry-server] for Node.
+
+**Thrown Responses**
+
+Note that this does not handle thrown `Response` instances from your `loader`/`action` functions. The intention of this handler is to find bugs in your code which result in unexpected thrown errors. If you are detecting a scenario and throwing a 401/404/etc. `Response` in your `loader`/`action` then it's an expected flow that is handled by your code. If you also wish to log, or send those to an external service, that should be done at the time you throw the response.
+
+[react-router-config]: https://api.reactrouter.com/v7/types/_react_router_dev.config.Config.html
+[route-module]: ../start/framework/route-module
+[routing]: ../start/framework/routing
+[server-entry]: #entryservertsx
+[client-entry]: #entryclienttsx
+[rendertopipeablestream]: https://react.dev/reference/react-dom/server/renderToPipeableStream
+[rendertoreadablestream]: https://react.dev/reference/react-dom/server/renderToReadableStream
+[node-streaming-entry-server]: https://github.com/remix-run/react-router/blob/dev/packages/react-router-dev/config/defaults/entry.server.node.tsx

From f763fd2eb1b5a63e4e4d9a72cae5e07a23eb68d9 Mon Sep 17 00:00:00 2001
From: Mark Dalgleish <mark.john.dalgleish@gmail.com>
Date: Fri, 22 Nov 2024 16:30:25 +1100
Subject: [PATCH 31/41] Update default create-react-router template (#12342)

---
 .../__tests__/fixtures/react-router-repo.tar.gz | Bin 38576 -> 0 bytes
 .../__tests__/fixtures/templates-repo.tar.gz    | Bin 0 -> 74240 bytes
 .../__tests__/github-mocks.ts                   |   8 ++------
 packages/create-react-router/index.ts           |   7 ++++---
 4 files changed, 6 insertions(+), 9 deletions(-)
 delete mode 100644 packages/create-react-router/__tests__/fixtures/react-router-repo.tar.gz
 create mode 100644 packages/create-react-router/__tests__/fixtures/templates-repo.tar.gz

diff --git a/packages/create-react-router/__tests__/fixtures/react-router-repo.tar.gz b/packages/create-react-router/__tests__/fixtures/react-router-repo.tar.gz
deleted file mode 100644
index 5b9e773757178f79d1e146abe36e1d74626f7e3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38576
zcmXVX1yCH%6E2nj!Gb#kf<tf#de|>mkl^m_?r^~a1a}Bd(BRJD?(XjH4hOf7|9h`$
zcWSqHwx*|hy0`1wZzv;C;H1D*7I28CZ8nZHLv9oTa>E4g1~6_0+Ry<O*PSVhTPUg_
z+$iErC(A)SS1p$y7s(i23!3PetH+(Y8zN$~DC>V|c$Cz4pEPi+tYn7b{}YxTQvNE*
zSRki^6~;1BK#hk9<VZu;Q8FSN8EBru@SQ$uKKLG(s%wDYxG5sF&fUjpO3Rp-xh94Z
z=qLESIJvH>jMDy^w{F#?tAAdvIvx+t$1G7TO`Rb1{W8dtG&F=yl`%$qq|1>xj2F4|
zeOUT0+LJFVI8NX?{TB60qZMy4lUnUnldbwZQ}S8GgN)RWx`xM)lqko`iHF>y)Wy>}
z?!{N9?FcQ-iZyP1PSws@+zlxXi7O3;Z5U~gnb-b&Iq5Nd`y+SXUIooWeKs%?uOgp%
z=iMi(I;Q;20rYsDd;<`ZrVs!Zy8yIOHrr<a%+H<JQzg-4FQU~jS~Dlz?&ND&3CouA
zxC6d3Whi8_XOU@PxT8AUz_R6u=L+@e38wp4c!s~TCdn#s;h9Hrr7gv|^4jROyWWpR
z{oRvmoS@H29W(ztwPZjzt}6hDKPl9BT0O1bERb@MHj6*)9q;c!ETS2H7pQpc(5Y=+
zufg!YGP!d&*QLImqX@T&c-@+v&H+;fE&YJ5fJ^rvrJtI2&q^!s&;Z^x+Fl(C<I7O!
z5y<02p$yTrKe$&URPlQPlwg9P?7v<-wt@%2LZ43XiZ<F*lHs2&!eQ1#>wj_^fkxWy
z{B1;^JHVE1Z4Tfn(KTlP$fXY1fH6}G=ObV5U~L&0{jxHAmoYuf#u2kJUe1IKd6rhg
zg<rm`bLyEPa&i{)G+Dwf{#g7m-vY>cTSY^CoU$ALe)RY?Y4HNuo&vuajV}IV3Q+D_
zb$kI8Ual^w^ZRWh3Cuzi2Jgr>7C=W3)l<|96y59{Atw4!+%epFR1dS8!!jXs2hoq=
zSa#~dKd>6Ibqq?rGT+{Ns2}66*cB=RPt6{!H$Jc_5NzGU?*alFf>5mLdhj~%j+u`L
z+wh+6oG0(7s^2=e>^0cgiTFMM&AYSdg?hClF9CWD3_}kaRO{!qS#H|(H9nxrZM}_$
ziVL5|bMXDGl|LOR*N5g=_fb!Q4EdQ0Uwa=Ybo~w-l0feu<f~gU|0f0&ZbG=|(-WxW
z6Vwwt$ZOAQjbGH@E`A!<!;b!TI1J=GZoFw!Ti*Y_`&LxM$DrJbqPaV@W|5-x4hg*u
z`pYrM+?>+F%<*%nZnnzNdTzx=e#M3If=5}||L@6Ec=tzHBuj-BRK%TlkQlznFQKP+
zfwpTz6xt~7S){ujbp^bPKLh`FgpeMW4VUx%=307p-d~3Qco;;cDgPYeA<foa{IKG{
z18O^6-rg=dDRU<Ofbjp693b~T0RGXN*XviW=DQ$~jsnaHGDQ(-;sP;G9pC9dw}3$O
z<O)naGJV6Af(rh01z<}U?gDHUVGh2F<*zZrxQ+%ea5MS~xaJZd8wV&Qh@OGA@*ewF
zpjZh0VGkI11*Ht{g~GrC*xoO|G*|f2>G$aKX$hdC(SOnH1w;UBumT`rfN|@8%fc}c
z2CixyYBgZo<l{x(z<{@Vh*9|Whh4FW{xtd?YJU$!6P?|=cxa<%iI+d2C%Js*JMzfy
zF2-}~L>BsH6XEVjz=7!P%KgLJ2>&yZ{hK}*|C{Uoe-OH5hvS|B)Mm|+Ci{4Tssdht
z4<W8CseLa70!b9lU~;LqX=!|4U?mSA+=RUXj(oPj4vJ4BxTkbk5r?*@!Mc)G-yKV-
zKMMv5L4N>Lb7MyeW-fuDzqLJ2Z#{=fO0Z3azpky8>h!BXv^_}126wIOZ$0zX<dVyy
zhAg+gx3%};Rmqnmd{!%3E!9LN`NYs{!$PDeh2EoI#*b0vi&*E{RiSzQ#|e~}`a$^D
z)QIUc`^lY)dk+&&X8-&j?7Wp&|D6`~8R3;0<~_p*Z=1j3NKJtU0wp#)y#L<Qx7qV9
zFyeP8bW0qf#uX{hZ<Nx+{};b*mrW*s;uhQn1-9CLzWF7CQ3;qZkL-Efh@nS+1#iq7
zUBJMeY@2PbU<ec}lF9fcjQMP84tW4rXq2C9spNz_4`I-GEX3bH*ge8}3Q+kQI1=~%
z3Zqmx+yQ*HdtMVT+X0J`n(eQ?sUskYI*P~p%(p<k!@a8^eQEd4b2HwPe8>8yi}3%g
zy#KY1P3*S-`Trc3`Q|teqR_2!(v}yn$21W3CfoW#cE1NiavRK1o_|6?_xt%jq0w8y
zGP-yI)#`%^uns$69VOx-2El*<T>|AZm_lw5^6Kyh<Z?dzBw6pf$$5VXNUOMbJb}$4
znzx=N25`Fj$;*_TOOvNuf0JH5laUiQ*V{whzw$+4lvSItlM`7R81`uWJ*XJ#ctZT@
zPV!};qMUfl?e!F07&6qJ9v&Ch<YbVQ<sy3?H0WKc<#7-{T$`Ht{m9GJl!lCVT#Hn_
zuSBC<+r@NOyr+ajN1@E<qnr9!x>gz~vDfWk97II9OalY*ElRoM(qXudL5I|{>^R2V
zuH~BF+R_Cfv-yYHu==Q_<|#=;OC)aT*6eS!3{mFtjC!6C`C{!k=JDjx#5KnZj-U>k
zgZ5+Y-`+ipjk5A9C2p#?YCE$n&gxOw@LHwDXKc;-<k?(g*Nk(!-aX4z<zsPiHg0HI
zA9MVBW`9HFZtvu4)%BgS>aKM2!YYJ<HRKa(IzZmpTsbulFTL*Zs$q212#}U!n)NDt
ztaf+4`8+{zs%~w@NqLg#N^UBcHUncsR$U%4zwVGe#3FFJ$v<Dk2WaRohB25-UUdWk
z7NI+UQ!xBXM=^4w4InnMI0A5~9ohr7tRONVhIaOs0Vr{g?0is~^9QHg$^0*tR3e%8
z8iv1V{w?>%3U>5$!@X><2=gxd>m8|35!57p`!MNJ9h`texS?PIw4OVI0h}sFW>u~-
zb<1&-@Yq76ny-AI%AyZ*r1$URkp5cnY7>B{IVxwXPGYsLN(w%k8_nsKy>`}*%s<Vk
zmCd>yZIx;{?b$pLOen!ily6_37}hQLI{hF$<7@gcp~Y#xkdYEv!p7LuP)ZlxY*waT
z^MzF&wDxu3Aw*55)<!)?e=~-`*oi80M^~z0Ls`i2=hcQYvwQgx1G(+hK{)(8c+a~Z
zF!pW&ZmNUZnfc4<<&Q~Q{kf`eR1ZI~G6zU-m<)KxoO5G^mVN0!>&`jpkhzyj#2rI)
z`Y8+r^RBeP1oepS0Ta|A)9F+P%`)|%Q1OvYPDc-_*=CraDGj02{r6uA*}7$4nYjmV
z2q#GDjEFv+t^pYp9S=S5_&?j8!5k~KfP{Aw4C;w60=So}T2=q?0nHAbbBrp=(-sMU
zMdF0X#c7MQ8=2L2NXp>hOPY-<9nB9a^tvouWpt?#xHOmu&L=iT3#M!1Q6oIaKk7b3
zq*5Vhzo&85pfD)?@m`_rW^Y6lKN%3~eY4qrrOie^`oEOtRw?DJ^Ie+vcxN$aJ70_@
zGZ>E<kBQICYJ4SeFIh@U76`vH&JXNG&8&D!Q!9%($QOzV93nVE83Op;oov#3o6Jt?
zX%trJF<%xK(lD~jt}N(SM!UHeu4XETV-QHD^MmJ=$2IKqs{O1OeI9`O(Jry(&a549
ziw<n!=H;Ra=(q}i0xe4n8&yovTJ7pO+g_D9g$C0DT6Ivq#CI(tI0X)3nU809@3R0c
z9zNT=V5HY22jaIZr<<PT{s4|g4SfYX5ro(jvk4}K2bXZ^*Ci&X>3fB5=5Xy|<b;U8
zF}<0A%b8m@cpba~0>|VkFXN<S9Ws}`A0P^+2oDfO*dj;w3(K|#9>w|^hG3iE_`U!9
z73iIl<D@&*J8+mPdMnzxN705NaaXG=f0qYxiQu7Vm;dvpJJc|7JSqO@BO;2s{+{cM
zN`Y&iB!AVs(7&G@WN|<2u4FcX)jEQXFay#0PVQ}eDi(@o<qXj|d=pG?@^|vrXFY#y
z7xM{YZ*R;T`$wE#iF8{@tV<G#xI#XVQBitG6XxDNvI-C=Kgs=$9=So$qeuL@;PqQs
zPwJ_KUbk}QP6yK1SU05kwYN&KSOC7As4Mw*aH}i#sTp>WxV}BpC<iIVlwa!S_0M{~
z@t2&~`_G7kJN_B6FcSM#WQsWbgY5aIDIST3l3%Tn@+esWk>PL@N*C~!hKgBX_o&Q^
z0Vj;_JOmIlCG<H6?)SG%*2RrS1(U?leTt5}1!y18hN?W`*T<AvUg|cf#T)}ze-4B@
z3U2#b8_&u~cB6luo={qU^rynUC*bekaLDqX_#wH}$?u4rf!C6X9_C9%_O24W>^@DE
zo2bY;zuaP5IlDHE<HFc~)hBB^X}ih8&OGp~b$kDSyY6$uzs_d%j<VJ%7prdVHh5Mm
z@0MI>LLN;apvUEQjq{rAx6j3wZGnBgJSbYT(}k_~?~_lSC|qrlX_&!TEl(ruUX|TD
zO?fhPI-!>sL<&VeDmgBePlF$}UkW@toTj0$nS}LxF6;@Rpp$|JL|3qbQ#V8ywAChh
z^z-xPNkO;R@CB~3Jht6Ik;Lly0mGVE_eNAR>ILQ=*dgE=M0-V%bVt4CmFbAS`iCw(
zBRtnW5b^fiY?_rJoJbXEr4+@cQ}O5LPllj`xceqI=fD#c{Rq$dkY5M75#CV;`T93)
zDp}C=Vhw|6Z+!1|Z`N&L8eKT7loE^-lm`Alj)6Kf?O6Y~&x;2o9e;{=I}}`9J&d|_
z_~pE^W4z}g6E|pk87rNuGwCmXw)~Niqm&RSW<JE{b}YW9#P_HCVHX2K@kSH|dZFYK
zP^iO&AgrshW84*P`5Ps|+Ht#x)I%r6^CTFyvvCA{^?;p&Z+jKNoknCiU@A&^#I4J%
zBZC={XETm(ew@PRdWFwz_gz6<fJ4WvK;xG~D9u%s_;>1M%sXWJbEOPe3g`$6-0|2<
zS?U6UU;8OC6{BQPw`SxC7c=m|fAYvy_mSLlMUfH@#@2DZ_DSE7irJ*+yX|++R%@Tl
z{i&m04}=|n4dTJmGpN$Xqqy=Xo3SmNyb&2Oh~~u~syIj_B<H3#9PP7E0t3l^1+l-(
zsuMbs_=m4n{wnH_7BV~2orTtJz`8rVVBJ#3>xkPDL|}H9@k?qJI^!c&7XSxn4myBm
zZ*1S2tOP%(Pzrr|`3~$zmd&cm<Z4iy6dSaqJhMOghIp>=0k_O=dZg{^Q8-Mp5~Xmz
z;F^S80AetW)KFW*bx@bk!Kcd(>kX=}^q%Nb&e#<e_#23d14P&50Q=V$&|J$&lI0&y
zBh04{Sij{%u@r%PYDEOtW5F#mMMlX*a^)9Jtd}Lq3Lk^VOXhVpzgzr^NJ<;ej_0e;
z2b=8J6GF!ACpO<*{EGvI%$sdS>wKAHJ<$sy#3@+p5$i|c)q-clXnKvpRtI2@5(^!O
z0kt0|9SPo+(RMRGT8$O~JzX(Zl$@acSyk>)lTOAt4S2L&ib0{WSqp>0YKk4#sQ%aE
zYrHk7r)C+qpi$?OU78_BWvNbd;(HoB4tK5%`eg$U<<&aaZy5@4c<t-F1b%tVGsmF^
z`o9x6J_W)8K)WMg7N~NT7Hx+3eQRQvu9P#zh*+!?HTubixp&TJmw^W!_@}Y>Y(FSL
zDM{5N+;EF2s3}CaqENTISFE-4d)U^>1`!eLVPo8-c_D&YBPUv_8<3Jp(l=+vlFSZ7
zNAdFcF~wr4I@r(&KT?cz5~PCg@TwwCxp~CLV7w{`mGJM@jPn1<f%bYY@>hrcd8tKU
z@3nxxmMv@A(?7!W?3YKHBSiFtl2hQe>~k*oZ;Cjd$zxFg7SdKnuH`0c7uHuvg_y^h
zXSrLlIt(x3GjtIQ{V-<JZRFW=8_9?A5ta2Ydj+44hlKOaDqzgOFB3{O4A0t?tqDu}
zD17O-1O8=}<7BpD_?)fmtfak+>9{Jw=qRzlF@bWHqDCp&TN`Fk0EScF-0QN6+n^dS
zX<ccet^yukn;tfR7Z2o6O6P8pJ^0l?Hi^Pe5%`rMBR9ixK#ULT8g#p|_h(SdQs?&O
zn*Wdyd*6p=`o}R@egUpLqkr*sU-86egWUFZ8OILbIq@NGh2w($e4rHs?8RI}-gDeb
zY)A_J$>p881|%OZdEqWW6hMFQ!(L$@0sNBL-E-bUPf|*23_qI}XuavA?VHKv0q=zu
zNbc&c9J+q6;V}VyA=vf<wVx08tP>u-cKCWvK&PeVTPr`dfnWIyZeTDSgAKw{@Xc5y
z7loM5BsfPfP^2g(=fdWh@Clsg<~GQ*xo~(>N&bdl3_ogh-w7P`PX=_!t+d1p+9B6t
zARkeB{>j2yLFl(h3~Ik`#u65M1hy(WwqECpNY>w9jo{Nh7_Ek_Cj9!<O4oYf_}sw;
z{T?CzL5Q;ELax9@?7*9#3VibbUWfKQdtH2PG=9sRjQhFM5AXod$PqgDt83k*q8KRU
z>YO6V?k%{kx&aVy%GU~d8kE1#P)}H&coAKNvJXkKUMY5BiJ-UrW5*Ew@Aj@I+K<G4
z@!9AC|8YQ4%IE#%$>V|nG~z*r(tFeIwvT8AbQ_WpP>tnnt-1tYa)EXm!J4MvOSNoR
z_=Z1>c&Z~BeE)Z$^~`3*)}xomx8&1v-99ks*OS|G7Z7U=9*ifRf9+<u2>@OrDgEzX
zfD>T<KuaU^h00I#O4JM)#DX<@8TrcguOC!>(s6&>bqnN2cRV~xrM)-gYE31~Fs389
zHv8GL*ePLsj@_`E8t+&CqSDU#3_9FIE7$<GV_LUgYo-Bk<}JYHCtmToo#L;$4o<7+
zxEcz5Sjl#7+W=0HTPyvDIVU&0E2BZTm*_WQhZ>xi!CsiC0waq?n^?c$RfgZAKRN4f
z!MR@MP5X%j5ga|+(8P$+1)RtHYN(!51NrzmMVRd6E#7b#T;8S+0@=Qd`>*?0ejN`T
zu#-*CpO{s$H6CGPNRI<pe8@Qm#by;6kD{_m$6^+pJi|SyzhKDFkw|(oh3)&+L*J(3
z!3SAFUn{XwgvpTaJOl8;1Pw8YtKnW9s-Q+TlEv0I3qPn=A2QeQdm(ouUL`xk@ZWME
zIJTdxaQ;7Q3?aet$nF@Mh*!q!#+dAU`x_?XvirAmt;}43jXp(^gh(LhW|Y-*2+lef
zn$L!T-q8@y&Fdq(A{r#L8GCuN>Y-^`X4TC+p(P()-b_Skl9_s@h1xX~7!g_G1T?lA
zs5Ve8TBppu&^f|sdw%!Z_M0UX5qsU-=zs+TYyo2vwzcE0-G3H4Kg<{-{`s1Bzu=FG
zJ%^QwnP*hUHTZ3lzY1-PLH9AvbejK;^fs`ak=LOM*OciJr*37f4|Sii3haM-U-vLK
z!TrF4`4d@`072nL_G3XZBIXQ?iqc<LitVO8e-tgSipzF53xfhxyR%hc;9@s5FRrQ)
z4r=ht7PacLc+9)XV2sn9UPPEF<rxrW@Pht8`2~%@IQJ*{rsXqGP!n`1^tB7qE5na6
zo>K$M9|dxV)8}H9)^i@Nl?MHqO}xX;zUWsu5$(e^7I{W`KY`WCe)hW9_PP|{Pk6Qg
z-%$s$O$oCCpC#lQDJnz&h=*Q3p!B<vY@LshPMaZGM-x?dN1h3lRac6`wft!(fvl*I
zC8j&Q#Yq3yXV`%KK&!!8OFJ73s06i*@m}VzlBwK+mB>YBU`;gvG@9=}aGd6>$k90D
zp0Q`G(G&kX1J8z94md0RNo1az(#Fxpf~@VJAw2Bw6+bXty~cFlJ@^OQuDmV>>Z4r)
zs`LP;n4<Uqya{~Fm~5D+@=#y$qjJgnzG!bVf_?9`*u?VcaZ=i@+)BOhK&2n_k4yec
zXw2jlIeZ>`i)`Myux4Y64Be;16xly|?C5yKaJVV_4P3^hDMmf<UiORzgdyyRn1Uwp
z`qdXNK{s@905))q<v-RKlo|GdOzJ7QB8DjiSb{gPO@#YdZaqfLeD5V3C>}v$b(B^k
zz*{V}2$Q`G!-^~^P3CK^Cmx$E{sAYC7wwN$$(bB62usQ%?NU_GkRH1gu)-7U=fs8|
z?jq<T$3v}{GiYDAg23$Dz_la48s2@eqp%Ma)*jPbXki9?=!P8!%?LFHU*U1S^K{WZ
zf-Mu?=2Y1{V=aTGU=z!*$VW<<jn~c~E};uV9lU3nLka<6sDG3Ugxnt{w-2j(MRPvw
zTdl1Hzs_a*_dzu%{X*<eQssg>kPHn}{T*_kC07jwS4L+W=pEBf@p1R92SzX8d(tiB
zTPd0q@bzAq{@pg-km8Sh&;tILMA+cKa+TumD2nhiotch%AiRt}_Nid-tc;Dt`>jU%
z381~`OtLQDzk|%DfM@UgcM|Z9m>w|NvGhAeFLoOnQo20$Ye^qk6@}Y}Z%9)?@4yB>
zL}+5m*s3YZN8R!jP8Ee&otKTg{E=Vs&z=l!1A=S7)g1~7hoTc368j<N&)0nnCztpj
zg?ccXqT6~|-LFSX7}g-7dtFlPk9(_+1_o(6&AtA!#)?1NQ3Wl0l^cClE(BeX>MFMu
zcsFJCfLP-;hu=qVyxC@Z4;Yjm7uyXFyk(w*&`E;aIXfeG+ePRbs1|E~+6?kAsQ8)>
zG=UUubW`+gru7w_@a!nb5C_EVK$`yyq`&o@bB(lAKCU9287%j^RiE%xq<p|_f3@KU
zZLN%aoXU<vz81*$UEvwcf&A8%!dCIW5%XSfA(xsuUlS6Ab{+FDE)#y>RevPOwf}E#
zpwv##1@#I)RRz04(K@>_Sa%8dl6y*r8c<7=&>Cyuu3brv$~8)~Ftv{BefI163M+=9
zbj?E#5r^cgAt2nrOEN0b7>(LX=c!r_Z$;B0(Sq@vV$DhVq!Z3P{?u9#-Lj3J!2HOg
zO@Vk=<_<v6H-XiQ{0;G>t$Ue*&euYGF6Jt4{{FE3M}l>xGW#`GlK-?K<@JJ;mFB>l
zc5=H-TXasg$r&NR&$C9*A<=n+Nef#j;sj!A$&N6HOCZ~$+z<CFR!6iM;iH!@OVU+|
z#7+2AMSYCkg*((w6O@EFmtyEoS_yvD?%?T^5<_;lM<Ie3U3B+Y$p-P{Zg|hT2@l`*
zYb##1*n0x%tiWxVv){qnsbJvIJ;Uzn5v;Md-FTp}_pGpXKA@Xv^!1v3@d>0}zO*RY
z<eVin<5$zcdA|rSW)2@f9>7C;VbBgTxvH|oks(iO?kZB}on)8VrOt0AEB#EE20wJl
zk}|E8wLz}Vy+APEmjnrYgrg%ZLF|U`g2V$ckeoufm9W)44SC#{MO00_bpw;UNxfP^
zzS8`dHZi2BZMtUF+_X1G;Cg~zLOAk@tMPnR_r!e0wn3N7oYP`fdk()0+ZSS+hLkC2
zQA~LqJ*<(Gep0+Goygb1G?gNc7(7)<il#>tajBqrBSx0EdlFLA^`|jPJwH%NcL!<B
z*2Lv|&#x@9qw-I8)#fz4+4JdFI>ExHDPg|xCu7#M1t9AN5}tf>I~=-QsI;a3?P~pB
z9goUvzF21t)9+=a1G5!+tR|KfSpB9eEpAcy6#`ply!b+^yC+|W?t1_^{0x6Gen9ar
z+7SgTn>Y(_V(GHjKhfEHU+>MfbFuYkK{{Tz61Epp%tC!bJ`^9xk$;+~{Z*J*VD;mR
zJi+@Dz}^Lo-j%%S_iXzFcz7SJZ|g~M0Q<cS5V}M5^WvmR5KtuKO0$0g>9AlvfI-PQ
zn$Sd}mfp2+g22-bspt;d1qujZqAvwkg{Hj9##sTp=zXsRhnw5pKqxKg_%`O!rg!<=
zKTVd|jl><JS;Zn{DvrjZ$<09HBcqY}<WX}gz1Q~B#M!be4w<<;+aKfe_;S5&`{qo0
zP#za%9kl_qBJxDtMvQ<{D>llu#bQ@5eWf6X5trla5njJ^_w)boe{op3+lZ$sygLQ4
zEa~<RpPyQBvpsLpqT+;2=#pis&LYjSmKSl@iF9D87GF9h=WZ=+MnUmEr2+RRSJ`Ll
zr}?Cj{(LXII_Y<6EWd|P6VJ8#3-wBfEaTlH3Y$X_IpU};#O&C!JLzVRPi4u1WYo%&
z&M+XWoXqiXI+{C{GV7{jGH0P%w)5!km8_+b`dAmt%Z^l?>I$?<Y>CTBA{vML>7oa@
zr)n_r&FvR$45dPwWj=AS{t!q>%vp^!x(LrRUweP>;e<0mdj#)qH06ZbG*^jdTyb^P
zAWfO-Kj=SVF~N#aBfx=sv&D=@hFRwgqjVAOt^U%Ixc&rr5WEv_KhME^EwxUvOK6Xn
zeQJ8gr|-<9@cBG>zNBq8qj*><rNQO(8CwK=w@DLianviDB(SY(Q91uLyh^;)o>yAz
zZ@l){+#|XMLQxzwns<{`O2!GAnN1I?mQ#E95)Z^G1HZIYtD0c?_8s@orzI0h4%3c%
znT1ApBtdxhG!N^qwQ6?=#apbnVkL8yn@Z}#a?&n6yia}kUPg2@ej?TuaLPplQXN|f
zD)K}BEl(Dw>LemxTc`Yr&Y$p<M;a;~&~z%)kC6;2$VW#yNIZlTYkR;r3G*F}0t{3#
zsfoXHW~1+ST0j0WDE9xWJy4N|N^Y4{DDQ<+V>V#_YObK^8wlvr_5lS7-qz!eOaH{4
z9)b|)-ia&O*-@F!iTleNaau}TC)RQ*5Z}C*{5WqsNN~34WLGJ%ZKOi}Tfg<*ev&dM
z6@`GkV>_`C;jdLO0`WQ=_8{iIg*8vuWG_oa{_iaKztAt=vMRKXrkFJA-R<_5cxQ^d
z3dlbzzP@K~aKqJg`0Dl$y{2oRT)CfZ&vxG<RIQ$`%AxmAs#Q-g`@=#qDl-c1L?v4i
zi*k5G2`;??{dH|EDywpvwp!v{ySklZ{-`(uG0w6U3Wp2onRd`)i%R{rA%wiy3T@fU
zVhnZrj}QF&+)Z4P50<l4W1fAw)l6u)%&HE;BAc;cYs{jkkVtzq0m{kzh_%;Z+}%F2
z!2Cvg<(>5y=z#^Ni$2O72t}}NQG~@u#EL?X!x@h&`scYwG=H7vls#*s`g<mOk)`m)
zCz@PdQA3%$s&NWio)>85;M0}_+50vFfj&MvCOenl3IQYsb*t8;>c+v5*Lm^w;|-nT
zNL<>YcDL!Kle%vQ33udIG-;NhdHSfJ9}>|M>YBI0a;s620p-$@>Ux|yHYf5Vb@e~V
zu!A`IQ%d(*_DO1eJ!T3$zDdT@_p+0ziOUVq7_q0wPCRX+fRSYkY2ei125owWzeSBi
zOSD3aK@IH2B;4t-Gz+el((ZQg_rC==x3I}7N1}h^2Y}aBKQUIR=5Znr^JYrI$@^<f
zB^(cYu%eGqd~cJnlHUL=H(sLRN5!wpTD0e?mZN=CkU?z08M_Ou9om1oi3**W^kmK8
zUVYufA|bczFcY?N&RT&V@lQF;c|4twGEo$4U*m0|_*8o)wIVn|a&lzY<F?0ZaXa*7
z@?%#_Hj|_S6sa|3a$3IcH%WFxHVMHwhiGZGOMLgDJ#JG_!Uy8~mz1dn=6>-%eU_FM
z!AQ?J-#*IxEl9Ub|7YnWmYKsPCcH<88Wj?q6=h4Jm#@{95XP#b!$D>ytNh=Zb#E%!
znp=??Bd+LOL^$sJr(9(zJ$g53w{-d1eh>+{mzcb>Sbv2XZJ^nCx83_>_SdPjI_zT!
zZC|ZvoEo+PC3n7mb5F65YJy|t!AUeVA=S{@@q`eiVQJ!!mw$1ryAsdjUE+JJ!PDV&
z{`UpiCC!|_rx+TVo6{CY>HhR<b0*0Cjb~s_y`)7UepN2Au&_u_)I|Dmw9+lv$5d&1
zl>0NZ&oe|cnhX1=mxc#NY)P$y`-g}4k*XMoN<PJVLYyIET2Wo5r0|EtY$ENU)AQJj
zBy|@<62&fG)ZnDMSJ*Ja65N-(J?mFmg-p&v2s5L&<+Hnhj^_9t?vrjyRpJEQbaPsu
z*u-yNR*nSOt=>M@yx2_C)dPnakC76e{v=o4jMO30qwlO@21T_`NZFIA3<R8^Eh9y^
z&BQ=-d&U?IXIk26e2a2KTCZ)P<z{>AfFFlg-=rOHQd;hcFLfppwHK=}8sercwfw|U
zR_Q3NczD{<AC3%#-N++q{KPyg7rELJNps%+j%JQ}zjK(3D)~24n`JZ6Mf3&!$U!qJ
zzDOZ%MGtU;q{^8(kAy5qI`InEa&t*|l;m|OMlBgrYYY}eb)#?5>}=qyM{ubYwv7G7
z`L8q&#x2M5T_rp|zvXYB^2mSBIbXSI6BQ<ur(5Bny#L9jj$bNv>zkv3iXV-$vdmDT
zg5L$QM$we`<|z##5{FRJj(&_)W#%@diyJ277pp+IMJ74cXUNHZoQ)kCrE?C>{vPpB
zOLJIB=Fs_;TX8m4W`f3<c!)vnaOC51@!svLvNvxELxBqndiy=P!Zn+bMhS*4{LMt^
zKbMg-aRSE;g`(mI^W@p`A2d16OL=iaX1Hm-<AZy@J{HSxAtBY*wdl#>Qs1Nn0wj3s
z8N+ZLTwHzk!iL#@)vqp&(rJ}0{XVFDQNl+p8f=G~-1TRaDEQDaTX_@Gi>{Bm1%HVU
z#}}tZCl@=ad)~X;#ti2gTAZzel$0qJg#D!exAsV@lx)f>)LS!-fldX<mS6nlce}xG
zK}p@F4-<X1$@LfqYw<gkVA3R@hN%*qU|!-_+Wv!q=K5)ATiHGIx!?BvZu-!VeXShZ
zhNvNy0BP4<69GBZ#ECis+*sl~HtJzxk_Rhq4la|Ad7MwaSMJf$)Jb1hEh1E#UEy^D
z4fWKA?DK_DT4`U2-D2>F<dUUrk|P*#{*K~AsFobNGs=xJstwi~9GK&5DoPsG)*jva
z2_(tlDRcRkaMe1O$t6MEOC+mqS0{K=@(BGI<@mV|ze8rp>Lte6RL)yuN3kh>&8!v%
zUjGSMof!=ASER(IXWm^|9Cxz#b5$)rZDrixr^rJyKlG0lt4eUC1{|cqM$MT^J&D7w
zS1rVms8w1dq^BN!?qq$Lk8tSAulVte#G?^^(75LX1b*mcoswwoyBT?BT+=(ideBuL
zF5bx!F0VI^OKee6;@09@m^w)4oO06(D(RWwGTd~|nw0Sq)kqO#G3QFT5jAbe;eXyk
z;E4IBpqld|sEJs3RN05RjQeqXZ#<%&85DEX@uiWWhgyb~)O`s@#jDTy7uCcU9+t9i
z#;7ZDlD5VwwGN7*A+-(W&Bn*Lnb!0f(}6f4rRsCxbr=KJQ+_;z`q6Q!^SbJMST8Z!
z+x{m1sgFh2RDUWHsk152W92Kuhh4|FpWIk6;5}C46^cqe%-~YXzTSX@I$Erg(gT)B
zx{m*I+|53u=GcKDKB?Cj)RVFfc~rH=CldZcTWjc8DbF#TZhBg*;Hu#lG#lbkXPFjY
zhc}8_R?D!BNR3QJ%gdk_W64aYVUFy7Kk^5q{k|0Y=%2Otkp7PinhiiWpjSS(UNBB?
z&t4}{s0&H9wU2W-P`30(wkTU^nwocQm0_ol`|!t^)PQDML;`l0km=|X1vYB(mcnu2
z<%;0-VQKoKA%@#&iNX2(=Z<i1S#`U9<OoiCnUFmfiFZDs*PEt2K7Dj^5To({%j1@g
zS!rTk<}YY29C-;U`V}?d#{J*MCR6J<Et>NF2<`4FTLeYgs?L4?nDpCStnBwOW-h5X
zw5pydiM-B0SyN!wwe&)K(6ywA?)5ZwYphVEUhWumWc;ws>1fOeUK!k(K!c{p!yik1
z!HuHk@{M6{VqD2Y<Mi3B`<P5&AVh@%<HOEW1(NSAOC0|#(KDg%mr^)d>4j`03XQS;
zbiMq6tMP-*RqMW`0=^UXX4^T0i(_-*flha|s`Dn^<t&N}X5aC0e9w^<8O5WF6Ze@G
zE&8+giJmpv)Vocc?jCaQ-iygl801WWe6M68zrklr4bNjUHN565-WuYT1VM3&f(?mF
zQ0AJT2R(xgwI4KJ!PgQ%_6`cv8l2IeNH28`q)iai3d6FSS0{mkui`~uMaN^1xo*Ga
z#^Owu6p{jsum$f}Y5;Dx$*K0#3H9)vE&?&tmnZ~dde=<#eA8x^e&WaaQ4r6k(MOf(
z%bW$i{(I`)ckc5`j9xQG(inWm@x}!a70GVs4gCq0dy4lEmbuHVllox-pH?Er?^I4j
z628=3t74&5gWXdhyWJ!*@Pi|}x=u8$V$a|5-x0gZ`I$E{)bA#iH+*S?r|K#;8iF^I
zCazME0E3YsX`*?s3RcxHjOW1gA&lBz^M}_STNW;B@-2p`=j!FAu4QaLjVp>W1+<Ub
z3EulYiIGsvX0@UZ608Oaj(I#Af3rOh+Dhw3kT9wI$N0C3E9;P~39h2<ELj?5nd7FW
zRq<artwVNw1ti4TV;;-cTIAPIEuqw>u~^Uav{fWAX;r;(*S15I6GL8RBwGhMjW2|y
zi20*Y#BzKNoES>k(h(W>uOwB$ElccWe#cMSQ6v3s{sZJv<~Fmz(RO#U**|K_?-F39
zqaH@=u?@UGAt)%E#~yoaP&lEq_xE-mM%7RdH0f_j0_)D+n}@i~L<rF2J-qRL0=1>|
zQkc0&l$FjkXX**?$_tcZx`hgcA5YE?b$ZFGP4XI9+G>Js#-Xon9MjbbmV}D&VOUyJ
zcNk)+N>~bn<^+fzIR)P8%G<ik0tH68aEliC0}fX;9*q#GR4F+kF!Y%XrhcHRI-tAw
zZX__QppRBGiiS?x>CZs#FEQDO&&gkSy8hF?EzC`{9-XT3KIumwUY?yFRo94}`>>XL
z_Qp-gC9)pNR)B)_Ux`a;azB!|cQ+x*#m)-FlK%crhXI1_)@-XKq}OOAKfRVd!+nfD
zoFdHOxBhF^hJX-zuvjfdg{{j~0RwS{`3vN>sb<b23qtyz+==>8wHS@@q-8J4Ry3o3
zYC~j*-lxgb`Qeg@I^DCI2xLWxZ<d0wTS6aOh(4Zv?RcUA?dvWx2Ci2#{paCcrttT4
zWm<Iw>S^*}*Ls<!#mqtg-IFM6t7VxG@n+}~)p!PxfZ)(InaQRy28AE%pNp2knwkIh
z7@y?=jign_ylDcnw-<<{`~124O>Ato7}x33$L}%8_qQb0mi1WwgSW_ar#Ky0Vku_}
zKGny<))S+7Z?bkiUKvyQqft?To8(U+Rv@P8+GH?4T!b$*0r%0$n$q8y!Rh|j9XT&X
zxBc41cC&)puXGp@2+vjWLYe+N6WX`_D#3n7U}~&W$ZxSbz_m1Xf-o1@izvBO0zlD@
zKkqdHPd43u3f}_ayc&noK;)6Ce=$HQg~D{jX@$#Ws$S$mYdN9(X-fINnP9MKle=_T
zT(nP`&Y0Iy(~NZfmiz&k$Tli4c`b>+OjPMIg`CEZu`+<Ti%BN2o^zf^x5NEL{kwX-
zbXLQP#)AdEkjPI2>ZLcJgAty{d8gca2^|GM`0FdO5VF_M4pY4dfqQ7eoFg}6%v@XL
zJ}Xp6on)g9(2}U#w~znUwh2zs?13R(f8AB2TU#zQ36Jg{E1dECJ@kRrD<WYzRI3{G
z<6whO5Atb5_`7Xhv;ta^AzFzn2JxEoIZ1m|lkkP)+HlDOn(`{^1r{yyUi<ucrb5`i
zVFEwdC=<RpJhheHc=q3Nnj2y`08M)G?r2hkT9lRDuRROZ(c5}7I|s%zo*{*?@5}Pw
zXIZ0TWN_?JcCX)^A)bn#vF!&pdAsUu679fiBxiaSRhERwNn6{vbm>enhr!s-{?%*u
z@c(&rt(Morv_LIK+$1_2CZ{C@>+f4OYlqeU_U7wFeEP_?$ivbSk^7aBHWA(=n;eHe
z*H(H2w}p??edf5{DHm}{?Yd6dx^mO151VNdUzZnNaoeH0X|~{fF6+5!S*L?mo%!6!
znA)QI_qjh`+)?%ItkNU9$TTGM>`e1m%vjCidv&JWf+wvNzQ9_WjfMrHc}ry5VaFW8
z4yfcfD&s^?liVWI>MM6_YSL;hQTVmDU#HYd-TFRL@vtNp^BjucooQ;$K@_APaTepJ
z4<D*RmB^8hi!~t!*ZIutjV{PsnS_D5r)S5UUTo<86eI9#bI0ZTURtP4L|wMFkOhg_
zZGUu@2sWm~NnY>21~to#R^e<OA0G%Zq{<3r<U%_ca{H{6G>YhSs?#m6@rk6FgZak<
zY*kThJ!-cmKbJHKTI<p*_gDuK9c@?0_-Q+1Bw8}hSLhH5lkp<XKQ73`R$Dusu|Eqk
zICh+fp7ctR+O<U^30LAENYRw8y*Ev6|2%;#Ws&wHan>dlwfMg?URNDvwH3ECu*qL~
z58WBVngtWohfnr0wylV+?$0D39Hm>5xnQTl!iC_xzxYEvE)wP1Zm#MP?ry~m>4hk9
zf{UO}^oGR-9>Zu<v(+9>So3<^rI}@4=4&Gt$m!hYCQ$g6)?TU(&iVx5(yLV6dP$H9
zduZ%#O!EE?sGrUH)<~?K-anYrZ&&=wwaGFfNjtf0pQq(Yt35tZndV(lC%lClH5o&2
z0C11>$>&sz8<_<OM(fk%iwc><T=UKauaBOOtt_y<&XwOS_}o4u^^H47YZx5O&k43i
z+_NHm&ufE3fdsX|HIWv>X72u<(r7H#2G1?m4z)hHVdE_7HqzQG)N6_5MoCHV)eXka
zleZsn{%|E_@V0i`fByTLv|-SD%28Z3WDwWklm#)>upyHWhNA1WB~$X!xnt@Y8<MrQ
zOQ=jx^}yeP)3BDqNITz%!|59Mu7^N~vH4pXkz4eFfh}mW8gG;!Ze(!{>sh>~N{b#i
zc`HNEie}JHp*aW&I7W=2wh5^X4u{!Fyw%Z91L}=sU{}ec5KQ0|9XGcva+3A1J$d#=
zI_k`*R_H%LWSOva_i&EaLc;qWWJl)^JSm5mrmr~WJCl^8dtdPyzcNCc^mB-{TWQPo
zq^tI<I&_&lit|?Q?wZzIcg$DoWhHf~aPo$|WwP+%<^Dzy+L%Y0&W65<l=&84ztv08
zDr$yGf-;OX(RFPfoE{J`xd|wK0?hwC44!tBa1)%lE`wG2Ze!n4<YIV_e!bj0xiVDn
zi8*;--A!BQ#*SHHhM_W=Tvlr%bL-O$=<@6G1j`$J8jRM<5qk5+{l;VgE`s1NCt*h~
zj=+EkD)Jcsy+YV9d6_VsS%Yna_}Ui(<Z_ouE#$M!dapf#?h`9kC;xd2_<cm2EohJs
zsvFoR-lc;Dh$)T+oxL`WG<e(PG*F(3Y~bFmt*Xi4OX(Z@ym+|Zl7P(HBDt|<AseO|
zoT`Ha8xOt65*Rs^**wPz$_v{(?H$%jS)Jj(MLOq_@>H7;n?YEzju+LZu~`4GbCBDR
zl+71vj`v}!G@Bdq=B$Eov(M8r^KoMFkDT3Q&f4>@arl(1E9sJT8rr^QYLmvQXpRsK
zVn&a9lSp9akn3(jtX0%g38z<7mf3G1ufjCUd2^9Erap4w`V=|sY|#3+7yc7-N3PFp
zjB}!kO(xghBnw>Wa8S9?_Vx}s<t5+*zeT1XasOB>L};+a9@l6<@XA%Mrs#BUSmD)?
zpEezn<s_`EerR%*i)Kc?R9M5u%sP!>3jS<x_zJ=w-tyhZt#H?L_7ImoSm*a+;esXh
zO%D1TIyyc%T=p6IL;>%XPV<Ff7AhsDj;{;V!HC+LujA4Z(f{C4qeaBB3dt)x%@Z^;
zs$>?lchp`_1-SclYTTTej5;IEJ<CFOiC9yH!&7+V2*S#%Ma_-V%1lz0IU`B^{iVa-
zF>m8^BBnonP@Sz|*N6V~?N@JDKBp~q@3s)W`?T4*ZRXL*(`q|p<G?_dkGYzV$Us~F
ztIMO`Ln>m(@YrIpS<4x91sX7?+#<iu8z5|&9`(hk%m}#<^MS5j%f*K`_6lEmNbRqz
z+v(^xHQI6eWZdC0S@;5Si_P0Di^EQ}k$H?MZLQqu2DOEC0c+cwE8`yVQuT5xjZ2d?
z`xd5<nbWY7=WY40vzChLd3Kxfh^0;kFfq9bc4MJoN+xF2lc+|Jo?CkVyUu!*jQ>R6
zVfqfV6j%Gq-Zt9Hsb)T4*U??Do6l{tt?$xW3<=K5IzP>qpUCi=(X&_-3GF@$&my0?
zMwi4(iaH{im>5p}zW*;8cy|7oTn~Jf<S>&`&y=MkE_g>e*ZE$s{>clKE-vAh>ss%0
zHL4kV3}(7b%$4m@!_?2@65r5SPVTEF<GoLtI&=ufOdq6)EOg`b!<p0UT63-_7ZS;2
zMHP6VIBm<(2+{T=Xw9nQpzY$d=3utO*R?FO<_`z&q@(cPS$BK3_sRB}$Zc8nStJFl
zQ3Y-os>^vJs&zYgGx&-;otmZw#Q-MmUZS5n_1~h;_2CJtk7XPniUu5fFYmw`^g5X8
zhq~HLVOlvZYF8BPo1ag$Es10LDU670%gl(Z^iJRJZbqzWZc#E=P=0Ue`XT%^{WC<s
zJ%sTA{itH6a>`sSK9pL2m%A9NaW{W9`?b8t-+E93{=s%OA(-Kk$ebdh)wX6Y5Rob6
zLx$02OABV}#$|=t!(0je8O5r?gbv0TCr9ZTeu=BFzl#7E?!a_dqc$N-cBJm9=;ZJZ
zcjHFgGpCw<>5}VlsQ&5T37?mSnt5#%1=78<G5w0jZ*_D*n0m`u!ug9)>qw-)!ru1p
zsa(W8_)B8j6k6(ysg%rFvsEj_lZd?_z0vZY5}q1px1)r}m;UBs!Dy}^yvDGSoE|3+
ze4Irg?Sua4<k;IyVTShM;r1<)>==YC+Nu-vzw6_KwGH>j>H{L$6)QDwn6OZKmyeF%
zmc2H!+Dr(THJiNqd{H|#XpPoLvI0A0lejZ={0uvF@bmBM-?B3fToouiqeY2A=FM|e
zmcCsQQs34O9P}ZjF4wdLma*uIXRlTe`-2}Q|0Wul@DJ)X;v^g)7&zZrBH8WpT$VOD
zN7+(^n){hsO9Q<BXsM_(uD=U3{SGl*@Zw^n4)`fa^K=(C3ZKoU!VYOEm|CFXu{{%2
z8m1CW_|aD)DIf~BRg=?V1tAZP@{826j*!W(G@&%H7ioZFDmty{3H>Ze|D=V#6o662
z6r99VgQGA|<@zP(6V9agS_C5aCiRkgDE6v(f7aUkQjl`kvNK7a$3{;`YWdgVdQVao
z{>0DEuj6t%pZyvl>>ZAL<uuT9Mps~%M(-(GyEA-~!V4P+&7xT7*Y5RnZucjx5xd3Q
z=?y<jAywVbx4+@{8~mBh-`~v~B!iYQcAyj_&b@+zl<pUg(d0WAI}y!&%iBAw>I7aS
zi{ZjkL*FcO>|I*&*ZpBpi=Gr9$bIGp=~O`5*j;z=&-;J#@W0>NH8AT5rg>b5c0iM_
zAaB1FqrqZ&nI5MX(=*xkOZIINejUA^i!d0+N)DTmc%I9(<d<mMti%oGitdIv*_DmP
z?$Lv?sp#OiKNr|55;MFbT>X<V!kRDno0Qx3&+*g*V(FUUzX0U0Hm#m4Js8H4UdO=W
z+>EH;c?7UF^Br+iOe9In+-IR#TEThPvw)0xATVg)bI><@B~R)&lu;EC#Mg^X7%1Z;
z+Kc-cT$*~E1+eX_NI-$=V9cWPt{C$UiSmw_0(Y=UlS%(9FFTP>;7mw<KRI(TUU-u7
z;P(}VyCqwuVjc^-k%n}4wT<D#T$s8;PXA{z5nG+3W#pdMvlHNY1VXA&T|8Y<?)JFR
zpx1<}H<M3DuFqa-2J>ehLegf3up)0fnOelbyStg*WFeme&_y)ow@rI&?ojZLn%vh5
z&2D%o2>R#rczL=Kt;<c5H_n}+XELYXkB-(3#ns&$fo;9%)Z*{{i}7+G;)-(5v9rV{
z4v(2q)o)l+)f}TC1S^7$U3><?k)@{&_bdWu*r9%zz?#UhyMfv16i~aQTkQiZ_=@nH
z0t49bzWUvIW^`ERqyzM@2-I{4q1)&{vf9Jhw|_(8f1`#}8&Y3lNiXay3<+Y8Tx=32
zlv8(H^t%|hkA-xOkLF1(uJ|neL6W4I%nSNWzB&ED$IAQ=WSOnnO6tR&>3l2^|6PC?
z)%csp4858!`N==;>HQi#+A_N>#J}T@OXczEI0L9TF7L<T{%JaSM1ED|F%P!aw!!3%
zQ5w~3U?L?L4eVDdGkbS#(vM-$XC+|FFN|1Omb#VB!>7O$+a}w=-{?6~h(7TN9E26a
zIj)hJa;B7ncNfe<C{lpW@V4)!R}bpfYSsEv%+0Ucs?hkeii-;~LDdAvY$NKt@|2{$
zd2Ls5e_QRq56P)y?>ehRTJ8nGPH>=5QKk=7z`#B=N*eh%|Gib3`_kZS_8(jN--2aj
zzW>-k>OXtG{nQ_y*nk6t#M}}*`_9nCG;z+q8?o(BBQ?4$u*A(}0Q;w{c9xmXRoEV}
zz3?84Hf?*S0It*%*%`8F=ZsQ02RrUEX;CRgWjtn)*(4Z@*H>h?`xRO!XZI7oG7)}!
z>B==NxL?f<I@d9VL>gFFA<FLu<s>A0TZ#JUAmC=r6HkCJ@v9<3K@C)xe)$dACBu+9
z4jMp?K_O}Ky55|;#85u7LVjGy{QXX2woZb4ju_=|jb1JCJqiT!E~uC>ElHV1Pn)lB
zszyDjRz;P_K{_2zA1Pbo-`wVozAEQuDv@p;&iHTNs;l4!Ik$MXPu+&sx<F52lrJBH
z)wS!(;-C*XP2MXazT)Fqo3d9|1kNq*I6zNqmVHz>P8tevu@W@PV>lXf(lYfc1Ajjp
z7}yxerj)A1#=p`H@9v7t`R3KeeuFFB{=j$bmiR68dn}4t5DNWuwycZg{q4W7B|f{w
zl$WslgNHA#XXSvI&kN`}ZPfAgpgK5UuZAMr26^b;*I&BoqnNBIW3DMH%qeEqI}S{L
zk0A`Fl|V-|w4(tEu23SY0ECj?K!^toTMX@fiWkt@4v@{b%OwHbs79IsjI#K6@3K>?
ziFHHkn%nyt>g6M8`$ESQAjW9hcj`4~nKO=xRBUOhJ64SY?ooPyYw=5q0%k0N8K<7c
z;X4(lg<F<v&is^p+kQ`9>Bqlkijv!~oo;9D&Mh-T&Wt9|Ad50yAL6eQo6_o!YeYtD
zsrh7v6xOS_+=<XkzB!htsb(T?D$32zTKTfNtF4Kf4`XA~*D(-+Bbmb^nuKVV?$up&
zH(u8^@@Wpaf?swuG5-*0@hk}pt6Wdt{I-s)i)-jmC5I>`n=0dRy7!dO;Pu;ga>Qut
z4t2Ab{#^CeFdw6OieC9sa<S;?VmhDU+toOFYTGfie|_678eUWD^9wbe8{=fm7R>lo
z(c#EU>=rLl%iyJ{R=yUR4U{R28HLc9ueLgd*l+Xw<N3$=lbM+ZP47>-R^AEDL_)^!
z478@rIQ%{e>7`{(6j!gFw}jZOA`k7Ih9f5vVvB-E63)y(^#g!-38qTQ-vPAv@gNC+
zMc50VDZT<j^Z4ZQPVjZud!s@^(vx{V!j04Lbk2pxw}nwRb+)+~mA{!Hl0o46*E0Ob
zBwyW~8XwjSj^craQd_s;`0euyR^^hYyYsMRhN^1&UW~E^Y^O0bW`+C&;sX<bq&vpa
zQM$7T7Mw&yNR&9a426hpN>BhIofL=TU((EE3cIc82|wI2?^cLWsY9-lyGscV^fUTm
zgGQrk9)Hl1tZ$#Sy|!@$2lKu57kiZrS~~4KZgrEQct`XvF4GFWcmfzwONpyk#($2#
z1bvgsr)@ZlIOE+J1=W?*js&kD+8Jn~n_$o<6!x_?xRl^S?Aq5<tNwjWa-QH@T$hhm
zu1@5D-F=QwBYDCU!;5z}z@wr)PoQ4*T+YNZB^9!Z=0g10TQ9G;;_@oKAicXokYhvU
zEJqeee9&Z4`r#3yfW^(ct;c*=Ggd=ax{h*RU_&KJQA1`pAUiKAT>t-2^_F2#h5frW
zq0%6r(hQB#AswS2B}#|164Ko{($Xm1B_Z8N4vkU+(mAAb#{d&+^ZcLv?)~mB>)XsR
zvyQdyS#w>#^SnL%#NOoMztu}N`b}OOUG)o34x~t;#ZS!Z64%Wwb2kwFqO~@7mbZcC
zPa=NZqK54J(eRN5cb(0#ZdG>qtd}~HhxT1w%pg5TpTW9SM}@?3#J{}d(-P==^4}e)
zxWlfz^IX^9>GH_CS&RKZwusMf4_-@kJQh_Bz?16OCm?BX=wkq<{1%hEbJ0J;3tj-+
zz^^Wv=aKaJl78>#_!$C&zWj{p)a*@}3e}@Rq1PqnZ=hKyYZ+#lzN?3_|HXb+Yp%SV
zk<NVlNT8S~{AJW$El^UQQGoKMXO<YiS+h0x!@2tEn~H%d<qoCf|ABpvpkoxKGcQ`!
zct=-XS4%SLjIX5&%SHW=<k_~8c<_CYm4artL-6XM&5-*bTEm>HpHof?BPMaR@aQL$
zeIL5Ra~%7Uwlopzz<&SAeVHz2@Y%Rj%}Cw0&n5-Z3)WoLho?Pl#QjvuMDNs?Gey!>
z%d=Jrsu%B2UjE_7(ErfC6v)Xgkpy<o4?rGQ`W;Q^B4h~-mWM`M!#D9m8=>$lvJZo%
z*Kl*usTs_|#sqNS6LLQf`@U)!JY(XYBSv3*_8^r{g~I2rnw}@EeTf>gSWjS|>ik_#
z8*@x->g~tGh!ZzjYB#^=ybw<7FAzkKT+vsSsb2!<Bv#h_WjZYk)ysg6wzyn2!|JC5
zUmiy(F6~^6vwM=5dfgJ+R;0chq5E8AnUch<bLG<+9B8DB>s_T)@ky+O;`9Sy*4Qr^
zPWJBV=5kk0#rG(cj$;SIm#6{#=8eKKH<D?j^7C}2ALYzM@AOrEHPTjMemUf%PV&{p
zHdv-^Rr1EbIHnROUp*rv4kDyAEwoBwF)3mdi8UDr=Hb?u%pwsl*B#@uu07{ZUL~Yi
znk3h)x^PT;Wy(*x{?xJJU&Q-gY7=>7*;$Gy6hu<Gt}C`8KG?!mi_N@MAAYNkPTSir
z6VjztzOm4zJnw$QC##J9w6@s7-5x*uDC>ib0L6V+-dh!9p~n?l_+n5ETps&1bC5cd
zNGo?fPz6<RzE2W4M`+j-*FR&wGY*!9T#43flLrvo3ZnTuesl&M4f4{nrLxNw*gas4
z(v4wqtvnF$svIsCxBsTJqf4c$l=FwvhHyX0cz9mhxEb`?H=dNMinte`Of?E#X!Cf*
z*pP<G)4PDYz8}M@1|(9kgjj<TWGI#&Z=ExN{(Vk}*}yBE%2{Q%pJtXLi(sUN2YyP#
zKsHes?)u}L<=eQabxMGe^T{!=&|7;SY2nj(R}y+H_mqvA5AFU|UjD^T@mr#FOZMyK
zIJw20xTFvTDcz1G>&wak8k$z_NX7F%+4Eu5y26=R@vndA4%jADllKf#9ljYCM%d~6
zAn*8GeU^SrU2$i(FWot;S8qDjuhQH{O5@l1+QZ56O}uK)a?*6ea&<Vqid{1O|D~r}
zMUzR@6%~Cp31vH{Nse!3zL6{5QZJjR9thc+Ig89zc7LkvFkN-}@RoQ}X6%P7NsK~d
zem@5tRrf;h<P?##r^vLDbGNxCF@hlc&~IRY!r1If+)ECYw{#EiO_E((*;7ZHZX}up
zv1U?@@FQ0VFOT>Y`U!%@Q<BtchO6y+N~$deB2{{GM>b3{xTBx0&Zh^Lt9e2_ye+pV
z#8|Io%;)@;9KMcn?ip0;e6-LEH~B7)L*vay@cqGFG`s)!$0O>`^_CnIM#I!j6`vjw
z;u-hP-thd<-6W^1VOk@9j{3%=N8`h|uA;$L!fAX&<qP4M`c?dE<M&r+fmP^_C8ef2
zO7_=-tzlE6l35AUnT_vF(+Atx((dCpnwyu3gOvS7koCBi4|*)k8<<`(XPj#p9GY)+
zj4BC>Y5M&6>HLShZTUFiW1jDuTfN~81{S=7JF{Cl8xbB6Q_8|OvO6a~Kh2>SlO`NZ
zx#*($m3<=pK6c4B`RX@gIa=aXGEMF4WxGWqFHCeEpa)YEO=fZ}Sp-<-i9?s_LpoEd
zCU=#K?E2{{A_7K#pYDM^(7c$5yCEqL{61V*vuM@xeIPG5Hcw<H&^_$+AY_K0)OZkc
z1X(ydMMZ8B;O;@}y|f)}@VG7b(fqo*vw+*rjeG1T6>IFM;N8wIR@OfcVuV=#tgVTE
zCnk+$t^Gutv17ze+z*WXwQ#tN3|u7Dx?jZr9gY(O@UHDE20RVKzo<pyN!3LBn{Fm^
zq@s3=jMNm?ah|8U6!`J3-$$p}Sk{}t9qY2`2dm=$5aL+XG;WKM#P2G8JQ|)m=gp0(
z(=D+;+fh3rMW~u4uO3A<Bu&%T$XjP+5wc}l*gq-e6QQ4rqih#y^z~vcgEJeX=;XYq
zcW0UZIwa;xG;~bWBV-v#41J3V4l=Xe%f&CzvMptjsny*P@)Vja^D47`McK#MsT-VQ
zAR@<rT$+B{Jn(B;U2Oa+@YBrfVdm5BHpSTuIY}z5E@fEe^T_r2-Zcz3y{$VQj^wvc
z{|_q83p~|YV7{-k65nye-9`-1?XTYySG8^Pd5l#?)Z%XC67(oflM3=d&MIHiMPT<b
zp`m+sT@XA9EW|$0i2+GaJcvXC;y5D^I~fKT;3?!kdiVanggE(}j2BMbfB5i`FW3cz
z|1TdN8iW0R@$jMV<t4gZEOs`p`op?6hBsAREWP)0_|3dhh##>G#`*CP9+AYf3~6lG
zYFyf_jYV8ZPd03=W>kH6bM~$LCx4yDp;m)1Z?lA7T~CN<FBR6<KR-IUN8{4j<^gQ;
zX--_1U(6EU4C=$zi~dLzrPa>=HFzqR=D6Y5LexHM`$x@&`8Z%^_UTgE;}$ZcSvSlA
z^0L_<fEDlAwgAqu_Z6RH$tgWrDv(xx^Uc;_6y-^QHF@;qZhr;mmIR)k0ERJ2>R}V!
z>duQGM-Pu_sgj!<G4Y_Jwc95HQ|;Yor)aQOtN=LXh9NxC+q+NgB)*|D&l9Eonx4LK
zMZO2l{1o>j1hKM*&{h=SH&HuXdA(06sZpCJs~p%{@OVHo-a;}$sq?HB^{*lxWm*hM
zDf_hdJL_*4&aKzZk=e}2$F|TlxwAHzrQ8D%t}6;^d1ClhdjIZCnV1M;q4@rL^{^X6
zV_ROKe@BALVxrh&IN3@yj?(WThQA8WWx8VG!*wwC{P(%E+}t0maZkn~ojJ{}V}iK@
z5A^Ku5wD}rGg84r%5t?Y{ED^gtjzojB>o2dKNHik2;D~&<vl?Ez9N*V^4L1wg|%Y3
z2Y$gzzC$DEPJ)$w%-xoH26>E41ah&Qm{W#WubH!a!JGESqMc9LDG2N(^jh<K+mjQI
zHJhj(8{XM^lird@eW6zTxNp_AEm!RiT2AON=ZCj&G9Q@tm-1ude4;g1mgV?gd70E#
z6yF5;zFrC^i*=bPhjl89JCA0S!rh-}in@>*_j82var7~R@RWME`^p13o{|jyT(vpK
z_%*%b@OiX79fZg&^(huVHp$A!zdz>mpu-TRe(?xZgPtJ=<6T@wF&Sph)aQYCF!!kt
z?X^?-z?N7P(dMdu%&&Ogv|Wsx)3Q_+<EA7&WA8hD%@W*#QYTEk^J>MZc(o11Q7Ur)
zZp4)BwEbwisMLC=ICyWxB>S=pxcq_Geb+AxTa(;FW39lAvQM30>OTA$l56-kl0RJ%
z&yiuq+HaO__a3((B;I;woO)Y0^|s63!j1A#>M9*dR-MYerkwP+Vx>|4KAV?itziXX
zdw!;+{z7&*c<>F+hkpO7EdD&q@`sF5PWIYeavDo+AoGSqTA}IYZP{GFN%BsY*#1mf
zk!g5tO>T@2839#ypOsx7dx&HF$5FwfkY_*4w(zfg_xX2zj@3{yteB*q>Wyoy-qYas
zD7iO*>u`m!!w!LTKA-j9ze9;+`-FZEN$AVbO5t!Nouwjh$m%N?_$+AXp2u85#zRgI
zYJ?fSG*3ppYH6#1P0F~0%3kIHH{N$aKn@fMk~y0KxlrTnn*COqdL<s<b2rzR5M&Um
znfETiKka8wP2lOrQ(%d|bKH^WPF6*_@^RAFW_fgQmeh0!u&sXA2j>quj@(~Xe<hZ$
ze#tsb<LFJz*u7a70`icgqYA=Xy`I7g2S#fA#lBJ*{~n$fproT@tXX9I<?A82fgU&k
z7Q21BFtCGFhJEg}7;3s#+SE#eWCTz+hEnJeOv@y#esk5c98jkmCnE+o&4g!1n6V(Z
zH}?1`)D5Jlt}ur!Pyv@*=;^mM#Fv}LgP>R_HMoRRo)9B{3ho9!J6{4_NoV!Ui>{-m
z@yPJOQ-Js+SCg*RZpx74zWzzEEU~N^vngT>j2`ax4Jz?X8=`9@8e}H{`sde?kVN2V
z3G>nygt`Ds0v}bg=#4*4z$o8n9ClzZfasnQj0iXY6O#h!O~-!hw4A2t@?E{S7D?-U
zQ$X48q%UCE7wG7r&-?A$_A#Tlkn6~URVrCjG(r^=IDp(3qFt>C>R3lFa&FxzMEhWf
zK)wS=iMKl)KGBOd->s-7qy}F#f-T#K-jIp?#C+NOlk(zZ335Ax+XrkW)c9H5k)rLQ
zP6>l(FZKYJQwvn&Xo8@~Q<4j6m$z5C-8ijyLNKnYg*4mBA#sx;S7@8G0zxy$No$3v
zVOdf_MJRikTtGfTMnyk%WfT#0JqJ_jK$zuSV~&j=f&wV8dG6I)w$OaD;CM+SaL<3<
zo`XiZlCAarlqAaVZ!^z*GwySHy!8#guT9P~cp0Z-?bhU>l;wcx^bpL-s`3#D*0ohH
z`{09#pd1@OzNMrSa&s;AC;~vYTo@lW75;u&w)yQ8nA9vzqZ!4WEM>x#TQ${rNksFs
zp4X*Yh^yyrEx9`oNS?s+xg&|D7P}|g^91yYKp#itpq=V_vr$3K)oQ+A+wsGg(wDh;
zECx~=CLGIrkAcWoQuMy^uGwDk#27W^#UAeK8|UY=zf@0gNxx08c2#01Wbhp2O%<g=
z)kEjj2{Uf6n~=1Vfd}Wwh=Q!C)f4m&DS>-_S>J3&Hqz~j>M3U`gyRjF^zseJoW{m@
zK|CE(noOUZ+KfxzqE5Ix;XNuWhqRi(dwh1dPO}I4^3=!I#c<2}_ZjtxXf^&JI0$@<
zMu35p;PuGtT18*1mbH<@p9SjOUTz;4J{&+M#zIkKXfFv)x5tam&>aD!es9BWP2)V0
zC5N8xz0r;amHP<pU;NfDt8u1SK7q<^2X1+dBBPLkCostECbBRv7Cj+0Norm8z7Yi`
zm+c_ILM04A1=j;xZR-?Xc^Pze?V??_*-tFSRaX<lj{RyTsZp(C{;M#pfWU(;#4Tdw
zLKYhC15c<yp5-DQ`T_iTs~26D-$YKh-<+5MV{;u)V0I4i5D5>sIEYo6V7vtF#^=NK
zSa*?`7zGT-%7mew@J8egWsjE(#0v$bx^$|w33_}y{o8!Z>bCUSvG4UA9%CuzK=YR~
z+U@+Bz+-tBDF$+L;Oqmv`Weyk8s(<&Cy*M!j9_D7sUbL#%Ep|G$R?R5;lLsfkraD|
z6Ro)q58)_u9wMkNXchUpDt)KRJKDGGGO!yw=qA|*B4yx3X-~kcI@*;imZ)R{I!*x?
z7)f%XF6%ahOquzC5C%U+$i5T$u8N{O4JDK3=YA)zP9BJ^waAMAH3!Z6Kg0-5PUd2x
zBr#WWT^s1xNJbw}py1#oS>XETkB6bTw7S>OzEQH<Bha%2P{2$nWTPbyqIg-enHRVx
z;*4B;xx^s&$c*c&Y}GB;1Mafx63Fyp5mav(;RzKO30Q*w8<BZ30B{Gr^_@*&hA4wH
zq%{_L$VPBQQ04$p#hLoyT}`K-z`b8>^Q04_S%N)J%>QqoBt0r3fM!iV^fWQkKa5wR
z#L|oxNUn*&kV)R)>>;2xtTjH+%1gkE6Ah^5CE7!8?w>>uW+eyC0rl(X>r&$r1Q>~Z
zVs92f{PNdo#U`1IbYH;ZyOdbmPr33T<3e84H@Ftv$@SRsUD^8LSPUIy9%d8y3T+tL
zKdgx=`AF76M+eUt7^7MC#)sDD*8!tc(w!XV0H;~BFZ5O(euAz6B*hu?aVx(ct}x?a
zW6t`<uy-ZwG7g@~CTcbNP0+Z+oeOXj0zH`X4V8?fUo!lXplZqU&c6@M3?H{+c`$2_
zxxPvWKiZ`9HecnRfgQy>5_R4(fCrhL^~Ba=Colw)=q$Zr+5Ah^O_Wdc1(eS-&-ZC6
z*aY|HRR?u!I__xPEh4?)yF@3!$#Cr2(dvuIhdnS^AB#+nf-nRev#W~RSL2vpJC^%b
zbb^UYoDC(7V0gA*mw7tuuBUBo&o?;qf%CJ!o}5d4{)V~TGEj9wm2!mFyvQyBC7}QE
zj8Qw!2Xqy#t^vM5)IdIdyn$Q@FIBoj1vo`(dmHDmIOEIEO=fa$u5e32ZPNFM>&bmc
z59Ndjse;%tJk-#SI`f^Q$Ba%NWDs^dIP&s#4Y|cT%ma1G90gtpj|Ilzu3;yJf6<=i
zl>NE=rLPh4JJJj`ITCR6{33+ukT|Q}I#em-nLy3dnUq9{4cj4aHztkT2<PzYghdbc
zCtRfX*%$DF(!KeO3fzZQ8VL#i@cbj5cqRt?^N>lJOs!Ua^)o#3$LLHbsF$zp&6%;`
zzgmBDy??Uf)`LEz#9r`&hRs#g3v*-y`U02#oj=&i8RC@>S3r7q^B<8dZGT!cLvGp3
zCnaqFSbnC{7y^k&qI*pWz0W7TJ7I@F$<-}x2UOCzgWA8geAQm3=C^@V*M*=TT|nKv
zZ9>1L`XmMb4%D3+NTkb%hMu57I(QR};A#gZg4AF+VyWG0ia$m+QnA(ul}8_upeE+U
zx@Ahv?YEwdsbO<{PKcY3?oMBc{m!=mz$X7drx_F43)-AN7jkb+`2&!Z<L%#qZovH<
zjYq<VIl5kEzq6lHHZLu@g#|K-@~HwVZRIsjYJOh@ew|}Fc&9C;e(?c#U3djT2h*H*
zB50R-x^5#w6MQ8xC(e+2&E|_uaDe4MZHq1vlz{tMLH94R1+tgnbx%c6unv_iNIw)6
zYIbq-afcb`dBiyBmDo24UIh8{e@M6&i!iv;<e?|B@G$DaM@oz5(0c4pCo()}J@8_2
zD7~o?B^-22a{x$U+WCVrt*l3jUNukGpJ@ILT6bBx&eQG!uU&Y<A6%2Y8AUrJE+@1m
zS14p4sa8&G9KJAI*Vxtp1t%8Odj<>8kXq>7+DjPkC+YBa*sIxkZP4q7GS3e)F`?J$
zjX*;)z=Bcw>kU3#BZeWnpM}d3v_+~7c9~iHb&AXbzPExMfe?CsLB!#q8RV+e><lxb
zWcG;;=O4v7KlVIT3Y=~?$gbl^Ki~sWtgptS>;94T#FrY#Lo423qsjkV=LOuB>vxJP
zoNFiF!aNl&CYaCbL=Pz~ij>TevzIk!$c7!MrR)ng<UUc%syZd<8h`^lYm8|Q?5V!m
z26=YEZ`c&th66)SLg)A|q;9K@tWI-o4+mvVv=eI1QIGzq_rUd&$q2UgRS%W8-B-#e
zk=h9{*<K%V;n;wUKZYuhso>D;uqKI8a^eD!=v&a<6(Be)88DEbeFPuT&OvbTvUG(4
zxaVIO9Jd{k18Mu`^#A$r)q$GkDf69s$7%AWk5;ddqzu?c_BTx=K3ccnA0JNWEF`~-
zSsUC2_TfEf=AUmh)siI(9n8-mt}TqKfkipuU-PWdx{(Y&$y*RSPMDIOE1t`2oYSUP
zSi&3XuG3f|dv-weU9%23T7S$fEA|?h*6eC>co%n2+#BW$7>=voTnoLqwB8Et7=I4;
zA`#x@E1K2pPlg91u3i}rX*T+ckxc~E`n`|74iAZY+ND@#q<LFsw=`}n7x3_(PX9^L
z;tn^n{xwAPdAo|-8qXjb|5irMti4h%vGAa0BO=UHsxSc6R}^W7Fq!)jrr7TIal?pF
zbF*+hM0r&&=#XMSbe3k@;B8ORVH<}>c37Z-2jXYcwP9ZTl@NyZ=ftO-8>qtB1@2k!
zWVc^UZF3|6JVWEkqNA)y#?Nv3hhgcHSk$}XyvwOb)RiXftZP$h@rhv#>+a46Wcb66
z$Rjezi1v;2<CyjC3oPe-9~dlle8<Ed{$RYX#$w@NkSUp}Rlxp4fO(_+k;Pp5N)TvP
zef!lFdpdmZzzjO;OmeC@(UT>EGw3wme(I9>_v8EBmRwJhg!<09S;~%Tx>ab(2pC;%
z48OgXs7}r0oW3N6Gpy^j-W=WPwsvW^AO-cUspF-I{V-X&_M*)cb_u5?NK3HQVJl$W
z<qx#Tm1|HR18(#^;OvUvF&4U(?5y{)d9Ohu?3bEe<#wuTYrdu(w%_Pisg)A~1<`NZ
zDu1{#PB(-Vh2*{T{~rHa@VnxIp@>mRN!?=kpYgPV0O};k3<6G3k*%HVg4}_d3?py5
zYR?8+QKMsuyipx{UHwYM(<32J$M!hQeq=|{xo+`4$#QWPJcJ%kHqV65axZ~-&P~*5
zm+Hl9;^eKRdwe_Kf8*Qm|KQv9(tX_onldv*n3>qH)Gg)h8{S?9uMs&}6?%bZe?cNf
zakS1U5cxn5!B|3Wd$Y&E@zup6Exw3YTivVl#qeP()aX@DnuB3ewcxZar^Mv`8r~>r
zUzX%y0+7ZfiWWD=<h`Z(D}w@OfzI!Rrn16ja4s>I2_>@sp|@S#{6MMT!uqeH-fXIT
zgR%A6cAsF|!3o855f+4@*Y}k6VLSYwwiK0iunO>}sgm5!F+5mlvQ7REn0?^_Sy*NI
zS+S8Gu)O`W!gk{x#byh}hdK?9AMKZF|4gL*>p>gvLEFL7Tjg=9$pp@-+V_0=9E0K?
z?l~ZyvOdAvfbqX=3rxYb<M>UP6=yW70S&fduF<x;TtrIqoENc@JOO>pqTeJsmm5dM
zJRKe;uo~ZTe4aZjan##z`cwIV$Tl0nu%aMT{En4{mFv^HKcR`8vC#%bM)(Fz6NQTy
zcgFgZt^%VkY+Ct#-RaKY4E0CgbTijsqu~C(qzrIGqa4EMrM`YtTU6*kvudVwur@)t
z{Nza$-J>0VS6Who=4W6YkUa83sP7^#p7pQ+y^V@uZ3ecqS{ZL4J{aU#SdQW^Rh!)|
z3*&`Vf#rYCNRrg^Xe-pJe6f`zoF;$mJGH)%K1*c~Hg5PgsB+h$FE3bRK38c)R4TfW
zc>IRX(!sf9Xz<b;LGa_{%?~u9>g~t*^7$jWHW6I02+1KA=1Z4w#kHY=c<%!edr#(R
z|3upc1$hn<l#^TWMx|%aR4o?~bGBczod~TS>y29->nBMw5mTFm;-P@T7}r!cA*Y|Q
zp)>C@u{FNG{;;atZR*8nbd1d`Wo_WONgw|i!r1!iSc1oLW#SMYdpw=wN~ftI=t$cR
z@8?*67UfjH_cEX7E7`k4Koutk30D7s{yT&~scds!{wAbc<G0mc+YMmPflG`YNMJo&
z!2D%K<G%Wz&=%^zd|y4azVq_I!0N)brl-FOT4g`GGWNLoZMky`PMUlmh+*dlc6^&d
z|LsDAf<^k*k5u`0iL7!XVy{%G9159a&&=P(-zsyso*qlIe@d~r`O^52Yk=PQCi$>I
ze3B)d#pm#c8drlx_GR0`y=i%9&@*>Zac|2g<qbpbqpBdAFNehb*ARRllE>oXefa!)
zCuSGO&=Hi`x*tZlb^z#hVA<_%vYNc0j@Zsi=)00E!1_GA0OQTW?BHQ<R>aEMGV3^(
z50nHaMG|v7ke__0#vw#9_Yckj+0?m8C91*Bo;uDliOafsbNkB`%KH=i^)l`1{$=X|
zw)7b699CAUj|{28`&EiF)fp)gfzp9hrXtfcS*R?xp4a&S_3hJnDS|D5FFVEvP*dQF
z^jnUrUa*zQBj!*KxGrtSN0aI*11Gtea#Po4o#MlYrP!bH%IIbNoQO%;#)hKIvP}A%
zN-pb}8=Ayou4m%Mlvn#V+3ShwKRM>;p7AWOvd-;4t7m$Jj`&G~5X^&2Ri@}?b2>_=
z?G|v8sU%h?zCa?25E8gt{xEe1PJ$imjfY;IyaqMtMrUjG-WI%V7m<HN+FMr*Rhl0X
zVp1GLdAJQkjtr@wQKUmV79{@X5cV*Jl34Tsr2k$W47VWgZ-#_O)+%4)@%=aIzZb)n
zh~Hln>}xvxk%i-}_fh|wKRi`Ntc3z`Y@xLC_@v?VZaXa>=CgpT;-P<;o)Zmb<k$N^
ztK9e;K)8o<2b`jIEC>TI_G6WX7?mqm1uR!5NONh}K8b&y!y|PSl5golK@aymbXAl_
zd&^t(kiqt8RTmW%dOxEsH1x-!xy?pef+;Nqeiz-FU>#-M(gTqsPN>ZfD*sWzzL(!0
zA(u5tfmZdow&>MwPxzxfHjUv_dX8h&2El%3KkIb*{}a+L&iyHeGkiMvKQ7pb8-H^w
z0A>uk$%B!i@4wz<)0Uxn=Cs&+5MAv9BIbT8F0A-Hsm{%!wNKX!hDPwqPu;hmK*pQk
z;rRx@x?$x4d^vDmy(uYkBn?W#s;4w;>e5QuAMa-a1U*VFu&~|BKTXjMa-q`yU%H?B
zpLE|Hil>Wpe|82OU?^v<`}kWnwfh`u!mVq_v$IO(dG1eqp{@Pr=XjpFrJ9(ITe)Yu
zxkz;#?c>Bu?rTD8uj9q10g7q;>?{KA#l75%<NwzID^8zU^Oc4r-|7{M_x4#at<~DJ
zlv&q1-Ha)FU6-QV7#;V%!dN3i`A-FJI-UO~=Kt3CpP2vG^L18TZL@Wo`Qp#khWqTZ
zF>!<xoE~lWx1zH}C}Rg$V&F#k)MH;~7aPiy5?a%5VCDD2w)aoDrKnHpKwd_z0MV53
zkb3)PX+j(21PVh{39}~8f$QSp!v$c85)bbmj(<F`cW(rNT|oOVz~KGx+QH`{o(k;h
znN*)u?y^0LPZcVLu0<=*0-gzzRHi_p{eI_Cfn5~r-dan^%(e^b8kz3|cK%*A`lI+u
zBCnwqgs@5IRH>_o+MDrQ@iRuhX9da$J^-2Y&MUG(IIC-Eezp@>{Y)GofA?Se>qmIr
z|LzK|Ip!;NNCp~u<zcJpMb0(o8jSX1JUmB4eCOz8mrJmB5AygD`GPe)jgRx@n8_25
z;rYBe=!a}i=l&&QpvAf-BtdQ=udY)+A8Nf`wpioZ=uHOhgjfyb`UQ8O?R_F;un`Hk
z7KzO}esRr+Q#yU?-hDKQt0>NOe?Md6JQ)SFbf)ugU3~v!UHpH#0zUv8C)GK}(G^oJ
zBj!2nFL!Pljh%fUt@yJ#H2XG8rbiJmzeDUYB9U%KrlHH(9VsJGH^+Xx+n+%#PRCL@
z9{NYo3g*+_xY+W<Kf)ZCE?c~qgu{gBwRVV!mg`~V|1AnMCHx;Ckq4a`!T(QDa3-5T
zc&*||`f~W45>`ca_^5S0+ZGR9HaG$OQN47F(R%s7ef+`>JQcRMMCp@_-%@n=LUI`S
z<@2<J_Pq8}I6s>u;ChIb%1dkz|8G4oo#C9cel6Smzw3dkt{O@=48gUXLZHhm{<ycF
z=@D*hV06vcZ-eLJpu_urh5&)}ITmRC;OS*>bCw=5>#fdC#T&~!+qKI^S+j6hH0@3U
zZ!UlAne6X*enjOWtNtmIHRHYNRSvUS8yPI)b4_x-?e2VoN)k9}f@Xs@g*)r41@pE&
z4aac?yAH*v9_$n>8zsvW)`8D2d?m8>{_A(O1Ft;4P9yz8b3r3v{mh>kUVyrFIMPnS
zWc(FBz}d;UZvwQ%v(&F`5-KjhWd7GV|E@lHVhH|!H9)d(g-Z$1xHl45LbmOQ*B^Af
zy>&D@=YJW&B*<j#*9FGHS#zs14l!DbOf_~(qsu(Zu*KpXeFsy6xqJ<0swz&lGH8CX
z@SR2VX^o{(e2Vz@r^Q;X#%?d_s&qDf{LpFD^40jk#{aEC>qYDNW3ZK5(9ZIbnK150
zEPUgE-Iag&?I$~}JGuVj_lM2Z^qm`%uR9SRp64{(e!56u8}fS{Aldz?69*XFp#0^d
z8G!H3!+ZTRdySg%D@hRES$-;iE!_DAaB{5_kD{9EU`!?u&*wc&i<O9Qo6uW3a5abS
zVeEk&YUKB5Z0rC`6B&pXGXw&X5Y%K}mNrHt(+^Iwi040&qD#R@DvJvM4!r}hBCNq1
zLd4b2!8f#cYu4AlZfaaX7ZgDm<OhzOe!&(X#$o{2KR7v?$AOaL5uI_lSR77Z^mPNi
z0jQNTG{_sWSHzIZ*`3Ao=={taj(;?DmiJJ70RT7AH69Tu9RXsin?6rZ3lf?N%2A)q
z^eo8crF{h@Pzi7hT0Sl6!xOU90kHIJL`XE+dzpG3b7Ph$LS47K24Sqj>pGn*8UU|h
z_<K)UkD<%bHPIB5_7~f}@q0e=LJ;I;&N^$M{0B%a#_h0Ff&sagex`0siMc7t`6}g-
zeM1%kY#cCjtqhp8jdI8HzVl#o#eR%fueI8rkEBkc@;sD(iahvr0e%NO*54hd?00-H
zCh-=4dopT(`A=yJZ&^@XKXw^yBxe&r==MGYaDsqu-4J~ZjQC~A9v|p)d~*Y4Mg8c9
zith|T9;*NS#d~H(4s38kZ>~?h!DrW}_FNcl^ABqXdyh?-4GR=UvAY>m&f?`z2hnK`
z8eXa^9o6d_ZygfEgjr7jHejSH0L%ftF>jZy|CJ%%0-Ey%KvS=AUB8(9!fjVw$iL>_
zec{j%J72A0TDsJD+%n7Omi?@wMdvWyKW#@m=<(vON(*dDHYcX3z+QBfy-Iw{wZ3+L
z51Rep{?kVKK9r6g2R1LkUm>Lyj8C386Rut;?%@nMcGQ@!v2c*w85T8vamF@2#k`;K
zK8^mW9Y;;3uS2YH$#4d$<G@0Y1E&@UJ`&(=2rTXafCHfYSF6?dX2GJl_~^V0O}C7m
zmyg{ErI~Jyo`yH9Y4$APJQ^+1G6R`>3u0wtxFgMsPq+ObCWu+ftJSk${5aOzp>U|$
z4}P89Vb)TvJ^7@6OrbLQN@!y}`@#aAgOA~Eefe`EkBOB2->Y9h%?o-TcLQ@D!o1u|
zUr&b32PmOI8V}k=QmAAQu{r+r9Q&hl5W3BKw~LkZ*+2SyY@XM7=|F3uxEDRs<bX2q
z^WWBc5)8PS8%zbVmzx-?J+UE32iGsShC7zns!SKx1#aL&<HrreH>9$R2P;!qe-W?_
z5tC*0Q-ZIozUl+$2kJTN^K+c!0M}Q5vILUeVz00sD$tz16PLzZ%9e55q@uWYDg!%<
z31cir-gT(6!b@6Ze?_Iks3JkoJX*}6(a&|rO{cnAIPwFM+1Z@_ahAyiK&8e+O0f&7
zfiy^BrYb=|z~=by>4_+u8dHxPJQZFMi_9w(xls*`?1Q{Q_)9sHKvCm;>uKID&~5n1
zEuwE-e;0XjC`%uN-pry$oFm~V)U+TNm?MM2Tpk>&EZZ9tCD0*+V}XYIi^$URlq-KO
z{UQ%sd}D@OF=P91@GC87`NDUyn4a_4f*O#(Y-aC1t2KodZa@R~EMPSN1f2$^4my}x
zS=TO1Yf38=bRPS0YJYzg#&!aA4uvOBI}E@{Bpg$<t}itg0fMG&+}Pw72q7i`gMU-%
zEZ3XL0RLN*(i%qIa7j%Hvk9Os?%xlw=^Y8!unME%^3=&7-+b6kW_*vqy8>H6{Y9cX
zZ%n~a)IQ&C(x?=`Jwl7_yU;G++#e#2njK;!0iXFrpMlPMS0)zmBs@*`fcOURRszr(
z1_EY=0L1J2$9UjwC(^%#ziyS>{xq)s_f#fEbs4cahRuLf8-j*)5lX`^q9HU;C;)@R
zSXrHdgz%n_==hy({(ZFq_&x=+X2FvO5KJHiaGS7-e6V>hE16R*)E=#%t{s{Q=A@9s
zv>evh+=5W*oAJMa?$DaV0AR+<&;Q2%Ek=o6l>z3qjP`tbqGkTcD-t-IT0LDdL;XJW
zhhvd>__XT7L4g4&d-)(hg1v6*JJ++_Z%B|KE*}?zz|9EzL)^8VgSXcYNm-oOH}pd|
zgAWtvEH=x`&`!uZg|4hQg}elG$jVYL0NIb5KFtE5rTPH085tSgZ!Efgf2A9yO8|9t
zjTLf}7J^HaLX1U?1;etRjuaukAiJaL?|vioctnVP?k_~IevNLVkm?JM<xd&X-*pp#
zsNvA*Q*SAL^>EzKIW`QkVw>ras0UU9XFl$XWa5@@244Qd#D}lQG^jk%)^E}zAC*Ad
zQ6me=((e|glBn~(EcJ1-5QXHTd+pPdp9w_*N9xd^U5q`$bB_l7M$*d%=3kI?AlM(n
z^sUZ4nuUh8=WYK8hdQV0cpq|%?3@0{MF6uf?zaeBlcVxQ_ygiEL|-2wNyoy?3VctU
z@5`nF<h{uCsBRP;tS}jz!XHI?+Di}zZB|t-_wDu(fW)5>cW6qmBPVqq5&;~!9-3&9
zfb|b~T#C=v9^?`>KG?keH~g>!Gyw_Pz!a~0%g$xlF<_Bk@jpl}l-ZLQ!=txGQ3e55
zjGc#b;{v?+h#X|e<$`KSrNaDN6e=e}SKKY$LQLL_#02N^Yof(#?gCsS+vJxMH9-vI
zya{%On(X)}k%GU6t@arMdm)2=66#LB7B(+yX<5T~`Pgq#x6N$)599T3lf=#hd*3Kl
zlFpNy@QXgN)Hetc^p29Oi|q}9QLPm3E{z&c2CPs8?b72n_F42Rh|%nMFjk&^W1yVo
z7EUGf1D<Rx(*;eNY#@BwZ1-koYo+ke^L1+2szc~MzDosAVJk3#(C&kDxLb4G0qWrP
zA<5HPo@}ifhz`xGO^k0bu3!e<TNik6i`Z9q@BAkj{}>;vSzwadoSu#qk&V)#JJKz<
znpkp#vY;6&VPtUjHsFug-#$3Ut(T$6#7^HOn64O5O2NItkPUTp<$LDsMDV}p<o8jV
zCRlOw=lvr}raotdIbQw?^?)bCy<OmsYTTm+Zz*c7ps#*mD!^t8T{|nEW#-9%tyBBl
zE&!GQ5ujgAxdMp_sV*3p;RR*OoW8MH!8^gr?p-8g!0fDYqQJ+{n@u?4>f>BD@ER|7
z+Anc)9Xtqf={HOeA-Z7jr!hm#BTIoit7Y{^DCl2oT<3&2NHL)OD?!Bm{em^>pL;5B
zg|2~K8~n?uOTbyxy6EEULFPzN?P6kvukk!EV~Ai3uGn=@E(JWHGui0r0+MRs#M0vn
zIeL!$9vL{csM+(~gZ2hO5R)+-En!zrq#xS2tNp<&KD#UnoVx+dLd;QlEf^{Ul+zc%
znoxb-MdqQIp49FC+tL9k!oBH*Lh~;mr|$Sq>*iu$>cEv5<_JUztaGk@X27|o_{1OF
zRr9=EYz;kd5o~hidIevGuwPhx@9ElcJ%p5We!{yf?O%fIhqgpi9Z*F<GOh32mDZ&#
zziM&qBEuIlC?^B$QFGT|+a|pFWb&@SO<e9i{>Q{00UYGB*qGVC*ELshW>*oA(-&=f
z`nl~WdJOszBnjHoMcgcG7I5csvv*|F0S!iLParbunX%0RLyv5%YUmuz{r4|=OBvGs
zDcyl74*_%1^tZskwWLB1ZYP8+m#Y2%uLjmY48J^y>4Do*6~VZ8owh>JxWiu<tFHe_
zFTMO)RdaZ@{87qolJnJSSgx>4>5xn<QY{<n_~3qFIL)qy{H|XX8}Y%)fo0YsBS`S?
zdr$Yy0tZG?|Hv!LUGBk~@xtARd>Bq;&s@G*T}ICKtxpu9?b0A=O?p5jHqeJ8`~3s2
zT5)J%2302vXQa#AopKgp%P@B}55MWu>{>g3&faUQ18JN_t&@Z6tGSlER;<@dOmm8q
zU$ox}bRBfYCs8BBNhZ8%@7_f>hlj*JZC11~Qdp?7TNy8W(To$bKL}528cTZtbpSqd
zbw<5FSN{0HlWg$o2P{5&Q`W*{$j5BLS}8dWXw9&QLv~req7ZgvNS{yToVj1$m^NBc
z7}}Q$>0(yT`6}*`qR^RlxuHP{mWUXtkOtXr7eW}CpZ%_g8^{|(8kqv#XStouaofQ3
zi5#NxKw>J-W~IEiOzoZIUNNZl-VW-L00>AvKJfKSwK_DYp-kTqM~35moEpaq%!^rR
z@Z-xR>Li;i`RyHK{RTcX-lYOgfW%wnVJ>_>ly6QAl~4-TH6+wIBhi7zQYoxWX?G~G
z8`J?}Fb7+fK-vci-?ivC5ftxGwsqmSRD!ivaZ0R;9}pN)ot&s|?Kne}f*{8xw`ij~
zZ;I^k>b$rEliRbQ3#oIYyWg^UtAzDjlv!jnVA0~g!k{h3&%lg-gN?~^ThMxO47@Ot
zxB%R^(&7O}k9Cq(e^}?zLGR>;$C-3DlP*RyG#I9QM720?5)(gbK}V4$v<5p^Z^a81
zG@C_z<<ItLFLlPLJ7#GqaOr?u;_(Zh)uzn*MbM7ta<eu3=zgjq@*_u#VmrKiVdZpA
zWT|k~HzwjvzDpBbt{L-<ql?K^U6<NTE;eZBL;P!H1$mObe7@E+?>_bu8nhE-&94Ct
znM0M|j{Q_1Tc-E*rb0aiOP!Z8A&jW)0(#QlITIP;O!ir!*{T>zbK8I0OBIOK4)?LO
zi4}s)?{<D~eUHwm<zg(DIGhfeU&fj{_Re+QZ;~SffICa_fvXaENVYT@_HVeA{LV}|
z25{v{Qy*>dqBW_oPN2Y$M*~`O3_cdh7^3p8TUu-epV_TmF8hHd8~(xQL!hu~`7sD7
z;)p@wk&f5?je59wv)eOZ?`5@o9AwTjK@M@%1V+Pj&u_&6v*$bGC}`eru`*Jj@BC{U
zC12Pd03QTBZfxn)e*(!Ba$1y81;77})$Pw>^cL-RKBR3#KfXaQu!iu0&NXKIgmSNc
zn$B}-P;qdA6%Ra|`8(2OU1QjJmwM;FQdObOYX99%p|9loQC4&9!MkytVKV#u*;=FO
z(moS^(+S)&TmB5w6Vc7vE%%qIp^3KUj{<c5m}#u1oj5KGCUN9n^lSWm90|WvC|FIM
z(RKiLI@9U3*dKM@Z}Ng<3b{A6rp^f7&#`XJf0v=qv3pr36R)PyI(xigESAetQ24aG
z%+}()sAju09d7BuO98gm(YZ}gU(%l^25Qi~<6H|f9H@Rn{m#y=eO=m<Hn8Fa!CEhE
z0sF#F@$Zr*eGH8x$N7!%v_$-KdeEKb$A*9HM7?8!=w_BkEWSL>c&6BF-&j>TUJ@=>
zh3%Q~DQdBmBk8Sta1pseRXpxrPqn#>Nv#rmPn4fvG>mP7eJ5`FsiFb9dFQ})@*kW3
zSWplPtQLoMC9MU$xz!K!uj6ID6*umjOa|<SZpE)fVW#Wp;uTuIGmy5d6(2ZF9hG$6
zJ&Q}*%Fy55UF2wSrr&U{R!Sq!WhYE|_P&2$w{liMrT$fim8Z(9;>^3wIFA&%V4EM$
zLrh7t6`k!{KY=~>y)r>sYD;?(dP%g-B1hZwEG{smNk;n^X3XM_v>D#x+y|#ZC(Yyy
zx??zB*BMz~cfyZYo^z+Lm)%a+-Sj1~GjsF@$`TM_l}~-OSasRbQGNSO@MY#KX-aT?
z2(6&2N36bZtRm}hbVZJun{2G)+t;V{=7IXtyL?sdB6r_RZ+K^32(7cJX1EaWL_pW{
z%fUY<T{B5=@Dz)8G%_AIoXuB3c?hG#?x!=^Zp>y?YItZFD@4jruAN`r24hXH8mrA8
zg~7GTh(mG@-82WET0{XKzU_1t$4b*`jK0kBe+>(^eGSE?8yym0>wU^IvplF)Cc09g
z5lruIDxGfT*kXc1ne<DUftBbjid!%DL&c@tQzyfTO!nEaSQ<u}p{;5#)?hAUh?Ggo
zri_c9QN{k$-{aL`@!yoTBKz-0E}RT_{SCq;Ssh|YaT?VvC}e_oK$Hcm{e+jD?R2cI
ze?2GV!`&(b3w1wBd{e<c=HX2L#dhuZ+Hb^h!8UP4+14<$`PixLQ~Cu@H_MYCc~$Hx
z+V~VF!~2Ln`<Kem>;Z0w^dTJUEp<&BJhm%e|2-#$YjHb8WPiwJ>Bm4(#!#BIpsT4`
zELm922Z9hQeyhr)3Pm|V)(0Na^zP={ZBs@EbELW}S{#He#l*p)VIOIFYj=s8+c6hx
z9ziJTp8V1Q?Ja`Zm-+a0qG2FWo6Zbzqpi)xszl>WYgOxQxs{_sW6@O)q_Aqn_#1H*
z=FI#ubvgCv@0&?aKL?tz>?>Aws|i(BR2!kksu+0}GheGk_fj9Ij$BLIC#iIax$I_r
zOWrDZ9<lRuN~`574bNxy7+I;_+irr6$NPF^Ni9*yW7G%Ls*UY?4oe>dNethAO*&|8
zWb-F=^;g6TKP8NZk<8gl_1+s*+4*WsOC{wVUK<NP;DA=&j_fDUs&Fo)^;PjQPAuAH
z&AUXY%i$hb$Il5PY#)GMIK2`pY?<-ItIUPY9<`Z}>_jMxtVGIMzUdCS|0UQILda#J
zsZa8E508@;R+Lv|Sg&!yk7O3IM(rK8dvU3_9Ve-^4Q-fuGrXVXBLW`CezlFV5DXn0
z+A!%G6n>_BwNv;*;2P(FH~G&*=3zi+{yO|aNKCrQyGP14q;^>3`fm&Wbeq49;g0so
zA-78dr_&OC%ZM{?tDC8$EH1FWRwFEU7ge!4zw)H0sAc;)i)3G;)RwuIR$M2u%!rNj
zr;2dxB1%b2>sdb=na$xsGflNS$j;q{bjmD8g|<NA$3mL!7&9_}_$eZ@vo85G*NJ0L
zNa*slF4?zrcEo}ki@jx>n{ChU6jcIr+@0JNAE(=AHK_lrU9*hApv_Y{;z$4TKenxm
zy_3xv`>gRve4Xy2&|vX6FAtApt{_q2U%b&bQ%=)fms+nz%-d8<)PyPa`ujyF<Ro~Z
zqU7Eb_hK_Bvr5`$m|J1ujI*e6S&6QEf3ogx*SnEw+e~7ujMtb6e6pjL94{5m9#NBz
z=^tc&m9*06$}+&QIS#7UFy&4i)e_V<<$XG8TxTe{o1@8<Ipgq*oXY)ks|JZo+Oc+5
z)1mz4=V}ds3U<~s{>)@4{pT6<1(TJ@7ZHA3+oR?)kiq~WU*Wu(XL>XI#bud9x6#2n
zZUnHWN#zAYa-wF%L*Fw-^b$MLjlSTx^o&mW`;~B9L?jxRJf|g+XwdniTXt`o;;H7d
z97D;a{@ro=-1J?nT*tIdZor!RbFr4_@TL62{T-2G)7&;ssMgDifu{2i1B2hX`W3o<
z!+OL)_B=YH=B>%X!@40Vs}Qzdy5%~hemtMY2t_olc{PaKb&8V97=IQX8iot$l+Vl<
zI|YAFCEjh>D+z0r22>_SYBtF3x2Gud_Qhd+9qgAT|J~saPns&0Vyhg%#k7ju(?<f%
zpH-i#X;fmN3WEL8@&9njif&yHeg3wV1fyUYsqif)(2ieC#iu)OEjJidef<!}EVo;c
zwKPxPok*b}oBIy#KEs0k>)z#1h~erS{HP%xV}I+0jqb`D`Fl84Q?67bm&5gpOR?*N
zz(sMPCJzP6MB=}nlrR78yNW1%;n^O+Sbyx66D7ORt4LX+2{g;sJj>f_d1dk%!;@)P
z!a?y)Gl0e<X=g^dfa_EX!k03}B}=(cuxTadEY}_o?5AatAa}I>-lOsDJd8DDP*3n<
z7?FfKbIYqZR_U=R;)=(ETim-w-@1)wU=_FYGtV$;SIN<_T?!Eo<36T-EE+b`zKR3=
z#nDw86C1W_&@n8ld{+Ka?AiINxqxqk{8*Mm*la}83cakLzYlv0wPbJJ<&07Wk!$I>
z`HW9S+RZS%+Ey(dMza*WY1S|p(Jymt6)Jmh<@uhyJ>e|>xN6_wrA$2&&qKMYhvg-5
z>GiLew3^C?W^l+$9a^aa`1IaSaLUz&hZ~<}k9;0;Yu=wTG)Yu4sgTBNqUinW51ltp
zmAz@Id?uJblRwK6CqG%Eoog=gjDYlw?Xk83JD*&x?RIZR>AN?7hKsQl6>?*BL5ux4
znM6IpO^M2!NvRZV3=AV@xM~ewC&J3Rm7jR_y?vwctSsl;>pi>Q@1L&|hPyACD6Z07
za?8GVK>1IG^mRDgqG*O$O%1szzp+a;o8ruH5M$S|2{oCryyTnEIPfSA7~n~XIbbi$
zd%3>Hz*K9>;_{b%Vyu`?kMQ=20xN^tKDx`4V?%QyYPiwvu}D$cLt6DGDYz>J38FkU
zD2iF&i?e35!p7TNNfINS?f326(b6@mO-G`2?3MiYdm-qKb;;7uj$fA?MU|^tma9k>
zTMZC49j0axKN<SI$J<1;s!XmwYotw<fO;1w2(3$^)0=9@_@+yfBdU^S->H}6zB-|9
zQO`k95b(a~AxnMU>SN7~yu7o;!3dL+a6|jBth6`3!QT|L28|NfYMwyXJ!Cdc@_pI)
z_?Msg5uYFFYjRjDuXsrkJMgL5y2WL_*TNHJa-e8mbeH+$F6j2j<$~jDm8zDX)wlWl
z49dZ|1%dCAC7IEPOoZ<FCR97k=Xs+CXGewfQB)#l;;T4Bx{{HeipcK!(Zc4LLjIAF
zN7EMi#F}w5^F~7X*qet07LzSs1u`PrD<gYBCtFEIcAKH>)Az2B)lN>#<GAU{!C2gA
zAqSPP?Oz2rGV&QN^&6dgiMuOJV!<yNWXu-Xh>ga&;yS6n{rSnGzW1iiqR7jp(kqmx
z@&zkdl<~goHdi}u6XhEb3u6H;VL!Ru;0aL&^k?^wOH~}zF!j=FK2Dy5@`K4da>mvD
zR^HO;Re_UOm8{f->{PXV;trMij*7|P2fi(;`Gzkk3?SYSkJ|S<jvwn#kuy*!`Zhk#
z&bx2tCmO>3C0gu4Pp!!xK7U<(!E@PW<tdgU+Nq`l$91E7@BPZGIa{&MDYDD6@=<U1
zAnm-X44#F0O%?4>Ym>a0f$05sOzrmNVLQWjJ_*L-e0$GcGXhew-KUT~>O1&#q0n%(
zdeODwjIM`ze){LWGv&sW)&cFXlEE9xC}Fw+?G92~AlPJOs_A|wjs+llP-N^zs_}=k
zlrIvdRiH&(2k=nA4k2or(Tj+%7L4|w<m}yX@FUq?7nZ#dJ=j|seDYlLsc20~&FY;;
zr}(zEPan$^>|D2dE*ZV7?ya`6ox>8|bXMsLF$GimbAP0o|6r|ko=c}fB8<0T{v#^)
zpC|F`Af^4b^R@rzjLYejmwP0yDKT})<95nVd0z#+HJM)43wSVh)xI~z8m|AP6BZ_>
zyt;ec(|26v5D{s3;M7Oz(P|<<ph%}gTK0<TOC0Usl9ad%Wz=9+n+9F37AY;q34Mdj
zN_r;|)F_s0ul|#-)KMEbmDxnhz&F?E*lD9on$uf6ny@#uzBC)WJ`XsLyzd+o?c6eI
z-&sTy_-jliYyGBi_F!zoacbP0i6Y4S;3MCam6er&<X`aaaAP&SEJ|J^Gryz{C)W^W
zPW}9h?Da3sa$bE4&|ssa@w+%lDZ}5qOQE~nOcz>%`z!6SxGy<{%s(qY80sV9XPOKx
z7H{wD4+a@9gOo~M_R|sZ772}cuNz9Ylg?~L)puUK!m-6tS7F-f0H=`U;?`P9HacqC
z)W~6V3uPocWpnhd<F1U<>u3Jd37Q|1?3c`JTTagi+u!a_b-HG@u}b#wh@aCjfOJMR
zD@c>G(shz#q>vA{Z^7nLEVr^JWK-D^Kn<_<xkG9T7+3j5Yr_0~ucaFdPb@L1L~4za
zk6rp5i(2Y7>4)pjD+$Ntbs%P(6<P{e{6E#qi}J8JR%4s9kx!N!I8ib`;(8H1Upw=N
zN@WsPo?vFa$m(oXHJs4HrZS^)RzoL_k#2l2Vnz2s(~)y28sQBIrBz`H3v;9;%P07r
z8u>P~-UiQ8jEPUoA*<!!(KWq{W1CE<c(GRkuVCQf*Xb-#eR8fcxXKhykCz%9(bQ64
zY1hg!O*@PMZ*o7?1TKoNKx`OC%_J>2Kst5iQcHxN`BzI~ETgN`(e%t*>=WCy+(SO>
zd~W9P_z|PwQ+qykW%A~D-4`1Jj=#ntYE-o?PWs{m6SMXj_rAsL)vkSFh}hfzfY0;4
z0=^VM>t(`-xMX4JjH2bs41pVMSoC=?zKfw{)I?<$^Tp&om@TW5OyW<mYYe4gI~rr#
z-dWzoceCg2O_(r`AM4SMnG}VLg@Q8Jj<Z+aT245l79zTVNDRWd7cXy&tx?=2XMR4s
zO&{($K=qnN%tL_4M`8h!e%udKI*lA{oE~1vN-0{-O7O@)88J*cEC?uLfILyVn&-`W
zzb~$7<Ue5trmy3$@_#N{E|n^f|B9u2?o9qajcfYxSA6RfdVmAu|8k*Nj>-S!O1^X^
z|DVPc7UE^oCS}O3PV^+`$Wb7XQl>l$WW3^bTUtXv)kq<tHt5<72io+B{s9hmMnUuL
zN{TYTDEP+?GCr5r#g1T$ILdYdXAJJ#zI!hvr&^>;#~UmAvk0C(ga9JNOiHbU04%xb
zey3rDn1AV|WM7OyIgr<PwJ!vi$3;YUbW6$X*1&RlI-#jQBtyG~R@)npM7`|iGB@FW
zKwc;O&7^xf9URfouo<}BZERL3&Qpxko?1<ZIs)F7clZEZQL%vCW`?v*E4dWN8%0Rg
zwtFbeG*<a=Ijcx?Niqr>PTQ7aMr<}}Z(!@sZthT48XTvmwx|LXi)k1)aK3{${y7XS
z@tL)z-AZX`i1}wU%<`oRt#7GYZ7ELeOgcS(`$|FTLmy)NCw5=Gn88+`D4P<ott}Q@
z6RQxOfbIl^rfm@zdfgoo6KOJNhYUrc7khyXDC!HBZf}k+`pI3l+ucbSv%8Xd58#5$
zDr=R@C;L=EU3|r9<Iq(K)%hTy0vP&ikT?fnLq?v!J?J_;dsN4T2}HkArcGRX6K|WY
zU;&@ta;Wpf{+h;(9t{Xhakte1d>bM)t66VtK(}M5;q0?X@J3(bTng&AHrnc-5Tz;e
zu#+U#lAbGw)^^+JSFNX(oZ|>kRm$~GkLi6&$dK4_#>$7G@d2?Bw7=dYQOz@IR(;zH
zglgUJWJ0Zrbs7zNPRvIRR*jw$61oJkq$K(Sv?0_6fdLv8%v^qT)3<hx5Yr_=$d%El
zE}Qp4;FoY5@J74S?_HCVfGbJt#s;$<k`>QmKv8T_A%q6tm3hfx-@q1I?lA0aR*$ww
zrk4T%Q38wIrKwIsR<nB;@){JRO@f>z9S)iVvODOy^hz4;%^24S_i&mZMY6bO(VUi2
zLp3^zwCmBu42RBuCH^hqWb8IfJB;xL3Ow&3V7+i50Nbb`!N@05`jMR1W&^TIA1U+E
z$!TU3CXFg&LSj)chF-tcay*aeH%@x;#I+1Yd%c$M4C0Z5;~juAYHR#Nx}wjhn#R?(
zJ`;+ORwxh44RvbO)kP`X)mN+EvxJMBp#K1$fTe!RZ7e6y#?iw)ICs%)MNeC76;|%J
zjO=Qj5o`+k*<mj^D-Y0Vf>O&BZ4ihKqqM`X3759*_LZefMBI$qd$SR7tZ2xZR~bhZ
zBi7ftW=3-seSJ*YW8LbqUVwS6S!VY?iTLTLks9Ns>^Lyj@AcfaY6RhldXAJ6%e5Pw
z0axNue`iE~udPJ$kgQ&d%j%I_^P>j=GZ^o<@@Jy<r?7Ih(O}~T;z`2Vjlx9j#>fGw
z>)^l^<C?5}&t`?0HeL<A#0qm-5BMRbqKGRfMp|(7&W-8nAJ1ZrC{$SGuh8GP##1sj
z8mG|CF-zB|=7*Ju(S=JCjE8UUnX2cQ*YxtgYzIwa25^A<pW{;nQTe}AJd^)V<(j<z
zKUs)pcOJ@H#|cU6!M0&UV4uW92g%2txjzCwHF^mDfJG?3vI@BX94kped~khV{rU)9
z4NeuCi51>sWU+Y6x#xo@bWjqBu_I)bw`do^>Co308#8WuVT$TVcHgHu`g+3E5i^^H
z{Mc=zA-JVU*iG{R&BV$*IW0$wEpPi3v&Cao<!x=Hot~Gr(w<!><Vp||)zC-sq>^Gb
zXT09F`oyDlop<cUvFh8lYOdQ--Jo%jTI3vQa0+q%3XZfEPEY@poO^Qm-)s(tc4GS9
zT<(nipT;$b!rpS~_5%|8qx2QWW8ZZ9yz}iSMbiwQjy>bDem1Wo?Ek>vXsTVn>Fs|@
z<$U>U|L-)eqw@dLAixpEzfw8#|9C3b5$FF@R^SJ$|M@~LZvR~_l+Wb9Q@MPhZh|<s
zuYGvLd)_41i{3;(h#_=R?hub{v3V7xiG5($67y)j|MqdK7j$ax(f<2AVcX4prBpHG
z^%?kaUmrhq+P!XA=Hh(-?(^$$@iXe8XFDZZWF%hjnMp@&d-2}hlHFS23XDFLLJw+V
z$2J;HLoC(dR?@#b7-3>N)-pEifoRUf5L20EVmF{M-ic4VWiL|=D2ik`r>?y3sItTi
zl*X%v<CcLHr`rxXas_7@L&d?+S#M(~1a!g&d^a2_3j0FZJ*5Lhzc=1OvMEx%m_-II
z3Hf+{%HQx?Bjt0^y|6PQ?Ud?J(0E|6BO($yP1D4%P+5KnJT%l{*XZ++fF3FvsLr-*
zf_ZHxR2Ev58tK?%y=|}GBT3e3W{T-HTaPQV<g_vXkIJqv@ML>bK^)1U{eLQu!}vZT
zu0}MulK>L+oij!=<8N7<DS3~59hv`|;xO1j>wj6CeT3G3N_KYs>r}2IYFPcrNK1~K
z0ST`@VVb55u6SpYNSlyJ&)(!y{cJik%P!fXlu8J&LOgcWkeS8LjfVL_O_If6Yc^Dv
zXy!WbQrlp5!!HjhabQJE0(e0aTY;uJ7RG14l+9ReConHTvrV7$biy6y6EFLBT=$nX
zd4WSQS#@BZq*y6wMGCevzBy7#7E`~#sI%lc-1~vlQn~@VO<)U|UUx^#YS@4&V&0^j
zH3z$a46jg1ZYnh@;+c(_N|fDdn98b3bx0e|!05v-(1od%qX(j2tI=B9?`UfswKmXt
z@zh4De!J&1@yC|a^Hd7AHxAaFmAfwMbv<LVYqk4LtBb$=V|0u~JemSsHadXwf!KiE
za(l)r=+~q%O9BgA*p9`pF}`a0uG`F(`wsQiVh>|>JN^1yK5~|MVAnEh_wL=vNR*v(
z5<KNGx9_nIuoGQVC5d#w3$2ZzMRR^EaQx5fAzaq>k6^`=9$8H)9WqEWHfn$kHfr<B
z5=f#XVd>(?5^+KqE+c|-!5Yt+Z3hErTgqlg9YYg~D;5qywq?SgZlD6wxatx2N>s@T
z;DW*5ZYw^NIyu)Hi}cDJ1q|IZ6pGoRAL1yOTtXKbzPD#NuEJ%Zr$$Y6)ihr1vk<Xu
zD;U*$QW^3N5zd2MEtw6}2-h9K@TJW2<6(}x{?9s%!zuv|vi~mU;_)9UdBp!XTmOIh
zmoNYOHrWzbA$qj%0JT8$RPh0};4iRgp=~^weS&2$5X-RAdhiD1;uqdnVIL^559Yk^
zsvcg=QCtUJVHzV#y65_5v{{s-rHBtX9oB|h%2DFabmyse4apTU&qh0mi2{vb;xXW3
zlYI{qP}x*C+y`!}=fe68-})V2oT_Q_;2=G_8ro-LRGTYO?Rx#@bp8U)$&{^Tl!nU4
z1oYE$bxE4q5A3l-m5*xn+>W6SJM#HW_NvNc7TSZ5FDEv#9YbhEvE#ea4I<t7%XrL+
zx)?KY#_A9Od8qr`ZI3x3-_Vzh)MecXwsl4G!6xQ*$RIp60wepyA-G@Nv|s`~4#dGS
z6*f4IH^GGSXk8i`T7uJq^`O`)EB%HKeGUb}M_{+?W+x~Y+qTZePQ;Iv=k@IwW1Uws
zSZ`}1+<{$dSsv_jId%w}V{1kZdKc43-X<!+JAf%&+7l3wCs^efl$Jkc+z{?FM=9B6
zzSXd4fx$~xR^C_d-oB+v@;RjWFdDGg`)<&-YiKdf=iAMu`=URQ6EM3CBStQU7<Vzb
z98eji7mS|V;u@c7pc!Yil~#(qKoF1V)SV7H<02FYaYRzy7|tC1^LYv;S2r~HB3#4H
z1cXus0UC{(ZZjF_0uYxO)q&$h5F37rnQKbPpl`vCF%KVW0F_a8!)3)0dMD-CP4U2n
zQx!r=6<P_U<G#cWP!I}ermp6~-aI8VO$uaqZo2KZ70&1Paz12AuZFcFmLmZm_6{(m
zXTdXMNI&^#d~%Gd=)k4(J>4*LWy$e9gc%%og`Ipg2&eW|<cusQ-SbUbv~y_XfbcNh
z2^d2(0!+^08&Pul$?23~Du_Oh{K-0u9~(5}ggwX~*LQrxW4vM9w02lp+>Vj5<Zj3l
zyBQ@Tv``0>?xfw%|1=!W<IkAi`GWx+@@=jUMuntjbq-)Ath24fJekKm(C_auexKHl
z@%R^()!AczOite&<8D17zTe=L(*c*}HuYYDTKzWdo_I;`S&&zCv|c#|Mk1^g>@fHR
zVgo=ELYnqefD&*)&3U+-25Q8*LCeOK5&1kM+8vHG@ZxYVX*h7o|5Uu|k0`%J256#J
z{GXj+I>a92t}HTp`|d?@k}Jj&We_<VUOb){w5kBZP16kRQ$7dz@2K`agDuxOA^AUB
z$;S8pD~0@-{{K|2h*9_9L$g1i;h(grJzg2^S}ElQ25V1vyKu&MV26bw(NYSYX&t4G
z&89AO<}A=`t8G`6SGEjwUhP1QS2$!0v~)pWxSzcDJKxw}xr#%TZhJFge;b%^o3ZWD
z>n<M{)ja>WKFJPRxVV^s?@}gOWr$pz*uLjc=l?XmAP<`VrAplXt5U3->HkjUI^z6i
zo0EM_TgFWxm=22*X?Gin2DR=pE@?%eJDCW){@S`<l-l!4X$=l^OI<r=hCpoYz-~5Y
zjxn*Z&Lvg?4_vU#7v`cR{>`4pq&>lFn)u&Aq}%E0IAH!43dQ*Tf2mN(p3VQ$xH23s
z;Z3C`5BrVdh`*wO=IKQfbKAB%zTSu>S%|bL*~%7`A4+52b_RCwh%vWkIF`a9$9V;%
zNUM0ZG}G-(_VKr9Y<bOOHf3bbr;N&Z7Cdw+ETUslu{ZW`I%U*{B>7xH5~Pe$eoU(L
z7S36Xq%9U=H7mF9p<1hcaT_F+q!9sh(LfBqrk(b7i1M^jM&ho$=|b{Iq>MGY`P7D5
z(70vy?a*_|c+IW3Jy$fRS7CLPGCZs8rAY*GHt26IE!}shz^f?V;NVflwU+xqClRVe
zy<y3PgR}y~HTPNCbKYU6@zM=y>oZPsG4;a5#l@Np=<}cAcO#z5Y15cHJ<hV2Zn^JJ
zkL!Jped;1D(F=_2BC9?n6(@*(d}?)*5zx;YBxO1cBj0&;IY^jxH#Rt|FuztENxcB@
za(TW3{46qQ7yA4VphsFM>%w&gUzH<_krV+Eity*x$pgG$wVdXT&f$+a7sd_OUjB1t
ziL+Zum>#J|de7l@NtjJHpsTgS#ZQ}-6v@2Eh`DbOg1h4jVxvGbOJFDkDWCg`kbUc{
zck$aSW1!LeFyQ2*^T8mbdv1qDjktx-JHqRp+tRP8CG6;6aR4Hcd@JP9;L&_)+&9m*
zy7evkI-&i#!PI_*O%vLvVjy64UsfX;LhSemhCx%en)PI^zGYm($l5I~PGMoXD`~R$
z5PsjZH^Q$+LCJ)K=m@vS$QXG=!VZC!rq@lg)hSO0Kk|bP{1EP~jB0F<$Iqa&`WghE
zkk}L4C=PES(JhGh$^QaY1d&L45=BCSNCd-@R?Wytvx9J{LisoQ*wUqDm8E8Xi1I~w
z(XyWDB4iK%s<eWQ<esM$CLcyZH6TKX{I@b3nmj%4W%hl0O~d~o^8EDN-@)=<VZ{EU
zlr5f}|2&oJ(0thl$2Ea7s~m<es}v5;msR8Sj`C&s()st5Q1vr(O*Q|2%Kl%2`ClyM
z&dz_H$~FD?`v<lTUB?0RKR0UsUoI5S^na&viTn@syfM)Kq>MrM7}8*ChjnWMn>od<
z!$!NJ4C3=v;`Yw%dRI`EZ0_;4+qTnYlVGoIb$6~9YwmyzPi!&V6>l1@wj!7KC^q}$
z<C3^A6@fYx9PDCG^6KoB6Ij^u!7esZz6ehFqL`WWJ90kD>Y+4A$wuDLGe(q!DI<K;
zYF@<y@V6z~DjJ^$uc|vJOc^2~LW?r-x4DsMh{s!!fwiLR`R4DwkCL#>5XzIV9Ecd%
zvRFIHTk<mXj8>ndk-%Q61Mib{*%Sqj-F2I$g4k;?%;OVzaxe=8ptRAGS&K+M(ao94
z$I6=%)83TIzGh~!{-#hY(f2YXDl8npCP>m8v^NXmxrFX!Et#tpsoDy06#49^{-*Dw
zTW;HBfhJ|#edQ)Sq+hc)amoOutTZh2<F>6j{jTypxuq<<*PWUz(l-+D=YAJMbju#l
zFzQl877Cx>WKf1=ol-U{s*h8j|I^cd!ITrE{{;z(9i{)JGx~ojSD^oeIgnL@r(Zem
z8w(=Bu9%zl<&d&h@6~X0Q<yNRxVff8uE!yYhze(;X|s@z-?VtoWi<xP*nW$(4lNSg
zebq%a`*bV*QY!_XZW(FAZa+<W)`p#?)yYb8m`<gAnpbL*pdl;N%iXwAD3avy<1Gmc
z98x)of-BdJYI?MWOTYJ3tm^gtim9=crrFG;-5U=uK-<~a(TNrfCM)Th-5c1VuCbcV
zW;^Zl>=qHxI;F9@lWIa3TBf8?c$A}xqe51m52KtKt%Fueqc6JXrsMU}OhB}%Gp52F
z>FwCQ7{(?dljcOdHo4ZO6R2+osxLLS*%-+K_imDus-=SQ-#Db$pq1|!NFiyb!U(Bx
zN{k5Lv_C3{8$7L!vqBw7Yn`6f=lYdy63fRUK)-45EomHPT;z$V8sHC*($ra<h|ZLu
zAfLFB`Eihoey0|{*di_mc8U%*dR6ppusliBtT4A+Buo`u@kkH-KI$%w_Ms1|5&A@6
zqfR4sFcT#YI?#@7^^$pFAvU_o20LingjR`0^PpxGRkQX+#%IM~{9G{>Ib3y``BKF-
z1e*8k=)eXUiAx!iPXl{wR`wYeO08z7uRW&OM{H=mz7^KP3t|JsC+OkTOz2t-2j=)$
zv($~u;aK%Y>9e16nohG@>?s$h$czc#5}EUd*qS&PB-}W?XvO+JzF*IqlQ_H1uCwcB
O?fQSh5;KedG6Mi^Q?UgA

diff --git a/packages/create-react-router/__tests__/fixtures/templates-repo.tar.gz b/packages/create-react-router/__tests__/fixtures/templates-repo.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..8effb4211a7a8c281334877c3bb087824cb04877
GIT binary patch
literal 74240
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
X>|E#KL{==LKt_R#0vQEfGYb5F5qcTi

literal 0
HcmV?d00001

diff --git a/packages/create-react-router/__tests__/github-mocks.ts b/packages/create-react-router/__tests__/github-mocks.ts
index b3b2967b16..607e2ded8a 100644
--- a/packages/create-react-router/__tests__/github-mocks.ts
+++ b/packages/create-react-router/__tests__/github-mocks.ts
@@ -55,12 +55,8 @@ let sendTarball: ResponseResolver = async (req, res, ctx) => {
   invariant(typeof repo === "string", "repo must be a string");
 
   let pathToTarball: string;
-  if (owner === "remix-run" && repo === "react-router") {
-    pathToTarball = path.join(
-      __dirname,
-      "fixtures",
-      "react-router-repo.tar.gz"
-    );
+  if (owner === "remix-run" && repo === "react-router-templates") {
+    pathToTarball = path.join(__dirname, "fixtures", "templates-repo.tar.gz");
   } else if (owner === "fake-react-router-tester" && repo === "nested-dir") {
     pathToTarball = path.join(__dirname, "fixtures", "nested-dir-repo.tar.gz");
   } else {
diff --git a/packages/create-react-router/index.ts b/packages/create-react-router/index.ts
index af55a9bfde..7fccd6884d 100644
--- a/packages/create-react-router/index.ts
+++ b/packages/create-react-router/index.ts
@@ -251,13 +251,14 @@ async function copyTemplateToTempDirStep(ctx: Context) {
     info("Template:", ["Using ", color.reset(ctx.template), "..."]);
   } else {
     log("");
-    info("Using basic template"); // TODO: (v7) Add link to templates
+    info("Using default template", [
+      "See https://github.com/remix-run/react-router-templates for more",
+    ]);
   }
 
   let template =
     ctx.template ??
-    // TODO: (v7) Update to main branch
-    "https://github.com/remix-run/react-router/tree/dev/templates/basic";
+    "https://github.com/remix-run/react-router-templates/tree/main/default";
 
   await loadingIndicator({
     start: "Template copying...",

From fd6c297658f01f48f1dd6ca9477342312d3fe2d0 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Fri, 22 Nov 2024 08:23:18 +0000
Subject: [PATCH 32/41] chore: format

---
 packages/react-router-dom/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
index ec70fc3bf9..f1f24518f9 100644
--- a/packages/react-router-dom/CHANGELOG.md
+++ b/packages/react-router-dom/CHANGELOG.md
@@ -14,7 +14,7 @@
 
 - Use `createRemixRouter`/`RouterProvider` in `entry.client` instead of `RemixBrowser` ([#11469](https://github.com/remix-run/react-router/pull/11469))
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - Remove `future.v7_startTransition` flag ([#11696](https://github.com/remix-run/react-router/pull/11696))
 

From 27de8e2b21ebe16d78b47de368391f4ce99553e5 Mon Sep 17 00:00:00 2001
From: ytori <ysk.trge@gmail.com>
Date: Fri, 22 Nov 2024 20:41:39 +0900
Subject: [PATCH 33/41] fix broken link in the home page of dev branch (#12343)

* fix link

* CLA
---
 contributors.yml | 1 +
 docs/index.md    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/contributors.yml b/contributors.yml
index 91550cb756..b97cf38cdc 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -292,6 +292,7 @@
 - xcsnowcity
 - yionr
 - yracnet
+- ytori
 - yuleicul
 - zeromask1337
 - zheng-chuang
diff --git a/docs/index.md b/docs/index.md
index 7171ce359d..0f696f8603 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -37,7 +37,7 @@ ReactDOM.createRoot(root).render(
 );
 ```
 
-[Get Started](./library/installation) with React Router as a library.
+[Get Started](./start/library/installation) with React Router as a library.
 
 ## React Router as a framework
 

From 10cd35ed1c3127ecb2f97982276f4b2ff2ee28eb Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 22 Nov 2024 09:16:58 -0500
Subject: [PATCH 34/41] Enter prerelease mode

---
 .changeset/pre.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .changeset/pre.json

diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 0000000000..b468b25f14
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,24 @@
+{
+  "mode": "pre",
+  "tag": "pre",
+  "initialVersions": {
+    "integration": "0.0.0",
+    "integration-vite-cloudflare-template": "0.0.0",
+    "integration-vite-template": "0.0.0",
+    "create-react-router": "7.0.0",
+    "react-router": "7.0.0",
+    "@react-router/architect": "7.0.0",
+    "@react-router/cloudflare": "7.0.0",
+    "@react-router/dev": "7.0.0",
+    "react-router-dom": "7.0.0",
+    "@react-router/express": "7.0.0",
+    "@react-router/fs-routes": "7.0.0",
+    "@react-router/node": "7.0.0",
+    "@react-router/remix-routes-option-adapter": "7.0.0",
+    "@react-router/serve": "7.0.0",
+    "@playground/framework": "0.0.0",
+    "@playground/framework-express": "0.0.0",
+    "@playground/framework-spa": "0.0.0"
+  },
+  "changesets": []
+}

From 32b0a84515be9744f0e026b2803421d8025fdc12 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 22 Nov 2024 09:38:12 -0500
Subject: [PATCH 35/41] exit pre-release mode (v7.0.1)

---
 .changeset/pre.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/pre.json b/.changeset/pre.json
index b468b25f14..d8c4577463 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -1,5 +1,5 @@
 {
-  "mode": "pre",
+  "mode": "exit",
   "tag": "pre",
   "initialVersions": {
     "integration": "0.0.0",

From 202825ca687d15f17833dac34e7f59c401c0685e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Nov 2024 09:42:50 -0500
Subject: [PATCH 36/41] chore: Update version for release (#12347)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/nice-cobras-sparkle.md             |  5 ----
 .changeset/pre.json                           | 24 -------------------
 packages/create-react-router/CHANGELOG.md     |  2 ++
 packages/create-react-router/package.json     |  2 +-
 packages/react-router-architect/CHANGELOG.md  |  8 +++++++
 packages/react-router-architect/package.json  |  2 +-
 packages/react-router-cloudflare/CHANGELOG.md |  7 ++++++
 packages/react-router-cloudflare/package.json |  2 +-
 packages/react-router-dev/CHANGELOG.md        | 12 +++++++++-
 packages/react-router-dev/package.json        |  2 +-
 packages/react-router-dom/CHANGELOG.md        |  9 ++++++-
 packages/react-router-dom/package.json        |  2 +-
 packages/react-router-express/CHANGELOG.md    | 10 +++++++-
 packages/react-router-express/package.json    |  2 +-
 packages/react-router-fs-routes/CHANGELOG.md  |  7 ++++++
 packages/react-router-fs-routes/package.json  |  2 +-
 packages/react-router-node/CHANGELOG.md       |  9 ++++++-
 packages/react-router-node/package.json       |  2 +-
 .../CHANGELOG.md                              |  7 ++++++
 .../package.json                              |  2 +-
 packages/react-router-serve/CHANGELOG.md      | 11 ++++++++-
 packages/react-router-serve/package.json      |  2 +-
 packages/react-router/CHANGELOG.md            |  4 +++-
 packages/react-router/package.json            |  2 +-
 24 files changed, 91 insertions(+), 46 deletions(-)
 delete mode 100644 .changeset/nice-cobras-sparkle.md
 delete mode 100644 .changeset/pre.json

diff --git a/.changeset/nice-cobras-sparkle.md b/.changeset/nice-cobras-sparkle.md
deleted file mode 100644
index 43405684f3..0000000000
--- a/.changeset/nice-cobras-sparkle.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@react-router/dev": patch
----
-
-Ensure typegen file watcher is cleaned up when Vite dev server restarts
diff --git a/.changeset/pre.json b/.changeset/pre.json
deleted file mode 100644
index d8c4577463..0000000000
--- a/.changeset/pre.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "mode": "exit",
-  "tag": "pre",
-  "initialVersions": {
-    "integration": "0.0.0",
-    "integration-vite-cloudflare-template": "0.0.0",
-    "integration-vite-template": "0.0.0",
-    "create-react-router": "7.0.0",
-    "react-router": "7.0.0",
-    "@react-router/architect": "7.0.0",
-    "@react-router/cloudflare": "7.0.0",
-    "@react-router/dev": "7.0.0",
-    "react-router-dom": "7.0.0",
-    "@react-router/express": "7.0.0",
-    "@react-router/fs-routes": "7.0.0",
-    "@react-router/node": "7.0.0",
-    "@react-router/remix-routes-option-adapter": "7.0.0",
-    "@react-router/serve": "7.0.0",
-    "@playground/framework": "0.0.0",
-    "@playground/framework-express": "0.0.0",
-    "@playground/framework-spa": "0.0.0"
-  },
-  "changesets": []
-}
diff --git a/packages/create-react-router/CHANGELOG.md b/packages/create-react-router/CHANGELOG.md
index 41300a3cda..bc333715cf 100644
--- a/packages/create-react-router/CHANGELOG.md
+++ b/packages/create-react-router/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `create-react-router`
 
+## 7.0.1
+
 ## 7.0.0
 
 Initial release.
diff --git a/packages/create-react-router/package.json b/packages/create-react-router/package.json
index 24515680be..3128529e3f 100644
--- a/packages/create-react-router/package.json
+++ b/packages/create-react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-react-router",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Create a new React Router app",
   "homepage": "https://reactrouter.com",
   "bugs": {
diff --git a/packages/react-router-architect/CHANGELOG.md b/packages/react-router-architect/CHANGELOG.md
index 3ebb931978..ce099e3bfb 100644
--- a/packages/react-router-architect/CHANGELOG.md
+++ b/packages/react-router-architect/CHANGELOG.md
@@ -1,5 +1,13 @@
 # `@react-router/architect`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.1`
+  - `@react-router/node@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/react-router-architect/package.json b/packages/react-router-architect/package.json
index 74650fafef..bf4119cb29 100644
--- a/packages/react-router-architect/package.json
+++ b/packages/react-router-architect/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/architect",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Architect server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-cloudflare/CHANGELOG.md b/packages/react-router-cloudflare/CHANGELOG.md
index 780ea18d0d..febbd9eeec 100644
--- a/packages/react-router-cloudflare/CHANGELOG.md
+++ b/packages/react-router-cloudflare/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/cloudflare`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/react-router-cloudflare/package.json b/packages/react-router-cloudflare/package.json
index 43b442a51e..e1fc4c69d3 100644
--- a/packages/react-router-cloudflare/package.json
+++ b/packages/react-router-cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/cloudflare",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Cloudflare platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-dev/CHANGELOG.md b/packages/react-router-dev/CHANGELOG.md
index bda0e22275..44398c16ec 100644
--- a/packages/react-router-dev/CHANGELOG.md
+++ b/packages/react-router-dev/CHANGELOG.md
@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.0.1
+
+### Patch Changes
+
+- Ensure typegen file watcher is cleaned up when Vite dev server restarts ([#12331](https://github.com/remix-run/react-router/pull/12331))
+- Updated dependencies:
+  - `react-router@7.0.1`
+  - `@react-router/node@7.0.1`
+  - `@react-router/serve@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
@@ -16,7 +26,7 @@
   +import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
   ```
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 
diff --git a/packages/react-router-dev/package.json b/packages/react-router-dev/package.json
index 6e96c41877..f832563227 100644
--- a/packages/react-router-dev/package.json
+++ b/packages/react-router-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
index f1f24518f9..1d947a8b69 100644
--- a/packages/react-router-dom/CHANGELOG.md
+++ b/packages/react-router-dom/CHANGELOG.md
@@ -1,5 +1,12 @@
 # react-router-dom
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
@@ -14,7 +21,7 @@
 
 - Use `createRemixRouter`/`RouterProvider` in `entry.client` instead of `RemixBrowser` ([#11469](https://github.com/remix-run/react-router/pull/11469))
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - Remove `future.v7_startTransition` flag ([#11696](https://github.com/remix-run/react-router/pull/11696))
 
diff --git a/packages/react-router-dom/package.json b/packages/react-router-dom/package.json
index 612cd7e7c9..7487f3cc42 100644
--- a/packages/react-router-dom/package.json
+++ b/packages/react-router-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router-dom",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Declarative routing for React web applications",
   "keywords": [
     "react",
diff --git a/packages/react-router-express/CHANGELOG.md b/packages/react-router-express/CHANGELOG.md
index de8e8cdda8..37e8e9d59a 100644
--- a/packages/react-router-express/CHANGELOG.md
+++ b/packages/react-router-express/CHANGELOG.md
@@ -1,10 +1,18 @@
 # `@react-router/express`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.1`
+  - `@react-router/node@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 - Add `exports` field to all packages ([#11675](https://github.com/remix-run/react-router/pull/11675))
 - node package no longer re-exports from react-router ([#11702](https://github.com/remix-run/react-router/pull/11702))
diff --git a/packages/react-router-express/package.json b/packages/react-router-express/package.json
index dbf9d52485..8f5c4024b2 100644
--- a/packages/react-router-express/package.json
+++ b/packages/react-router-express/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/express",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Express server request handler for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-fs-routes/CHANGELOG.md b/packages/react-router-fs-routes/CHANGELOG.md
index 33442d22b9..583b714601 100644
--- a/packages/react-router-fs-routes/CHANGELOG.md
+++ b/packages/react-router-fs-routes/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/fs-routes`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@react-router/dev@7.0.1`
+
 ## 7.0.0
 
 Initial release.
diff --git a/packages/react-router-fs-routes/package.json b/packages/react-router-fs-routes/package.json
index e584775d6f..3631641d3c 100644
--- a/packages/react-router-fs-routes/package.json
+++ b/packages/react-router-fs-routes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/fs-routes",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "File system routing conventions for React Router, for use within routes.ts",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-node/CHANGELOG.md b/packages/react-router-node/CHANGELOG.md
index 632d3553fe..77cc30770e 100644
--- a/packages/react-router-node/CHANGELOG.md
+++ b/packages/react-router-node/CHANGELOG.md
@@ -1,10 +1,17 @@
 # `@react-router/node`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - For Remix consumers migrating to React Router, the `crypto` global from the [Web Crypto API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API) is now required when using cookie and session APIs. This means that the following APIs are provided from `react-router` rather than platform-specific packages: ([#11837](https://github.com/remix-run/react-router/pull/11837))
 
diff --git a/packages/react-router-node/package.json b/packages/react-router-node/package.json
index 64172b2f4d..3558d5cca8 100644
--- a/packages/react-router-node/package.json
+++ b/packages/react-router-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/node",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Node.js platform abstractions for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-remix-routes-option-adapter/CHANGELOG.md b/packages/react-router-remix-routes-option-adapter/CHANGELOG.md
index c67fc1a1dd..120c1abbd1 100644
--- a/packages/react-router-remix-routes-option-adapter/CHANGELOG.md
+++ b/packages/react-router-remix-routes-option-adapter/CHANGELOG.md
@@ -1,5 +1,12 @@
 # `@react-router/remix-config-routes-adapter`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@react-router/dev@7.0.1`
+
 ## 7.0.0
 
 Initial release.
diff --git a/packages/react-router-remix-routes-option-adapter/package.json b/packages/react-router-remix-routes-option-adapter/package.json
index 9387c37975..693c3bc6ef 100644
--- a/packages/react-router-remix-routes-option-adapter/package.json
+++ b/packages/react-router-remix-routes-option-adapter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/remix-routes-option-adapter",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Adapter for Remix's \"routes\" config option, for use within routes.ts",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router-serve/CHANGELOG.md b/packages/react-router-serve/CHANGELOG.md
index a1f425a755..9bdecf0b78 100644
--- a/packages/react-router-serve/CHANGELOG.md
+++ b/packages/react-router-serve/CHANGELOG.md
@@ -1,10 +1,19 @@
 # `@react-router/serve`
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.0.1`
+  - `@react-router/express@7.0.1`
+  - `@react-router/node@7.0.1`
+
 ## 7.0.0
 
 ### Major Changes
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 - Add `exports` field to all packages ([#11675](https://github.com/remix-run/react-router/pull/11675))
 - node package no longer re-exports from react-router ([#11702](https://github.com/remix-run/react-router/pull/11702))
diff --git a/packages/react-router-serve/package.json b/packages/react-router-serve/package.json
index 4152187db6..0d076826ec 100644
--- a/packages/react-router-serve/package.json
+++ b/packages/react-router-serve/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@react-router/serve",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Production application server for React Router",
   "bugs": {
     "url": "https://github.com/remix-run/react-router/issues"
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index 9360f675af..51aab01dba 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -1,5 +1,7 @@
 # `react-router`
 
+## 7.0.1
+
 ## 7.0.0
 
 ### Major Changes
@@ -17,7 +19,7 @@
   - Collapse `@remix-run/server-runtime` into `react-router`
   - Collapse `@remix-run/testing` into `react-router`
 
-- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - Drop support for Node 16, React Router SSR now requires Node 18 or higher ([#11391](https://github.com/remix-run/react-router/pull/11391))
 
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 7d78b492c5..883e81939e 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "Declarative routing for React",
   "keywords": [
     "react",

From c0e5b161009532e19b1ab42ddedba75cd6450642 Mon Sep 17 00:00:00 2001
From: Remix Run Bot <hello@remix.run>
Date: Fri, 22 Nov 2024 14:55:17 +0000
Subject: [PATCH 37/41] chore: format

---
 packages/react-router-dev/CHANGELOG.md     | 2 +-
 packages/react-router-dom/CHANGELOG.md     | 2 +-
 packages/react-router-express/CHANGELOG.md | 2 +-
 packages/react-router-node/CHANGELOG.md    | 2 +-
 packages/react-router-serve/CHANGELOG.md   | 2 +-
 packages/react-router/CHANGELOG.md         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/react-router-dev/CHANGELOG.md b/packages/react-router-dev/CHANGELOG.md
index 44398c16ec..83f9700b2b 100644
--- a/packages/react-router-dev/CHANGELOG.md
+++ b/packages/react-router-dev/CHANGELOG.md
@@ -26,7 +26,7 @@
   +import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
   ```
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 
diff --git a/packages/react-router-dom/CHANGELOG.md b/packages/react-router-dom/CHANGELOG.md
index 1d947a8b69..ab4a1d63ae 100644
--- a/packages/react-router-dom/CHANGELOG.md
+++ b/packages/react-router-dom/CHANGELOG.md
@@ -21,7 +21,7 @@
 
 - Use `createRemixRouter`/`RouterProvider` in `entry.client` instead of `RemixBrowser` ([#11469](https://github.com/remix-run/react-router/pull/11469))
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - Remove `future.v7_startTransition` flag ([#11696](https://github.com/remix-run/react-router/pull/11696))
 
diff --git a/packages/react-router-express/CHANGELOG.md b/packages/react-router-express/CHANGELOG.md
index 37e8e9d59a..0e0f38f577 100644
--- a/packages/react-router-express/CHANGELOG.md
+++ b/packages/react-router-express/CHANGELOG.md
@@ -12,7 +12,7 @@
 
 ### Major Changes
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 - Add `exports` field to all packages ([#11675](https://github.com/remix-run/react-router/pull/11675))
 - node package no longer re-exports from react-router ([#11702](https://github.com/remix-run/react-router/pull/11702))
diff --git a/packages/react-router-node/CHANGELOG.md b/packages/react-router-node/CHANGELOG.md
index 77cc30770e..2ae778ab48 100644
--- a/packages/react-router-node/CHANGELOG.md
+++ b/packages/react-router-node/CHANGELOG.md
@@ -11,7 +11,7 @@
 
 ### Major Changes
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - For Remix consumers migrating to React Router, the `crypto` global from the [Web Crypto API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Crypto_API) is now required when using cookie and session APIs. This means that the following APIs are provided from `react-router` rather than platform-specific packages: ([#11837](https://github.com/remix-run/react-router/pull/11837))
 
diff --git a/packages/react-router-serve/CHANGELOG.md b/packages/react-router-serve/CHANGELOG.md
index 9bdecf0b78..7a4896c729 100644
--- a/packages/react-router-serve/CHANGELOG.md
+++ b/packages/react-router-serve/CHANGELOG.md
@@ -13,7 +13,7 @@
 
 ### Major Changes
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 - update minimum node version to 18 ([#11690](https://github.com/remix-run/react-router/pull/11690))
 - Add `exports` field to all packages ([#11675](https://github.com/remix-run/react-router/pull/11675))
 - node package no longer re-exports from react-router ([#11702](https://github.com/remix-run/react-router/pull/11702))
diff --git a/packages/react-router/CHANGELOG.md b/packages/react-router/CHANGELOG.md
index 51aab01dba..7cc40fc92c 100644
--- a/packages/react-router/CHANGELOG.md
+++ b/packages/react-router/CHANGELOG.md
@@ -19,7 +19,7 @@
   - Collapse `@remix-run/server-runtime` into `react-router`
   - Collapse `@remix-run/testing` into `react-router`
 
-- Remove single\_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
+- Remove single_fetch future flag. ([#11522](https://github.com/remix-run/react-router/pull/11522))
 
 - Drop support for Node 16, React Router SSR now requires Node 18 or higher ([#11391](https://github.com/remix-run/react-router/pull/11391))
 

From 6c87e2b34fdde52146e6a62fb0528527041d158a Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 22 Nov 2024 10:06:31 -0500
Subject: [PATCH 38/41] remove references to obsoleted typescript plugin

---
 CHANGELOG.md | 126 +--------------------------------------------------
 1 file changed, 2 insertions(+), 124 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1259307b45..1da5b3e4da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -470,131 +470,9 @@ Also note that, if you were using Remix's `routes` option to define config-based
 
 #### Typesafety improvements
 
-React Router now generates types for each of your route modules and passes typed props to route module component exports ([#11961](https://github.com/remix-run/react-router/pull/11961), [#12019](https://github.com/remix-run/react-router/pull/12019)). You can access those types by importing them from `./+types.<route filename without extension>`.
+React Router now generates types for each of your route modules and passes typed props to route module component exports ([#11961](https://github.com/remix-run/react-router/pull/11961), [#12019](https://github.com/remix-run/react-router/pull/12019)). You can access those types by importing them from `./+types/<route filename without extension>`.
 
-For example:
-
-```ts
-// app/routes/product.tsx
-import type * as Route from "./+types.product";
-
-export function loader({ params }: Route.LoaderArgs) {}
-
-export default function Component({ loaderData }: Route.ComponentProps) {}
-```
-
-This initial implementation targets type inference for:
-
-- `Params` : Path parameters from your routing config in `routes.ts` including file-based routing
-- `LoaderData` : Loader data from `loader` and/or `clientLoader` within your route module
-- `ActionData` : Action data from `action` and/or `clientAction` within your route module
-
-These types are then used to create types for route export args and props:
-
-- `LoaderArgs`
-- `ClientLoaderArgs`
-- `ActionArgs`
-- `ClientActionArgs`
-- `HydrateFallbackProps`
-- `ComponentProps` (for the `default` export)
-- `ErrorBoundaryProps`
-
-In the future, we plan to add types for the rest of the route module exports: `meta`, `links`, `headers`, `shouldRevalidate`, etc.
-
-We also plan to generate types for typesafe `Link`s:
-
-```tsx
-<Link to="/products/:id" params={{ id: 1 }} />
-//        ^^^^^^^^^^^^^          ^^^^^^^^^
-// typesafe `to` and `params` based on the available routes in your app
-```
-
-##### Setup
-
-React Router will generate types into a `.react-router/` directory at the root of your app. This directory is fully managed by React Router and is derived based on your route config (`routes.ts`).
-
-👉 **Add `.react-router/` to `.gitignore`**
-
-```txt
-.react-router
-```
-
-You should also ensure that generated types for routes are always present before running typechecking, especially for running typechecking in CI.
-
-👉 **Add `react-router typegen` to your `typecheck` command in `package.json`**
-
-```json
-{
-  "scripts": {
-    "typecheck": "react-router typegen && tsc"
-  }
-}
-```
-
-To get TypeScript to use those generated types, you'll need to add them to `include` in `tsconfig.json`. And to be able to import them as if they files next to your route modules, you'll also need to configure `rootDirs`.
-
-👉 **Configure `tsconfig.json` for generated types**
-
-```json
-{
-  "include": [".react-router/types/**/*"],
-  "compilerOptions": {
-    "rootDirs": [".", "./.react-router/types"]
-  }
-}
-```
-
-##### `typegen` command
-
-You can manually generate types with the new `typegen` command:
-
-```sh
-react-router typegen
-```
-
-However, manual type generation is tedious and types can get out of sync quickly if you ever forget to run `typegen`. Instead, we recommend that you setup our new TypeScript plugin which will automatically generate fresh types whenever routes change. That way, you'll always have up-to-date types.
-
-##### TypeScript plugin
-
-To get automatic type generation, you can use our new TypeScript plugin.
-
-👉 **Add the TypeScript plugin to `tsconfig.json`**
-
-```json
-{
-  "compilerOptions": {
-    "plugins": [{ "name": "@react-router/dev" }]
-  }
-}
-```
-
-We plan to add some other goodies to our TypeScript plugin soon, including:
-
-- Automatic `jsdoc` for route exports that include links to official docs
-- Autocomplete for route exports
-- Warnings for non-HMR compliant exports
-
-###### VSCode
-
-TypeScript looks for plugins registered in `tsconfig.json` in the local `node_modules/`,
-but VSCode ships with its own copy of TypeScript that is installed outside of your project.
-For TypeScript plugins to work, you'll need to tell VSCode to use the local workspace version of TypeScript.
-
-👉 **Ensure that VSCode is using the workspace version of TypeScript**
-
-This should already be set up for you by a `.vscode/settings.json`:
-
-```json
-{
-  "typescript.tsdk": "node_modules/typescript/lib"
-}
-```
-
-Alternatively, you can open up any TypeScript file and use <kbd>CMD</kbd>+<kbd>SHIFT</kbd>+<kbd>P</kbd> to find `Select TypeScript Version` and then select `Use Workspace Version`. You may need to quit VSCode and reopen it for this setting to take effect.
-
-###### Troubleshooting
-
-In VSCode, open up any TypeScript file in your project and then use <kbd>CMD</kbd>+<kbd>SHIFT</kbd>+<kbd>P</kbd> to select `Open TS Server log`. There should be a log for `[react-router] setup` that indicates that the plugin was resolved correctly. Then look for any errors in the log.
+See [_How To > Route Module Type Safety_](https://reactrouter.com/dev/how-to/route-module-type-safety) and [_Explanations > Type Safety_](https://reactrouter.com/dev/explanation/type-safety) for more details.
 
 #### Prerendering
 

From 4fa0d2dc7177b1ea50a68b4f8638f8f0d9861e76 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 22 Nov 2024 10:08:20 -0500
Subject: [PATCH 39/41] remove TOC references to non-existent sections

---
 CHANGELOG.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1da5b3e4da..52f038a76a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,11 +25,6 @@ We manage release notes in this file instead of the paginated Github Releases Pa
     - [Other Notable Changes](#other-notable-changes)
       - [`routes.ts`](#routests)
       - [Typesafety improvements](#typesafety-improvements)
-        - [Setup](#setup)
-        - [`typegen` command](#typegen-command)
-        - [TypeScript plugin](#typescript-plugin)
-          - [VSCode](#vscode)
-          - [Troubleshooting](#troubleshooting)
       - [Prerendering](#prerendering)
     - [Major Changes (`react-router`)](#major-changes-react-router)
     - [Major Changes (`@react-router/*`)](#major-changes-react-router-1)

From 6ba37386cc1691887798b784d7bf4ea87f18af57 Mon Sep 17 00:00:00 2001
From: Pedro Cattori <pcattori@gmail.com>
Date: Fri, 22 Nov 2024 10:32:58 -0500
Subject: [PATCH 40/41] replace vite plugin config w/ react-router.config.ts

---
 CHANGELOG.md | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 52f038a76a..fe19c029c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -329,29 +329,26 @@ For Remix consumers migrating to React Router, the `vitePlugin` and `cloudflareD
 +import { cloudflareDevProxy } from "@react-router/dev/vite/cloudflare";
 ```
 
-**Removed Vite Plugin `manifest` option**
+**Removed `manifest` option**
 
 For Remix consumers migrating to React Router, the Vite plugin's `manifest` option has been removed. The `manifest` option been superseded by the more powerful `buildEnd` hook since it's passed the `buildManifest` argument. You can still write the build manifest to disk if needed, but you'll most likely find it more convenient to write any logic depending on the build manifest within the `buildEnd` hook itself. ([#11573](https://github.com/remix-run/react-router/pull/11573))
 
 If you were using the `manifest` option, you can replace it with a `buildEnd` hook that writes the manifest to disk like this:
 
 ```js
-import { reactRouter } from "@react-router/dev/vite";
+// react-router.config.ts
+import { type Config } from "@react-router/dev/config";
 import { writeFile } from "node:fs/promises";
 
 export default {
-  plugins: [
-    reactRouter({
-      async buildEnd({ buildManifest }) {
-        await writeFile(
-          "build/manifest.json",
-          JSON.stringify(buildManifest, null, 2),
-          "utf-8"
-        );
-      },
-    }),
-  ],
-};
+  async buildEnd({ buildManifest }) {
+    await writeFile(
+      "build/manifest.json",
+      JSON.stringify(buildManifest, null, 2),
+      "utf-8"
+    );
+  },
+} satisfies Config;
 ```
 
 #### Exposed Router Promises

From 2a20ec3ea77c1bac86bbb55901da7cff6b2cd8a4 Mon Sep 17 00:00:00 2001
From: Brooks Lybrand <brookslybrand@gmail.com>
Date: Fri, 22 Nov 2024 10:56:39 -0600
Subject: [PATCH 41/41] docs: fix some broken links and prerelease references

---
 docs/start/framework/actions.md      | 2 +-
 docs/start/framework/installation.md | 5 +++--
 docs/start/framework/navigating.md   | 2 +-
 docs/start/framework/pending-ui.md   | 2 +-
 docs/upgrading/remix.md              | 8 +-------
 docs/upgrading/v6.md                 | 4 ++--
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/docs/start/framework/actions.md b/docs/start/framework/actions.md
index 39c8ff2c4c..5725643eae 100644
--- a/docs/start/framework/actions.md
+++ b/docs/start/framework/actions.md
@@ -167,5 +167,5 @@ See the [Using Fetchers][fetchers] guide for more information.
 
 Next: [Navigating](./navigating)
 
-[fetchers]: ../how-to/fetchers
+[fetchers]: ../../how-to/fetchers
 [data]: ../../api/react-router/data
diff --git a/docs/start/framework/installation.md b/docs/start/framework/installation.md
index b47bb6569a..23677860e7 100644
--- a/docs/start/framework/installation.md
+++ b/docs/start/framework/installation.md
@@ -8,7 +8,7 @@ order: 1
 Most projects start with a template. Let's use a basic template maintained by React Router:
 
 ```shellscript nonumber
-npm create react-router@pre my-react-router-app
+npx create-react-router@latest my-react-router-app
 ```
 
 Now change into the new directory and start the app
@@ -21,7 +21,7 @@ npm run dev
 
 You can now open your browser to `http://localhost:5173`
 
-You can [view the template on GitHub](https://github.com/remix-run/react-router/tree/dev/templates/basic) to see how to manually set up your project.
+You can [view the template on GitHub][default-template] to see how to manually set up your project.
 
 <!-- TODO: Show how to find and use community templates -->
 
@@ -30,3 +30,4 @@ You can [view the template on GitHub](https://github.com/remix-run/react-router/
 Next: [Routing](./routing)
 
 [manual_usage]: ../how-to/manual-usage
+[default-template]: https://github.com/remix-run/react-router-templates/tree/main/default
diff --git a/docs/start/framework/navigating.md b/docs/start/framework/navigating.md
index 0582b7e603..d7deb5a52e 100644
--- a/docs/start/framework/navigating.md
+++ b/docs/start/framework/navigating.md
@@ -122,7 +122,7 @@ If the user enters "journey" into the input and submits it, they will navigate t
 /search?q=journey
 ```
 
-Forms with `<Form method="post" />` will also navigate to the action prop but will submit the data as `FormData` instead of `URLSearchParams`. However, it is more common to `useFetcher()` to POST form data. See [Using Fetchers](../how-to/fetchers).
+Forms with `<Form method="post" />` will also navigate to the action prop but will submit the data as `FormData` instead of `URLSearchParams`. However, it is more common to `useFetcher()` to POST form data. See [Using Fetchers](../../how-to/fetchers).
 
 ## redirect
 
diff --git a/docs/start/framework/pending-ui.md b/docs/start/framework/pending-ui.md
index b26f821c9d..f290fba552 100644
--- a/docs/start/framework/pending-ui.md
+++ b/docs/start/framework/pending-ui.md
@@ -134,4 +134,4 @@ function Task({ task }) {
 
 Next: [Testing](./testing)
 
-[use_fetcher]: ../hooks/use-fetcher
+[use_fetcher]: https://api.reactrouter.com/v7/functions/react_router.useFetcher.html
diff --git a/docs/upgrading/remix.md b/docs/upgrading/remix.md
index a779d14baa..b614de6f1d 100644
--- a/docs/upgrading/remix.md
+++ b/docs/upgrading/remix.md
@@ -26,7 +26,7 @@ Adopt all existing [future flags][v2-future-flags] in your Remix v2 application.
 Most of the "shared" APIs that used to be re-exported through the runtime-specific packages (`@remix-run/node`, `@remix-run/cloudflare`, etc.) have all been collapsed into `react-router` in v7. So instead of importing from `@react-router/node` or `@react-router/cloudflare`, you'll import those directly from `react-router`.
 
 ```diff
--import { redirect } from "@react-router/node";
+-import { redirect } from "@remix-run/node";
 +import { redirect } from "react-router";
 ```
 
@@ -44,12 +44,6 @@ npx codemod remix/2/react-router/upgrade
 
 After the codemod updates your dependencies, you need to install the dependencies to remove Remix packages and add the new React Router packages.
 
-<docs-warning>
-
-While still in prerelease, you need to update your `package.json` to point to the prerelease versions of the `react-router` packages.
-
-</docs-warning>
-
 ```shellscript nonumber
 npm install
 ```
diff --git a/docs/upgrading/v6.md b/docs/upgrading/v6.md
index 1bf2bdc03d..e34a5fe065 100644
--- a/docs/upgrading/v6.md
+++ b/docs/upgrading/v6.md
@@ -21,7 +21,7 @@ npm install react-router-dom@6
 
 **Background**
 
-Changes the relative path matching and linking for multi-segment splats paths like `dashboard/*` (vs. just `*`). [View the CHANGELOG](https://github.com/remix-run/react-router/blob/main/packages/react-router-dom/CHANGELOG.md#minor-changes-2) for more information.
+Changes the relative path matching and linking for multi-segment splats paths like `dashboard/*` (vs. just `*`). [View the CHANGELOG](https://github.com/remix-run/react-router/blob/main/CHANGELOG.md#futurev7_relativesplatpath) for more information.
 
 👉 **Enable the flag**
 
@@ -107,7 +107,7 @@ function Dashboard() {
 
 **Background**
 
-This uses `React.useTransition` instead of `React.useState` for Router state updates. View the [CHANGELOG](https://github.com/remix-run/react-router/blob/main/CHANGELOG.md#v7_starttransition) for more information.
+This uses `React.useTransition` instead of `React.useState` for Router state updates. View the [CHANGELOG](https://github.com/remix-run/react-router/blob/main/CHANGELOG.md#futurev7_starttransition) for more information.
 
 👉 **Enable the flag**