From b87a7a0fc13b340c60b5a96c596fea820ff66322 Mon Sep 17 00:00:00 2001
From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Fri, 17 Feb 2023 10:52:09 -0700
Subject: [PATCH] Checkpoint

---
 README.md                                     |   8 +-
 docs/adapters/react-router.md                 |   2 +-
 docs/api/react/Outlet.md                      |   3 +-
 docs/api/react/RouterProvider.md              |  15 +-
 docs/api/react/createReactRouter.md           |  10 +-
 docs/api/react/createRouteConfig.md           |   6 +-
 docs/api/react/lazy.md                        |   5 +-
 docs/comparison.md                            |   4 +-
 docs/config.json                              |   4 +-
 docs/devtools.md                              |  12 +-
 .../custom-search-param-serialization.md      |  34 +-
 docs/guide/data-loading.md                    |  14 +-
 docs/guide/history-types.md                   |  14 +-
 docs/guide/preloading.md                      |   6 +-
 docs/guide/routes.md                          |  14 +-
 docs/guide/type-safety.md                     |   2 +-
 docs/quick-start.md                           |   8 +-
 .../basic-ssr-generated-wip/package.json      |   4 +-
 .../src/entry-server.tsx                      |   2 +-
 .../basic-ssr-generated-wip/src/index.tsx     |   2 +-
 .../basic-ssr-generated-wip/src/router.tsx    |   6 +-
 .../src/routes.generated/__root.client.tsx    |  45 +-
 .../src/routes.generated/__root.tsx           |   6 +-
 .../src/routes.generated/index.client.tsx     |   4 +-
 .../src/routes.generated/index.tsx            |   4 +-
 .../src/routes.generated/posts.client.tsx     |   4 +-
 .../src/routes.generated/posts.tsx            |   4 +-
 .../routes.generated/posts/$postId.client.tsx |  81 +-
 .../src/routes.generated/posts/$postId.tsx    |  81 +-
 .../routes.generated/posts/index.client.tsx   |   4 +-
 .../src/routes.generated/posts/index.tsx      |   4 +-
 .../src/routes/__root.tsx                     |   4 +-
 .../src/routes/index.tsx                      |   2 +-
 .../src/routes/posts.tsx                      |   2 +-
 .../src/routes/posts/$postId.tsx              |   2 +-
 .../src/routes/posts/index.tsx                |   2 +-
 .../react/basic-ssr-streaming/package.json    |   4 +-
 .../basic-ssr-streaming/src/entry-server.tsx  |   6 +-
 .../react/basic-ssr-streaming/src/index.tsx   |   2 +-
 .../react/basic-ssr-streaming/src/router.tsx  |   6 +-
 .../basic-ssr-streaming/src/routes/__root.tsx |   4 +-
 .../basic-ssr-streaming/src/routes/index.tsx  |   2 +-
 .../basic-ssr-streaming/src/routes/posts.tsx  |   2 +-
 .../src/routes/posts/$postId.tsx              |   2 +-
 .../src/routes/posts/index.tsx                |   2 +-
 .../react/basic-ssr-with-html/package.json    |   4 +-
 .../basic-ssr-with-html/src/entry-server.tsx  |   2 +-
 .../react/basic-ssr-with-html/src/index.tsx   |   2 +-
 .../react/basic-ssr-with-html/src/router.tsx  |   6 +-
 .../basic-ssr-with-html/src/routes/__root.tsx |   4 +-
 .../basic-ssr-with-html/src/routes/index.tsx  |   2 +-
 .../basic-ssr-with-html/src/routes/posts.tsx  |   2 +-
 .../src/routes/posts/$postId.tsx              |   2 +-
 .../src/routes/posts/index.tsx                |   2 +-
 examples/react/basic-ssr/package.json         |   4 +-
 examples/react/basic-ssr/src/entry-server.tsx |   2 +-
 examples/react/basic-ssr/src/index.tsx        |   2 +-
 examples/react/basic-ssr/src/router.tsx       |   6 +-
 .../react/basic-ssr/src/routes/__root.tsx     |   4 +-
 examples/react/basic-ssr/src/routes/index.tsx |   2 +-
 examples/react/basic-ssr/src/routes/posts.tsx |   2 +-
 .../basic-ssr/src/routes/posts/$postId.tsx    |   2 +-
 .../basic-ssr/src/routes/posts/index.tsx      |   2 +-
 examples/react/basic/package.json             |   4 +-
 examples/react/basic/src/main.tsx             | 182 ++--
 .../kitchen-sink-multi-file/package.json      |   4 +-
 .../kitchen-sink-multi-file/src/main.tsx      |   2 +-
 .../kitchen-sink-multi-file/src/mockTodos.ts  |   2 +-
 .../kitchen-sink-multi-file/src/router.tsx    |   6 +-
 .../src/routes/__root.tsx                     |   4 +-
 .../src/routes/authenticated/index.tsx        |   2 +-
 .../src/routes/dashboard/dashboard.tsx        |   2 +-
 .../src/routes/dashboard/index.tsx            |   2 +-
 .../src/routes/dashboard/invoices/index.tsx   |   2 +-
 .../src/routes/dashboard/invoices/invoice.tsx |   2 +-
 .../routes/dashboard/invoices/invoices.tsx    |   2 +-
 .../src/routes/dashboard/users/index.tsx      |   2 +-
 .../src/routes/dashboard/users/user.tsx       |   2 +-
 .../src/routes/dashboard/users/users.tsx      |   2 +-
 .../src/routes/expensive/index.tsx            |   2 +-
 .../src/routes/index.tsx                      |   2 +-
 .../src/routes/layout/index.tsx               |   2 +-
 .../src/routes/layout/layout-a.tsx            |   2 +-
 .../src/routes/layout/layout-b.tsx            |   2 +-
 .../kitchen-sink-route-gen-wip/package.json   |   4 +-
 .../kitchen-sink-route-gen-wip/src/actions.ts |   2 +-
 .../kitchen-sink-route-gen-wip/src/main.tsx   |   2 +-
 .../src/mockTodos.ts                          |   2 +-
 .../kitchen-sink-route-gen-wip/src/router.tsx |   6 +-
 .../src/routes/__layout.tsx                   |   2 +-
 .../src/routes/__root.tsx                     |   4 +-
 .../src/routes/authenticated.tsx              |   2 +-
 .../src/routes/dashboard.tsx                  |   2 +-
 .../src/routes/dashboard/index.tsx            |   2 +-
 .../src/routes/dashboard/invoices.tsx         |   2 +-
 .../routes/dashboard/invoices/$invoiceId.tsx  |   2 +-
 .../src/routes/dashboard/invoices/index.tsx   |   2 +-
 .../src/routes/dashboard/users.tsx            |   2 +-
 .../src/routes/dashboard/users/$userId.tsx    |   2 +-
 .../src/routes/index.tsx                      |   2 +-
 .../kitchen-sink-single-file/package.json     |   4 +-
 .../kitchen-sink-single-file/src/main.tsx     | 153 ++-
 .../kitchen-sink-single-file/src/mockTodos.ts |   2 +-
 examples/react/quickstart/package.json        |   4 +-
 examples/react/quickstart/src/main.tsx        |   8 +-
 .../package.json                              |   4 +-
 .../src/main.tsx                              |  10 +-
 .../src/mockTodos.ts                          |   2 +-
 .../chunks/App.880c3073.mjs                   |  42 +-
 .../chunks/App.8def3af9.mjs                   |  42 +-
 .../chunks/App.f72c7d3d.mjs                   |  43 +-
 .../chunks/routeTree.2e12cfef.mjs             | 886 ++++++++++--------
 .../chunks/routeTree.c870053d.mjs             | 886 ++++++++++--------
 .../chunks/routeTree.f436718c.mjs             | 886 ++++++++++--------
 examples/react/with-astro-ssr/package.json    |   4 +-
 examples/react/with-astro-ssr/src/app/App.tsx |   2 +-
 .../react/with-astro-ssr/src/app/router.tsx   |   6 +-
 .../with-astro-ssr/src/app/routes/__root.tsx  |   4 +-
 .../with-astro-ssr/src/app/routes/index.tsx   |   2 +-
 .../with-astro-ssr/src/app/routes/posts.tsx   |   2 +-
 .../src/app/routes/posts/$postId.tsx          |   2 +-
 .../src/app/routes/posts/index.tsx            |   2 +-
 examples/react/with-react-query/package.json  |   4 +-
 examples/react/with-react-query/src/main.tsx  |  12 +-
 .../with-trpc-react-query/client/main.tsx     |  12 +-
 .../react/with-trpc-react-query/package.json  |   4 +-
 examples/react/with-trpc/client/main.tsx      |  10 +-
 examples/react/with-trpc/package.json         |   4 +-
 examples/solid/basic/.gitignore               |   2 -
 examples/solid/basic/README.md                |  34 -
 examples/solid/basic/index.html               |  17 -
 examples/solid/basic/package.json             |  22 -
 examples/solid/basic/src/index.css            |   9 -
 examples/solid/basic/src/index.tsx            | 211 -----
 examples/solid/basic/tsconfig.json            |  15 -
 examples/solid/basic/vite.config.ts           |  12 -
 .../solid/kitchen-sink-multi-file/.gitignore  |   5 -
 .../solid/kitchen-sink-multi-file/README.md   |   6 -
 .../solid/kitchen-sink-multi-file/index.html  |  15 -
 .../kitchen-sink-multi-file/package.json      |  23 -
 .../solid/kitchen-sink-multi-file/src/App.tsx | 130 ---
 .../src/actionClient.tsx                      |  13 -
 .../src/components/InvoiceFields.tsx          |  27 -
 .../src/components/Spinner.tsx                |   3 -
 .../kitchen-sink-multi-file/src/index.tsx     |   6 -
 .../src/loaderClient.tsx                      |  22 -
 .../kitchen-sink-multi-file/src/mockTodos.ts  | 139 ---
 .../kitchen-sink-multi-file/src/router.tsx    |  54 --
 .../src/routes/__root.tsx                     |  71 --
 .../src/routes/authenticated/index.tsx        |  85 --
 .../src/routes/dashboard/dashboard.tsx        |  25 -
 .../src/routes/dashboard/index.tsx            |  64 --
 .../src/routes/dashboard/invoices/index.tsx   |  76 --
 .../src/routes/dashboard/invoices/invoice.tsx | 157 ----
 .../routes/dashboard/invoices/invoices.tsx    |  67 --
 .../src/routes/dashboard/users/index.tsx      | 169 ----
 .../src/routes/dashboard/users/user.tsx       |  49 -
 .../src/routes/dashboard/users/users.tsx      |  32 -
 .../src/routes/expensive/Expensive.tsx        |   8 -
 .../src/routes/expensive/index.tsx            |   9 -
 .../src/routes/index.tsx                      |  39 -
 .../src/routes/layout/index.tsx               |  40 -
 .../src/routes/layout/layout-a.tsx            |  16 -
 .../src/routes/layout/layout-b.tsx            |  16 -
 .../kitchen-sink-multi-file/src/utils.tsx     |  49 -
 .../kitchen-sink-multi-file/tsconfig.json     |  19 -
 .../kitchen-sink-multi-file/vite.config.js    |  12 -
 .../solid/with-trpc-solid-query/.gitignore    |   5 -
 .../solid/with-trpc-solid-query/README.md     |   6 -
 .../solid/with-trpc-solid-query/index.html    |  15 -
 .../solid/with-trpc-solid-query/package.json  |  32 -
 .../with-trpc-solid-query/server/server.ts    |  44 -
 .../solid/with-trpc-solid-query/src/App.tsx   | 184 ----
 .../solid/with-trpc-solid-query/src/index.tsx |   6 -
 .../solid/with-trpc-solid-query/tsconfig.json |  15 -
 .../with-trpc-solid-query/vite.config.js      |  12 -
 media/logo.svg                                |   2 +-
 package.json                                  |   3 +-
 packages/loaders/src/index.ts                 | 213 ++---
 packages/react-actions/src/index.tsx          |   4 +-
 packages/react-loaders/src/index.tsx          |   2 +-
 packages/react-router/package.json            |  50 -
 packages/react-router/tsconfig.json           |  12 -
 packages/react-store/src/index.tsx            |  37 +-
 packages/router-cli/bin/tsr.js                |   3 -
 packages/router-cli/package.json              |  61 --
 packages/router-cli/src/config.ts             |  15 -
 packages/router-cli/src/generate.ts           |  12 -
 packages/router-cli/src/generator.ts          | 513 ----------
 packages/router-cli/src/index.ts              |  24 -
 packages/router-cli/src/transformCode.ts      | 860 -----------------
 packages/router-cli/src/watch.ts              |  48 -
 packages/router-cli/tsconfig.json             |   9 -
 .../README.md                                 |   0
 .../media/logo.sketch                         | Bin
 .../media/logo.svg                            |   2 +-
 .../media/repo-dark.png                       | Bin
 .../package.json                              |   6 +-
 .../src/Explorer.tsx                          |   0
 .../src/devtools.tsx                          |   3 +-
 .../src/index.tsx                             |   0
 .../src/styledComponents.ts                   |   0
 .../src/theme.tsx                             |   0
 .../src/useLocalStorage.ts                    |   0
 .../src/useMediaQuery.ts                      |   0
 .../src/utils.ts                              |   2 +-
 .../tsconfig.json                             |   0
 packages/router/package.json                  |   8 +-
 packages/router/src/frameworks.ts             |  12 -
 packages/router/src/index.ts                  |   3 +-
 packages/router/src/path.ts                   |   1 -
 .../src/index.tsx => router/src/react.tsx}    | 159 ++--
 packages/router/src/route.ts                  | 183 ++--
 packages/router/src/routeInfo.ts              |   2 +
 packages/router/src/routeMatch.ts             |  78 +-
 packages/router/src/router.ts                 |  40 +-
 packages/solid-actions/package.json           |  50 -
 packages/solid-actions/src/index.tsx          |  98 --
 packages/solid-actions/transform.js           |   9 -
 packages/solid-actions/tsconfig.json          |  14 -
 packages/solid-loaders/package.json           |  50 -
 packages/solid-loaders/src/index.tsx          | 184 ----
 packages/solid-loaders/transform.js           |   9 -
 packages/solid-loaders/tsconfig.json          |  14 -
 packages/solid-router/package.json            |  49 -
 packages/solid-router/src/index.tsx           | 810 ----------------
 packages/solid-router/transform.js            |   9 -
 packages/solid-router/tsconfig.json           |  14 -
 packages/solid-store/package.json             |  43 -
 packages/solid-store/src/index.tsx            |  58 --
 packages/solid-store/tsconfig.json            |  12 -
 packages/store/src/index.ts                   |  54 --
 pnpm-lock.yaml                                | 551 ++++-------
 scripts/config.ts                             |  99 +-
 tsconfig.base.json                            |   4 +-
 tsconfig.json                                 |  12 +-
 236 files changed, 2760 insertions(+), 7657 deletions(-)
 delete mode 100644 examples/solid/basic/.gitignore
 delete mode 100644 examples/solid/basic/README.md
 delete mode 100644 examples/solid/basic/index.html
 delete mode 100644 examples/solid/basic/package.json
 delete mode 100644 examples/solid/basic/src/index.css
 delete mode 100644 examples/solid/basic/src/index.tsx
 delete mode 100644 examples/solid/basic/tsconfig.json
 delete mode 100644 examples/solid/basic/vite.config.ts
 delete mode 100644 examples/solid/kitchen-sink-multi-file/.gitignore
 delete mode 100644 examples/solid/kitchen-sink-multi-file/README.md
 delete mode 100644 examples/solid/kitchen-sink-multi-file/index.html
 delete mode 100644 examples/solid/kitchen-sink-multi-file/package.json
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/App.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/actionClient.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/components/InvoiceFields.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/components/Spinner.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/loaderClient.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/mockTodos.ts
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/router.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/__root.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/authenticated/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/expensive/Expensive.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/expensive/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/layout/index.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/src/utils.tsx
 delete mode 100644 examples/solid/kitchen-sink-multi-file/tsconfig.json
 delete mode 100644 examples/solid/kitchen-sink-multi-file/vite.config.js
 delete mode 100644 examples/solid/with-trpc-solid-query/.gitignore
 delete mode 100644 examples/solid/with-trpc-solid-query/README.md
 delete mode 100644 examples/solid/with-trpc-solid-query/index.html
 delete mode 100644 examples/solid/with-trpc-solid-query/package.json
 delete mode 100644 examples/solid/with-trpc-solid-query/server/server.ts
 delete mode 100644 examples/solid/with-trpc-solid-query/src/App.tsx
 delete mode 100644 examples/solid/with-trpc-solid-query/src/index.tsx
 delete mode 100644 examples/solid/with-trpc-solid-query/tsconfig.json
 delete mode 100644 examples/solid/with-trpc-solid-query/vite.config.js
 delete mode 100644 packages/react-router/package.json
 delete mode 100644 packages/react-router/tsconfig.json
 delete mode 100755 packages/router-cli/bin/tsr.js
 delete mode 100644 packages/router-cli/package.json
 delete mode 100644 packages/router-cli/src/config.ts
 delete mode 100644 packages/router-cli/src/generate.ts
 delete mode 100644 packages/router-cli/src/generator.ts
 delete mode 100644 packages/router-cli/src/index.ts
 delete mode 100644 packages/router-cli/src/transformCode.ts
 delete mode 100644 packages/router-cli/src/watch.ts
 delete mode 100644 packages/router-cli/tsconfig.json
 rename packages/{react-router-devtools => router-devtools}/README.md (100%)
 rename packages/{react-router-devtools => router-devtools}/media/logo.sketch (100%)
 rename packages/{react-router-devtools => router-devtools}/media/logo.svg (99%)
 rename packages/{react-router-devtools => router-devtools}/media/repo-dark.png (100%)
 rename packages/{react-router-devtools => router-devtools}/package.json (88%)
 rename packages/{react-router-devtools => router-devtools}/src/Explorer.tsx (100%)
 rename packages/{react-router-devtools => router-devtools}/src/devtools.tsx (99%)
 rename packages/{react-router-devtools => router-devtools}/src/index.tsx (100%)
 rename packages/{react-router-devtools => router-devtools}/src/styledComponents.ts (100%)
 rename packages/{react-router-devtools => router-devtools}/src/theme.tsx (100%)
 rename packages/{react-router-devtools => router-devtools}/src/useLocalStorage.ts (100%)
 rename packages/{react-router-devtools => router-devtools}/src/useMediaQuery.ts (100%)
 rename packages/{react-router-devtools => router-devtools}/src/utils.ts (98%)
 rename packages/{react-router-devtools => router-devtools}/tsconfig.json (100%)
 delete mode 100644 packages/router/src/frameworks.ts
 rename packages/{react-router/src/index.tsx => router/src/react.tsx} (89%)
 delete mode 100644 packages/solid-actions/package.json
 delete mode 100644 packages/solid-actions/src/index.tsx
 delete mode 100644 packages/solid-actions/transform.js
 delete mode 100644 packages/solid-actions/tsconfig.json
 delete mode 100644 packages/solid-loaders/package.json
 delete mode 100644 packages/solid-loaders/src/index.tsx
 delete mode 100644 packages/solid-loaders/transform.js
 delete mode 100644 packages/solid-loaders/tsconfig.json
 delete mode 100644 packages/solid-router/package.json
 delete mode 100644 packages/solid-router/src/index.tsx
 delete mode 100644 packages/solid-router/transform.js
 delete mode 100644 packages/solid-router/tsconfig.json
 delete mode 100644 packages/solid-store/package.json
 delete mode 100644 packages/solid-store/src/index.tsx
 delete mode 100644 packages/solid-store/tsconfig.json

diff --git a/README.md b/README.md
index 9b4c8d4880..9ee9ab9510 100644
--- a/README.md
+++ b/README.md
@@ -8,10 +8,10 @@
   <img alt="#TanStack" src="https://img.shields.io/twitter/url?color=%2308a0e9&label=%23TanStack&style=social&url=https%3A%2F%2Ftwitter.com%2Fintent%2Ftweet%3Fbutton_hashtag%3DTanStack">
 </a><a href="https://discord.com/invite/WrRKjPJ" target="\_parent">
   <img alt="" src="https://img.shields.io/badge/Discord-TanStack-%235865F2" />
-</a><a href="https://npmjs.com/package/@tanstack/react-router" target="\_parent">
-  <img alt="" src="https://img.shields.io/npm/dm/@tanstack/react-router.svg" />
-</a><a href="https://bundlephobia.com/result?p=@tanstack/react-router" target="\_parent">
-  <img alt="" src="https://badgen.net/bundlephobia/minzip/@tanstack/react-router" />
+</a><a href="https://npmjs.com/package/@tanstack/router" target="\_parent">
+  <img alt="" src="https://img.shields.io/npm/dm/@tanstack/router.svg" />
+</a><a href="https://bundlephobia.com/result?p=@tanstack/router" target="\_parent">
+  <img alt="" src="https://badgen.net/bundlephobia/minzip/@tanstack/router" />
 </a><a href="#badge">
     <img alt="semantic-release" src="https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg">
   </a><a href="https://github.com/tanstack/router/discussions">
diff --git a/docs/adapters/react-router.md b/docs/adapters/react-router.md
index 8f82a3a3c7..44d94e7f7e 100644
--- a/docs/adapters/react-router.md
+++ b/docs/adapters/react-router.md
@@ -5,7 +5,7 @@ title: React Router
 You can install TanStack React Router with any [NPM](https://npmjs.com) package manager.
 
 ```sh
-npm install @tanstack/react-router@beta
+npm install @tanstack/router@beta
 ```
 
 TanStack React Router is compatible with React v16.8+ and is currently only compatible with ReactDOM only. If you would like to contribute to the React Native adapter, please reach out to us on [Discord](https://tlinz.com/discord).
diff --git a/docs/api/react/Outlet.md b/docs/api/react/Outlet.md
index 169938625f..254f0b5476 100644
--- a/docs/api/react/Outlet.md
+++ b/docs/api/react/Outlet.md
@@ -4,8 +4,7 @@ title: Outlet
 ---
 
 ```tsx
-import { Outlet } from '@tanstack/react-router'
-
+import { Outlet } from '@tanstack/router'
 ```
 
 **Options**
diff --git a/docs/api/react/RouterProvider.md b/docs/api/react/RouterProvider.md
index 77d7d8acbd..5245a2649a 100644
--- a/docs/api/react/RouterProvider.md
+++ b/docs/api/react/RouterProvider.md
@@ -3,12 +3,12 @@ id: RouterProvider
 title: RouterProvider
 ---
 
-Use the `RouterProvider` component to connect and provide a `ReactRouter` to your application:
+Use the `RouterProvider` component to connect and provide a `Router` to your application:
 
 ```tsx
-import { RouterProvider, ReactRouter } from '@tanstack/react-router'
+import { RouterProvider, Router } from '@tanstack/router'
 
-const router = new ReactRouter()
+const router = new Router()
 
 function App() {
   return <RouterProvider router={router} />
@@ -19,7 +19,7 @@ function App() {
 
 - `router: Router`
   - **Required**
-  - the `ReactRouter` instance to provide
+  - the `Router` instance to provide
 - `history?: BrowserHistory | MemoryHistory | HashHistory`
   - **Optional**
 - `stringifySearch?: SearchSerializer`
@@ -38,7 +38,10 @@ function App() {
   - **Optional**
 - `defaultComponent?: GetFrameworkGeneric<'Component'>`
   - **Optional**
-- `defaultErrorComponent?: GetFrameworkGeneric<'ErrorComponent'>`
+- `defaultErrorComponent?: RouteComponent<{
+  error: Error
+  info: { componentStack: string }
+}>`
   - **Optional**
 - `defaultPendingComponent?: GetFrameworkGeneric<'Component'>`
   - **Optional**
@@ -60,5 +63,3 @@ function App() {
   - **Optional**
 - `context?: TRouterContext`
   - **Optional**
-- `loadComponent?: (component: GetFrameworkGeneric<'Component'>) => Promise<GetFrameworkGeneric<'Component'>`
-  - **Optional**
diff --git a/docs/api/react/createReactRouter.md b/docs/api/react/createReactRouter.md
index 4513f06d2e..4e437d9ed1 100644
--- a/docs/api/react/createReactRouter.md
+++ b/docs/api/react/createReactRouter.md
@@ -1,16 +1,16 @@
 ---
-id: ReactRouter
-title: ReactRouter
+id: Router
+title: Router
 ---
 
-use the 'ReactRouter' to create a router to provide it to the Router Provider, 'ReactRouter' takes in routes config in the options.
+use the 'Router' to create a router to provide it to the Router Provider, 'Router' takes in routes config in the options.
 
 ```tsx
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 
 const routeConfig = rootRoute.addChildren([indexRoute])
 
-const router = new ReactRouter({
+const router = new Router({
   routeConfig,
   //add other options here
 })
diff --git a/docs/api/react/createRouteConfig.md b/docs/api/react/createRouteConfig.md
index de8814377e..4f3bed5ae3 100644
--- a/docs/api/react/createRouteConfig.md
+++ b/docs/api/react/createRouteConfig.md
@@ -6,7 +6,7 @@ title: route
 Use the 'route' to create route to pass to your Route Provider.
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 
 const router = new Route()
 ```
@@ -110,14 +110,14 @@ search: {}}) => void | ((match: {params: {};
 search: {};
 }) => void) | undefined) | undefined `
 
-                                This function is called when moving from an inactive state to an active one. Likewise, when moving from an active to an inactive state, the return function (if provided) is called.
+                                    This function is called when moving from an inactive state to an active one. Likewise, when moving from an active to an inactive state, the return function (if provided) is called.
 
   - `onTransition: ((match: {
 params: {};
 search: {};
 }) => void) | undefined `
 
-                                This function is called when the route remains active from one transition to the next.
+                                    This function is called when the route remains active from one transition to the next.
 
   - `parseParams: ((rawParams: Record<never, string>) => Record<never, string>) | undefined`
 
diff --git a/docs/api/react/lazy.md b/docs/api/react/lazy.md
index b85ef18c4d..799aad450a 100644
--- a/docs/api/react/lazy.md
+++ b/docs/api/react/lazy.md
@@ -4,9 +4,10 @@ title: lazy
 ---
 
 ```tsx
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 
-export const expensiveRoute = new Route({ getParentRoute: () => rootRoute,
+export const expensiveRoute = new Route({
+  getParentRoute: () => rootRoute,
   path: 'expensive',
   component: lazy(() => import('./Expensive')),
 })
diff --git a/docs/comparison.md b/docs/comparison.md
index cbd8b9cbf2..46889c83ba 100644
--- a/docs/comparison.md
+++ b/docs/comparison.md
@@ -62,8 +62,8 @@ Feature/Capability Key:
 | Deferred Loader Streaming                      | 🛑                                               | ✅                                                    | 🔶                                                    |
 | `<Form>` API                                   | 🛑                                               | ✅                                                    | 🛑                                                    |
 
-[bp-tanstack-router]: https://badgen.net/bundlephobia/minzip/@tanstack/react-router@beta?label=Router
-[bpl-tanstack-router]: https://bundlephobia.com/result?p=@tanstack/react-router@beta
+[bp-tanstack-router]: https://badgen.net/bundlephobia/minzip/@tanstack/router@beta?label=Router
+[bpl-tanstack-router]: https://bundlephobia.com/result?p=@tanstack/router@beta
 [bp-tanstack-loaders]: https://badgen.net/bundlephobia/minzip/@tanstack/react-loaders@beta?label=Loaders
 [bpl-tanstack-loaders]: https://bundlephobia.com/result?p=@tanstack/react-loaders@beta
 [bp-tanstack-actions]: https://badgen.net/bundlephobia/minzip/@tanstack/react-actions@beta?label=Actions
diff --git a/docs/config.json b/docs/config.json
index 3ab5316e42..08a0a6fc9e 100644
--- a/docs/config.json
+++ b/docs/config.json
@@ -137,8 +137,8 @@
           "to": "api/react/RouterProvider"
         },
         {
-          "label": "ReactRouter",
-          "to": "api/react/ReactRouter"
+          "label": "Router",
+          "to": "api/react/Router"
         },
         {
           "label": "route",
diff --git a/docs/devtools.md b/docs/devtools.md
index 64f6c810ea..a17543bc5f 100644
--- a/docs/devtools.md
+++ b/docs/devtools.md
@@ -13,13 +13,13 @@ When you begin your TanStack Router journey, you'll want these devtools by your
 ## Installation
 
 ```sh
-npm install @tanstack/react-router-devtools@beta --save
+npm install @tanstack/router-devtools@beta --save
 ```
 
 ## Import the Devtools
 
 ```js
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 ```
 
 ## Only importing and using Devtools in Development
@@ -32,7 +32,7 @@ const TanStackRouterDevtools =
     ? () => null // Render nothing in production
     : React.lazy(() =>
         // Lazy load in development
-        import('@tanstack/react-router-devtools').then((res) => ({
+        import('@tanstack/router-devtools').then((res) => ({
           default: res.TanStackRouterDevtools,
           // For Embedded Mode
           // default: res.TanStackRouterDevtoolsPanel
@@ -54,7 +54,7 @@ const rootRoute = new RootRoute({
   ),
 })
 
-const router = new ReactRouter({
+const router = new Router({
   routes: [rootRoute],
 })
 
@@ -85,7 +85,7 @@ Floating Mode will mount the devtools as a fixed, floating element in your app a
 Place the following code as high in your React app as you can. The closer it is to the root of the page, the better it will work!
 
 ```js
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 
 function App() {
   return (
@@ -118,7 +118,7 @@ function App() {
 Embedded Mode will embed the devtools as a regular component in your application. You can style it however you'd like after that!
 
 ```js
-import { TanStackRouterDevtoolsPanel } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtoolsPanel } from '@tanstack/router-devtools'
 
 function App() {
   return (
diff --git a/docs/guide/custom-search-param-serialization.md b/docs/guide/custom-search-param-serialization.md
index 0c27a9e209..b407efd98b 100644
--- a/docs/guide/custom-search-param-serialization.md
+++ b/docs/guide/custom-search-param-serialization.md
@@ -6,18 +6,14 @@ title: Custom Search Param Serialization
 
 By default, TanStack Router parses and serializes your search params automatically. Depending on your needs though, you may want to customize the serialization process.
 
-To do so, you can [use `ReactRouter`'s `parseSearch` and `stringifySearch` options combined with the `parseSearchWith` and `stringifySearchWith` utilities](../docs/api#search-param-parsing-and-serialization).
+To do so, you can [use `Router`'s `parseSearch` and `stringifySearch` options combined with the `parseSearchWith` and `stringifySearchWith` utilities](../docs/api#search-param-parsing-and-serialization).
 
 For example: We can reimplement the default parser/serializer with the following code:
 
 ```tsx
-import {
-  ReactRouter,
-  parseSearchWith,
-  stringifySearchWith,
-} from '@tanstack/react-router'
+import { Router, parseSearchWith, stringifySearchWith } from '@tanstack/router'
 
-const router = new ReactRouter({
+const router = new Router({
   parseSearch: parseSearchWith(JSON.parse),
   stringifySearch: stringifySearchWith(JSON.stringify),
 })
@@ -28,13 +24,9 @@ const router = new ReactRouter({
 It's common to base64 encode your search params to achieve maximum compatibility across browsers and URL unfurlers, etc. This can be done with the following code:
 
 ```tsx
-import {
-  ReactRouter,
-  parseSearchWith,
-  stringifySearchWith,
-} from '@tanstack/react-router'
+import { Router, parseSearchWith, stringifySearchWith } from '@tanstack/router'
 
-const router = new ReactRouter({
+const router = new Router({
   parseSearch: parseSearchWith((value) => JSON.parse(decodeFromBinary(value))),
   stringifySearch: stringifySearchWith((value) =>
     encodeToBinary(JSON.stringify(value)),
@@ -66,14 +58,10 @@ export function encodeToBinary(str: string): string {
 [Zipson](https://jgranstrom.github.io/zipson/) is a very user-friendly and performant JSON compression library (both in runtime performance and the resulting compression performance). To compress your search params with it (which requires escaping/unescaping and base64 encoding/decoding them as well), you can use the following code:
 
 ```tsx
-import {
-  ReactRouter,
-  parseSearchWith,
-  stringifySearchWith,
-} from '@tanstack/react-router'
+import { Router, parseSearchWith, stringifySearchWith } from '@tanstack/router'
 import { stringify, parse } from 'zipson'
 
-const router = new ReactRouter({
+const router = new Router({
   parseSearch: parseSearchWith((value) =>
     parse(decodeURIComponent(decodeFromBinary(value))),
   ),
@@ -107,14 +95,10 @@ export function encodeToBinary(str: string): string {
 [JSURL](https://github.com/Sage/jsurl) is a non-standard library that can both compress URLs while still maintaining readability. This can be done with the following code:
 
 ```tsx
-import {
-  ReactRouter,
-  parseSearchWith,
-  stringifySearchWith,
-} from '@tanstack/react-router'
+import { Router, parseSearchWith, stringifySearchWith } from '@tanstack/router'
 import jsurl from 'jsurl'
 
-const router = new ReactRouter({
+const router = new Router({
   parseSearch: parseSearchWith(jsurl.parse),
   stringifySearch: stringifySearchWith(jsurl.stringify),
 })
diff --git a/docs/guide/data-loading.md b/docs/guide/data-loading.md
index 75548763f3..faa5c1cd96 100644
--- a/docs/guide/data-loading.md
+++ b/docs/guide/data-loading.md
@@ -60,7 +60,7 @@ The biggest reason for calling `onLoad` every time is to notify your data loadin
 Here is a simple example of using `onLoad` to fetch data for a route:
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 
 const postsLoader = new Loader({
@@ -107,7 +107,7 @@ Using these parameters, we can do a lot of cool things. Let's take a look at a f
 The `params` property of the `onLoad` function is an object containing the route's path params.
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 
 const postLoader = new Loader({
@@ -140,7 +140,7 @@ const postRoute = new Route({
 The `search` and `routeSearch` properties of the `onLoad` function are objects containing the route's search params. `search` contains _all_ of the search params including parent search params. `routeSearch` only includes specific search params from this route. In this example, we'll use zod to validate and parse the search params for `/posts/$postId` route and use them in an `onload` function and our component.
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 
 const postsLoader = new Loader({
@@ -181,7 +181,7 @@ The `context` and `routeContext` properties of the `onLoad` function are objects
 > 🧠 Context is a powerful tool for dependency injection. You can use it to inject services, loaders, and other objects into your router and routes. You can also additively pass data down the route tree at every route using a route's `getContext` option.
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 
 const postsLoader = new Loader({
@@ -223,7 +223,7 @@ const postsRoute = new Route({
 
 const routeTree = rootRoute.addChildren([postsRoute])
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   context: {
     // Supply our loaderClient to the whole router
@@ -237,7 +237,7 @@ const router = new ReactRouter({
 The `signal` property of the `onLoad` function is an [AbortSignal](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) which is cancelled when the route is unloaded or when the `onLoad` call becomes outdated. This is useful for cancelling network requests when the route is unloaded or when the route's params change. Here is an example using TanStack Loader's signal passthrough:
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 
 const postsLoader = new Loader({
@@ -270,7 +270,7 @@ const postsRoute = new Route({
 The `prefetch` property of the `onLoad` function is a boolean which is `true` when the route is being loaded via a prefetch action. Some data loading libraries may handle prefetching differently than a standard fetch, so you may want to pass `prefetch` to your data loading library, or use it to execute the appropriate data loading logic. Here is an example using TanStack Loader and it's built-in `prefetch` flag:
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 
 const postsLoader = new Loader({
diff --git a/docs/guide/history-types.md b/docs/guide/history-types.md
index 43007ebde9..6a65284947 100644
--- a/docs/guide/history-types.md
+++ b/docs/guide/history-types.md
@@ -16,10 +16,10 @@ If you need a special history instance type, You can use the history package to
 
 Each of these APIs behaves slightly differently and documentation for them can be found in the [history](https://github.com/remix-run/history) package.
 
-Once you have a history instance, you can pass it to the `ReactRouter` constructor:
+Once you have a history instance, you can pass it to the `Router` constructor:
 
 ```ts
-import { createMemoryHistory, ReactRouter, route } from '@tanstack/react-router'
+import { createMemoryHistory, Router, route } from '@tanstack/router'
 
 const rootRoute = new Route()
 
@@ -29,7 +29,7 @@ const memoryHistory = createMemoryHistory({
   initialEntries: ['/'], // Pass your initial url
 })
 
-const router = new ReactRouter({ routeConfig, history: memoryHistory })
+const router = new Router({ routeConfig, history: memoryHistory })
 ```
 
 ## Browser Routing
@@ -41,7 +41,7 @@ The `createBrowserHistory` is the default history type. It uses the browser's hi
 Hash routing can be helpful if your server doesn't support rewrites to index.html for HTTP requests (among other environments that don't have a server).
 
 ```ts
-import { createHashHistory, ReactRouter, route } from '@tanstack/react-router'
+import { createHashHistory, Router, route } from '@tanstack/router'
 
 const rootRoute = new Route()
 
@@ -49,7 +49,7 @@ const indexRoute = new Route({ getParentRoute: () => rootRoute, path: '/' })
 
 const hashHistory = createHashHistory()
 
-const router = new ReactRouter({ routeConfig, history: hashHistory })
+const router = new Router({ routeConfig, history: hashHistory })
 ```
 
 ## Memory Routing
@@ -57,7 +57,7 @@ const router = new ReactRouter({ routeConfig, history: hashHistory })
 Memory routing is useful in environments that are not a browser or when you do not want components to interact with the URL.
 
 ```ts
-import { createMemoryHistory, ReactRouter, route } from '@tanstack/router'
+import { createMemoryHistory, Router, route } from '@tanstack/router'
 
 const rootRoute = new Route()
 
@@ -67,5 +67,5 @@ const memoryHistory = createMemoryHistory({
   initialEntries: ['/'], // Pass your initial url
 })
 
-const router = new ReactRouter({ routeConfig, history: memoryHistory })
+const router = new Router({ routeConfig, history: memoryHistory })
 ```
diff --git a/docs/guide/preloading.md b/docs/guide/preloading.md
index a11343b17e..9b6bb7f355 100644
--- a/docs/guide/preloading.md
+++ b/docs/guide/preloading.md
@@ -9,7 +9,7 @@ Preloading in TanStack Router is a way to load a route before the user actually
 The simplest way to preload routes for your application is to set the `preload` option to `intent` for your entire router:
 
 ```tsx
-import { Router } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 
 const router = new Router({
   // ...
@@ -24,7 +24,7 @@ This will turn on preloading by default for all `<Link>` components in your appl
 By default, preloading will start after **50ms** of the user hovering or touching a `<Link>` component. You can change this delay by setting the `preloadDelay` option on your router:
 
 ```tsx
-import { Router } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 
 const router = new Router({
   // ...
@@ -41,7 +41,7 @@ Preloading is most useful when combined with your favorite data loading library.
 Here's an example using TanStack Loaders:
 
 ```tsx
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 
 const postsRoute = new Route({
   getParentRoute: () => rootRoute,
diff --git a/docs/guide/routes.md b/docs/guide/routes.md
index 7291644d8a..5c587e7cbc 100644
--- a/docs/guide/routes.md
+++ b/docs/guide/routes.md
@@ -57,18 +57,18 @@ const routeTree = rootRoute.addChildren([
 
 ## Creating a Router
 
-Once you have a route tree, you can create a router using the framework `Router` class of your choice. For example, if you are using React, you would use call `new ReactRouter()`. Router classes take a route tree as one of their many options, and return a router instance.
+Once you have a route tree, you can create a router using the framework `Router` class of your choice. For example, if you are using React, you would use call `new Router()`. Router classes take a route tree as one of their many options, and return a router instance.
 
 ```tsx
-const router = new ReactRouter({ routeTree })
+const router = new Router({ routeTree })
 ```
 
 ## Registering Router Types
 
-TanStack Router provides amazing support for TypeScript, even for things you wouldn't expect like relative navigation and even context-aware hooks! To make this possible, you must register your router type using TypeScripts' [Declaration Merging](https://www.typescriptlang.org/docs/handbook/declaration-merging.html) feature. This is done by extending the `Register` interface on your framework's router module. For example, if you are using React, you would extend the `Register` interface on `@tanstack/react-router` with a `router` property that has the type of your `router` instance:
+TanStack Router provides amazing support for TypeScript, even for things you wouldn't expect like relative navigation and even context-aware hooks! To make this possible, you must register your router type using TypeScripts' [Declaration Merging](https://www.typescriptlang.org/docs/handbook/declaration-merging.html) feature. This is done by extending the `Register` interface on your framework's router module. For example, if you are using React, you would extend the `Register` interface on `@tanstack/router` with a `router` property that has the type of your `router` instance:
 
 ```tsx
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     // This infers the type of our router and registers it across your entire project
     router: typeof router
@@ -81,7 +81,7 @@ With your router type registered, you'll now get type-safety across your entire
 ## All together now!
 
 ```ts
-import { RootRoute, Route, ReactRouter } from '@tanstack/react-router'
+import { RootRoute, Route, Router } from '@tanstack/router'
 let rootRoute = new RootRoute()
 
 const indexRoute = new Route({ getParentRoute: () => rootRoute, path: '/' })
@@ -93,9 +93,9 @@ const routeTree = rootRoute.addChildren([
   blogRoute.addChildren([postRoute]),
 ])
 
-const router = new ReactRouter({ routeTree })
+const router = new Router({ routeTree })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/docs/guide/type-safety.md b/docs/guide/type-safety.md
index 6c72dab0ce..63aba22fec 100644
--- a/docs/guide/type-safety.md
+++ b/docs/guide/type-safety.md
@@ -27,7 +27,7 @@ const router = new Router({
   // ...
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/docs/quick-start.md b/docs/quick-start.md
index f01e685092..a4f759d3ed 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -11,10 +11,10 @@ import {
   Outlet,
   RouterProvider,
   Link,
-  ReactRouter,
+  Router,
   Route,
   RootRoute,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 
 // Create a root route
 const rootRoute = new RootRoute({
@@ -62,10 +62,10 @@ function About() {
 const routeTree = rootRoute.addChildren([indexRoute, aboutRoute])
 
 // Create the router using your route tree
-const router = new ReactRouter({ routeTree })
+const router = new Router({ routeTree })
 
 // Register your router for maximum type safety
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/basic-ssr-generated-wip/package.json b/examples/react/basic-ssr-generated-wip/package.json
index 98a7b3b3ba..2f9171ab55 100644
--- a/examples/react/basic-ssr-generated-wip/package.json
+++ b/examples/react/basic-ssr-generated-wip/package.json
@@ -16,8 +16,8 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",
diff --git a/examples/react/basic-ssr-generated-wip/src/entry-server.tsx b/examples/react/basic-ssr-generated-wip/src/entry-server.tsx
index c3cdd713f7..df74382b10 100644
--- a/examples/react/basic-ssr-generated-wip/src/entry-server.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/entry-server.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import { createMemoryHistory, Router } from '@tanstack/react-router'
+import { createMemoryHistory, Router } from '@tanstack/router'
 import jsesc from 'jsesc'
 import { ServerResponse } from 'http'
 import { createLoaderClient } from './loaderClient'
diff --git a/examples/react/basic-ssr-generated-wip/src/index.tsx b/examples/react/basic-ssr-generated-wip/src/index.tsx
index 4fd8efe362..ec74f2c499 100644
--- a/examples/react/basic-ssr-generated-wip/src/index.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { RegisteredRouter, RouterProvider } from '@tanstack/react-router'
+import { RegisteredRouter, RouterProvider } from '@tanstack/router'
 import {
   LoaderClientProvider,
   RegisteredLoaderClient,
diff --git a/examples/react/basic-ssr-generated-wip/src/router.tsx b/examples/react/basic-ssr-generated-wip/src/router.tsx
index f4389efb8c..98fff160eb 100644
--- a/examples/react/basic-ssr-generated-wip/src/router.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/router.tsx
@@ -1,5 +1,5 @@
 import { RegisteredLoaderClient } from '@tanstack/react-loaders'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 import { loaderClient } from './loaderClient'
 import { routeTree } from './routeTree'
 
@@ -7,14 +7,14 @@ export interface RouterContext {
   loaderClient: RegisteredLoaderClient
 }
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeTree,
   context: {
     loaderClient,
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.client.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.client.tsx
index adb7c582c5..b48635882f 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.client.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.client.tsx
@@ -1,24 +1,32 @@
-import { lazy } from '@tanstack/react-router';
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools';
-import * as React from 'react';
-import { Link, Outlet, RootRoute } from '@tanstack/react-router';
-import { RouterContext } from '../router';
+import { lazy } from '@tanstack/router'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
+import * as React from 'react'
+import { Link, Outlet, RootRoute } from '@tanstack/router'
+import { RouterContext } from '../router'
 export const rootRoute = RootRoute.withRouterContext<RouterContext>()({
-  component: Root
-});
+  component: Root,
+})
 function Root() {
-  return <>
+  return (
+    <>
       <div className="p-2 flex gap-2 text-lg">
-        <Link to="/" activeProps={{
-        className: 'font-bold'
-      }} activeOptions={{
-        exact: true
-      }}>
+        <Link
+          to="/"
+          activeProps={{
+            className: 'font-bold',
+          }}
+          activeOptions={{
+            exact: true,
+          }}
+        >
           Home
         </Link>{' '}
-        <Link to="/posts" activeProps={{
-        className: 'font-bold'
-      }}>
+        <Link
+          to="/posts"
+          activeProps={{
+            className: 'font-bold',
+          }}
+        >
           Posts
         </Link>
       </div>
@@ -26,6 +34,7 @@ function Root() {
       <Outlet /> {/* Start rendering router matches */}
       <TanStackRouterDevtools position="bottom-right" />
       <script type="module" src="/src/entry-client.tsx"></script>
-    </>;
+    </>
+  )
 }
-export { route, route as rootRoute };
\ No newline at end of file
+export { route, route as rootRoute }
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.tsx
index 7b5c2a78ae..d8312966ec 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/__root.tsx
@@ -1,7 +1,7 @@
-import { lazy } from '@tanstack/react-router'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { lazy } from '@tanstack/router'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import * as React from 'react'
-import { Link, Outlet, RootRoute } from '@tanstack/react-router'
+import { Link, Outlet, RootRoute } from '@tanstack/router'
 import { RouterContext } from '../router'
 export const rootRoute = RootRoute.withRouterContext<RouterContext>()({
   component: Root,
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/index.client.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/index.client.tsx
index e4a0aad180..47c9d12ae5 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/index.client.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/index.client.tsx
@@ -1,6 +1,6 @@
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 import { route as parentRoute } from './__root.client'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 export const indexRoute = new Route({
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/index.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/index.tsx
index 634aae2a1d..6f008d4162 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/index.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/index.tsx
@@ -1,6 +1,6 @@
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 import { route as parentRoute } from './__root'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 export const indexRoute = new Route({
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.client.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.client.tsx
index 3d894a96a9..eaaac684a9 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.client.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.client.tsx
@@ -1,7 +1,7 @@
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 import { route as parentRoute } from './__root.client'
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 // import { loaderClient } from '../entry-client'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.tsx
index 523486f177..86dcd52f9a 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts.tsx
@@ -1,7 +1,7 @@
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 import { route as parentRoute } from './__root'
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 // import { loaderClient } from '../entry-client'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.client.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.client.tsx
index 8c4b08e562..8736eefce7 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.client.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.client.tsx
@@ -1,59 +1,56 @@
-import { lazy } from '@tanstack/react-router';
-import { route as parentRoute } from "../posts.client";
-import { Loader, useLoaderInstance } from '@tanstack/react-loaders';
-import { Route, useParams } from '@tanstack/react-router';
-import * as React from 'react';
-import { postsLoader, postsRoute } from '../posts';
+import { lazy } from '@tanstack/router'
+import { route as parentRoute } from '../posts.client'
+import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
+import { Route, useParams } from '@tanstack/router'
+import * as React from 'react'
+import { postsLoader, postsRoute } from '../posts'
 export type PostType = {
-  id: string;
-  title: string;
-  body: string;
-};
+  id: string
+  title: string
+  body: string
+}
 export const postLoader = new Loader({
   key: 'post',
   loader: async (postId: string) => {
-    console.log(`Fetching post with id ${postId}...`);
-    await new Promise(r => setTimeout(r, Math.round(Math.random() * 300)));
-    return fetch(`https://jsonplaceholder.typicode.com/posts/${postId}`).then(r => (r.json() as Promise<PostType>));
+    console.log(`Fetching post with id ${postId}...`)
+    await new Promise((r) => setTimeout(r, Math.round(Math.random() * 300)))
+    return fetch(`https://jsonplaceholder.typicode.com/posts/${postId}`).then(
+      (r) => r.json() as Promise<PostType>,
+    )
   },
   onAllInvalidate: async () => {
-    await postsLoader.invalidateAll();
-  }
-});
+    await postsLoader.invalidateAll()
+  },
+})
 export const postIdRoute = new Route({
   getParentRoute: () => postsRoute,
   path: '$postId',
   component: Post,
-  onLoad: async ({
-    params: {
-      postId
-    },
-    preload,
-    context
-  }) => context.loaderClient.getLoader({
-    key: 'post'
-  }).load({
-    variables: postId,
-    preload
-  })
-});
+  onLoad: async ({ params: { postId }, preload, context }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'post',
+      })
+      .load({
+        variables: postId,
+        preload,
+      }),
+})
 function Post() {
+  const { postId } = useParams({
+    from: postIdRoute.id,
+  })
   const {
-    postId
-  } = useParams({
-    from: postIdRoute.id
-  });
-  const {
-    state: {
-      data: post
-    }
+    state: { data: post },
   } = useLoaderInstance({
     key: 'post',
-    variables: postId
-  });
-  return <div className="space-y-2">
+    variables: postId,
+  })
+  return (
+    <div className="space-y-2">
       <h4 className="text-xl font-bold underline">{post.title}</h4>
       <div className="text-sm">{post.body}</div>
-    </div>;
+    </div>
+  )
 }
-export { route, route as postspostIdRoute };
\ No newline at end of file
+export { route, route as postspostIdRoute }
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.tsx
index 7a7bdfe376..678a28fb7e 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/$postId.tsx
@@ -1,59 +1,56 @@
-import { lazy } from '@tanstack/react-router';
-import { route as parentRoute } from "../posts";
-import { Loader, useLoaderInstance } from '@tanstack/react-loaders';
-import { Route, useParams } from '@tanstack/react-router';
-import * as React from 'react';
-import { postsLoader, postsRoute } from '../posts';
+import { lazy } from '@tanstack/router'
+import { route as parentRoute } from '../posts'
+import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
+import { Route, useParams } from '@tanstack/router'
+import * as React from 'react'
+import { postsLoader, postsRoute } from '../posts'
 export type PostType = {
-  id: string;
-  title: string;
-  body: string;
-};
+  id: string
+  title: string
+  body: string
+}
 export const postLoader = new Loader({
   key: 'post',
   loader: async (postId: string) => {
-    console.log(`Fetching post with id ${postId}...`);
-    await new Promise(r => setTimeout(r, Math.round(Math.random() * 300)));
-    return fetch(`https://jsonplaceholder.typicode.com/posts/${postId}`).then(r => (r.json() as Promise<PostType>));
+    console.log(`Fetching post with id ${postId}...`)
+    await new Promise((r) => setTimeout(r, Math.round(Math.random() * 300)))
+    return fetch(`https://jsonplaceholder.typicode.com/posts/${postId}`).then(
+      (r) => r.json() as Promise<PostType>,
+    )
   },
   onAllInvalidate: async () => {
-    await postsLoader.invalidateAll();
-  }
-});
+    await postsLoader.invalidateAll()
+  },
+})
 export const postIdRoute = new Route({
   getParentRoute: () => postsRoute,
   path: '$postId',
   component: Post,
-  onLoad: async ({
-    params: {
-      postId
-    },
-    preload,
-    context
-  }) => context.loaderClient.getLoader({
-    key: 'post'
-  }).load({
-    variables: postId,
-    preload
-  })
-});
+  onLoad: async ({ params: { postId }, preload, context }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'post',
+      })
+      .load({
+        variables: postId,
+        preload,
+      }),
+})
 function Post() {
+  const { postId } = useParams({
+    from: postIdRoute.id,
+  })
   const {
-    postId
-  } = useParams({
-    from: postIdRoute.id
-  });
-  const {
-    state: {
-      data: post
-    }
+    state: { data: post },
   } = useLoaderInstance({
     key: 'post',
-    variables: postId
-  });
-  return <div className="space-y-2">
+    variables: postId,
+  })
+  return (
+    <div className="space-y-2">
       <h4 className="text-xl font-bold underline">{post.title}</h4>
       <div className="text-sm">{post.body}</div>
-    </div>;
+    </div>
+  )
 }
-export { route };
\ No newline at end of file
+export { route }
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.client.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.client.tsx
index 8850b40899..0e764946f1 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.client.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.client.tsx
@@ -1,6 +1,6 @@
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 import { route as parentRoute } from '../posts.client'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { postsRoute } from '../posts'
 export const postsIndexRoute = new Route({
diff --git a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.tsx b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.tsx
index df26e505e0..94a454991d 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes.generated/posts/index.tsx
@@ -1,6 +1,6 @@
-import { lazy } from '@tanstack/react-router'
+import { lazy } from '@tanstack/router'
 import { route as parentRoute } from '../posts'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { postsRoute } from '../posts'
 export const postsIndexRoute = new Route({
diff --git a/examples/react/basic-ssr-generated-wip/src/routes/__root.tsx b/examples/react/basic-ssr-generated-wip/src/routes/__root.tsx
index 9c5add7ce4..7c12d078ce 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes/__root.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import * as React from 'react'
-import { Link, Outlet, RootRoute } from '@tanstack/react-router'
+import { Link, Outlet, RootRoute } from '@tanstack/router'
 import { RouterContext } from '../router'
 
 export const rootRoute = RootRoute.withRouterContext<RouterContext>()({
diff --git a/examples/react/basic-ssr-generated-wip/src/routes/index.tsx b/examples/react/basic-ssr-generated-wip/src/routes/index.tsx
index d14cba8216..8c42554efd 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes/index.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes/index.tsx
@@ -1,5 +1,5 @@
 import { Route } from '../routes.generated/index'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 export const indexRoute = new Route({
diff --git a/examples/react/basic-ssr-generated-wip/src/routes/posts.tsx b/examples/react/basic-ssr-generated-wip/src/routes/posts.tsx
index 9958d4771a..5e81b44d4b 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes/posts.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes/posts.tsx
@@ -1,6 +1,6 @@
 import { Route } from '../routes.generated/posts'
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 // import { loaderClient } from '../entry-client'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
diff --git a/examples/react/basic-ssr-generated-wip/src/routes/posts/$postId.tsx b/examples/react/basic-ssr-generated-wip/src/routes/posts/$postId.tsx
index 540a079991..877f78e6bb 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes/posts/$postId.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes/posts/$postId.tsx
@@ -1,6 +1,6 @@
 import { Route } from '../../routes.generated/posts/$postId'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
-import { Route, useParams } from '@tanstack/react-router'
+import { Route, useParams } from '@tanstack/router'
 import * as React from 'react'
 import { postsLoader, postsRoute } from '../posts'
 export type PostType = {
diff --git a/examples/react/basic-ssr-generated-wip/src/routes/posts/index.tsx b/examples/react/basic-ssr-generated-wip/src/routes/posts/index.tsx
index ac36443b9e..d0d3fd2341 100644
--- a/examples/react/basic-ssr-generated-wip/src/routes/posts/index.tsx
+++ b/examples/react/basic-ssr-generated-wip/src/routes/posts/index.tsx
@@ -1,5 +1,5 @@
 import { Route } from '../../routes.generated/posts/index'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { postsRoute } from '../posts'
 export const postsIndexRoute = new Route({
diff --git a/examples/react/basic-ssr-streaming/package.json b/examples/react/basic-ssr-streaming/package.json
index 56b6c9a7db..a0fd5b941b 100644
--- a/examples/react/basic-ssr-streaming/package.json
+++ b/examples/react/basic-ssr-streaming/package.json
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",
diff --git a/examples/react/basic-ssr-streaming/src/entry-server.tsx b/examples/react/basic-ssr-streaming/src/entry-server.tsx
index 9d993f2610..ea948bcb54 100644
--- a/examples/react/basic-ssr-streaming/src/entry-server.tsx
+++ b/examples/react/basic-ssr-streaming/src/entry-server.tsx
@@ -1,10 +1,6 @@
 import * as React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import {
-  createMemoryHistory,
-  Router,
-  RouterProvider,
-} from '@tanstack/react-router'
+import { createMemoryHistory, Router, RouterProvider } from '@tanstack/router'
 import isbot from 'isbot'
 import jsesc from 'jsesc'
 import { ServerResponse } from 'http'
diff --git a/examples/react/basic-ssr-streaming/src/index.tsx b/examples/react/basic-ssr-streaming/src/index.tsx
index 4fd8efe362..ec74f2c499 100644
--- a/examples/react/basic-ssr-streaming/src/index.tsx
+++ b/examples/react/basic-ssr-streaming/src/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { RegisteredRouter, RouterProvider } from '@tanstack/react-router'
+import { RegisteredRouter, RouterProvider } from '@tanstack/router'
 import {
   LoaderClientProvider,
   RegisteredLoaderClient,
diff --git a/examples/react/basic-ssr-streaming/src/router.tsx b/examples/react/basic-ssr-streaming/src/router.tsx
index f4389efb8c..98fff160eb 100644
--- a/examples/react/basic-ssr-streaming/src/router.tsx
+++ b/examples/react/basic-ssr-streaming/src/router.tsx
@@ -1,5 +1,5 @@
 import { RegisteredLoaderClient } from '@tanstack/react-loaders'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 import { loaderClient } from './loaderClient'
 import { routeTree } from './routeTree'
 
@@ -7,14 +7,14 @@ export interface RouterContext {
   loaderClient: RegisteredLoaderClient
 }
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeTree,
   context: {
     loaderClient,
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/basic-ssr-streaming/src/routes/__root.tsx b/examples/react/basic-ssr-streaming/src/routes/__root.tsx
index 6158648cfb..af9354a75c 100644
--- a/examples/react/basic-ssr-streaming/src/routes/__root.tsx
+++ b/examples/react/basic-ssr-streaming/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import * as React from 'react'
-import { Link, Outlet, RootRoute, useRouter } from '@tanstack/react-router'
+import { Link, Outlet, RootRoute, useRouter } from '@tanstack/router'
 import { RouterContext } from '../router'
 import { useHead } from '../head'
 
diff --git a/examples/react/basic-ssr-streaming/src/routes/index.tsx b/examples/react/basic-ssr-streaming/src/routes/index.tsx
index 2c4a1a6941..7e9ac4067a 100644
--- a/examples/react/basic-ssr-streaming/src/routes/index.tsx
+++ b/examples/react/basic-ssr-streaming/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 
diff --git a/examples/react/basic-ssr-streaming/src/routes/posts.tsx b/examples/react/basic-ssr-streaming/src/routes/posts.tsx
index f89921bb41..2ec0e84ca1 100644
--- a/examples/react/basic-ssr-streaming/src/routes/posts.tsx
+++ b/examples/react/basic-ssr-streaming/src/routes/posts.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 import { useLoaderInstance } from '@tanstack/react-loaders'
 import { postIdRoute } from './posts/$postId'
diff --git a/examples/react/basic-ssr-streaming/src/routes/posts/$postId.tsx b/examples/react/basic-ssr-streaming/src/routes/posts/$postId.tsx
index f7a0276583..c3f3a91542 100644
--- a/examples/react/basic-ssr-streaming/src/routes/posts/$postId.tsx
+++ b/examples/react/basic-ssr-streaming/src/routes/posts/$postId.tsx
@@ -1,5 +1,5 @@
 import { useLoaderInstance } from '@tanstack/react-loaders'
-import { Route, useParams } from '@tanstack/react-router'
+import { Route, useParams } from '@tanstack/router'
 import * as React from 'react'
 // import { loaderClient } from '../../entry-client'
 import { postsRoute } from '../posts'
diff --git a/examples/react/basic-ssr-streaming/src/routes/posts/index.tsx b/examples/react/basic-ssr-streaming/src/routes/posts/index.tsx
index 579b05edfb..aa96f1fbb5 100644
--- a/examples/react/basic-ssr-streaming/src/routes/posts/index.tsx
+++ b/examples/react/basic-ssr-streaming/src/routes/posts/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { postsRoute } from '../posts'
 
diff --git a/examples/react/basic-ssr-with-html/package.json b/examples/react/basic-ssr-with-html/package.json
index 996450e1b6..d1424b4a40 100644
--- a/examples/react/basic-ssr-with-html/package.json
+++ b/examples/react/basic-ssr-with-html/package.json
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",
diff --git a/examples/react/basic-ssr-with-html/src/entry-server.tsx b/examples/react/basic-ssr-with-html/src/entry-server.tsx
index 0220eb5594..e0807dc044 100644
--- a/examples/react/basic-ssr-with-html/src/entry-server.tsx
+++ b/examples/react/basic-ssr-with-html/src/entry-server.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import { createMemoryHistory, Router } from '@tanstack/react-router'
+import { createMemoryHistory, Router } from '@tanstack/router'
 import jsesc from 'jsesc'
 import { ServerResponse } from 'http'
 import { createLoaderClient } from './loaderClient'
diff --git a/examples/react/basic-ssr-with-html/src/index.tsx b/examples/react/basic-ssr-with-html/src/index.tsx
index e70b8a3485..aa94f2c619 100644
--- a/examples/react/basic-ssr-with-html/src/index.tsx
+++ b/examples/react/basic-ssr-with-html/src/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { RegisteredRouter, RouterProvider } from '@tanstack/react-router'
+import { RegisteredRouter, RouterProvider } from '@tanstack/router'
 import {
   LoaderClientProvider,
   RegisteredLoaderClient,
diff --git a/examples/react/basic-ssr-with-html/src/router.tsx b/examples/react/basic-ssr-with-html/src/router.tsx
index f4389efb8c..98fff160eb 100644
--- a/examples/react/basic-ssr-with-html/src/router.tsx
+++ b/examples/react/basic-ssr-with-html/src/router.tsx
@@ -1,5 +1,5 @@
 import { RegisteredLoaderClient } from '@tanstack/react-loaders'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 import { loaderClient } from './loaderClient'
 import { routeTree } from './routeTree'
 
@@ -7,14 +7,14 @@ export interface RouterContext {
   loaderClient: RegisteredLoaderClient
 }
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeTree,
   context: {
     loaderClient,
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/basic-ssr-with-html/src/routes/__root.tsx b/examples/react/basic-ssr-with-html/src/routes/__root.tsx
index 79632c4ed5..e5af0b8cb8 100644
--- a/examples/react/basic-ssr-with-html/src/routes/__root.tsx
+++ b/examples/react/basic-ssr-with-html/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import * as React from 'react'
-import { Link, Outlet, RootRoute, useRouter } from '@tanstack/react-router'
+import { Link, Outlet, RootRoute, useRouter } from '@tanstack/router'
 import { RouterContext } from '../router'
 import { useHead } from '../head'
 
diff --git a/examples/react/basic-ssr-with-html/src/routes/index.tsx b/examples/react/basic-ssr-with-html/src/routes/index.tsx
index b01a039fd2..6d8a3bd6d8 100644
--- a/examples/react/basic-ssr-with-html/src/routes/index.tsx
+++ b/examples/react/basic-ssr-with-html/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 
diff --git a/examples/react/basic-ssr-with-html/src/routes/posts.tsx b/examples/react/basic-ssr-with-html/src/routes/posts.tsx
index 14ff5de574..82b72a3c2d 100644
--- a/examples/react/basic-ssr-with-html/src/routes/posts.tsx
+++ b/examples/react/basic-ssr-with-html/src/routes/posts.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 // import { loaderClient } from '../entry-client'
 import { useLoaderInstance } from '@tanstack/react-loaders'
diff --git a/examples/react/basic-ssr-with-html/src/routes/posts/$postId.tsx b/examples/react/basic-ssr-with-html/src/routes/posts/$postId.tsx
index 9686efdf12..207f7b372a 100644
--- a/examples/react/basic-ssr-with-html/src/routes/posts/$postId.tsx
+++ b/examples/react/basic-ssr-with-html/src/routes/posts/$postId.tsx
@@ -5,7 +5,7 @@ import {
   useParams,
   useRouter,
   useRouterContext,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import * as React from 'react'
 // import { loaderClient } from '../../entry-client'
 import { postsRoute } from '../posts'
diff --git a/examples/react/basic-ssr-with-html/src/routes/posts/index.tsx b/examples/react/basic-ssr-with-html/src/routes/posts/index.tsx
index 579b05edfb..aa96f1fbb5 100644
--- a/examples/react/basic-ssr-with-html/src/routes/posts/index.tsx
+++ b/examples/react/basic-ssr-with-html/src/routes/posts/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { postsRoute } from '../posts'
 
diff --git a/examples/react/basic-ssr/package.json b/examples/react/basic-ssr/package.json
index 9c2922d393..56f6a6199b 100644
--- a/examples/react/basic-ssr/package.json
+++ b/examples/react/basic-ssr/package.json
@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "axios": "^1.1.3",
     "react": "^18.2.0",
diff --git a/examples/react/basic-ssr/src/entry-server.tsx b/examples/react/basic-ssr/src/entry-server.tsx
index 024716f28b..80074363d0 100644
--- a/examples/react/basic-ssr/src/entry-server.tsx
+++ b/examples/react/basic-ssr/src/entry-server.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import ReactDOMServer from 'react-dom/server'
-import { createMemoryHistory, Router } from '@tanstack/react-router'
+import { createMemoryHistory, Router } from '@tanstack/router'
 import jsesc from 'jsesc'
 import { ServerResponse } from 'http'
 import { createLoaderClient } from './loaderClient'
diff --git a/examples/react/basic-ssr/src/index.tsx b/examples/react/basic-ssr/src/index.tsx
index 910c563687..b0d723e54f 100644
--- a/examples/react/basic-ssr/src/index.tsx
+++ b/examples/react/basic-ssr/src/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 
-import { RegisteredRouter, RouterProvider } from '@tanstack/react-router'
+import { RegisteredRouter, RouterProvider } from '@tanstack/router'
 import {
   LoaderClientProvider,
   RegisteredLoaderClient,
diff --git a/examples/react/basic-ssr/src/router.tsx b/examples/react/basic-ssr/src/router.tsx
index f4389efb8c..98fff160eb 100644
--- a/examples/react/basic-ssr/src/router.tsx
+++ b/examples/react/basic-ssr/src/router.tsx
@@ -1,5 +1,5 @@
 import { RegisteredLoaderClient } from '@tanstack/react-loaders'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 import { loaderClient } from './loaderClient'
 import { routeTree } from './routeTree'
 
@@ -7,14 +7,14 @@ export interface RouterContext {
   loaderClient: RegisteredLoaderClient
 }
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeTree,
   context: {
     loaderClient,
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/basic-ssr/src/routes/__root.tsx b/examples/react/basic-ssr/src/routes/__root.tsx
index 4f1de14d76..826d6f3373 100644
--- a/examples/react/basic-ssr/src/routes/__root.tsx
+++ b/examples/react/basic-ssr/src/routes/__root.tsx
@@ -1,6 +1,6 @@
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import * as React from 'react'
-import { Link, Outlet, RootRoute } from '@tanstack/react-router'
+import { Link, Outlet, RootRoute } from '@tanstack/router'
 import { RouterContext } from '../router'
 
 export const rootRoute = RootRoute.withRouterContext<RouterContext>()({
diff --git a/examples/react/basic-ssr/src/routes/index.tsx b/examples/react/basic-ssr/src/routes/index.tsx
index 2c4a1a6941..7e9ac4067a 100644
--- a/examples/react/basic-ssr/src/routes/index.tsx
+++ b/examples/react/basic-ssr/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 
diff --git a/examples/react/basic-ssr/src/routes/posts.tsx b/examples/react/basic-ssr/src/routes/posts.tsx
index a174097469..11bbe7b793 100644
--- a/examples/react/basic-ssr/src/routes/posts.tsx
+++ b/examples/react/basic-ssr/src/routes/posts.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 // import { loaderClient } from '../entry-client'
 import { useLoaderInstance } from '@tanstack/react-loaders'
diff --git a/examples/react/basic-ssr/src/routes/posts/$postId.tsx b/examples/react/basic-ssr/src/routes/posts/$postId.tsx
index f7a0276583..c3f3a91542 100644
--- a/examples/react/basic-ssr/src/routes/posts/$postId.tsx
+++ b/examples/react/basic-ssr/src/routes/posts/$postId.tsx
@@ -1,5 +1,5 @@
 import { useLoaderInstance } from '@tanstack/react-loaders'
-import { Route, useParams } from '@tanstack/react-router'
+import { Route, useParams } from '@tanstack/router'
 import * as React from 'react'
 // import { loaderClient } from '../../entry-client'
 import { postsRoute } from '../posts'
diff --git a/examples/react/basic-ssr/src/routes/posts/index.tsx b/examples/react/basic-ssr/src/routes/posts/index.tsx
index 579b05edfb..aa96f1fbb5 100644
--- a/examples/react/basic-ssr/src/routes/posts/index.tsx
+++ b/examples/react/basic-ssr/src/routes/posts/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { postsRoute } from '../posts'
 
diff --git a/examples/react/basic/package.json b/examples/react/basic/package.json
index 6f5cb90794..681c488f23 100644
--- a/examples/react/basic/package.json
+++ b/examples/react/basic/package.json
@@ -9,10 +9,10 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/react-router": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
     "@tanstack/react-actions": "0.0.1-beta.81",
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",
diff --git a/examples/react/basic/src/main.tsx b/examples/react/basic/src/main.tsx
index 9661daf996..cba75a6d2a 100644
--- a/examples/react/basic/src/main.tsx
+++ b/examples/react/basic/src/main.tsx
@@ -3,24 +3,23 @@ import ReactDOM from 'react-dom/client'
 import {
   Outlet,
   RouterProvider,
-  ReactRouter,
+  Router,
   Link,
   useParams,
   RootRoute,
   Route,
   ErrorComponent,
   createHashHistory,
-  lazy,
-} from '@tanstack/react-router'
+  useMatch,
+} from '@tanstack/router'
+import { TanStackRouterDevtools } from '../../../../packages/router-devtools/build/types'
+import axios from 'axios'
 import {
-  Loader,
   LoaderClient,
+  Loader,
   LoaderClientProvider,
   useLoaderInstance,
 } from '@tanstack/react-loaders'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
-
-import axios from 'axios'
 
 type PostType = {
   id: string
@@ -28,37 +27,44 @@ type PostType = {
   body: string
 }
 
-const fetchPosts = server$(async () => {
+const fetchPosts = async () => {
   console.log('Fetching posts...')
   await new Promise((r) => setTimeout(r, 500))
   return axios
     .get<PostType[]>('https://jsonplaceholder.typicode.com/posts')
     .then((r) => r.data.slice(0, 10))
-})
+}
+
+const fetchPost = async (postId: string) => {
+  console.log(`Fetching post with id ${postId}...`)
+  await new Promise((r) => setTimeout(r, 500))
+  const post = await axios
+    .get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
+    .then((r) => r.data)
+
+  if (!post) {
+    throw new NotFoundError(postId)
+  }
+
+  return post
+}
 
 const postsLoader = new Loader({
-  key: 'posts',
-  loader: fetchPosts,
+  fn: fetchPosts,
 })
 
 const postLoader = new Loader({
-  key: 'post',
-  loader: server$(async (postId: string) => {
-    console.log(`Fetching post with id ${postId}...`)
-    await new Promise((r) => setTimeout(r, 500))
-    const post = await axios
-      .get<PostType>(`https://jsonplaceholder.typicode.com/posts/${postId}`)
-      .then((r) => r.data)
-
-    return post
-  }),
-  onAllInvalidate: async () => {
-    await postsLoader.invalidateAll()
+  fn: fetchPost,
+  onInvalidate: () => {
+    postsLoader.invalidate()
   },
 })
 
 const loaderClient = new LoaderClient({
-  getLoaders: () => [postsLoader, postLoader],
+  getLoaders: () => ({
+    posts: postsLoader,
+    post: postLoader,
+  }),
 })
 
 declare module '@tanstack/react-loaders' {
@@ -67,7 +73,11 @@ declare module '@tanstack/react-loaders' {
   }
 }
 
-const rootRoute = new RootRoute({
+type RouterContext = {
+  loaderClient: typeof loaderClient
+}
+
+const rootRoute = RootRoute.withRouterContext<RouterContext>()({
   component: () => {
     return (
       <>
@@ -114,55 +124,47 @@ const indexRoute = new Route({
 const postsRoute = new Route({
   getParentRoute: () => rootRoute,
   path: 'posts',
-  onLoad: ({ preload }) =>
-    loaderClient.getLoader({ key: 'posts' }).load({ preload }),
-  component: lazy(
-    split$(() => {
-      const postsLoaderInstance = useLoaderInstance({
-        key: postsLoader.key,
-      })
+  onLoad: async ({ context }) => context.loaderClient.loaders.posts.load(),
+  component: () => {
+    const match = useMatch({ from: postsRoute.id })
+    const postsLoader = useLoaderInstance({
+      loader: match.context.loaderClient.loaders.posts,
+    })
 
-      return (
-        <div className="p-2 flex gap-2">
-          <ul className="list-disc pl-4">
-            {[
-              ...postsLoaderInstance.state.data,
-              { id: 'i-do-not-exist', title: 'Non-existent Post' },
-            ]?.map((post) => {
-              return (
-                <li key={post.id} className="whitespace-nowrap">
-                  <Link
-                    to={postRoute.fullPath}
-                    params={{
-                      postId: post.id,
-                    }}
-                    className="block py-1 text-blue-800 hover:text-blue-600"
-                    activeProps={{ className: 'text-black font-bold' }}
-                  >
-                    <div>{post.title.substring(0, 20)}</div>
-                  </Link>
-                </li>
-              )
-            })}
-          </ul>
-          <hr />
-          <Outlet />
-        </div>
-      )
-    }),
-  ),
+    return (
+      <div className="p-2 flex gap-2">
+        <ul className="list-disc pl-4">
+          {[
+            ...postsLoader.state.data,
+            { id: 'i-do-not-exist', title: 'Non-existent Post' },
+          ]?.map((post) => {
+            return (
+              <li key={post.id} className="whitespace-nowrap">
+                <Link
+                  to={postRoute.fullPath}
+                  params={{
+                    postId: post.id,
+                  }}
+                  className="block py-1 text-blue-800 hover:text-blue-600"
+                  activeProps={{ className: 'text-black font-bold' }}
+                >
+                  <div>{post.title.substring(0, 20)}</div>
+                </Link>
+              </li>
+            )
+          })}
+        </ul>
+        <hr />
+        <Outlet />
+      </div>
+    )
+  },
 })
 
-const PostsIndexRoute = new Route({
+const postsIndexRoute = new Route({
   getParentRoute: () => postsRoute,
   path: '/',
-  component: () => {
-    return (
-      <>
-        <div>Select a post.</div>
-      </>
-    )
-  },
+  component: () => <div>Select a post.</div>,
 })
 
 class NotFoundError extends Error {
@@ -176,12 +178,17 @@ class NotFoundError extends Error {
 const postRoute = new Route({
   getParentRoute: () => postsRoute,
   path: '$postId',
-  onLoad: async ({ params: { postId } }) => {
-    try {
-      await postLoader.load({ variables: postId })
-    } catch (err) {
-      throw new NotFoundError(postId)
-    }
+  onLoad: async ({ context: { loaderClient }, params: { postId } }) => {
+    await loaderClient.loaders.post.load({
+      variables: postId,
+    })
+
+    // Return a hook!
+    return () =>
+      useLoaderInstance({
+        loader: loaderClient.loaders.post,
+        variables: postId,
+      })
   },
   errorComponent: ({ error }) => {
     if (error instanceof NotFoundError) {
@@ -191,14 +198,9 @@ const postRoute = new Route({
     return <ErrorComponent error={error} />
   },
   component: () => {
-    const { postId } = useParams({ from: postRoute.id })
-    const postLoaderInstance = useLoaderInstance({
-      key: postLoader.key,
-      variables: postId,
-      // strict: false,
-    })
-
-    const post = postLoaderInstance.state.data
+    const {
+      state: { data },
+    } = postRoute.useLoader()()
 
     return (
       <div className="space-y-2">
@@ -210,21 +212,21 @@ const postRoute = new Route({
 })
 
 const routeTree = rootRoute.addChildren([
-  postsRoute.addChildren([postRoute, PostsIndexRoute]),
+  postsRoute.addChildren([postRoute, postsIndexRoute]),
   indexRoute,
 ])
 
-const hashHistory = createHashHistory()
-
-// Set up a ReactRouter instance
-const router = new ReactRouter({
-  history: hashHistory,
+// Set up a Router instance
+const router = new Router({
   routeTree,
   defaultPreload: 'intent',
+  context: {
+    loaderClient,
+  },
 })
 
 // Register things for typesafety
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/kitchen-sink-multi-file/package.json b/examples/react/kitchen-sink-multi-file/package.json
index b2752ea7d7..eb6c1fd1bb 100644
--- a/examples/react/kitchen-sink-multi-file/package.json
+++ b/examples/react/kitchen-sink-multi-file/package.json
@@ -9,10 +9,10 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/react-router": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
     "@tanstack/react-loaders": "0.0.1-beta.81",
     "@tanstack/react-actions": "0.0.1-beta.81",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",
diff --git a/examples/react/kitchen-sink-multi-file/src/main.tsx b/examples/react/kitchen-sink-multi-file/src/main.tsx
index 07f925ebe2..7ae46036f5 100644
--- a/examples/react/kitchen-sink-multi-file/src/main.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/main.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
-import { RouterProvider } from '@tanstack/react-router'
+import { RouterProvider } from '@tanstack/router'
 import { LoaderClientProvider } from '@tanstack/react-loaders'
 import { ActionClientProvider } from '@tanstack/react-actions'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/mockTodos.ts b/examples/react/kitchen-sink-multi-file/src/mockTodos.ts
index e480808758..d6ac7cef6f 100644
--- a/examples/react/kitchen-sink-multi-file/src/mockTodos.ts
+++ b/examples/react/kitchen-sink-multi-file/src/mockTodos.ts
@@ -1,4 +1,4 @@
-import { PickAsRequired } from '@tanstack/react-router'
+import { PickAsRequired } from '@tanstack/router'
 import axios from 'axios'
 import { produce } from 'immer'
 import { actionDelayFn, loaderDelayFn, shuffle } from './utils'
diff --git a/examples/react/kitchen-sink-multi-file/src/router.tsx b/examples/react/kitchen-sink-multi-file/src/router.tsx
index ff937a3c1c..5ebe492119 100644
--- a/examples/react/kitchen-sink-multi-file/src/router.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/router.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 
 import { rootRoute } from './routes/__root'
 import { indexRoute } from './routes'
@@ -39,7 +39,7 @@ const routeTree = rootRoute.addChildren([
   layoutRoute.addChildren([layoutRouteA, layoutRouteB]),
 ])
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeTree,
   defaultPendingComponent: () => (
     <div className={`p-2 text-2xl`}>
@@ -52,7 +52,7 @@ export const router = new ReactRouter({
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/__root.tsx b/examples/react/kitchen-sink-multi-file/src/routes/__root.tsx
index a771d5b50e..eee87db83f 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/__root.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/__root.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
-import { Link, Outlet, RootRoute, useRouter } from '@tanstack/react-router'
+import { Link, Outlet, RootRoute, useRouter } from '@tanstack/router'
 import { Spinner } from '../components/Spinner'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import { useLoaderClient } from '@tanstack/react-loaders'
 
 export const rootRoute = new RootRoute({
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/authenticated/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/authenticated/index.tsx
index 06c55fb8dd..72b8529f18 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/authenticated/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/authenticated/index.tsx
@@ -1,4 +1,4 @@
-import { Outlet, Route } from '@tanstack/react-router'
+import { Outlet, Route } from '@tanstack/router'
 import * as React from 'react'
 import { useAuth } from '../../main'
 import { rootRoute } from '../__root'
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx
index f3653b08f2..da39adc435 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx
@@ -1,5 +1,5 @@
 import { useLoaderInstance } from '@tanstack/react-loaders'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { dashboardRoute, invoicesLoader } from '.'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/index.tsx
index 6f6f045159..4a0fb56b3f 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/index.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { fetchInvoices } from '../../mockTodos'
 import { rootRoute } from '../__root'
 import { Loader } from '@tanstack/react-loaders'
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx
index e08a346ff2..8d233f3a54 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx
@@ -1,4 +1,4 @@
-import { Link, Outlet, MatchRoute, Route } from '@tanstack/react-router'
+import { Link, Outlet, MatchRoute, Route } from '@tanstack/router'
 import * as React from 'react'
 import { Spinner } from '../../../components/Spinner'
 import { dashboardRoute, invoicesLoader } from '..'
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx
index 9d3fce4dc8..156fca01af 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx
@@ -9,7 +9,7 @@ import {
   Link,
   useParams,
   Route,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
 import { Action, useAction } from '@tanstack/react-actions'
 import { invoicesLoader } from '..'
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx
index bf6fea03f5..0c4cc82236 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx
@@ -4,7 +4,7 @@ import { InvoiceFields } from '../../../components/InvoiceFields'
 import { invoicesRoute } from '.'
 import { Action, useAction } from '@tanstack/react-actions'
 import { invoicesLoader } from '..'
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 
 export const createInvoiceAction = new Action({
   key: 'createInvoice',
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx
index 1faeafa475..5821589d43 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx
@@ -6,7 +6,7 @@ import {
   useMatch,
   useNavigate,
   useSearch,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import * as React from 'react'
 import { z } from 'zod'
 import { Spinner } from '../../../components/Spinner'
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx
index ac9feb7e47..13e1738926 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import { fetchUserById } from '../../../mockTodos'
 import { usersRoute } from '.'
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
-import { Route, useParams } from '@tanstack/react-router'
+import { Route, useParams } from '@tanstack/router'
 import { loaderClient } from '../../../loaderClient'
 
 export const userLoader = new Loader({
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx
index dd72a7f9aa..c7a5df6261 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { usersRoute } from '.'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/expensive/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/expensive/index.tsx
index 2b7a4af8c1..0f8f0a5b7b 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/expensive/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/expensive/index.tsx
@@ -1,4 +1,4 @@
-import { lazy, Route } from '@tanstack/react-router'
+import { lazy, Route } from '@tanstack/router'
 import { loaderDelayFn } from '../../utils'
 import { rootRoute } from '../__root'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/index.tsx
index 5e1350beb7..7a1e75a62a 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Link, Route } from '@tanstack/react-router'
+import { Link, Route } from '@tanstack/router'
 import * as React from 'react'
 import { rootRoute } from './__root'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/layout/index.tsx b/examples/react/kitchen-sink-multi-file/src/routes/layout/index.tsx
index d96fb98aa5..8b7adee826 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/layout/index.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/layout/index.tsx
@@ -1,5 +1,5 @@
 import { Loader, useLoaderInstance } from '@tanstack/react-loaders'
-import { Outlet, Route } from '@tanstack/react-router'
+import { Outlet, Route } from '@tanstack/router'
 import * as React from 'react'
 import { fetchRandomNumber } from '../../mockTodos'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx b/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx
index 97db4c2666..0daaada319 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { layoutRoute } from '.'
 
diff --git a/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx b/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx
index cde681dd49..98ee8b6d58 100644
--- a/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx
+++ b/examples/react/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import * as React from 'react'
 import { layoutRoute } from '.'
 
diff --git a/examples/react/kitchen-sink-route-gen-wip/package.json b/examples/react/kitchen-sink-route-gen-wip/package.json
index c3b9def831..dfdba79c2f 100644
--- a/examples/react/kitchen-sink-route-gen-wip/package.json
+++ b/examples/react/kitchen-sink-route-gen-wip/package.json
@@ -9,9 +9,9 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/react-router": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@tanstack/router-cli": "0.0.1-beta.69",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/actions.ts b/examples/react/kitchen-sink-route-gen-wip/src/actions.ts
index bda383e2ce..521209e331 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/actions.ts
+++ b/examples/react/kitchen-sink-route-gen-wip/src/actions.ts
@@ -1,4 +1,4 @@
-import { Action } from '@tanstack/react-router'
+import { Action } from '@tanstack/router'
 import { patchInvoice, postInvoice } from './mockTodos'
 import { router } from './router'
 
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/main.tsx b/examples/react/kitchen-sink-route-gen-wip/src/main.tsx
index 46a994ad95..e066db43b4 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/main.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/main.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
-import { RouterProvider } from '@tanstack/react-router'
+import { RouterProvider } from '@tanstack/router'
 
 import { router } from './router'
 import { useSessionStorage } from './utils'
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/mockTodos.ts b/examples/react/kitchen-sink-route-gen-wip/src/mockTodos.ts
index 414a19a8dd..8d07147df9 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/mockTodos.ts
+++ b/examples/react/kitchen-sink-route-gen-wip/src/mockTodos.ts
@@ -1,4 +1,4 @@
-import { PickAsRequired } from '@tanstack/react-router'
+import { PickAsRequired } from '@tanstack/router'
 import { actionDelayFn, loaderDelayFn, shuffle } from './utils'
 export type Invoice = {
   id: number
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/router.tsx b/examples/react/kitchen-sink-route-gen-wip/src/router.tsx
index 5077550fff..8e71467519 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/router.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/router.tsx
@@ -1,10 +1,10 @@
 import * as React from 'react'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 
 import { routeConfig } from './routes.generated/routeConfig'
 import { Spinner } from './components/Spinner'
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeConfig: routeConfig,
   defaultPreload: 'intent',
   // useServerData: true,
@@ -15,7 +15,7 @@ export const router = new ReactRouter({
   ),
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/__layout.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/__layout.tsx
index 9174c64eed..982dee4813 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/__layout.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/__layout.tsx
@@ -1,5 +1,5 @@
 import { routeConfig } from '../routes.generated/__layout'
-import { Outlet, useLoaderInstance, useMatch } from '@tanstack/react-router'
+import { Outlet, useLoaderInstance, useMatch } from '@tanstack/router'
 import * as React from 'react'
 import { loaderDelayFn } from '../utils'
 
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/__root.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/__root.tsx
index 6aca29fe2d..2cab547a5d 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/__root.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/__root.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
-import { route, Link, Outlet, useRouter } from '@tanstack/react-router'
+import { route, Link, Outlet, useRouter } from '@tanstack/router'
 import { Spinner } from '../components/Spinner'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 
 route({
   component: () => {
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/authenticated.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/authenticated.tsx
index b220918cef..9ea95d2610 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/authenticated.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/authenticated.tsx
@@ -1,4 +1,4 @@
-import { Outlet } from '@tanstack/react-router'
+import { Outlet } from '@tanstack/router'
 import * as React from 'react'
 import { useAuth } from '../main'
 import { routeConfig } from '../routes.generated/authenticated'
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard.tsx
index a524e66a50..2e163d6485 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Link, Outlet } from '@tanstack/react-router'
+import { Link, Outlet } from '@tanstack/router'
 import { fetchInvoices } from '../mockTodos'
 
 import { routeConfig } from '../routes.generated/dashboard'
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/index.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/index.tsx
index be4c4913fb..251f67a0f0 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/index.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/index.tsx
@@ -1,4 +1,4 @@
-import { useLoaderInstance, useMatch } from '@tanstack/react-router'
+import { useLoaderInstance, useMatch } from '@tanstack/router'
 import * as React from 'react'
 import { routeConfig } from '../../routes.generated/dashboard/index'
 
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices.tsx
index 79562ea93b..ba50097712 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices.tsx
@@ -6,7 +6,7 @@ import {
   useLoaderInstance,
   useMatch,
   useRoute,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import * as React from 'react'
 import { createInvoiceAction, updateInvoiceAction } from '../../actions'
 import { Spinner } from '../../components/Spinner'
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/$invoiceId.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/$invoiceId.tsx
index 520a304cf8..5c06d9b46b 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/$invoiceId.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/$invoiceId.tsx
@@ -8,7 +8,7 @@ import {
   useLoaderInstance,
   useNavigate,
   useSearch,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import { routeConfig } from '../../../routes.generated/dashboard/invoices/$invoiceId'
 import { updateInvoiceAction } from '../../../actions'
 
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/index.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/index.tsx
index c9980b3941..8d2b639e3e 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/index.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/invoices/index.tsx
@@ -2,7 +2,7 @@ import { routeConfig } from '../../../routes.generated/dashboard/invoices/index'
 import * as React from 'react'
 import { Invoice } from '../../../mockTodos'
 import { InvoiceFields } from '../../../components/InvoiceFields'
-import { useAction } from '@tanstack/react-router'
+import { useAction } from '@tanstack/router'
 import { createInvoiceAction } from '../../../actions'
 
 routeConfig.generate({
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users.tsx
index f6b67161f7..4cab48f05c 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users.tsx
@@ -5,7 +5,7 @@ import {
   useLoaderInstance,
   useNavigate,
   useSearch,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import * as React from 'react'
 import { z } from 'zod'
 import { Spinner } from '../../components/Spinner'
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users/$userId.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users/$userId.tsx
index 8517301e74..9b324f3abd 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users/$userId.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/dashboard/users/$userId.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 import { fetchUserById } from '../../../mockTodos'
 import { routeConfig } from '../../../routes.generated/dashboard/users/$userId'
-import { useLoaderInstance, useMatch } from '@tanstack/react-router'
+import { useLoaderInstance, useMatch } from '@tanstack/router'
 
 routeConfig.generate({
   parseParams: ({ userId }) => ({
diff --git a/examples/react/kitchen-sink-route-gen-wip/src/routes/index.tsx b/examples/react/kitchen-sink-route-gen-wip/src/routes/index.tsx
index a24e05fd2b..11d9ec3b39 100644
--- a/examples/react/kitchen-sink-route-gen-wip/src/routes/index.tsx
+++ b/examples/react/kitchen-sink-route-gen-wip/src/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Link } from '@tanstack/react-router'
+import { Link } from '@tanstack/router'
 import * as React from 'react'
 import { fetchUsers } from '../mockTodos'
 import { routeConfig } from '../routes.generated/index'
diff --git a/examples/react/kitchen-sink-single-file/package.json b/examples/react/kitchen-sink-single-file/package.json
index 6c4a8dbfaf..2df9541b09 100644
--- a/examples/react/kitchen-sink-single-file/package.json
+++ b/examples/react/kitchen-sink-single-file/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.81",
     "@tanstack/react-actions": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",
diff --git a/examples/react/kitchen-sink-single-file/src/main.tsx b/examples/react/kitchen-sink-single-file/src/main.tsx
index 227462411b..f5737ba80b 100644
--- a/examples/react/kitchen-sink-single-file/src/main.tsx
+++ b/examples/react/kitchen-sink-single-file/src/main.tsx
@@ -8,11 +8,11 @@ import {
   MatchRoute,
   useNavigate,
   useSearch,
-  ReactRouter,
+  Router,
   useParams,
   RootRoute,
   Route,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import {
   Action,
   ActionClient,
@@ -26,7 +26,7 @@ import {
   useLoaderClient,
   LoaderClientProvider,
 } from '@tanstack/react-loaders'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 
 import {
   fetchInvoices,
@@ -571,6 +571,149 @@ const invoiceRoute = new Route({
   },
 })
 
+const usersRoute = new Route({
+  getParentRoute: () => dashboardRoute,
+  path: 'users',
+  onLoad: ({ preload }) => usersLoader.load({ preload }),
+  validateSearch: z.object({
+    usersView: z
+      .object({
+        sortBy: z.enum(['name', 'id', 'email']).optional(),
+        filterBy: z.string().optional(),
+      })
+      .optional(),
+  }).parse,
+  preSearchFilters: [
+    // Persist (or set as default) the usersView search param
+    // while navigating within or to this route (or it's children!)
+    (search) => ({
+      ...search,
+      usersView: {
+        ...search.usersView,
+      },
+    }),
+  ],
+  component: () => {
+    const usersLoaderInstance = useLoaderInstance({ key: usersLoader.key })
+    const users = usersLoaderInstance.state.data
+
+    const { usersView } = useSearch({ from: usersRoute.id })
+    const navigate = useNavigate({ from: usersRoute.id })
+
+    const sortBy = usersView?.sortBy ?? 'name'
+    const filterBy = usersView?.filterBy
+
+    const [filterDraft, setFilterDraft] = React.useState(filterBy ?? '')
+
+    const sortedUsers = React.useMemo(() => {
+      if (!users) return []
+
+      return !sortBy
+        ? users
+        : [...users].sort((a, b) => {
+            return a[sortBy] > b[sortBy] ? 1 : -1
+          })
+    }, [users, sortBy])
+
+    const filteredUsers = React.useMemo(() => {
+      if (!filterBy) return sortedUsers
+
+      return sortedUsers.filter((user) =>
+        user.name.toLowerCase().includes(filterBy.toLowerCase()),
+      )
+    }, [sortedUsers, filterBy])
+
+    const setSortBy = (sortBy: UsersViewSortBy) =>
+      navigate({
+        search: (old) => {
+          return {
+            ...old,
+            usersView: {
+              ...(old?.usersView ?? {}),
+              sortBy,
+            },
+          }
+        },
+        replace: true,
+      })
+
+    React.useEffect(() => {
+      navigate({
+        search: (old) => {
+          return {
+            ...old,
+            usersView: {
+              ...old?.usersView,
+              filterBy: filterDraft || undefined,
+            },
+          }
+        },
+        replace: true,
+      })
+    }, [filterDraft])
+
+    return (
+      <div className="flex-1 flex">
+        <div className="divide-y">
+          <div className="py-2 px-3 flex gap-2 items-center bg-gray-100">
+            <div>Sort By:</div>
+            <select
+              value={sortBy}
+              onChange={(e) => setSortBy(e.target.value as UsersViewSortBy)}
+              className="flex-1 border p-1 px-2 rounded"
+            >
+              {['name', 'id', 'email'].map((d) => {
+                return <option key={d} value={d} children={d} />
+              })}
+            </select>
+          </div>
+          <div className="py-2 px-3 flex gap-2 items-center bg-gray-100">
+            <div>Filter By:</div>
+            <input
+              value={filterDraft}
+              onChange={(e) => setFilterDraft(e.target.value)}
+              placeholder="Search Names..."
+              className="min-w-0 flex-1 border p-1 px-2 rounded"
+            />
+          </div>
+          {filteredUsers?.map((user) => {
+            return (
+              <div key={user.id}>
+                <Link
+                  to="/dashboard/users/user"
+                  search={(d) => ({
+                    ...d,
+                    userId: user.id,
+                  })}
+                  className="block py-2 px-3 text-blue-700"
+                  activeProps={{ className: `font-bold` }}
+                >
+                  <pre className="text-sm">
+                    {user.name}{' '}
+                    <MatchRoute
+                      to={userRoute.fullPath}
+                      search={(d) => ({
+                        ...d,
+                        userId: user.id,
+                      })}
+                      pending
+                    >
+                      <Spinner />
+                    </MatchRoute>
+                  </pre>
+                </Link>
+              </div>
+            )
+          })}
+        </div>
+        <div className="flex-initial border-l border-gray-200">
+          <Outlet />
+        </div>
+      </div>
+    )
+  },
+})
+
 const usersIndexRoute = new Route({
   getParentRoute: () => usersRoute,
   path: '/',
@@ -791,7 +934,7 @@ const routeTree = rootRoute.addChildren([
   layoutRoute.addChildren([layoutARoute, layoutBRoute]),
 ])
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   defaultPendingComponent: () => (
     <div className={`p-2 text-2xl`}>
@@ -806,7 +949,7 @@ const router = new ReactRouter({
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/kitchen-sink-single-file/src/mockTodos.ts b/examples/react/kitchen-sink-single-file/src/mockTodos.ts
index a12c67b1dd..38df40e333 100644
--- a/examples/react/kitchen-sink-single-file/src/mockTodos.ts
+++ b/examples/react/kitchen-sink-single-file/src/mockTodos.ts
@@ -1,4 +1,4 @@
-import { PickAsPartial, PickAsRequired } from '@tanstack/react-router'
+import { PickAsPartial, PickAsRequired } from '@tanstack/router'
 import { match } from 'assert'
 import axios from 'axios'
 import { produce } from 'immer'
diff --git a/examples/react/quickstart/package.json b/examples/react/quickstart/package.json
index 3ccdaba44a..ddb16f19bc 100644
--- a/examples/react/quickstart/package.json
+++ b/examples/react/quickstart/package.json
@@ -9,8 +9,8 @@
     "start": "vite"
   },
   "dependencies": {
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@vitejs/plugin-react": "^1.1.3",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
diff --git a/examples/react/quickstart/src/main.tsx b/examples/react/quickstart/src/main.tsx
index b02626c2dc..339135e1c8 100644
--- a/examples/react/quickstart/src/main.tsx
+++ b/examples/react/quickstart/src/main.tsx
@@ -4,10 +4,10 @@ import {
   Outlet,
   RouterProvider,
   Link,
-  ReactRouter,
+  Router,
   Route,
   RootRoute,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 
 const rootRoute = new RootRoute({
   component: () => (
@@ -35,9 +35,9 @@ const aboutRoute = new Route({
 
 const routeTree = rootRoute.addChildren([indexRoute, aboutRoute])
 
-const router = new ReactRouter({ routeTree })
+const router = new Router({ routeTree })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/start-kitchen-sink-single-file/package.json b/examples/react/start-kitchen-sink-single-file/package.json
index 73ded94cea..707139a682 100644
--- a/examples/react/start-kitchen-sink-single-file/package.json
+++ b/examples/react/start-kitchen-sink-single-file/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-loaders": "0.0.1-beta.81",
     "@tanstack/react-actions": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",
diff --git a/examples/react/start-kitchen-sink-single-file/src/main.tsx b/examples/react/start-kitchen-sink-single-file/src/main.tsx
index 04833ae737..f5737ba80b 100644
--- a/examples/react/start-kitchen-sink-single-file/src/main.tsx
+++ b/examples/react/start-kitchen-sink-single-file/src/main.tsx
@@ -8,11 +8,11 @@ import {
   MatchRoute,
   useNavigate,
   useSearch,
-  ReactRouter,
+  Router,
   useParams,
   RootRoute,
   Route,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import {
   Action,
   ActionClient,
@@ -26,7 +26,7 @@ import {
   useLoaderClient,
   LoaderClientProvider,
 } from '@tanstack/react-loaders'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 
 import {
   fetchInvoices,
@@ -934,7 +934,7 @@ const routeTree = rootRoute.addChildren([
   layoutRoute.addChildren([layoutARoute, layoutBRoute]),
 ])
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   defaultPendingComponent: () => (
     <div className={`p-2 text-2xl`}>
@@ -949,7 +949,7 @@ const router = new ReactRouter({
   },
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/start-kitchen-sink-single-file/src/mockTodos.ts b/examples/react/start-kitchen-sink-single-file/src/mockTodos.ts
index a12c67b1dd..38df40e333 100644
--- a/examples/react/start-kitchen-sink-single-file/src/mockTodos.ts
+++ b/examples/react/start-kitchen-sink-single-file/src/mockTodos.ts
@@ -1,4 +1,4 @@
-import { PickAsPartial, PickAsRequired } from '@tanstack/react-router'
+import { PickAsPartial, PickAsRequired } from '@tanstack/router'
 import { match } from 'assert'
 import axios from 'axios'
 import { produce } from 'immer'
diff --git a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.880c3073.mjs b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.880c3073.mjs
index bb41f97840..09058f1566 100644
--- a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.880c3073.mjs
+++ b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.880c3073.mjs
@@ -1,18 +1,26 @@
-import { _ as __astro_tag_component__, H as Hydrate } from './Hydrate.ff008fd4.mjs';
-import { R as ReactRouter, r as routeTree, L as LoaderClientProvider, a as RouterProvider } from './routeTree.2e12cfef.mjs';
-import { loaderClient } from './loaderClient.1e71ba34.mjs';
-import { jsx } from 'react/jsx-runtime';
-import 'react';
-import 'jsesc';
-import 'use-sync-external-store/shim/with-selector.js';
+import {
+  _ as __astro_tag_component__,
+  H as Hydrate,
+} from './Hydrate.ff008fd4.mjs'
+import {
+  R as Router,
+  r as routeTree,
+  L as LoaderClientProvider,
+  a as RouterProvider,
+} from './routeTree.2e12cfef.mjs'
+import { loaderClient } from './loaderClient.1e71ba34.mjs'
+import { jsx } from 'react/jsx-runtime'
+import 'react'
+import 'jsesc'
+import 'use-sync-external-store/shim/with-selector.js'
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   context: {
-    loaderClient
+    loaderClient,
   },
-  defaultPreload: "intent"
-});
+  defaultPreload: 'intent',
+})
 
 function App() {
   return /* @__PURE__ */ jsx(Hydrate, {
@@ -21,11 +29,11 @@ function App() {
     children: /* @__PURE__ */ jsx(LoaderClientProvider, {
       loaderClient,
       children: /* @__PURE__ */ jsx(RouterProvider, {
-        router
-      })
-    })
-  });
+        router,
+      }),
+    }),
+  })
 }
-__astro_tag_component__(App, "@astrojs/react");
+__astro_tag_component__(App, '@astrojs/react')
 
-export { App };
+export { App }
diff --git a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.8def3af9.mjs b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.8def3af9.mjs
index 2704395d04..c841a6124d 100644
--- a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.8def3af9.mjs
+++ b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.8def3af9.mjs
@@ -1,18 +1,26 @@
-import { _ as __astro_tag_component__, H as Hydrate } from './Hydrate.f13f5eaa.mjs';
-import { R as ReactRouter, r as routeTree, L as LoaderClientProvider, a as RouterProvider } from './routeTree.c870053d.mjs';
-import { loaderClient } from './loaderClient.a6c93954.mjs';
-import { jsx } from 'react/jsx-runtime';
-import 'react';
-import 'jsesc';
-import 'use-sync-external-store/shim/with-selector.js';
+import {
+  _ as __astro_tag_component__,
+  H as Hydrate,
+} from './Hydrate.f13f5eaa.mjs'
+import {
+  R as Router,
+  r as routeTree,
+  L as LoaderClientProvider,
+  a as RouterProvider,
+} from './routeTree.c870053d.mjs'
+import { loaderClient } from './loaderClient.a6c93954.mjs'
+import { jsx } from 'react/jsx-runtime'
+import 'react'
+import 'jsesc'
+import 'use-sync-external-store/shim/with-selector.js'
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   context: {
-    loaderClient
+    loaderClient,
   },
-  defaultPreload: "intent"
-});
+  defaultPreload: 'intent',
+})
 
 function App() {
   return /* @__PURE__ */ jsx(Hydrate, {
@@ -21,11 +29,11 @@ function App() {
     children: /* @__PURE__ */ jsx(LoaderClientProvider, {
       loaderClient,
       children: /* @__PURE__ */ jsx(RouterProvider, {
-        router
-      })
-    })
-  });
+        router,
+      }),
+    }),
+  })
 }
-__astro_tag_component__(App, "@astrojs/react");
+__astro_tag_component__(App, '@astrojs/react')
 
-export { App };
+export { App }
diff --git a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.f72c7d3d.mjs b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.f72c7d3d.mjs
index f05e56c946..c24c93b60b 100644
--- a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.f72c7d3d.mjs
+++ b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/App.f72c7d3d.mjs
@@ -1,20 +1,25 @@
-import { H as Hydrate, _ as __astro_tag_component__ } from '../entry.mjs';
-import { R as ReactRouter, r as routeTree, L as LoaderClientProvider, a as RouterProvider } from './routeTree.f436718c.mjs';
-import { loaderClient } from './loaderClient.50d6b99a.mjs';
-import { jsx } from 'react/jsx-runtime';
-import '@astrojs/netlify/netlify-functions.js';
-import 'react';
-import 'react-dom/server';
-import 'jsesc';
-import 'use-sync-external-store/shim/with-selector.js';
+import { H as Hydrate, _ as __astro_tag_component__ } from '../entry.mjs'
+import {
+  R as Router,
+  r as routeTree,
+  L as LoaderClientProvider,
+  a as RouterProvider,
+} from './routeTree.f436718c.mjs'
+import { loaderClient } from './loaderClient.50d6b99a.mjs'
+import { jsx } from 'react/jsx-runtime'
+import '@astrojs/netlify/netlify-functions.js'
+import 'react'
+import 'react-dom/server'
+import 'jsesc'
+import 'use-sync-external-store/shim/with-selector.js'
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   context: {
-    loaderClient
+    loaderClient,
   },
-  defaultPreload: "intent"
-});
+  defaultPreload: 'intent',
+})
 
 function App() {
   return /* @__PURE__ */ jsx(Hydrate, {
@@ -23,11 +28,11 @@ function App() {
     children: /* @__PURE__ */ jsx(LoaderClientProvider, {
       loaderClient,
       children: /* @__PURE__ */ jsx(RouterProvider, {
-        router
-      })
-    })
-  });
+        router,
+      }),
+    }),
+  })
 }
-__astro_tag_component__(App, "@astrojs/react");
+__astro_tag_component__(App, '@astrojs/react')
 
-export { App };
+export { App }
diff --git a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.2e12cfef.mjs b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.2e12cfef.mjs
index c216434bf3..8691437139 100644
--- a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.2e12cfef.mjs
+++ b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.2e12cfef.mjs
@@ -1,7 +1,16 @@
-import { s as shallow, i as invariant, R as Router, l as last, f as functionalUpdate, a as RootRoute, b as RouterScripts, c as Route } from './Hydrate.ff008fd4.mjs';
-import * as React from 'react';
-import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector.js';
-import { jsx, jsxs } from 'react/jsx-runtime';
+import {
+  s as shallow,
+  i as invariant,
+  R as Router,
+  l as last,
+  f as functionalUpdate,
+  a as RootRoute,
+  b as RouterScripts,
+  c as Route,
+} from './Hydrate.ff008fd4.mjs'
+import * as React from 'react'
+import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector.js'
+import { jsx, jsxs } from 'react/jsx-runtime'
 
 /**
  * react-store
@@ -14,9 +23,15 @@ import { jsx, jsxs } from 'react/jsx-runtime';
  * @license MIT
  */
 
-function useStore(store, selector = d => d, compareShallow) {
-  const slice = useSyncExternalStoreWithSelector(store.subscribe, () => store.state, () => store.state, selector, compareShallow ? shallow : undefined);
-  return slice;
+function useStore(store, selector = (d) => d, compareShallow) {
+  const slice = useSyncExternalStoreWithSelector(
+    store.subscribe,
+    () => store.state,
+    () => store.state,
+    selector,
+    compareShallow ? shallow : undefined,
+  )
+  return slice
 }
 
 /**
@@ -32,19 +47,19 @@ function useStore(store, selector = d => d, compareShallow) {
 
 //
 
-const loaderClientContext = /*#__PURE__*/React.createContext(null);
-function LoaderClientProvider({
-  loaderClient,
-  children,
-  ...rest
-}) {
+const loaderClientContext = /*#__PURE__*/ React.createContext(null)
+function LoaderClientProvider({ loaderClient, children, ...rest }) {
   loaderClient.options = {
     ...loaderClient.options,
-    ...rest
-  };
-  return /*#__PURE__*/React.createElement(loaderClientContext.Provider, {
-    value: loaderClient
-  }, children);
+    ...rest,
+  }
+  return /*#__PURE__*/ React.createElement(
+    loaderClientContext.Provider,
+    {
+      value: loaderClient,
+    },
+    children,
+  )
 }
 function useLoaderInstance(opts) {
   // opts as typeof opts & {
@@ -52,49 +67,57 @@ function useLoaderInstance(opts) {
   //   loader?: Loader<any, any, any, any>
   // }
 
-  const loaderClient = React.useContext(loaderClientContext);
-  const optsKey = opts.key;
-  const optsLoader = opts.loader;
-  invariant(loaderClient || optsLoader, 'useLoaderInstance must be used inside a <LoaderClientProvider> component!');
-  const loader = optsLoader ?? loaderClient.getLoader({
-    key: optsKey
-  });
+  const loaderClient = React.useContext(loaderClientContext)
+  const optsKey = opts.key
+  const optsLoader = opts.loader
+  invariant(
+    loaderClient || optsLoader,
+    'useLoaderInstance must be used inside a <LoaderClientProvider> component!',
+  )
+  const loader =
+    optsLoader ??
+    loaderClient.getLoader({
+      key: optsKey,
+    })
   const loaderInstance = loader.getInstance({
-    variables: opts?.variables
-  });
+    variables: opts?.variables,
+  })
   if (loaderInstance.state.status === 'error' && (opts.throwOnError ?? true)) {
-    throw loaderInstance.state.error;
+    throw loaderInstance.state.error
   }
   if (opts?.strict ?? true) {
-    invariant(typeof loaderInstance.state.data !== 'undefined', `useLoaderInstance:
+    invariant(
+      typeof loaderInstance.state.data !== 'undefined',
+      `useLoaderInstance:
   Loader instance { key: ${loader.key}, variables: ${opts.variables} }) is currently in a "${loaderInstance.state.status}" state. By default useLoaderInstance will throw an error if the loader instance is not in a "success" state. To avoid this error:
   
   - Load the loader instance before using it (e.g. via your router's onLoad or loader option)
 
-  - Set opts.strict to false and handle the loading state in your component`);
+  - Set opts.strict to false and handle the loading state in your component`,
+    )
   }
   React.useEffect(() => {
-    loaderInstance.load();
-  }, [loaderInstance]);
-  useStore(loaderInstance.__store, d => opts?.track?.(d) ?? d, true);
-  return loaderInstance;
+    loaderInstance.load()
+  }, [loaderInstance])
+  useStore(loaderInstance.__store, (d) => opts?.track?.(d) ?? d, true)
+  return loaderInstance
 }
 
-var isProduction = process.env.NODE_ENV === 'production';
+var isProduction = process.env.NODE_ENV === 'production'
 function warning(condition, message) {
   if (!isProduction) {
     if (condition) {
-      return;
+      return
     }
 
-    var text = "Warning: " + message;
+    var text = 'Warning: ' + message
 
     if (typeof console !== 'undefined') {
-      console.warn(text);
+      console.warn(text)
     }
 
     try {
-      throw Error(text);
+      throw Error(text)
     } catch (x) {}
   }
 }
@@ -111,30 +134,32 @@ function warning(condition, message) {
  */
 
 function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
+  _extends = Object.assign
+    ? Object.assign.bind()
+    : function (target) {
+        for (var i = 1; i < arguments.length; i++) {
+          var source = arguments[i]
+          for (var key in source) {
+            if (Object.prototype.hasOwnProperty.call(source, key)) {
+              target[key] = source[key]
+            }
+          }
         }
+        return target
       }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+  return _extends.apply(this, arguments)
 }
 //
 
 function useLinkProps(options) {
-  const router = useRouterContext();
+  const router = useRouterContext()
   const {
     // custom props
     type,
     children,
     target,
     activeProps = () => ({
-      className: 'active'
+      className: 'active',
     }),
     inactiveProps = () => ({}),
     activeOptions,
@@ -156,15 +181,13 @@ function useLinkProps(options) {
     onMouseLeave,
     onTouchStart,
     ...rest
-  } = options;
-  const linkInfo = router.buildLink(options);
+  } = options
+  const linkInfo = router.buildLink(options)
   if (linkInfo.type === 'external') {
-    const {
-      href
-    } = linkInfo;
+    const { href } = linkInfo
     return {
-      href
-    };
+      href,
+    }
   }
   const {
     handleClick,
@@ -173,31 +196,35 @@ function useLinkProps(options) {
     handleLeave,
     handleTouchStart,
     isActive,
-    next
-  } = linkInfo;
-  const reactHandleClick = e => {
+    next,
+  } = linkInfo
+  const reactHandleClick = (e) => {
     if (React.startTransition) {
       // This is a hack for react < 18
       React.startTransition(() => {
-        handleClick(e);
-      });
+        handleClick(e)
+      })
     } else {
-      handleClick(e);
+      handleClick(e)
     }
-  };
-  const composeHandlers = handlers => e => {
-    if (e.persist) e.persist();
-    handlers.filter(Boolean).forEach(handler => {
-      if (e.defaultPrevented) return;
-      handler(e);
-    });
-  };
+  }
+  const composeHandlers = (handlers) => (e) => {
+    if (e.persist) e.persist()
+    handlers.filter(Boolean).forEach((handler) => {
+      if (e.defaultPrevented) return
+      handler(e)
+    })
+  }
 
   // Get the active props
-  const resolvedActiveProps = isActive ? functionalUpdate(activeProps, {}) ?? {} : {};
+  const resolvedActiveProps = isActive
+    ? functionalUpdate(activeProps, {}) ?? {}
+    : {}
 
   // Get the inactive props
-  const resolvedInactiveProps = isActive ? {} : functionalUpdate(inactiveProps, {}) ?? {};
+  const resolvedInactiveProps = isActive
+    ? {}
+    : functionalUpdate(inactiveProps, {}) ?? {}
   return {
     ...resolvedActiveProps,
     ...resolvedInactiveProps,
@@ -212,134 +239,188 @@ function useLinkProps(options) {
     style: {
       ...style,
       ...resolvedActiveProps.style,
-      ...resolvedInactiveProps.style
+      ...resolvedInactiveProps.style,
     },
-    className: [className, resolvedActiveProps.className, resolvedInactiveProps.className].filter(Boolean).join(' ') || undefined,
-    ...(disabled ? {
-      role: 'link',
-      'aria-disabled': true
-    } : undefined),
-    ['data-status']: isActive ? 'active' : undefined
-  };
+    className:
+      [
+        className,
+        resolvedActiveProps.className,
+        resolvedInactiveProps.className,
+      ]
+        .filter(Boolean)
+        .join(' ') || undefined,
+    ...(disabled
+      ? {
+          role: 'link',
+          'aria-disabled': true,
+        }
+      : undefined),
+    ['data-status']: isActive ? 'active' : undefined,
+  }
 }
-const Link = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const linkProps = useLinkProps(props);
-  return /*#__PURE__*/React.createElement("a", _extends({
-    ref: ref
-  }, linkProps, {
-    children: typeof props.children === 'function' ? props.children({
-      isActive: linkProps['data-status'] === 'active'
-    }) : props.children
-  }));
-});
-const matchesContext = /*#__PURE__*/React.createContext(null);
-const routerContext = /*#__PURE__*/React.createContext(null);
-class ReactRouter extends Router {
+const Link = /*#__PURE__*/ React.forwardRef((props, ref) => {
+  const linkProps = useLinkProps(props)
+  return /*#__PURE__*/ React.createElement(
+    'a',
+    _extends(
+      {
+        ref: ref,
+      },
+      linkProps,
+      {
+        children:
+          typeof props.children === 'function'
+            ? props.children({
+                isActive: linkProps['data-status'] === 'active',
+              })
+            : props.children,
+      },
+    ),
+  )
+})
+const matchesContext = /*#__PURE__*/ React.createContext(null)
+const routerContext = /*#__PURE__*/ React.createContext(null)
+class Router extends Router {
   constructor(opts) {
     super({
       ...opts,
-      loadComponent: async component => {
+      loadComponent: async (component) => {
         if (component.preload) {
-          await component.preload();
+          await component.preload()
         }
-        return component;
-      }
-    });
+        return component
+      },
+    })
   }
 }
-function RouterProvider({
-  router,
-  ...rest
-}) {
-  router.update(rest);
-  const currentMatches = useStore(router.__store, s => s.currentMatches);
-  React.useEffect(router.mount, [router]);
-  return /*#__PURE__*/React.createElement(routerContext.Provider, {
-    value: {
-      router: router
-    }
-  }, /*#__PURE__*/React.createElement(matchesContext.Provider, {
-    value: [undefined, ...currentMatches]
-  }, /*#__PURE__*/React.createElement(CatchBoundary, {
-    errorComponent: ErrorComponent,
-    onCatch: () => {
-      warning(false, `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`);
-    }
-  }, /*#__PURE__*/React.createElement(Outlet, null))));
+function RouterProvider({ router, ...rest }) {
+  router.update(rest)
+  const currentMatches = useStore(router.__store, (s) => s.currentMatches)
+  React.useEffect(router.mount, [router])
+  return /*#__PURE__*/ React.createElement(
+    routerContext.Provider,
+    {
+      value: {
+        router: router,
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      matchesContext.Provider,
+      {
+        value: [undefined, ...currentMatches],
+      },
+      /*#__PURE__*/ React.createElement(
+        CatchBoundary,
+        {
+          errorComponent: ErrorComponent,
+          onCatch: () => {
+            warning(
+              false,
+              `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`,
+            )
+          },
+        },
+        /*#__PURE__*/ React.createElement(Outlet, null),
+      ),
+    ),
+  )
 }
 function useRouterContext() {
-  const value = React.useContext(routerContext);
-  warning(value, 'useRouter must be used inside a <Router> component!');
-  useStore(value.router.__store);
-  return value.router;
+  const value = React.useContext(routerContext)
+  warning(value, 'useRouter must be used inside a <Router> component!')
+  useStore(value.router.__store)
+  return value.router
 }
-function useRouter(track, shallow) {
-  const router = useRouterContext();
-  useStore(router.__store, track, shallow);
-  return router;
+function useRouter(track) {
+  const router = useRouterContext()
+  useStore(router.__store, track)
+  return router
 }
 function useMatches() {
-  return React.useContext(matchesContext);
+  return React.useContext(matchesContext)
 }
 function useParams(opts) {
-  const router = useRouterContext();
-  useStore(router.__store, d => {
-    const params = last(d.currentMatches)?.params;
-    return opts?.track?.(params) ?? params;
-  }, true);
-  return last(router.state.currentMatches)?.params;
+  const router = useRouterContext()
+  useStore(
+    router.__store,
+    (d) => {
+      const params = last(d.currentMatches)?.params
+      return opts?.track?.(params) ?? params
+    },
+    true,
+  )
+  return last(router.state.currentMatches)?.params
 }
 function Outlet() {
-  const matches = useMatches().slice(1);
-  const match = matches[0];
+  const matches = useMatches().slice(1)
+  const match = matches[0]
   if (!match) {
-    return null;
+    return null
   }
-  return /*#__PURE__*/React.createElement(SubOutlet, {
+  return /*#__PURE__*/ React.createElement(SubOutlet, {
     matches: matches,
-    match: match
-  });
+    match: match,
+  })
 }
-function SubOutlet({
-  matches,
-  match
-}) {
-  const router = useRouterContext();
-  useStore(match.__store, store => [store.status, store.error], true);
-  const defaultPending = React.useCallback(() => null, []);
-  const PendingComponent = match.pendingComponent ?? router.options.defaultPendingComponent ?? defaultPending;
-  const errorComponent = match.errorComponent ?? router.options.defaultErrorComponent;
-  const ResolvedSuspenseBoundary = match.route.options.wrapInSuspense ?? true ? React.Suspense : SafeFragment;
-  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment;
-  return /*#__PURE__*/React.createElement(matchesContext.Provider, {
-    value: matches
-  }, /*#__PURE__*/React.createElement(ResolvedSuspenseBoundary, {
-    fallback: /*#__PURE__*/React.createElement(PendingComponent, null)
-  }, /*#__PURE__*/React.createElement(ResolvedCatchBoundary, {
-    key: match.route.id,
-    errorComponent: errorComponent,
-    onCatch: () => {
-      warning(false, `Error in route match: ${match.id}`);
-    }
-  }, /*#__PURE__*/React.createElement(Inner, {
-    match: match
-  }))));
+function SubOutlet({ matches, match }) {
+  const router = useRouterContext()
+  useStore(match.__store, (store) => [store.status, store.error], true)
+  const defaultPending = React.useCallback(() => null, [])
+  const PendingComponent =
+    match.pendingComponent ??
+    router.options.defaultPendingComponent ??
+    defaultPending
+  const errorComponent =
+    match.errorComponent ?? router.options.defaultErrorComponent
+  const ResolvedSuspenseBoundary =
+    match.route.options.wrapInSuspense ?? true ? React.Suspense : SafeFragment
+  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment
+  return /*#__PURE__*/ React.createElement(
+    matchesContext.Provider,
+    {
+      value: matches,
+    },
+    /*#__PURE__*/ React.createElement(
+      ResolvedSuspenseBoundary,
+      {
+        fallback: /*#__PURE__*/ React.createElement(PendingComponent, null),
+      },
+      /*#__PURE__*/ React.createElement(
+        ResolvedCatchBoundary,
+        {
+          key: match.route.id,
+          errorComponent: errorComponent,
+          onCatch: () => {
+            warning(false, `Error in route match: ${match.id}`)
+          },
+        },
+        /*#__PURE__*/ React.createElement(Inner, {
+          match: match,
+        }),
+      ),
+    ),
+  )
 }
 function Inner(props) {
-  const router = useRouterContext();
+  const router = useRouterContext()
   if (props.match.state.status === 'error') {
-    throw props.match.state.error;
+    throw props.match.state.error
   }
   if (props.match.state.status === 'success') {
-    return /*#__PURE__*/React.createElement(props.match.component ?? router.options.defaultComponent ?? Outlet);
+    return /*#__PURE__*/ React.createElement(
+      props.match.component ?? router.options.defaultComponent ?? Outlet,
+    )
   }
   if (props.match.state.status === 'pending') {
-    throw props.match.__loadPromise;
+    throw props.match.__loadPromise
   }
-  invariant(false, 'Idle routeMatch status encountered during rendering! You should never see this. File an issue!');
+  invariant(
+    false,
+    'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',
+  )
 }
 function SafeFragment(props) {
-  return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  return /*#__PURE__*/ React.createElement(React.Fragment, null, props.children)
 }
 
 // This is the messiest thing ever... I'm either seriously tired (likely) or
@@ -349,261 +430,320 @@ function SafeFragment(props) {
 class CatchBoundary extends React.Component {
   state = {
     error: false,
-    info: undefined
-  };
+    info: undefined,
+  }
   componentDidCatch(error, info) {
-    this.props.onCatch(error, info);
-    console.error(error);
+    this.props.onCatch(error, info)
+    console.error(error)
     this.setState({
       error,
-      info
-    });
+      info,
+    })
   }
   render() {
-    return /*#__PURE__*/React.createElement(CatchBoundaryInner, _extends({}, this.props, {
-      errorState: this.state,
-      reset: () => this.setState({})
-    }));
+    return /*#__PURE__*/ React.createElement(
+      CatchBoundaryInner,
+      _extends({}, this.props, {
+        errorState: this.state,
+        reset: () => this.setState({}),
+      }),
+    )
   }
 }
 function CatchBoundaryInner(props) {
-  const [activeErrorState, setActiveErrorState] = React.useState(props.errorState);
-  const router = useRouterContext();
-  const errorComponent = props.errorComponent ?? ErrorComponent;
-  const prevKeyRef = React.useRef('');
+  const [activeErrorState, setActiveErrorState] = React.useState(
+    props.errorState,
+  )
+  const router = useRouterContext()
+  const errorComponent = props.errorComponent ?? ErrorComponent
+  const prevKeyRef = React.useRef('')
   React.useEffect(() => {
     if (activeErrorState) {
       if (router.state.currentLocation.key !== prevKeyRef.current) {
-        setActiveErrorState({});
+        setActiveErrorState({})
       }
     }
-    prevKeyRef.current = router.state.currentLocation.key;
-  }, [activeErrorState, router.state.currentLocation.key]);
+    prevKeyRef.current = router.state.currentLocation.key
+  }, [activeErrorState, router.state.currentLocation.key])
   React.useEffect(() => {
     if (props.errorState.error) {
-      setActiveErrorState(props.errorState);
+      setActiveErrorState(props.errorState)
     }
     // props.reset()
-  }, [props.errorState.error]);
+  }, [props.errorState.error])
   if (props.errorState.error && activeErrorState.error) {
-    return /*#__PURE__*/React.createElement(errorComponent, activeErrorState);
+    return /*#__PURE__*/ React.createElement(errorComponent, activeErrorState)
   }
-  return props.children;
+  return props.children
 }
-function ErrorComponent({
-  error
-}) {
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      padding: '.5rem',
-      maxWidth: '100%'
-    }
-  }, /*#__PURE__*/React.createElement("strong", {
-    style: {
-      fontSize: '1.2rem'
-    }
-  }, "Something went wrong!"), /*#__PURE__*/React.createElement("div", {
-    style: {
-      height: '.5rem'
-    }
-  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("pre", {
-    style: {
-      fontSize: '.7em',
-      border: '1px solid red',
-      borderRadius: '.25rem',
-      padding: '.5rem',
-      color: 'red',
-      overflow: 'auto'
-    }
-  }, error.message ? /*#__PURE__*/React.createElement("code", null, error.message) : null)));
+function ErrorComponent({ error }) {
+  return /*#__PURE__*/ React.createElement(
+    'div',
+    {
+      style: {
+        padding: '.5rem',
+        maxWidth: '100%',
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      'strong',
+      {
+        style: {
+          fontSize: '1.2rem',
+        },
+      },
+      'Something went wrong!',
+    ),
+    /*#__PURE__*/ React.createElement('div', {
+      style: {
+        height: '.5rem',
+      },
+    }),
+    /*#__PURE__*/ React.createElement(
+      'div',
+      null,
+      /*#__PURE__*/ React.createElement(
+        'pre',
+        {
+          style: {
+            fontSize: '.7em',
+            border: '1px solid red',
+            borderRadius: '.25rem',
+            padding: '.5rem',
+            color: 'red',
+            overflow: 'auto',
+          },
+        },
+        error.message
+          ? /*#__PURE__*/ React.createElement('code', null, error.message)
+          : null,
+      ),
+    ),
+  )
 }
 
 const rootRoute = RootRoute.withRouterContext()({
   component: Root,
   wrapInSuspense: false,
-  errorComponent: ({
-    error
-  }) => /* @__PURE__ */ jsx(ErrorComponent, {
-    error
-  })
-});
+  errorComponent: ({ error }) =>
+    /* @__PURE__ */ jsx(ErrorComponent, {
+      error,
+    }),
+})
 function Root() {
-  const router = useRouter();
-  const titleMatch = [...router.state.currentMatches].reverse().find((d) => d.routeContext?.getTitle);
-  const title = titleMatch?.context?.getTitle?.() ?? "Astro + TanStack Router";
-  return /* @__PURE__ */ jsxs("html", {
-    lang: "en",
-    children: [/* @__PURE__ */ jsxs("head", {
-      children: [/* @__PURE__ */ jsx("meta", {
-        charSet: "UTF-8"
-      }), /* @__PURE__ */ jsx("meta", {
-        name: "viewport",
-        content: "width=device-width, initial-scale=1.0"
-      }), /* @__PURE__ */ jsx("title", {
-        children: title
-      }), /* @__PURE__ */ jsx("script", {
-        src: "https://cdn.tailwindcss.com"
-      })]
-    }), /* @__PURE__ */ jsxs("body", {
-      children: [/* @__PURE__ */ jsxs("div", {
-        className: "p-2 flex gap-2 text-lg",
-        children: [/* @__PURE__ */ jsx(Link, {
-          to: "/",
-          activeProps: {
-            className: "font-bold"
-          },
-          activeOptions: {
-            exact: true
-          },
-          children: "Home"
-        }), " ", /* @__PURE__ */ jsx(Link, {
-          to: "/posts",
-          activeProps: {
-            className: "font-bold"
-          },
-          children: "Posts"
-        })]
-      }), /* @__PURE__ */ jsx("hr", {}), /* @__PURE__ */ jsx(Outlet, {}), " ", /* @__PURE__ */ jsx(RouterScripts, {})]
-    })]
-  });
+  const router = useRouter()
+  const titleMatch = [...router.state.currentMatches]
+    .reverse()
+    .find((d) => d.routeContext?.getTitle)
+  const title = titleMatch?.context?.getTitle?.() ?? 'Astro + TanStack Router'
+  return /* @__PURE__ */ jsxs('html', {
+    lang: 'en',
+    children: [
+      /* @__PURE__ */ jsxs('head', {
+        children: [
+          /* @__PURE__ */ jsx('meta', {
+            charSet: 'UTF-8',
+          }),
+          /* @__PURE__ */ jsx('meta', {
+            name: 'viewport',
+            content: 'width=device-width, initial-scale=1.0',
+          }),
+          /* @__PURE__ */ jsx('title', {
+            children: title,
+          }),
+          /* @__PURE__ */ jsx('script', {
+            src: 'https://cdn.tailwindcss.com',
+          }),
+        ],
+      }),
+      /* @__PURE__ */ jsxs('body', {
+        children: [
+          /* @__PURE__ */ jsxs('div', {
+            className: 'p-2 flex gap-2 text-lg',
+            children: [
+              /* @__PURE__ */ jsx(Link, {
+                to: '/',
+                activeProps: {
+                  className: 'font-bold',
+                },
+                activeOptions: {
+                  exact: true,
+                },
+                children: 'Home',
+              }),
+              ' ',
+              /* @__PURE__ */ jsx(Link, {
+                to: '/posts',
+                activeProps: {
+                  className: 'font-bold',
+                },
+                children: 'Posts',
+              }),
+            ],
+          }),
+          /* @__PURE__ */ jsx('hr', {}),
+          /* @__PURE__ */ jsx(Outlet, {}),
+          ' ',
+          /* @__PURE__ */ jsx(RouterScripts, {}),
+        ],
+      }),
+    ],
+  })
 }
 
 const indexRoute = new Route({
   getParentRoute: () => rootRoute,
-  path: "/",
-  component: () => /* @__PURE__ */ jsx("div", {
-    className: "p-2",
-    children: /* @__PURE__ */ jsx("h3", {
-      children: "Welcome Home!"
-    })
-  })
-});
+  path: '/',
+  component: () =>
+    /* @__PURE__ */ jsx('div', {
+      className: 'p-2',
+      children: /* @__PURE__ */ jsx('h3', {
+        children: 'Welcome Home!',
+      }),
+    }),
+})
 
 const postIdRoute = new Route({
   getParentRoute: () => postsRoute,
-  path: "$postId",
-  getContext: ({
-    context,
-    params: {
-      postId
-    }
-  }) => ({
-    getTitle: () => context.loaderClient.getLoader({
-      key: "post"
-    }).getInstance({
-      variables: postId
-    }).state.data?.title
+  path: '$postId',
+  getContext: ({ context, params: { postId } }) => ({
+    getTitle: () =>
+      context.loaderClient
+        .getLoader({
+          key: 'post',
+        })
+        .getInstance({
+          variables: postId,
+        }).state.data?.title,
   }),
-  onLoad: async ({
-    params: {
-      postId
-    },
-    preload,
-    context
-  }) => context.loaderClient.getLoader({
-    key: "post"
-  }).load({
-    variables: postId,
-    preload
-  }),
-  component: Post
-});
+  onLoad: async ({ params: { postId }, preload, context }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'post',
+      })
+      .load({
+        variables: postId,
+        preload,
+      }),
+  component: Post,
+})
 function Post() {
+  const { postId } = useParams({
+    from: postIdRoute.id,
+  })
   const {
-    postId
-  } = useParams({
-    from: postIdRoute.id
-  });
-  const {
-    state: {
-      data: post
-    }
+    state: { data: post },
   } = useLoaderInstance({
-    key: "post",
-    variables: postId
-  });
-  return /* @__PURE__ */ jsxs("div", {
-    className: "space-y-2",
-    children: [/* @__PURE__ */ jsx("h4", {
-      className: "text-xl font-bold underline",
-      children: post.title
-    }), /* @__PURE__ */ jsx("div", {
-      className: "text-sm",
-      children: post.body
-    })]
-  });
+    key: 'post',
+    variables: postId,
+  })
+  return /* @__PURE__ */ jsxs('div', {
+    className: 'space-y-2',
+    children: [
+      /* @__PURE__ */ jsx('h4', {
+        className: 'text-xl font-bold underline',
+        children: post.title,
+      }),
+      /* @__PURE__ */ jsx('div', {
+        className: 'text-sm',
+        children: post.body,
+      }),
+    ],
+  })
 }
 
 const postsRoute = new Route({
   getParentRoute: () => rootRoute,
-  path: "posts",
-  onLoad: ({
-    context,
-    preload
-  }) => context.loaderClient.getLoader({
-    key: "posts"
-  }).load({
-    preload
-  }),
+  path: 'posts',
+  onLoad: ({ context, preload }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'posts',
+      })
+      .load({
+        preload,
+      }),
   component: Posts,
-  getContext: ({
-    context
-  }) => ({
-    getTitle: () => `${context.loaderClient.getLoader({
-      key: "posts"
-    }).getInstance().state.data?.length} Posts`
-  })
-});
+  getContext: ({ context }) => ({
+    getTitle: () =>
+      `${
+        context.loaderClient
+          .getLoader({
+            key: 'posts',
+          })
+          .getInstance().state.data?.length
+      } Posts`,
+  }),
+})
 function Posts() {
   const {
-    state: {
-      data: posts
-    }
+    state: { data: posts },
   } = useLoaderInstance({
-    key: "posts"
-  });
-  return /* @__PURE__ */ jsxs("div", {
-    className: "p-2 flex gap-2",
-    children: [/* @__PURE__ */ jsx("ul", {
-      className: "list-disc pl-4",
-      children: posts.map((post) => {
-        return /* @__PURE__ */ jsx("li", {
-          className: "whitespace-nowrap",
-          children: /* @__PURE__ */ jsx(Link, {
-            to: postIdRoute.fullPath,
-            params: {
-              postId: post.id
-            },
-            className: "block py-1 text-blue-800 hover:text-blue-600",
-            activeProps: {
-              className: "text-black font-bold"
+    key: 'posts',
+  })
+  return /* @__PURE__ */ jsxs('div', {
+    className: 'p-2 flex gap-2',
+    children: [
+      /* @__PURE__ */ jsx('ul', {
+        className: 'list-disc pl-4',
+        children: posts.map((post) => {
+          return /* @__PURE__ */ jsx(
+            'li',
+            {
+              className: 'whitespace-nowrap',
+              children: /* @__PURE__ */ jsx(Link, {
+                to: postIdRoute.fullPath,
+                params: {
+                  postId: post.id,
+                },
+                className: 'block py-1 text-blue-800 hover:text-blue-600',
+                activeProps: {
+                  className: 'text-black font-bold',
+                },
+                children: /* @__PURE__ */ jsx('div', {
+                  children: post.title.substring(0, 20),
+                }),
+              }),
             },
-            children: /* @__PURE__ */ jsx("div", {
-              children: post.title.substring(0, 20)
-            })
-          })
-        }, post.id);
-      })
-    }), /* @__PURE__ */ jsx("hr", {}), /* @__PURE__ */ jsx(Outlet, {})]
-  });
+            post.id,
+          )
+        }),
+      }),
+      /* @__PURE__ */ jsx('hr', {}),
+      /* @__PURE__ */ jsx(Outlet, {}),
+    ],
+  })
 }
 
 const postsIndexRoute = new Route({
   getParentRoute: () => postsRoute,
-  path: "/",
-  component: () => /* @__PURE__ */ jsx("div", {
-    children: "Select a post."
-  })
-});
+  path: '/',
+  component: () =>
+    /* @__PURE__ */ jsx('div', {
+      children: 'Select a post.',
+    }),
+})
 
 const routeTree = rootRoute.addChildren([
   indexRoute,
-  postsRoute.addChildren([postsIndexRoute, postIdRoute])
-]);
+  postsRoute.addChildren([postsIndexRoute, postIdRoute]),
+])
 
-const routeTree$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
-  __proto__: null,
-  routeTree
-}, Symbol.toStringTag, { value: 'Module' }));
+const routeTree$1 = /*#__PURE__*/ Object.freeze(
+  /*#__PURE__*/ Object.defineProperty(
+    {
+      __proto__: null,
+      routeTree,
+    },
+    Symbol.toStringTag,
+    { value: 'Module' },
+  ),
+)
 
-export { LoaderClientProvider as L, ReactRouter as R, RouterProvider as a, routeTree$1 as b, routeTree as r };
+export {
+  LoaderClientProvider as L,
+  Router as R,
+  RouterProvider as a,
+  routeTree$1 as b,
+  routeTree as r,
+}
diff --git a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.c870053d.mjs b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.c870053d.mjs
index 3bd28566d8..7c17e99f93 100644
--- a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.c870053d.mjs
+++ b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.c870053d.mjs
@@ -1,7 +1,16 @@
-import { s as shallow, i as invariant, R as Router, l as last, f as functionalUpdate, a as RootRoute, b as RouterScripts, c as Route } from './Hydrate.f13f5eaa.mjs';
-import * as React from 'react';
-import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector.js';
-import { jsx, jsxs } from 'react/jsx-runtime';
+import {
+  s as shallow,
+  i as invariant,
+  R as Router,
+  l as last,
+  f as functionalUpdate,
+  a as RootRoute,
+  b as RouterScripts,
+  c as Route,
+} from './Hydrate.f13f5eaa.mjs'
+import * as React from 'react'
+import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector.js'
+import { jsx, jsxs } from 'react/jsx-runtime'
 
 /**
  * react-store
@@ -14,9 +23,15 @@ import { jsx, jsxs } from 'react/jsx-runtime';
  * @license MIT
  */
 
-function useStore(store, selector = d => d, compareShallow) {
-  const slice = useSyncExternalStoreWithSelector(store.subscribe, () => store.state, () => store.state, selector, compareShallow ? shallow : undefined);
-  return slice;
+function useStore(store, selector = (d) => d, compareShallow) {
+  const slice = useSyncExternalStoreWithSelector(
+    store.subscribe,
+    () => store.state,
+    () => store.state,
+    selector,
+    compareShallow ? shallow : undefined,
+  )
+  return slice
 }
 
 /**
@@ -32,19 +47,19 @@ function useStore(store, selector = d => d, compareShallow) {
 
 //
 
-const loaderClientContext = /*#__PURE__*/React.createContext(null);
-function LoaderClientProvider({
-  loaderClient,
-  children,
-  ...rest
-}) {
+const loaderClientContext = /*#__PURE__*/ React.createContext(null)
+function LoaderClientProvider({ loaderClient, children, ...rest }) {
   loaderClient.options = {
     ...loaderClient.options,
-    ...rest
-  };
-  return /*#__PURE__*/React.createElement(loaderClientContext.Provider, {
-    value: loaderClient
-  }, children);
+    ...rest,
+  }
+  return /*#__PURE__*/ React.createElement(
+    loaderClientContext.Provider,
+    {
+      value: loaderClient,
+    },
+    children,
+  )
 }
 function useLoaderInstance(opts) {
   // opts as typeof opts & {
@@ -52,49 +67,57 @@ function useLoaderInstance(opts) {
   //   loader?: Loader<any, any, any, any>
   // }
 
-  const loaderClient = React.useContext(loaderClientContext);
-  const optsKey = opts.key;
-  const optsLoader = opts.loader;
-  invariant(loaderClient || optsLoader, 'useLoaderInstance must be used inside a <LoaderClientProvider> component!');
-  const loader = optsLoader ?? loaderClient.getLoader({
-    key: optsKey
-  });
+  const loaderClient = React.useContext(loaderClientContext)
+  const optsKey = opts.key
+  const optsLoader = opts.loader
+  invariant(
+    loaderClient || optsLoader,
+    'useLoaderInstance must be used inside a <LoaderClientProvider> component!',
+  )
+  const loader =
+    optsLoader ??
+    loaderClient.getLoader({
+      key: optsKey,
+    })
   const loaderInstance = loader.getInstance({
-    variables: opts?.variables
-  });
+    variables: opts?.variables,
+  })
   if (loaderInstance.state.status === 'error' && (opts.throwOnError ?? true)) {
-    throw loaderInstance.state.error;
+    throw loaderInstance.state.error
   }
   if (opts?.strict ?? true) {
-    invariant(typeof loaderInstance.state.data !== 'undefined', `useLoaderInstance:
+    invariant(
+      typeof loaderInstance.state.data !== 'undefined',
+      `useLoaderInstance:
   Loader instance { key: ${loader.key}, variables: ${opts.variables} }) is currently in a "${loaderInstance.state.status}" state. By default useLoaderInstance will throw an error if the loader instance is not in a "success" state. To avoid this error:
   
   - Load the loader instance before using it (e.g. via your router's onLoad or loader option)
 
-  - Set opts.strict to false and handle the loading state in your component`);
+  - Set opts.strict to false and handle the loading state in your component`,
+    )
   }
   React.useEffect(() => {
-    loaderInstance.load();
-  }, [loaderInstance]);
-  useStore(loaderInstance.__store, d => opts?.track?.(d) ?? d, true);
-  return loaderInstance;
+    loaderInstance.load()
+  }, [loaderInstance])
+  useStore(loaderInstance.__store, (d) => opts?.track?.(d) ?? d, true)
+  return loaderInstance
 }
 
-var isProduction = process.env.NODE_ENV === 'production';
+var isProduction = process.env.NODE_ENV === 'production'
 function warning(condition, message) {
   if (!isProduction) {
     if (condition) {
-      return;
+      return
     }
 
-    var text = "Warning: " + message;
+    var text = 'Warning: ' + message
 
     if (typeof console !== 'undefined') {
-      console.warn(text);
+      console.warn(text)
     }
 
     try {
-      throw Error(text);
+      throw Error(text)
     } catch (x) {}
   }
 }
@@ -111,30 +134,32 @@ function warning(condition, message) {
  */
 
 function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
+  _extends = Object.assign
+    ? Object.assign.bind()
+    : function (target) {
+        for (var i = 1; i < arguments.length; i++) {
+          var source = arguments[i]
+          for (var key in source) {
+            if (Object.prototype.hasOwnProperty.call(source, key)) {
+              target[key] = source[key]
+            }
+          }
         }
+        return target
       }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+  return _extends.apply(this, arguments)
 }
 //
 
 function useLinkProps(options) {
-  const router = useRouterContext();
+  const router = useRouterContext()
   const {
     // custom props
     type,
     children,
     target,
     activeProps = () => ({
-      className: 'active'
+      className: 'active',
     }),
     inactiveProps = () => ({}),
     activeOptions,
@@ -156,15 +181,13 @@ function useLinkProps(options) {
     onMouseLeave,
     onTouchStart,
     ...rest
-  } = options;
-  const linkInfo = router.buildLink(options);
+  } = options
+  const linkInfo = router.buildLink(options)
   if (linkInfo.type === 'external') {
-    const {
-      href
-    } = linkInfo;
+    const { href } = linkInfo
     return {
-      href
-    };
+      href,
+    }
   }
   const {
     handleClick,
@@ -173,31 +196,35 @@ function useLinkProps(options) {
     handleLeave,
     handleTouchStart,
     isActive,
-    next
-  } = linkInfo;
-  const reactHandleClick = e => {
+    next,
+  } = linkInfo
+  const reactHandleClick = (e) => {
     if (React.startTransition) {
       // This is a hack for react < 18
       React.startTransition(() => {
-        handleClick(e);
-      });
+        handleClick(e)
+      })
     } else {
-      handleClick(e);
+      handleClick(e)
     }
-  };
-  const composeHandlers = handlers => e => {
-    if (e.persist) e.persist();
-    handlers.filter(Boolean).forEach(handler => {
-      if (e.defaultPrevented) return;
-      handler(e);
-    });
-  };
+  }
+  const composeHandlers = (handlers) => (e) => {
+    if (e.persist) e.persist()
+    handlers.filter(Boolean).forEach((handler) => {
+      if (e.defaultPrevented) return
+      handler(e)
+    })
+  }
 
   // Get the active props
-  const resolvedActiveProps = isActive ? functionalUpdate(activeProps, {}) ?? {} : {};
+  const resolvedActiveProps = isActive
+    ? functionalUpdate(activeProps, {}) ?? {}
+    : {}
 
   // Get the inactive props
-  const resolvedInactiveProps = isActive ? {} : functionalUpdate(inactiveProps, {}) ?? {};
+  const resolvedInactiveProps = isActive
+    ? {}
+    : functionalUpdate(inactiveProps, {}) ?? {}
   return {
     ...resolvedActiveProps,
     ...resolvedInactiveProps,
@@ -212,134 +239,188 @@ function useLinkProps(options) {
     style: {
       ...style,
       ...resolvedActiveProps.style,
-      ...resolvedInactiveProps.style
+      ...resolvedInactiveProps.style,
     },
-    className: [className, resolvedActiveProps.className, resolvedInactiveProps.className].filter(Boolean).join(' ') || undefined,
-    ...(disabled ? {
-      role: 'link',
-      'aria-disabled': true
-    } : undefined),
-    ['data-status']: isActive ? 'active' : undefined
-  };
+    className:
+      [
+        className,
+        resolvedActiveProps.className,
+        resolvedInactiveProps.className,
+      ]
+        .filter(Boolean)
+        .join(' ') || undefined,
+    ...(disabled
+      ? {
+          role: 'link',
+          'aria-disabled': true,
+        }
+      : undefined),
+    ['data-status']: isActive ? 'active' : undefined,
+  }
 }
-const Link = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const linkProps = useLinkProps(props);
-  return /*#__PURE__*/React.createElement("a", _extends({
-    ref: ref
-  }, linkProps, {
-    children: typeof props.children === 'function' ? props.children({
-      isActive: linkProps['data-status'] === 'active'
-    }) : props.children
-  }));
-});
-const matchesContext = /*#__PURE__*/React.createContext(null);
-const routerContext = /*#__PURE__*/React.createContext(null);
-class ReactRouter extends Router {
+const Link = /*#__PURE__*/ React.forwardRef((props, ref) => {
+  const linkProps = useLinkProps(props)
+  return /*#__PURE__*/ React.createElement(
+    'a',
+    _extends(
+      {
+        ref: ref,
+      },
+      linkProps,
+      {
+        children:
+          typeof props.children === 'function'
+            ? props.children({
+                isActive: linkProps['data-status'] === 'active',
+              })
+            : props.children,
+      },
+    ),
+  )
+})
+const matchesContext = /*#__PURE__*/ React.createContext(null)
+const routerContext = /*#__PURE__*/ React.createContext(null)
+class Router extends Router {
   constructor(opts) {
     super({
       ...opts,
-      loadComponent: async component => {
+      loadComponent: async (component) => {
         if (component.preload) {
-          await component.preload();
+          await component.preload()
         }
-        return component;
-      }
-    });
+        return component
+      },
+    })
   }
 }
-function RouterProvider({
-  router,
-  ...rest
-}) {
-  router.update(rest);
-  const currentMatches = useStore(router.__store, s => s.currentMatches);
-  React.useEffect(router.mount, [router]);
-  return /*#__PURE__*/React.createElement(routerContext.Provider, {
-    value: {
-      router: router
-    }
-  }, /*#__PURE__*/React.createElement(matchesContext.Provider, {
-    value: [undefined, ...currentMatches]
-  }, /*#__PURE__*/React.createElement(CatchBoundary, {
-    errorComponent: ErrorComponent,
-    onCatch: () => {
-      warning(false, `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`);
-    }
-  }, /*#__PURE__*/React.createElement(Outlet, null))));
+function RouterProvider({ router, ...rest }) {
+  router.update(rest)
+  const currentMatches = useStore(router.__store, (s) => s.currentMatches)
+  React.useEffect(router.mount, [router])
+  return /*#__PURE__*/ React.createElement(
+    routerContext.Provider,
+    {
+      value: {
+        router: router,
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      matchesContext.Provider,
+      {
+        value: [undefined, ...currentMatches],
+      },
+      /*#__PURE__*/ React.createElement(
+        CatchBoundary,
+        {
+          errorComponent: ErrorComponent,
+          onCatch: () => {
+            warning(
+              false,
+              `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`,
+            )
+          },
+        },
+        /*#__PURE__*/ React.createElement(Outlet, null),
+      ),
+    ),
+  )
 }
 function useRouterContext() {
-  const value = React.useContext(routerContext);
-  warning(value, 'useRouter must be used inside a <Router> component!');
-  useStore(value.router.__store);
-  return value.router;
+  const value = React.useContext(routerContext)
+  warning(value, 'useRouter must be used inside a <Router> component!')
+  useStore(value.router.__store)
+  return value.router
 }
-function useRouter(track, shallow) {
-  const router = useRouterContext();
-  useStore(router.__store, track, shallow);
-  return router;
+function useRouter(track) {
+  const router = useRouterContext()
+  useStore(router.__store, track)
+  return router
 }
 function useMatches() {
-  return React.useContext(matchesContext);
+  return React.useContext(matchesContext)
 }
 function useParams(opts) {
-  const router = useRouterContext();
-  useStore(router.__store, d => {
-    const params = last(d.currentMatches)?.params;
-    return opts?.track?.(params) ?? params;
-  }, true);
-  return last(router.state.currentMatches)?.params;
+  const router = useRouterContext()
+  useStore(
+    router.__store,
+    (d) => {
+      const params = last(d.currentMatches)?.params
+      return opts?.track?.(params) ?? params
+    },
+    true,
+  )
+  return last(router.state.currentMatches)?.params
 }
 function Outlet() {
-  const matches = useMatches().slice(1);
-  const match = matches[0];
+  const matches = useMatches().slice(1)
+  const match = matches[0]
   if (!match) {
-    return null;
+    return null
   }
-  return /*#__PURE__*/React.createElement(SubOutlet, {
+  return /*#__PURE__*/ React.createElement(SubOutlet, {
     matches: matches,
-    match: match
-  });
+    match: match,
+  })
 }
-function SubOutlet({
-  matches,
-  match
-}) {
-  const router = useRouterContext();
-  useStore(match.__store, store => [store.status, store.error], true);
-  const defaultPending = React.useCallback(() => null, []);
-  const PendingComponent = match.pendingComponent ?? router.options.defaultPendingComponent ?? defaultPending;
-  const errorComponent = match.errorComponent ?? router.options.defaultErrorComponent;
-  const ResolvedSuspenseBoundary = match.route.options.wrapInSuspense ?? true ? React.Suspense : SafeFragment;
-  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment;
-  return /*#__PURE__*/React.createElement(matchesContext.Provider, {
-    value: matches
-  }, /*#__PURE__*/React.createElement(ResolvedSuspenseBoundary, {
-    fallback: /*#__PURE__*/React.createElement(PendingComponent, null)
-  }, /*#__PURE__*/React.createElement(ResolvedCatchBoundary, {
-    key: match.route.id,
-    errorComponent: errorComponent,
-    onCatch: () => {
-      warning(false, `Error in route match: ${match.id}`);
-    }
-  }, /*#__PURE__*/React.createElement(Inner, {
-    match: match
-  }))));
+function SubOutlet({ matches, match }) {
+  const router = useRouterContext()
+  useStore(match.__store, (store) => [store.status, store.error], true)
+  const defaultPending = React.useCallback(() => null, [])
+  const PendingComponent =
+    match.pendingComponent ??
+    router.options.defaultPendingComponent ??
+    defaultPending
+  const errorComponent =
+    match.errorComponent ?? router.options.defaultErrorComponent
+  const ResolvedSuspenseBoundary =
+    match.route.options.wrapInSuspense ?? true ? React.Suspense : SafeFragment
+  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment
+  return /*#__PURE__*/ React.createElement(
+    matchesContext.Provider,
+    {
+      value: matches,
+    },
+    /*#__PURE__*/ React.createElement(
+      ResolvedSuspenseBoundary,
+      {
+        fallback: /*#__PURE__*/ React.createElement(PendingComponent, null),
+      },
+      /*#__PURE__*/ React.createElement(
+        ResolvedCatchBoundary,
+        {
+          key: match.route.id,
+          errorComponent: errorComponent,
+          onCatch: () => {
+            warning(false, `Error in route match: ${match.id}`)
+          },
+        },
+        /*#__PURE__*/ React.createElement(Inner, {
+          match: match,
+        }),
+      ),
+    ),
+  )
 }
 function Inner(props) {
-  const router = useRouterContext();
+  const router = useRouterContext()
   if (props.match.state.status === 'error') {
-    throw props.match.state.error;
+    throw props.match.state.error
   }
   if (props.match.state.status === 'success') {
-    return /*#__PURE__*/React.createElement(props.match.component ?? router.options.defaultComponent ?? Outlet);
+    return /*#__PURE__*/ React.createElement(
+      props.match.component ?? router.options.defaultComponent ?? Outlet,
+    )
   }
   if (props.match.state.status === 'pending') {
-    throw props.match.__loadPromise;
+    throw props.match.__loadPromise
   }
-  invariant(false, 'Idle routeMatch status encountered during rendering! You should never see this. File an issue!');
+  invariant(
+    false,
+    'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',
+  )
 }
 function SafeFragment(props) {
-  return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  return /*#__PURE__*/ React.createElement(React.Fragment, null, props.children)
 }
 
 // This is the messiest thing ever... I'm either seriously tired (likely) or
@@ -349,261 +430,320 @@ function SafeFragment(props) {
 class CatchBoundary extends React.Component {
   state = {
     error: false,
-    info: undefined
-  };
+    info: undefined,
+  }
   componentDidCatch(error, info) {
-    this.props.onCatch(error, info);
-    console.error(error);
+    this.props.onCatch(error, info)
+    console.error(error)
     this.setState({
       error,
-      info
-    });
+      info,
+    })
   }
   render() {
-    return /*#__PURE__*/React.createElement(CatchBoundaryInner, _extends({}, this.props, {
-      errorState: this.state,
-      reset: () => this.setState({})
-    }));
+    return /*#__PURE__*/ React.createElement(
+      CatchBoundaryInner,
+      _extends({}, this.props, {
+        errorState: this.state,
+        reset: () => this.setState({}),
+      }),
+    )
   }
 }
 function CatchBoundaryInner(props) {
-  const [activeErrorState, setActiveErrorState] = React.useState(props.errorState);
-  const router = useRouterContext();
-  const errorComponent = props.errorComponent ?? ErrorComponent;
-  const prevKeyRef = React.useRef('');
+  const [activeErrorState, setActiveErrorState] = React.useState(
+    props.errorState,
+  )
+  const router = useRouterContext()
+  const errorComponent = props.errorComponent ?? ErrorComponent
+  const prevKeyRef = React.useRef('')
   React.useEffect(() => {
     if (activeErrorState) {
       if (router.state.currentLocation.key !== prevKeyRef.current) {
-        setActiveErrorState({});
+        setActiveErrorState({})
       }
     }
-    prevKeyRef.current = router.state.currentLocation.key;
-  }, [activeErrorState, router.state.currentLocation.key]);
+    prevKeyRef.current = router.state.currentLocation.key
+  }, [activeErrorState, router.state.currentLocation.key])
   React.useEffect(() => {
     if (props.errorState.error) {
-      setActiveErrorState(props.errorState);
+      setActiveErrorState(props.errorState)
     }
     // props.reset()
-  }, [props.errorState.error]);
+  }, [props.errorState.error])
   if (props.errorState.error && activeErrorState.error) {
-    return /*#__PURE__*/React.createElement(errorComponent, activeErrorState);
+    return /*#__PURE__*/ React.createElement(errorComponent, activeErrorState)
   }
-  return props.children;
+  return props.children
 }
-function ErrorComponent({
-  error
-}) {
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      padding: '.5rem',
-      maxWidth: '100%'
-    }
-  }, /*#__PURE__*/React.createElement("strong", {
-    style: {
-      fontSize: '1.2rem'
-    }
-  }, "Something went wrong!"), /*#__PURE__*/React.createElement("div", {
-    style: {
-      height: '.5rem'
-    }
-  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("pre", {
-    style: {
-      fontSize: '.7em',
-      border: '1px solid red',
-      borderRadius: '.25rem',
-      padding: '.5rem',
-      color: 'red',
-      overflow: 'auto'
-    }
-  }, error.message ? /*#__PURE__*/React.createElement("code", null, error.message) : null)));
+function ErrorComponent({ error }) {
+  return /*#__PURE__*/ React.createElement(
+    'div',
+    {
+      style: {
+        padding: '.5rem',
+        maxWidth: '100%',
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      'strong',
+      {
+        style: {
+          fontSize: '1.2rem',
+        },
+      },
+      'Something went wrong!',
+    ),
+    /*#__PURE__*/ React.createElement('div', {
+      style: {
+        height: '.5rem',
+      },
+    }),
+    /*#__PURE__*/ React.createElement(
+      'div',
+      null,
+      /*#__PURE__*/ React.createElement(
+        'pre',
+        {
+          style: {
+            fontSize: '.7em',
+            border: '1px solid red',
+            borderRadius: '.25rem',
+            padding: '.5rem',
+            color: 'red',
+            overflow: 'auto',
+          },
+        },
+        error.message
+          ? /*#__PURE__*/ React.createElement('code', null, error.message)
+          : null,
+      ),
+    ),
+  )
 }
 
 const rootRoute = RootRoute.withRouterContext()({
   component: Root,
   wrapInSuspense: false,
-  errorComponent: ({
-    error
-  }) => /* @__PURE__ */ jsx(ErrorComponent, {
-    error
-  })
-});
+  errorComponent: ({ error }) =>
+    /* @__PURE__ */ jsx(ErrorComponent, {
+      error,
+    }),
+})
 function Root() {
-  const router = useRouter();
-  const titleMatch = [...router.state.currentMatches].reverse().find((d) => d.routeContext?.getTitle);
-  const title = titleMatch?.context?.getTitle?.() ?? "Astro + TanStack Router";
-  return /* @__PURE__ */ jsxs("html", {
-    lang: "en",
-    children: [/* @__PURE__ */ jsxs("head", {
-      children: [/* @__PURE__ */ jsx("meta", {
-        charSet: "UTF-8"
-      }), /* @__PURE__ */ jsx("meta", {
-        name: "viewport",
-        content: "width=device-width, initial-scale=1.0"
-      }), /* @__PURE__ */ jsx("title", {
-        children: title
-      }), /* @__PURE__ */ jsx("script", {
-        src: "https://cdn.tailwindcss.com"
-      })]
-    }), /* @__PURE__ */ jsxs("body", {
-      children: [/* @__PURE__ */ jsxs("div", {
-        className: "p-2 flex gap-2 text-lg",
-        children: [/* @__PURE__ */ jsx(Link, {
-          to: "/",
-          activeProps: {
-            className: "font-bold"
-          },
-          activeOptions: {
-            exact: true
-          },
-          children: "Home"
-        }), " ", /* @__PURE__ */ jsx(Link, {
-          to: "/posts",
-          activeProps: {
-            className: "font-bold"
-          },
-          children: "Posts"
-        })]
-      }), /* @__PURE__ */ jsx("hr", {}), /* @__PURE__ */ jsx(Outlet, {}), " ", /* @__PURE__ */ jsx(RouterScripts, {})]
-    })]
-  });
+  const router = useRouter()
+  const titleMatch = [...router.state.currentMatches]
+    .reverse()
+    .find((d) => d.routeContext?.getTitle)
+  const title = titleMatch?.context?.getTitle?.() ?? 'Astro + TanStack Router'
+  return /* @__PURE__ */ jsxs('html', {
+    lang: 'en',
+    children: [
+      /* @__PURE__ */ jsxs('head', {
+        children: [
+          /* @__PURE__ */ jsx('meta', {
+            charSet: 'UTF-8',
+          }),
+          /* @__PURE__ */ jsx('meta', {
+            name: 'viewport',
+            content: 'width=device-width, initial-scale=1.0',
+          }),
+          /* @__PURE__ */ jsx('title', {
+            children: title,
+          }),
+          /* @__PURE__ */ jsx('script', {
+            src: 'https://cdn.tailwindcss.com',
+          }),
+        ],
+      }),
+      /* @__PURE__ */ jsxs('body', {
+        children: [
+          /* @__PURE__ */ jsxs('div', {
+            className: 'p-2 flex gap-2 text-lg',
+            children: [
+              /* @__PURE__ */ jsx(Link, {
+                to: '/',
+                activeProps: {
+                  className: 'font-bold',
+                },
+                activeOptions: {
+                  exact: true,
+                },
+                children: 'Home',
+              }),
+              ' ',
+              /* @__PURE__ */ jsx(Link, {
+                to: '/posts',
+                activeProps: {
+                  className: 'font-bold',
+                },
+                children: 'Posts',
+              }),
+            ],
+          }),
+          /* @__PURE__ */ jsx('hr', {}),
+          /* @__PURE__ */ jsx(Outlet, {}),
+          ' ',
+          /* @__PURE__ */ jsx(RouterScripts, {}),
+        ],
+      }),
+    ],
+  })
 }
 
 const indexRoute = new Route({
   getParentRoute: () => rootRoute,
-  path: "/",
-  component: () => /* @__PURE__ */ jsx("div", {
-    className: "p-2",
-    children: /* @__PURE__ */ jsx("h3", {
-      children: "Welcome Home!"
-    })
-  })
-});
+  path: '/',
+  component: () =>
+    /* @__PURE__ */ jsx('div', {
+      className: 'p-2',
+      children: /* @__PURE__ */ jsx('h3', {
+        children: 'Welcome Home!',
+      }),
+    }),
+})
 
 const postIdRoute = new Route({
   getParentRoute: () => postsRoute,
-  path: "$postId",
-  getContext: ({
-    context,
-    params: {
-      postId
-    }
-  }) => ({
-    getTitle: () => context.loaderClient.getLoader({
-      key: "post"
-    }).getInstance({
-      variables: postId
-    }).state.data?.title
+  path: '$postId',
+  getContext: ({ context, params: { postId } }) => ({
+    getTitle: () =>
+      context.loaderClient
+        .getLoader({
+          key: 'post',
+        })
+        .getInstance({
+          variables: postId,
+        }).state.data?.title,
   }),
-  onLoad: async ({
-    params: {
-      postId
-    },
-    preload,
-    context
-  }) => context.loaderClient.getLoader({
-    key: "post"
-  }).load({
-    variables: postId,
-    preload
-  }),
-  component: Post
-});
+  onLoad: async ({ params: { postId }, preload, context }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'post',
+      })
+      .load({
+        variables: postId,
+        preload,
+      }),
+  component: Post,
+})
 function Post() {
+  const { postId } = useParams({
+    from: postIdRoute.id,
+  })
   const {
-    postId
-  } = useParams({
-    from: postIdRoute.id
-  });
-  const {
-    state: {
-      data: post
-    }
+    state: { data: post },
   } = useLoaderInstance({
-    key: "post",
-    variables: postId
-  });
-  return /* @__PURE__ */ jsxs("div", {
-    className: "space-y-2",
-    children: [/* @__PURE__ */ jsx("h4", {
-      className: "text-xl font-bold underline",
-      children: post.title
-    }), /* @__PURE__ */ jsx("div", {
-      className: "text-sm",
-      children: post.body
-    })]
-  });
+    key: 'post',
+    variables: postId,
+  })
+  return /* @__PURE__ */ jsxs('div', {
+    className: 'space-y-2',
+    children: [
+      /* @__PURE__ */ jsx('h4', {
+        className: 'text-xl font-bold underline',
+        children: post.title,
+      }),
+      /* @__PURE__ */ jsx('div', {
+        className: 'text-sm',
+        children: post.body,
+      }),
+    ],
+  })
 }
 
 const postsRoute = new Route({
   getParentRoute: () => rootRoute,
-  path: "posts",
-  onLoad: ({
-    context,
-    preload
-  }) => context.loaderClient.getLoader({
-    key: "posts"
-  }).load({
-    preload
-  }),
+  path: 'posts',
+  onLoad: ({ context, preload }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'posts',
+      })
+      .load({
+        preload,
+      }),
   component: Posts,
-  getContext: ({
-    context
-  }) => ({
-    getTitle: () => `${context.loaderClient.getLoader({
-      key: "posts"
-    }).getInstance().state.data?.length} Posts`
-  })
-});
+  getContext: ({ context }) => ({
+    getTitle: () =>
+      `${
+        context.loaderClient
+          .getLoader({
+            key: 'posts',
+          })
+          .getInstance().state.data?.length
+      } Posts`,
+  }),
+})
 function Posts() {
   const {
-    state: {
-      data: posts
-    }
+    state: { data: posts },
   } = useLoaderInstance({
-    key: "posts"
-  });
-  return /* @__PURE__ */ jsxs("div", {
-    className: "p-2 flex gap-2",
-    children: [/* @__PURE__ */ jsx("ul", {
-      className: "list-disc pl-4",
-      children: posts.map((post) => {
-        return /* @__PURE__ */ jsx("li", {
-          className: "whitespace-nowrap",
-          children: /* @__PURE__ */ jsx(Link, {
-            to: postIdRoute.fullPath,
-            params: {
-              postId: post.id
-            },
-            className: "block py-1 text-blue-800 hover:text-blue-600",
-            activeProps: {
-              className: "text-black font-bold"
+    key: 'posts',
+  })
+  return /* @__PURE__ */ jsxs('div', {
+    className: 'p-2 flex gap-2',
+    children: [
+      /* @__PURE__ */ jsx('ul', {
+        className: 'list-disc pl-4',
+        children: posts.map((post) => {
+          return /* @__PURE__ */ jsx(
+            'li',
+            {
+              className: 'whitespace-nowrap',
+              children: /* @__PURE__ */ jsx(Link, {
+                to: postIdRoute.fullPath,
+                params: {
+                  postId: post.id,
+                },
+                className: 'block py-1 text-blue-800 hover:text-blue-600',
+                activeProps: {
+                  className: 'text-black font-bold',
+                },
+                children: /* @__PURE__ */ jsx('div', {
+                  children: post.title.substring(0, 20),
+                }),
+              }),
             },
-            children: /* @__PURE__ */ jsx("div", {
-              children: post.title.substring(0, 20)
-            })
-          })
-        }, post.id);
-      })
-    }), /* @__PURE__ */ jsx("hr", {}), /* @__PURE__ */ jsx(Outlet, {})]
-  });
+            post.id,
+          )
+        }),
+      }),
+      /* @__PURE__ */ jsx('hr', {}),
+      /* @__PURE__ */ jsx(Outlet, {}),
+    ],
+  })
 }
 
 const postsIndexRoute = new Route({
   getParentRoute: () => postsRoute,
-  path: "/",
-  component: () => /* @__PURE__ */ jsx("div", {
-    children: "Select a post."
-  })
-});
+  path: '/',
+  component: () =>
+    /* @__PURE__ */ jsx('div', {
+      children: 'Select a post.',
+    }),
+})
 
 const routeTree = rootRoute.addChildren([
   indexRoute,
-  postsRoute.addChildren([postsIndexRoute, postIdRoute])
-]);
+  postsRoute.addChildren([postsIndexRoute, postIdRoute]),
+])
 
-const routeTree$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
-  __proto__: null,
-  routeTree
-}, Symbol.toStringTag, { value: 'Module' }));
+const routeTree$1 = /*#__PURE__*/ Object.freeze(
+  /*#__PURE__*/ Object.defineProperty(
+    {
+      __proto__: null,
+      routeTree,
+    },
+    Symbol.toStringTag,
+    { value: 'Module' },
+  ),
+)
 
-export { LoaderClientProvider as L, ReactRouter as R, RouterProvider as a, routeTree$1 as b, routeTree as r };
+export {
+  LoaderClientProvider as L,
+  Router as R,
+  RouterProvider as a,
+  routeTree$1 as b,
+  routeTree as r,
+}
diff --git a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.f436718c.mjs b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.f436718c.mjs
index bc8d41f40e..226bda98e4 100644
--- a/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.f436718c.mjs
+++ b/examples/react/with-astro-ssr/.netlify/functions-internal/chunks/routeTree.f436718c.mjs
@@ -1,23 +1,32 @@
-import { s as shallow, i as invariant, R as Router, l as last, f as functionalUpdate, a as RootRoute, b as RouterScripts, c as Route } from '../entry.mjs';
-import * as React from 'react';
-import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector.js';
-import { jsx, jsxs } from 'react/jsx-runtime';
+import {
+  s as shallow,
+  i as invariant,
+  R as Router,
+  l as last,
+  f as functionalUpdate,
+  a as RootRoute,
+  b as RouterScripts,
+  c as Route,
+} from '../entry.mjs'
+import * as React from 'react'
+import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector.js'
+import { jsx, jsxs } from 'react/jsx-runtime'
 
-var isProduction = process.env.NODE_ENV === 'production';
+var isProduction = process.env.NODE_ENV === 'production'
 function warning(condition, message) {
   if (!isProduction) {
     if (condition) {
-      return;
+      return
     }
 
-    var text = "Warning: " + message;
+    var text = 'Warning: ' + message
 
     if (typeof console !== 'undefined') {
-      console.warn(text);
+      console.warn(text)
     }
 
     try {
-      throw Error(text);
+      throw Error(text)
     } catch (x) {}
   }
 }
@@ -33,9 +42,15 @@ function warning(condition, message) {
  * @license MIT
  */
 
-function useStore(store, selector = d => d, compareShallow) {
-  const slice = useSyncExternalStoreWithSelector(store.subscribe, () => store.state, () => store.state, selector, compareShallow ? shallow : undefined);
-  return slice;
+function useStore(store, selector = (d) => d, compareShallow) {
+  const slice = useSyncExternalStoreWithSelector(
+    store.subscribe,
+    () => store.state,
+    () => store.state,
+    selector,
+    compareShallow ? shallow : undefined,
+  )
+  return slice
 }
 
 /**
@@ -51,19 +66,19 @@ function useStore(store, selector = d => d, compareShallow) {
 
 //
 
-const loaderClientContext = /*#__PURE__*/React.createContext(null);
-function LoaderClientProvider({
-  loaderClient,
-  children,
-  ...rest
-}) {
+const loaderClientContext = /*#__PURE__*/ React.createContext(null)
+function LoaderClientProvider({ loaderClient, children, ...rest }) {
   loaderClient.options = {
     ...loaderClient.options,
-    ...rest
-  };
-  return /*#__PURE__*/React.createElement(loaderClientContext.Provider, {
-    value: loaderClient
-  }, children);
+    ...rest,
+  }
+  return /*#__PURE__*/ React.createElement(
+    loaderClientContext.Provider,
+    {
+      value: loaderClient,
+    },
+    children,
+  )
 }
 function useLoaderInstance(opts) {
   // opts as typeof opts & {
@@ -71,32 +86,40 @@ function useLoaderInstance(opts) {
   //   loader?: Loader<any, any, any, any>
   // }
 
-  const loaderClient = React.useContext(loaderClientContext);
-  const optsKey = opts.key;
-  const optsLoader = opts.loader;
-  invariant(loaderClient || optsLoader, 'useLoaderInstance must be used inside a <LoaderClientProvider> component!');
-  const loader = optsLoader ?? loaderClient.getLoader({
-    key: optsKey
-  });
+  const loaderClient = React.useContext(loaderClientContext)
+  const optsKey = opts.key
+  const optsLoader = opts.loader
+  invariant(
+    loaderClient || optsLoader,
+    'useLoaderInstance must be used inside a <LoaderClientProvider> component!',
+  )
+  const loader =
+    optsLoader ??
+    loaderClient.getLoader({
+      key: optsKey,
+    })
   const loaderInstance = loader.getInstance({
-    variables: opts?.variables
-  });
+    variables: opts?.variables,
+  })
   if (loaderInstance.state.status === 'error' && (opts.throwOnError ?? true)) {
-    throw loaderInstance.state.error;
+    throw loaderInstance.state.error
   }
   if (opts?.strict ?? true) {
-    invariant(typeof loaderInstance.state.data !== 'undefined', `useLoaderInstance:
+    invariant(
+      typeof loaderInstance.state.data !== 'undefined',
+      `useLoaderInstance:
   Loader instance { key: ${loader.key}, variables: ${opts.variables} }) is currently in a "${loaderInstance.state.status}" state. By default useLoaderInstance will throw an error if the loader instance is not in a "success" state. To avoid this error:
   
   - Load the loader instance before using it (e.g. via your router's onLoad or loader option)
 
-  - Set opts.strict to false and handle the loading state in your component`);
+  - Set opts.strict to false and handle the loading state in your component`,
+    )
   }
   React.useEffect(() => {
-    loaderInstance.load();
-  }, [loaderInstance]);
-  useStore(loaderInstance.__store, d => opts?.track?.(d) ?? d, true);
-  return loaderInstance;
+    loaderInstance.load()
+  }, [loaderInstance])
+  useStore(loaderInstance.__store, (d) => opts?.track?.(d) ?? d, true)
+  return loaderInstance
 }
 
 /**
@@ -111,30 +134,32 @@ function useLoaderInstance(opts) {
  */
 
 function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
+  _extends = Object.assign
+    ? Object.assign.bind()
+    : function (target) {
+        for (var i = 1; i < arguments.length; i++) {
+          var source = arguments[i]
+          for (var key in source) {
+            if (Object.prototype.hasOwnProperty.call(source, key)) {
+              target[key] = source[key]
+            }
+          }
         }
+        return target
       }
-    }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+  return _extends.apply(this, arguments)
 }
 //
 
 function useLinkProps(options) {
-  const router = useRouterContext();
+  const router = useRouterContext()
   const {
     // custom props
     type,
     children,
     target,
     activeProps = () => ({
-      className: 'active'
+      className: 'active',
     }),
     inactiveProps = () => ({}),
     activeOptions,
@@ -156,15 +181,13 @@ function useLinkProps(options) {
     onMouseLeave,
     onTouchStart,
     ...rest
-  } = options;
-  const linkInfo = router.buildLink(options);
+  } = options
+  const linkInfo = router.buildLink(options)
   if (linkInfo.type === 'external') {
-    const {
-      href
-    } = linkInfo;
+    const { href } = linkInfo
     return {
-      href
-    };
+      href,
+    }
   }
   const {
     handleClick,
@@ -173,31 +196,35 @@ function useLinkProps(options) {
     handleLeave,
     handleTouchStart,
     isActive,
-    next
-  } = linkInfo;
-  const reactHandleClick = e => {
+    next,
+  } = linkInfo
+  const reactHandleClick = (e) => {
     if (React.startTransition) {
       // This is a hack for react < 18
       React.startTransition(() => {
-        handleClick(e);
-      });
+        handleClick(e)
+      })
     } else {
-      handleClick(e);
+      handleClick(e)
     }
-  };
-  const composeHandlers = handlers => e => {
-    if (e.persist) e.persist();
-    handlers.filter(Boolean).forEach(handler => {
-      if (e.defaultPrevented) return;
-      handler(e);
-    });
-  };
+  }
+  const composeHandlers = (handlers) => (e) => {
+    if (e.persist) e.persist()
+    handlers.filter(Boolean).forEach((handler) => {
+      if (e.defaultPrevented) return
+      handler(e)
+    })
+  }
 
   // Get the active props
-  const resolvedActiveProps = isActive ? functionalUpdate(activeProps, {}) ?? {} : {};
+  const resolvedActiveProps = isActive
+    ? functionalUpdate(activeProps, {}) ?? {}
+    : {}
 
   // Get the inactive props
-  const resolvedInactiveProps = isActive ? {} : functionalUpdate(inactiveProps, {}) ?? {};
+  const resolvedInactiveProps = isActive
+    ? {}
+    : functionalUpdate(inactiveProps, {}) ?? {}
   return {
     ...resolvedActiveProps,
     ...resolvedInactiveProps,
@@ -212,134 +239,188 @@ function useLinkProps(options) {
     style: {
       ...style,
       ...resolvedActiveProps.style,
-      ...resolvedInactiveProps.style
+      ...resolvedInactiveProps.style,
     },
-    className: [className, resolvedActiveProps.className, resolvedInactiveProps.className].filter(Boolean).join(' ') || undefined,
-    ...(disabled ? {
-      role: 'link',
-      'aria-disabled': true
-    } : undefined),
-    ['data-status']: isActive ? 'active' : undefined
-  };
+    className:
+      [
+        className,
+        resolvedActiveProps.className,
+        resolvedInactiveProps.className,
+      ]
+        .filter(Boolean)
+        .join(' ') || undefined,
+    ...(disabled
+      ? {
+          role: 'link',
+          'aria-disabled': true,
+        }
+      : undefined),
+    ['data-status']: isActive ? 'active' : undefined,
+  }
 }
-const Link = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const linkProps = useLinkProps(props);
-  return /*#__PURE__*/React.createElement("a", _extends({
-    ref: ref
-  }, linkProps, {
-    children: typeof props.children === 'function' ? props.children({
-      isActive: linkProps['data-status'] === 'active'
-    }) : props.children
-  }));
-});
-const matchesContext = /*#__PURE__*/React.createContext(null);
-const routerContext = /*#__PURE__*/React.createContext(null);
-class ReactRouter extends Router {
+const Link = /*#__PURE__*/ React.forwardRef((props, ref) => {
+  const linkProps = useLinkProps(props)
+  return /*#__PURE__*/ React.createElement(
+    'a',
+    _extends(
+      {
+        ref: ref,
+      },
+      linkProps,
+      {
+        children:
+          typeof props.children === 'function'
+            ? props.children({
+                isActive: linkProps['data-status'] === 'active',
+              })
+            : props.children,
+      },
+    ),
+  )
+})
+const matchesContext = /*#__PURE__*/ React.createContext(null)
+const routerContext = /*#__PURE__*/ React.createContext(null)
+class Router extends Router {
   constructor(opts) {
     super({
       ...opts,
-      loadComponent: async component => {
+      loadComponent: async (component) => {
         if (component.preload) {
-          await component.preload();
+          await component.preload()
         }
-        return component;
-      }
-    });
+        return component
+      },
+    })
   }
 }
-function RouterProvider({
-  router,
-  ...rest
-}) {
-  router.update(rest);
-  const currentMatches = useStore(router.__store, s => s.currentMatches);
-  React.useEffect(router.mount, [router]);
-  return /*#__PURE__*/React.createElement(routerContext.Provider, {
-    value: {
-      router: router
-    }
-  }, /*#__PURE__*/React.createElement(matchesContext.Provider, {
-    value: [undefined, ...currentMatches]
-  }, /*#__PURE__*/React.createElement(CatchBoundary, {
-    errorComponent: ErrorComponent,
-    onCatch: () => {
-      warning(false, `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`);
-    }
-  }, /*#__PURE__*/React.createElement(Outlet, null))));
+function RouterProvider({ router, ...rest }) {
+  router.update(rest)
+  const currentMatches = useStore(router.__store, (s) => s.currentMatches)
+  React.useEffect(router.mount, [router])
+  return /*#__PURE__*/ React.createElement(
+    routerContext.Provider,
+    {
+      value: {
+        router: router,
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      matchesContext.Provider,
+      {
+        value: [undefined, ...currentMatches],
+      },
+      /*#__PURE__*/ React.createElement(
+        CatchBoundary,
+        {
+          errorComponent: ErrorComponent,
+          onCatch: () => {
+            warning(
+              false,
+              `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`,
+            )
+          },
+        },
+        /*#__PURE__*/ React.createElement(Outlet, null),
+      ),
+    ),
+  )
 }
 function useRouterContext() {
-  const value = React.useContext(routerContext);
-  warning(value, 'useRouter must be used inside a <Router> component!');
-  useStore(value.router.__store);
-  return value.router;
+  const value = React.useContext(routerContext)
+  warning(value, 'useRouter must be used inside a <Router> component!')
+  useStore(value.router.__store)
+  return value.router
 }
-function useRouter(track, shallow) {
-  const router = useRouterContext();
-  useStore(router.__store, track, shallow);
-  return router;
+function useRouter(track) {
+  const router = useRouterContext()
+  useStore(router.__store, track)
+  return router
 }
 function useMatches() {
-  return React.useContext(matchesContext);
+  return React.useContext(matchesContext)
 }
 function useParams(opts) {
-  const router = useRouterContext();
-  useStore(router.__store, d => {
-    const params = last(d.currentMatches)?.params;
-    return opts?.track?.(params) ?? params;
-  }, true);
-  return last(router.state.currentMatches)?.params;
+  const router = useRouterContext()
+  useStore(
+    router.__store,
+    (d) => {
+      const params = last(d.currentMatches)?.params
+      return opts?.track?.(params) ?? params
+    },
+    true,
+  )
+  return last(router.state.currentMatches)?.params
 }
 function Outlet() {
-  const matches = useMatches().slice(1);
-  const match = matches[0];
+  const matches = useMatches().slice(1)
+  const match = matches[0]
   if (!match) {
-    return null;
+    return null
   }
-  return /*#__PURE__*/React.createElement(SubOutlet, {
+  return /*#__PURE__*/ React.createElement(SubOutlet, {
     matches: matches,
-    match: match
-  });
+    match: match,
+  })
 }
-function SubOutlet({
-  matches,
-  match
-}) {
-  const router = useRouterContext();
-  useStore(match.__store, store => [store.status, store.error], true);
-  const defaultPending = React.useCallback(() => null, []);
-  const PendingComponent = match.pendingComponent ?? router.options.defaultPendingComponent ?? defaultPending;
-  const errorComponent = match.errorComponent ?? router.options.defaultErrorComponent;
-  const ResolvedSuspenseBoundary = match.route.options.wrapInSuspense ?? true ? React.Suspense : SafeFragment;
-  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment;
-  return /*#__PURE__*/React.createElement(matchesContext.Provider, {
-    value: matches
-  }, /*#__PURE__*/React.createElement(ResolvedSuspenseBoundary, {
-    fallback: /*#__PURE__*/React.createElement(PendingComponent, null)
-  }, /*#__PURE__*/React.createElement(ResolvedCatchBoundary, {
-    key: match.route.id,
-    errorComponent: errorComponent,
-    onCatch: () => {
-      warning(false, `Error in route match: ${match.id}`);
-    }
-  }, /*#__PURE__*/React.createElement(Inner, {
-    match: match
-  }))));
+function SubOutlet({ matches, match }) {
+  const router = useRouterContext()
+  useStore(match.__store, (store) => [store.status, store.error], true)
+  const defaultPending = React.useCallback(() => null, [])
+  const PendingComponent =
+    match.pendingComponent ??
+    router.options.defaultPendingComponent ??
+    defaultPending
+  const errorComponent =
+    match.errorComponent ?? router.options.defaultErrorComponent
+  const ResolvedSuspenseBoundary =
+    match.route.options.wrapInSuspense ?? true ? React.Suspense : SafeFragment
+  const ResolvedCatchBoundary = errorComponent ? CatchBoundary : SafeFragment
+  return /*#__PURE__*/ React.createElement(
+    matchesContext.Provider,
+    {
+      value: matches,
+    },
+    /*#__PURE__*/ React.createElement(
+      ResolvedSuspenseBoundary,
+      {
+        fallback: /*#__PURE__*/ React.createElement(PendingComponent, null),
+      },
+      /*#__PURE__*/ React.createElement(
+        ResolvedCatchBoundary,
+        {
+          key: match.route.id,
+          errorComponent: errorComponent,
+          onCatch: () => {
+            warning(false, `Error in route match: ${match.id}`)
+          },
+        },
+        /*#__PURE__*/ React.createElement(Inner, {
+          match: match,
+        }),
+      ),
+    ),
+  )
 }
 function Inner(props) {
-  const router = useRouterContext();
+  const router = useRouterContext()
   if (props.match.state.status === 'error') {
-    throw props.match.state.error;
+    throw props.match.state.error
   }
   if (props.match.state.status === 'success') {
-    return /*#__PURE__*/React.createElement(props.match.component ?? router.options.defaultComponent ?? Outlet);
+    return /*#__PURE__*/ React.createElement(
+      props.match.component ?? router.options.defaultComponent ?? Outlet,
+    )
   }
   if (props.match.state.status === 'pending') {
-    throw props.match.__loadPromise;
+    throw props.match.__loadPromise
   }
-  invariant(false, 'Idle routeMatch status encountered during rendering! You should never see this. File an issue!');
+  invariant(
+    false,
+    'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',
+  )
 }
 function SafeFragment(props) {
-  return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+  return /*#__PURE__*/ React.createElement(React.Fragment, null, props.children)
 }
 
 // This is the messiest thing ever... I'm either seriously tired (likely) or
@@ -349,261 +430,320 @@ function SafeFragment(props) {
 class CatchBoundary extends React.Component {
   state = {
     error: false,
-    info: undefined
-  };
+    info: undefined,
+  }
   componentDidCatch(error, info) {
-    this.props.onCatch(error, info);
-    console.error(error);
+    this.props.onCatch(error, info)
+    console.error(error)
     this.setState({
       error,
-      info
-    });
+      info,
+    })
   }
   render() {
-    return /*#__PURE__*/React.createElement(CatchBoundaryInner, _extends({}, this.props, {
-      errorState: this.state,
-      reset: () => this.setState({})
-    }));
+    return /*#__PURE__*/ React.createElement(
+      CatchBoundaryInner,
+      _extends({}, this.props, {
+        errorState: this.state,
+        reset: () => this.setState({}),
+      }),
+    )
   }
 }
 function CatchBoundaryInner(props) {
-  const [activeErrorState, setActiveErrorState] = React.useState(props.errorState);
-  const router = useRouterContext();
-  const errorComponent = props.errorComponent ?? ErrorComponent;
-  const prevKeyRef = React.useRef('');
+  const [activeErrorState, setActiveErrorState] = React.useState(
+    props.errorState,
+  )
+  const router = useRouterContext()
+  const errorComponent = props.errorComponent ?? ErrorComponent
+  const prevKeyRef = React.useRef('')
   React.useEffect(() => {
     if (activeErrorState) {
       if (router.state.currentLocation.key !== prevKeyRef.current) {
-        setActiveErrorState({});
+        setActiveErrorState({})
       }
     }
-    prevKeyRef.current = router.state.currentLocation.key;
-  }, [activeErrorState, router.state.currentLocation.key]);
+    prevKeyRef.current = router.state.currentLocation.key
+  }, [activeErrorState, router.state.currentLocation.key])
   React.useEffect(() => {
     if (props.errorState.error) {
-      setActiveErrorState(props.errorState);
+      setActiveErrorState(props.errorState)
     }
     // props.reset()
-  }, [props.errorState.error]);
+  }, [props.errorState.error])
   if (props.errorState.error && activeErrorState.error) {
-    return /*#__PURE__*/React.createElement(errorComponent, activeErrorState);
+    return /*#__PURE__*/ React.createElement(errorComponent, activeErrorState)
   }
-  return props.children;
+  return props.children
 }
-function ErrorComponent({
-  error
-}) {
-  return /*#__PURE__*/React.createElement("div", {
-    style: {
-      padding: '.5rem',
-      maxWidth: '100%'
-    }
-  }, /*#__PURE__*/React.createElement("strong", {
-    style: {
-      fontSize: '1.2rem'
-    }
-  }, "Something went wrong!"), /*#__PURE__*/React.createElement("div", {
-    style: {
-      height: '.5rem'
-    }
-  }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("pre", {
-    style: {
-      fontSize: '.7em',
-      border: '1px solid red',
-      borderRadius: '.25rem',
-      padding: '.5rem',
-      color: 'red',
-      overflow: 'auto'
-    }
-  }, error.message ? /*#__PURE__*/React.createElement("code", null, error.message) : null)));
+function ErrorComponent({ error }) {
+  return /*#__PURE__*/ React.createElement(
+    'div',
+    {
+      style: {
+        padding: '.5rem',
+        maxWidth: '100%',
+      },
+    },
+    /*#__PURE__*/ React.createElement(
+      'strong',
+      {
+        style: {
+          fontSize: '1.2rem',
+        },
+      },
+      'Something went wrong!',
+    ),
+    /*#__PURE__*/ React.createElement('div', {
+      style: {
+        height: '.5rem',
+      },
+    }),
+    /*#__PURE__*/ React.createElement(
+      'div',
+      null,
+      /*#__PURE__*/ React.createElement(
+        'pre',
+        {
+          style: {
+            fontSize: '.7em',
+            border: '1px solid red',
+            borderRadius: '.25rem',
+            padding: '.5rem',
+            color: 'red',
+            overflow: 'auto',
+          },
+        },
+        error.message
+          ? /*#__PURE__*/ React.createElement('code', null, error.message)
+          : null,
+      ),
+    ),
+  )
 }
 
 const rootRoute = RootRoute.withRouterContext()({
   component: Root,
   wrapInSuspense: false,
-  errorComponent: ({
-    error
-  }) => /* @__PURE__ */ jsx(ErrorComponent, {
-    error
-  })
-});
+  errorComponent: ({ error }) =>
+    /* @__PURE__ */ jsx(ErrorComponent, {
+      error,
+    }),
+})
 function Root() {
-  const router = useRouter();
-  const titleMatch = [...router.state.currentMatches].reverse().find((d) => d.routeContext?.getTitle);
-  const title = titleMatch?.context?.getTitle?.() ?? "Astro + TanStack Router";
-  return /* @__PURE__ */ jsxs("html", {
-    lang: "en",
-    children: [/* @__PURE__ */ jsxs("head", {
-      children: [/* @__PURE__ */ jsx("meta", {
-        charSet: "UTF-8"
-      }), /* @__PURE__ */ jsx("meta", {
-        name: "viewport",
-        content: "width=device-width, initial-scale=1.0"
-      }), /* @__PURE__ */ jsx("title", {
-        children: title
-      }), /* @__PURE__ */ jsx("script", {
-        src: "https://cdn.tailwindcss.com"
-      })]
-    }), /* @__PURE__ */ jsxs("body", {
-      children: [/* @__PURE__ */ jsxs("div", {
-        className: "p-2 flex gap-2 text-lg",
-        children: [/* @__PURE__ */ jsx(Link, {
-          to: "/",
-          activeProps: {
-            className: "font-bold"
-          },
-          activeOptions: {
-            exact: true
-          },
-          children: "Home"
-        }), " ", /* @__PURE__ */ jsx(Link, {
-          to: "/posts",
-          activeProps: {
-            className: "font-bold"
-          },
-          children: "Posts"
-        })]
-      }), /* @__PURE__ */ jsx("hr", {}), /* @__PURE__ */ jsx(Outlet, {}), " ", /* @__PURE__ */ jsx(RouterScripts, {})]
-    })]
-  });
+  const router = useRouter()
+  const titleMatch = [...router.state.currentMatches]
+    .reverse()
+    .find((d) => d.routeContext?.getTitle)
+  const title = titleMatch?.context?.getTitle?.() ?? 'Astro + TanStack Router'
+  return /* @__PURE__ */ jsxs('html', {
+    lang: 'en',
+    children: [
+      /* @__PURE__ */ jsxs('head', {
+        children: [
+          /* @__PURE__ */ jsx('meta', {
+            charSet: 'UTF-8',
+          }),
+          /* @__PURE__ */ jsx('meta', {
+            name: 'viewport',
+            content: 'width=device-width, initial-scale=1.0',
+          }),
+          /* @__PURE__ */ jsx('title', {
+            children: title,
+          }),
+          /* @__PURE__ */ jsx('script', {
+            src: 'https://cdn.tailwindcss.com',
+          }),
+        ],
+      }),
+      /* @__PURE__ */ jsxs('body', {
+        children: [
+          /* @__PURE__ */ jsxs('div', {
+            className: 'p-2 flex gap-2 text-lg',
+            children: [
+              /* @__PURE__ */ jsx(Link, {
+                to: '/',
+                activeProps: {
+                  className: 'font-bold',
+                },
+                activeOptions: {
+                  exact: true,
+                },
+                children: 'Home',
+              }),
+              ' ',
+              /* @__PURE__ */ jsx(Link, {
+                to: '/posts',
+                activeProps: {
+                  className: 'font-bold',
+                },
+                children: 'Posts',
+              }),
+            ],
+          }),
+          /* @__PURE__ */ jsx('hr', {}),
+          /* @__PURE__ */ jsx(Outlet, {}),
+          ' ',
+          /* @__PURE__ */ jsx(RouterScripts, {}),
+        ],
+      }),
+    ],
+  })
 }
 
 const indexRoute = new Route({
   getParentRoute: () => rootRoute,
-  path: "/",
-  component: () => /* @__PURE__ */ jsx("div", {
-    className: "p-2",
-    children: /* @__PURE__ */ jsx("h3", {
-      children: "Welcome Home!"
-    })
-  })
-});
+  path: '/',
+  component: () =>
+    /* @__PURE__ */ jsx('div', {
+      className: 'p-2',
+      children: /* @__PURE__ */ jsx('h3', {
+        children: 'Welcome Home!',
+      }),
+    }),
+})
 
 const postIdRoute = new Route({
   getParentRoute: () => postsRoute,
-  path: "$postId",
-  getContext: ({
-    context,
-    params: {
-      postId
-    }
-  }) => ({
-    getTitle: () => context.loaderClient.getLoader({
-      key: "post"
-    }).getInstance({
-      variables: postId
-    }).state.data?.title
+  path: '$postId',
+  getContext: ({ context, params: { postId } }) => ({
+    getTitle: () =>
+      context.loaderClient
+        .getLoader({
+          key: 'post',
+        })
+        .getInstance({
+          variables: postId,
+        }).state.data?.title,
   }),
-  onLoad: async ({
-    params: {
-      postId
-    },
-    preload,
-    context
-  }) => context.loaderClient.getLoader({
-    key: "post"
-  }).load({
-    variables: postId,
-    preload
-  }),
-  component: Post
-});
+  onLoad: async ({ params: { postId }, preload, context }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'post',
+      })
+      .load({
+        variables: postId,
+        preload,
+      }),
+  component: Post,
+})
 function Post() {
+  const { postId } = useParams({
+    from: postIdRoute.id,
+  })
   const {
-    postId
-  } = useParams({
-    from: postIdRoute.id
-  });
-  const {
-    state: {
-      data: post
-    }
+    state: { data: post },
   } = useLoaderInstance({
-    key: "post",
-    variables: postId
-  });
-  return /* @__PURE__ */ jsxs("div", {
-    className: "space-y-2",
-    children: [/* @__PURE__ */ jsx("h4", {
-      className: "text-xl font-bold underline",
-      children: post.title
-    }), /* @__PURE__ */ jsx("div", {
-      className: "text-sm",
-      children: post.body
-    })]
-  });
+    key: 'post',
+    variables: postId,
+  })
+  return /* @__PURE__ */ jsxs('div', {
+    className: 'space-y-2',
+    children: [
+      /* @__PURE__ */ jsx('h4', {
+        className: 'text-xl font-bold underline',
+        children: post.title,
+      }),
+      /* @__PURE__ */ jsx('div', {
+        className: 'text-sm',
+        children: post.body,
+      }),
+    ],
+  })
 }
 
 const postsRoute = new Route({
   getParentRoute: () => rootRoute,
-  path: "posts",
-  onLoad: ({
-    context,
-    preload
-  }) => context.loaderClient.getLoader({
-    key: "posts"
-  }).load({
-    preload
-  }),
+  path: 'posts',
+  onLoad: ({ context, preload }) =>
+    context.loaderClient
+      .getLoader({
+        key: 'posts',
+      })
+      .load({
+        preload,
+      }),
   component: Posts,
-  getContext: ({
-    context
-  }) => ({
-    getTitle: () => `${context.loaderClient.getLoader({
-      key: "posts"
-    }).getInstance().state.data?.length} Posts`
-  })
-});
+  getContext: ({ context }) => ({
+    getTitle: () =>
+      `${
+        context.loaderClient
+          .getLoader({
+            key: 'posts',
+          })
+          .getInstance().state.data?.length
+      } Posts`,
+  }),
+})
 function Posts() {
   const {
-    state: {
-      data: posts
-    }
+    state: { data: posts },
   } = useLoaderInstance({
-    key: "posts"
-  });
-  return /* @__PURE__ */ jsxs("div", {
-    className: "p-2 flex gap-2",
-    children: [/* @__PURE__ */ jsx("ul", {
-      className: "list-disc pl-4",
-      children: posts.map((post) => {
-        return /* @__PURE__ */ jsx("li", {
-          className: "whitespace-nowrap",
-          children: /* @__PURE__ */ jsx(Link, {
-            to: postIdRoute.fullPath,
-            params: {
-              postId: post.id
-            },
-            className: "block py-1 text-blue-800 hover:text-blue-600",
-            activeProps: {
-              className: "text-black font-bold"
+    key: 'posts',
+  })
+  return /* @__PURE__ */ jsxs('div', {
+    className: 'p-2 flex gap-2',
+    children: [
+      /* @__PURE__ */ jsx('ul', {
+        className: 'list-disc pl-4',
+        children: posts.map((post) => {
+          return /* @__PURE__ */ jsx(
+            'li',
+            {
+              className: 'whitespace-nowrap',
+              children: /* @__PURE__ */ jsx(Link, {
+                to: postIdRoute.fullPath,
+                params: {
+                  postId: post.id,
+                },
+                className: 'block py-1 text-blue-800 hover:text-blue-600',
+                activeProps: {
+                  className: 'text-black font-bold',
+                },
+                children: /* @__PURE__ */ jsx('div', {
+                  children: post.title.substring(0, 20),
+                }),
+              }),
             },
-            children: /* @__PURE__ */ jsx("div", {
-              children: post.title.substring(0, 20)
-            })
-          })
-        }, post.id);
-      })
-    }), /* @__PURE__ */ jsx("hr", {}), /* @__PURE__ */ jsx(Outlet, {})]
-  });
+            post.id,
+          )
+        }),
+      }),
+      /* @__PURE__ */ jsx('hr', {}),
+      /* @__PURE__ */ jsx(Outlet, {}),
+    ],
+  })
 }
 
 const postsIndexRoute = new Route({
   getParentRoute: () => postsRoute,
-  path: "/",
-  component: () => /* @__PURE__ */ jsx("div", {
-    children: "Select a post."
-  })
-});
+  path: '/',
+  component: () =>
+    /* @__PURE__ */ jsx('div', {
+      children: 'Select a post.',
+    }),
+})
 
 const routeTree = rootRoute.addChildren([
   indexRoute,
-  postsRoute.addChildren([postsIndexRoute, postIdRoute])
-]);
+  postsRoute.addChildren([postsIndexRoute, postIdRoute]),
+])
 
-const routeTree$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
-  __proto__: null,
-  routeTree
-}, Symbol.toStringTag, { value: 'Module' }));
+const routeTree$1 = /*#__PURE__*/ Object.freeze(
+  /*#__PURE__*/ Object.defineProperty(
+    {
+      __proto__: null,
+      routeTree,
+    },
+    Symbol.toStringTag,
+    { value: 'Module' },
+  ),
+)
 
-export { LoaderClientProvider as L, ReactRouter as R, RouterProvider as a, routeTree$1 as b, routeTree as r };
+export {
+  LoaderClientProvider as L,
+  Router as R,
+  RouterProvider as a,
+  routeTree$1 as b,
+  routeTree as r,
+}
diff --git a/examples/react/with-astro-ssr/package.json b/examples/react/with-astro-ssr/package.json
index 1e7a936b97..8439efc091 100644
--- a/examples/react/with-astro-ssr/package.json
+++ b/examples/react/with-astro-ssr/package.json
@@ -14,8 +14,8 @@
     "@astrojs/netlify": "^1.2.1",
     "@astrojs/react": "^1.2.2",
     "@tanstack/react-loaders": "0.0.1-beta.81",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@tanstack/router": "0.0.1-beta.82",
     "astro": "^1.6.12",
     "concurrently": "^7.6.0",
diff --git a/examples/react/with-astro-ssr/src/app/App.tsx b/examples/react/with-astro-ssr/src/app/App.tsx
index 91e87169c3..e3a3341c4d 100644
--- a/examples/react/with-astro-ssr/src/app/App.tsx
+++ b/examples/react/with-astro-ssr/src/app/App.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { LoaderClientProvider } from '@tanstack/react-loaders'
-import { RouterProvider } from '@tanstack/react-router'
+import { RouterProvider } from '@tanstack/router'
 import { loaderClient } from './loaderClient'
 import { router } from './router'
 import { Hydrate } from './Hydrate'
diff --git a/examples/react/with-astro-ssr/src/app/router.tsx b/examples/react/with-astro-ssr/src/app/router.tsx
index b14094f4c7..e59ad02567 100644
--- a/examples/react/with-astro-ssr/src/app/router.tsx
+++ b/examples/react/with-astro-ssr/src/app/router.tsx
@@ -1,5 +1,5 @@
 import type { RegisteredLoaderClient } from '@tanstack/react-loaders'
-import { ReactRouter } from '@tanstack/react-router'
+import { Router } from '@tanstack/router'
 import { loaderClient } from './loaderClient'
 import { routeTree } from './routeTree'
 
@@ -7,7 +7,7 @@ export interface RouterContext {
   loaderClient: RegisteredLoaderClient
 }
 
-export const router = new ReactRouter({
+export const router = new Router({
   routeTree,
   context: {
     loaderClient,
@@ -15,7 +15,7 @@ export const router = new ReactRouter({
   defaultPreload: 'intent',
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/with-astro-ssr/src/app/routes/__root.tsx b/examples/react/with-astro-ssr/src/app/routes/__root.tsx
index 9b9982bda5..db8d39fe63 100644
--- a/examples/react/with-astro-ssr/src/app/routes/__root.tsx
+++ b/examples/react/with-astro-ssr/src/app/routes/__root.tsx
@@ -1,11 +1,11 @@
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import {
   ErrorComponent,
   Link,
   Outlet,
   RootRoute,
   useRouter,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 
 import type { RouterContext } from '../router'
 import { RouterScripts } from '../Hydrate'
diff --git a/examples/react/with-astro-ssr/src/app/routes/index.tsx b/examples/react/with-astro-ssr/src/app/routes/index.tsx
index 059b2ae72f..27379f263b 100644
--- a/examples/react/with-astro-ssr/src/app/routes/index.tsx
+++ b/examples/react/with-astro-ssr/src/app/routes/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 
 export const indexRoute = new Route({
diff --git a/examples/react/with-astro-ssr/src/app/routes/posts.tsx b/examples/react/with-astro-ssr/src/app/routes/posts.tsx
index 3f0ebdaecb..7d83afc43e 100644
--- a/examples/react/with-astro-ssr/src/app/routes/posts.tsx
+++ b/examples/react/with-astro-ssr/src/app/routes/posts.tsx
@@ -1,4 +1,4 @@
-import { Link, Outlet, Route } from '@tanstack/react-router'
+import { Link, Outlet, Route } from '@tanstack/router'
 import { rootRoute } from './__root'
 
 import { useLoaderInstance } from '@tanstack/react-loaders'
diff --git a/examples/react/with-astro-ssr/src/app/routes/posts/$postId.tsx b/examples/react/with-astro-ssr/src/app/routes/posts/$postId.tsx
index 43d4759604..42e091f81b 100644
--- a/examples/react/with-astro-ssr/src/app/routes/posts/$postId.tsx
+++ b/examples/react/with-astro-ssr/src/app/routes/posts/$postId.tsx
@@ -1,5 +1,5 @@
 import { useLoaderInstance } from '@tanstack/react-loaders'
-import { Route, useParams } from '@tanstack/react-router'
+import { Route, useParams } from '@tanstack/router'
 import { postsRoute } from '../posts'
 
 export const postIdRoute = new Route({
diff --git a/examples/react/with-astro-ssr/src/app/routes/posts/index.tsx b/examples/react/with-astro-ssr/src/app/routes/posts/index.tsx
index 7defee4f9a..08e9dcff13 100644
--- a/examples/react/with-astro-ssr/src/app/routes/posts/index.tsx
+++ b/examples/react/with-astro-ssr/src/app/routes/posts/index.tsx
@@ -1,4 +1,4 @@
-import { Route } from '@tanstack/react-router'
+import { Route } from '@tanstack/router'
 import { postsRoute } from '../posts'
 
 export const postsIndexRoute = new Route({
diff --git a/examples/react/with-react-query/package.json b/examples/react/with-react-query/package.json
index 144fac48de..05336cd1dd 100644
--- a/examples/react/with-react-query/package.json
+++ b/examples/react/with-react-query/package.json
@@ -11,8 +11,8 @@
   "dependencies": {
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@vitejs/plugin-react": "^1.1.3",
     "axios": "^1.1.3",
     "immer": "^9.0.15",
diff --git a/examples/react/with-react-query/src/main.tsx b/examples/react/with-react-query/src/main.tsx
index c159089a67..c32f37f45c 100644
--- a/examples/react/with-react-query/src/main.tsx
+++ b/examples/react/with-react-query/src/main.tsx
@@ -3,13 +3,13 @@ import ReactDOM from 'react-dom/client'
 import {
   Outlet,
   RouterProvider,
-  ReactRouter,
+  Router,
   Route,
   Link,
   useParams,
   RootRoute,
-} from '@tanstack/react-router'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+} from '@tanstack/router'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import {
   useQuery,
   useQueryClient,
@@ -142,13 +142,13 @@ const routeTree = rootRoute.addChildren([
   postsRoute.addChildren([postsIndexRoute, postRoute]),
 ])
 
-// Set up a ReactRouter instance
-const router = new ReactRouter({
+// Set up a Router instance
+const router = new Router({
   routeTree,
   defaultPreload: 'intent',
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/with-trpc-react-query/client/main.tsx b/examples/react/with-trpc-react-query/client/main.tsx
index 87add64b49..2718a708cf 100644
--- a/examples/react/with-trpc-react-query/client/main.tsx
+++ b/examples/react/with-trpc-react-query/client/main.tsx
@@ -3,14 +3,14 @@ import ReactDOM from 'react-dom/client'
 import {
   Outlet,
   RouterProvider,
-  ReactRouter,
+  Router,
   Link,
   useParams,
   RootRoute,
   Route,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import { AppRouter } from '../server/server'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { httpBatchLink } from '@trpc/client'
 import { createTRPCReact } from '@trpc/react-query'
@@ -146,13 +146,13 @@ const routeTree = rootRoute.addChildren([
   postsRoute.addChildren([postsIndexRoute, postRoute]),
 ])
 
-// Set up a ReactRouter instance
-const router = new ReactRouter({
+// Set up a Router instance
+const router = new Router({
   routeTree,
   defaultPreload: 'intent',
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/with-trpc-react-query/package.json b/examples/react/with-trpc-react-query/package.json
index 394fdb2f61..867d840885 100644
--- a/examples/react/with-trpc-react-query/package.json
+++ b/examples/react/with-trpc-react-query/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@trpc/client": "^10.0.0-rc.6",
     "@trpc/react-query": "^10.0.0-rc.6",
     "@trpc/server": "^10.0.0-rc.6",
diff --git a/examples/react/with-trpc/client/main.tsx b/examples/react/with-trpc/client/main.tsx
index 48b8abebed..e6f31b03fd 100644
--- a/examples/react/with-trpc/client/main.tsx
+++ b/examples/react/with-trpc/client/main.tsx
@@ -3,7 +3,7 @@ import ReactDOM from 'react-dom/client'
 import {
   Outlet,
   RouterProvider,
-  ReactRouter,
+  Router,
   Link,
   MatchRoute,
   useSearch,
@@ -12,7 +12,7 @@ import {
   Route,
   useParams,
   useRouter,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 import {
   Loader,
   LoaderClient,
@@ -21,7 +21,7 @@ import {
   useLoaderInstance,
 } from '@tanstack/react-loaders'
 import { AppRouter } from '../server/server'
-import { TanStackRouterDevtools } from '@tanstack/react-router-devtools'
+import { TanStackRouterDevtools } from '@tanstack/router-devtools'
 import { createTRPCProxyClient, httpBatchLink } from '@trpc/client'
 
 import { z } from 'zod'
@@ -381,7 +381,7 @@ const routeTree = rootRoute.addChildren([
   ]),
 ])
 
-const router = new ReactRouter({
+const router = new Router({
   routeTree,
   defaultPendingComponent: () => (
     <div className={`p-2 text-2xl`}>
@@ -390,7 +390,7 @@ const router = new ReactRouter({
   ),
 })
 
-declare module '@tanstack/react-router' {
+declare module '@tanstack/router' {
   interface Register {
     router: typeof router
   }
diff --git a/examples/react/with-trpc/package.json b/examples/react/with-trpc/package.json
index 69e5b2cf66..e8dbdce883 100644
--- a/examples/react/with-trpc/package.json
+++ b/examples/react/with-trpc/package.json
@@ -14,8 +14,8 @@
     "@tanstack/react-loaders": "0.0.1-beta.81",
     "@tanstack/react-query": "^4.14.1",
     "@tanstack/react-query-devtools": "^4.14.1",
-    "@tanstack/react-router": "0.0.1-beta.82",
-    "@tanstack/react-router-devtools": "0.0.1-beta.82",
+    "@tanstack/router": "0.0.1-beta.82",
+    "@tanstack/router-devtools": "0.0.1-beta.82",
     "@trpc/client": "^10.0.0-rc.6",
     "@trpc/react-query": "^10.0.0-rc.6",
     "@trpc/server": "^10.0.0-rc.6",
diff --git a/examples/solid/basic/.gitignore b/examples/solid/basic/.gitignore
deleted file mode 100644
index 76add878f8..0000000000
--- a/examples/solid/basic/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules
-dist
\ No newline at end of file
diff --git a/examples/solid/basic/README.md b/examples/solid/basic/README.md
deleted file mode 100644
index 434f7bb9df..0000000000
--- a/examples/solid/basic/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## Usage
-
-Those templates dependencies are maintained via [pnpm](https://pnpm.io) via `pnpm up -Lri`.
-
-This is the reason you see a `pnpm-lock.yaml`. That being said, any package manager will work. This file can be safely be removed once you clone a template.
-
-```bash
-$ npm install # or pnpm install or yarn install
-```
-
-### Learn more on the [Solid Website](https://solidjs.com) and come chat with us on our [Discord](https://discord.com/invite/solidjs)
-
-## Available Scripts
-
-In the project directory, you can run:
-
-### `npm dev` or `npm start`
-
-Runs the app in the development mode.<br>
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br>
-
-### `npm run build`
-
-Builds the app for production to the `dist` folder.<br>
-It correctly bundles Solid in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-## Deployment
-
-You can deploy the `dist` folder to any static host provider (netlify, surge, now, etc.)
diff --git a/examples/solid/basic/index.html b/examples/solid/basic/index.html
deleted file mode 100644
index 0cd6aab7c0..0000000000
--- a/examples/solid/basic/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <link rel="shortcut icon" type="image/ico" href="/src/assets/favicon.ico" />
-    <title>Solid-Router Basic</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-
-    <script src="/src/index.tsx" type="module"></script>
-  </body>
-</html>
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
deleted file mode 100644
index be0c0d851f..0000000000
--- a/examples/solid/basic/package.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "tanstack-solid-router_basic",
-  "version": "0.0.0",
-  "description": "",
-  "scripts": {
-    "start": "vite",
-    "dev": "vite",
-    "build": "vite build",
-    "serve": "vite preview"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "typescript": "^4.9.5",
-    "vite": "^4.1.1",
-    "vite-plugin-solid": "^2.5.0"
-  },
-  "dependencies": {
-    "@tanstack/solid-router": "workspace:*",
-    "@tanstack/solid-loaders": "workspace:*",
-    "solid-js": "^1.6.10"
-  }
-}
diff --git a/examples/solid/basic/src/index.css b/examples/solid/basic/src/index.css
deleted file mode 100644
index d01438c81d..0000000000
--- a/examples/solid/basic/src/index.css
+++ /dev/null
@@ -1,9 +0,0 @@
-body {
-  margin: 0;
-  padding: 5px
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
-}
diff --git a/examples/solid/basic/src/index.tsx b/examples/solid/basic/src/index.tsx
deleted file mode 100644
index e0af26b782..0000000000
--- a/examples/solid/basic/src/index.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-/* @refresh reload */
-import { render } from 'solid-js/web'
-
-import './index.css'
-
-import {
-  Loader,
-  LoaderClient,
-  LoaderClientProvider,
-  useLoaderInstance,
-} from '@tanstack/solid-loaders'
-import {
-  ErrorComponent,
-  Link,
-  Outlet,
-  RootRoute,
-  Route,
-  RouterProvider,
-  SolidRouter,
-  useParams,
-} from '@tanstack/solid-router'
-import { Component, For } from 'solid-js'
-
-type PostType = {
-  id: string
-  title: string
-  body: string
-}
-
-const postsLoader = new Loader({
-  key: 'posts',
-  loader: async () => {
-    console.log('Fetching posts...')
-    await new Promise((r) => setTimeout(r, 500))
-    return await fetch('https://jsonplaceholder.typicode.com/posts')
-      .then((response) => response.json() as Promise<PostType[]>)
-      .then((r) => r.slice(0, 10))
-  },
-})
-
-const postLoader = new Loader({
-  key: 'post',
-  loader: async (postId: string) => {
-    console.log(`Fetching post with id ${postId}...`)
-
-    await new Promise((r) => setTimeout(r, 500))
-
-    if (postId === '5') {
-      throw new Error('Postid === 5. Example Error Boundary catching request')
-    }
-
-    return await fetch(
-      `https://jsonplaceholder.typicode.com/posts/${postId}`,
-    ).then((response) => response.json() as Promise<PostType>)
-  },
-  onAllInvalidate: async () => {
-    await postsLoader.invalidateAll()
-  },
-})
-
-const loaderClient = new LoaderClient({
-  getLoaders: () => [postsLoader, postLoader],
-})
-
-declare module '@tanstack/solid-loaders' {
-  interface Register {
-    loaderClient: typeof loaderClient
-  }
-}
-
-const rootRoute = new RootRoute({
-  component: () => {
-    return (
-      <>
-        <div class="p-2 flex gap-2 text-lg">
-          <Link
-            to="/"
-            activeProps={{
-              class: 'font-bold',
-            }}
-            activeOptions={{ exact: true }}
-          >
-            Home
-          </Link>{' '}
-          <Link
-            to="/posts"
-            activeProps={{
-              class: 'font-bold',
-            }}
-          >
-            Posts
-          </Link>
-        </div>
-        <hr />
-        <Outlet />
-      </>
-    )
-  },
-})
-
-const indexRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: '/',
-  component: () => {
-    return (
-      <div class="p-2">
-        <h3>Welcome Home!</h3>
-      </div>
-    )
-  },
-})
-
-const Spinner = () => <div class="inline-block animate-spin px-3">⍥</div>
-
-const postsRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: '/posts',
-  pendingComponent: Spinner,
-  onLoad: ({ preload }) =>
-    loaderClient.getLoader({ key: 'posts' }).load({ preload }),
-  component: () => {
-    const postsLoaderInstance = useLoaderInstance({
-      key: postsLoader.key,
-    })
-
-    return (
-      <div class="p-2 flex gap-2">
-        <ul class="list-disc pl-4">
-          <For each={postsLoaderInstance.state.data}>
-            {(post) => (
-              <li class="whitespace-nowrap">
-                <Link
-                  to={postRoute.fullPath}
-                  params={{
-                    postId: post.id,
-                  }}
-                  class="block py-1 text-blue-800 hover:text-blue-600"
-                  activeProps={{ class: 'text-black font-bold' }}
-                >
-                  <div>{post.title.substring(0, 20)}</div>
-                </Link>
-              </li>
-            )}
-          </For>
-        </ul>
-        <hr />
-        <Outlet />
-      </div>
-    )
-  },
-})
-
-const PostsIndexRoute = new Route({
-  getParentRoute: () => postsRoute,
-  path: '/',
-  component: () => {
-    return (
-      <>
-        <div>Select a post.</div>
-      </>
-    )
-  },
-})
-
-const postRoute = new Route({
-  getParentRoute: () => postsRoute,
-  path: 'post/$postId',
-  wrapInSuspense: true,
-  pendingComponent: Spinner,
-  onLoad: async ({ params: { postId } }) =>
-    postLoader.load({ variables: postId }),
-  errorComponent: ErrorComponent,
-  component: () => {
-    const params = useParams({ from: postRoute.id })
-
-    const postLoaderInstance = useLoaderInstance({
-      key: postLoader.key,
-      variables: params.postId,
-      // strict: false,
-    })
-
-    return (
-      <div class="space-y-2">
-        <h4 class="text-xl font-bold underline">
-          {postLoaderInstance.state.data.title}
-        </h4>
-        <div class="text-sm">{postLoaderInstance.state.data.body}</div>
-      </div>
-    )
-  },
-})
-
-const routeTree = rootRoute.addChildren([
-  indexRoute,
-  postsRoute.addChildren([PostsIndexRoute, postRoute]),
-])
-
-const router = new SolidRouter({
-  routeTree,
-  defaultPreload: 'intent',
-})
-
-const App: Component = () => {
-  return (
-    <LoaderClientProvider loaderClient={loaderClient}>
-      <RouterProvider router={router} />
-    </LoaderClientProvider>
-  )
-}
-
-render(() => <App />, document.getElementById('root') as HTMLElement)
diff --git a/examples/solid/basic/tsconfig.json b/examples/solid/basic/tsconfig.json
deleted file mode 100644
index 249b2732a7..0000000000
--- a/examples/solid/basic/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "strict": true,
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vite/client"],
-    "noEmit": true,
-    "isolatedModules": true
-  }
-}
diff --git a/examples/solid/basic/vite.config.ts b/examples/solid/basic/vite.config.ts
deleted file mode 100644
index 9ff59a1722..0000000000
--- a/examples/solid/basic/vite.config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { defineConfig } from 'vite';
-import solidPlugin from 'vite-plugin-solid';
-
-export default defineConfig({
-  plugins: [solidPlugin()],
-  server: {
-    port: 3000,
-  },
-  build: {
-    target: 'esnext',
-  },
-});
diff --git a/examples/solid/kitchen-sink-multi-file/.gitignore b/examples/solid/kitchen-sink-multi-file/.gitignore
deleted file mode 100644
index d451ff16c1..0000000000
--- a/examples/solid/kitchen-sink-multi-file/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules
-.DS_Store
-dist
-dist-ssr
-*.local
diff --git a/examples/solid/kitchen-sink-multi-file/README.md b/examples/solid/kitchen-sink-multi-file/README.md
deleted file mode 100644
index 32519da48c..0000000000
--- a/examples/solid/kitchen-sink-multi-file/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example
-
-To run this example:
-
-- `pnpm install`
-- `pnpm start`
diff --git a/examples/solid/kitchen-sink-multi-file/index.html b/examples/solid/kitchen-sink-multi-file/index.html
deleted file mode 100644
index 128e63aeb5..0000000000
--- a/examples/solid/kitchen-sink-multi-file/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <title>Solid-Router Kitchen Sink</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <script src="/src/index.tsx" type="module"></script>
-  </body>
-</html>
diff --git a/examples/solid/kitchen-sink-multi-file/package.json b/examples/solid/kitchen-sink-multi-file/package.json
deleted file mode 100644
index e411f22d92..0000000000
--- a/examples/solid/kitchen-sink-multi-file/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "tanstack-router-solid-example-kitchen-sink-multi-file",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "dev": "vite --port=3000",
-    "build": "vite build",
-    "serve": "vite preview",
-    "start": "vite"
-  },
-  "dependencies": {
-    "@tanstack/solid-router": "workspace:*",
-    "@tanstack/solid-loaders": "workspace:*",
-    "@tanstack/solid-actions": "workspace:*",
-    "vite": "^2.8.6",
-    "zod": "^3.19.1",
-    "immer": "^9.0.15"
-  },
-  "devDependencies": {
-    "solid-js": "^1.6.10",
-    "vite-plugin-solid": "^2.5.0"
-  }
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/App.tsx b/examples/solid/kitchen-sink-multi-file/src/App.tsx
deleted file mode 100644
index 0bcd0c4902..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/App.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { ActionClientProvider } from '@tanstack/solid-actions'
-import { LoaderClientProvider } from '@tanstack/solid-loaders'
-import { RouterProvider } from '@tanstack/solid-router'
-
-import { createContext, JSXElement, useContext } from 'solid-js'
-import { createStore } from 'solid-js/store'
-import { actionClient } from './actionClient'
-import { loaderClient } from './loaderClient'
-import { router } from './router'
-import { useSessionStorage } from './utils'
-
-function App() {
-  // This stuff is just to tweak our sandbox setup in real-time
-  const [loaderDelay, setLoaderDelay] = useSessionStorage('loaderDelay', 500)
-  const [actionDelay, setActionDelay] = useSessionStorage('actionDelay', 500)
-
-  const [defaultLoaderMaxAge, setDefaultLoaderMaxAge] = useSessionStorage(
-    'defaultLoaderMaxAge',
-    0,
-  )
-
-  return (
-    <>
-      <div class="text-xs fixed w-52 shadow rounded bottom-2 left-2 bg-white bg-opacity-75 p-2 border-b flex flex-col gap-1 flex-wrap items-left">
-        <div>Loader Delay: {loaderDelay()}ms</div>
-        <div>
-          <input
-            type="range"
-            min="0"
-            max="5000"
-            step="100"
-            value={loaderDelay()}
-            onInput={(e) => setLoaderDelay(e.currentTarget.valueAsNumber)}
-            class="w-full"
-          />
-        </div>
-
-        <div>Action Delay: {actionDelay}ms</div>
-        <div>
-          <input
-            type="range"
-            min="0"
-            max="5000"
-            step="100"
-            value={actionDelay()}
-            onInput={(e) => setActionDelay(e.currentTarget.valueAsNumber)}
-            class="w-full"
-          />
-        </div>
-        <div>
-          Loader Max Age:{' '}
-          {defaultLoaderMaxAge ? `${defaultLoaderMaxAge}ms` : 'Off'}
-        </div>
-        <div>
-          <input
-            type="range"
-            min="0"
-            max="10000"
-            step="250"
-            value={defaultLoaderMaxAge()}
-            onInput={(e) =>
-              setDefaultLoaderMaxAge(e.currentTarget.valueAsNumber)
-            }
-            class='w-full"'
-          />
-        </div>
-      </div>
-      <AuthProvider>
-        <LoaderClientProvider
-          loaderClient={loaderClient}
-          defaultMaxAge={defaultLoaderMaxAge()}
-        >
-          <ActionClientProvider actionClient={actionClient}>
-            <RouterProvider
-              router={router}
-              defaultLoaderMaxAge={defaultLoaderMaxAge()}
-              // Normally, the options above aren't changing, but for this particular
-              // example, we need to key the router when they change
-            />
-          </ActionClientProvider>
-        </LoaderClientProvider>
-      </AuthProvider>
-    </>
-  )
-}
-
-type AuthContextStore = {
-  status: 'loggedOut' | 'loggedIn'
-  username?: string
-}
-
-type AuthContextUtils = {
-  login: (username: string) => void
-  logout: () => void
-}
-
-const AuthContext = createContext<[AuthContextStore, AuthContextUtils]>(null!)
-
-export function AuthProvider(props: { children: JSXElement }) {
-  const [store, setStore] = createStore<AuthContextStore>({
-    status: 'loggedOut',
-  })
-
-  const utils = {
-    login(username: string) {
-      setStore({ status: 'loggedIn', username })
-    },
-    logout() {
-      setStore('status', 'loggedOut')
-    },
-  }
-
-  return (
-    <AuthContext.Provider value={[store, utils]}>
-      {props.children}
-    </AuthContext.Provider>
-  )
-}
-
-export function useAuth() {
-  const auth = useContext(AuthContext)
-
-  if (!auth) {
-    throw new Error('useAuth must be used under an auth context')
-  }
-
-  return auth!
-}
-
-export default App
diff --git a/examples/solid/kitchen-sink-multi-file/src/actionClient.tsx b/examples/solid/kitchen-sink-multi-file/src/actionClient.tsx
deleted file mode 100644
index a3716170a1..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/actionClient.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { ActionClient } from '@tanstack/solid-actions'
-import { updateInvoiceAction } from './routes/dashboard/invoices/invoice'
-import { createInvoiceAction } from './routes/dashboard/invoices/invoices'
-
-export const actionClient = new ActionClient({
-  getActions: () => [createInvoiceAction, updateInvoiceAction],
-})
-
-declare module '@tanstack/solid-actions' {
-  interface Register {
-    actionClient: typeof actionClient
-  }
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/components/InvoiceFields.tsx b/examples/solid/kitchen-sink-multi-file/src/components/InvoiceFields.tsx
deleted file mode 100644
index 911d9f2294..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/components/InvoiceFields.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Invoice } from '../mockTodos'
-
-export function InvoiceFields(props: { invoice: Invoice; disabled?: boolean }) {
-  return (
-    <div class="space-y-2">
-      <h2 class="font-bold text-lg">
-        <input
-          name="title"
-          value={props.invoice?.title || ''}
-          placeholder="Invoice Title"
-          class="border border-opacity-50 rounded p-2 w-full"
-          disabled={props.disabled}
-        />
-      </h2>
-      <div>
-        <textarea
-          name="body"
-          value={props.invoice?.body || ''}
-          rows={6}
-          placeholder="Invoice Body..."
-          class="border border-opacity-50 p-2 rounded w-full"
-          disabled={props.disabled}
-        />
-      </div>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/components/Spinner.tsx b/examples/solid/kitchen-sink-multi-file/src/components/Spinner.tsx
deleted file mode 100644
index e4d1cf6a53..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/components/Spinner.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export function Spinner() {
-  return <div class="inline-block animate-spin px-3">⍥</div>
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/index.tsx b/examples/solid/kitchen-sink-multi-file/src/index.tsx
deleted file mode 100644
index 2979cc861b..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/index.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* @refresh reload */
-import { render } from 'solid-js/web'
-
-import App from './App'
-
-render(() => <App />, document.getElementById('root') as HTMLElement)
diff --git a/examples/solid/kitchen-sink-multi-file/src/loaderClient.tsx b/examples/solid/kitchen-sink-multi-file/src/loaderClient.tsx
deleted file mode 100644
index 46b53dd782..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/loaderClient.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { LoaderClient } from '@tanstack/solid-loaders'
-import { invoicesLoader } from './routes/dashboard'
-import { invoiceLoader } from './routes/dashboard/invoices/invoice'
-import { usersLoader } from './routes/dashboard/users'
-import { userLoader } from './routes/dashboard/users/user'
-import { randomIdLoader } from './routes/layout'
-
-export const loaderClient = new LoaderClient({
-  getLoaders: () => [
-    invoicesLoader,
-    invoiceLoader,
-    usersLoader,
-    userLoader,
-    randomIdLoader,
-  ],
-})
-
-declare module '@tanstack/solid-loaders' {
-  interface Register {
-    loaderClient: typeof loaderClient
-  }
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/mockTodos.ts b/examples/solid/kitchen-sink-multi-file/src/mockTodos.ts
deleted file mode 100644
index 60a7a90ac7..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/mockTodos.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { PickAsRequired } from '@tanstack/solid-router'
-import { produce } from 'immer'
-import { actionDelayFn, loaderDelayFn, shuffle } from './utils'
-export type Invoice = {
-  id: number
-  title: string
-  body: string
-}
-
-export interface User {
-  id: number
-  name: string
-  username: string
-  email: string
-  address: Address
-  phone: string
-  website: string
-  company: Company
-}
-export interface Address {
-  street: string
-  suite: string
-  city: string
-  zipcode: string
-  geo: Geo
-}
-
-export interface Geo {
-  lat: string
-  lng: string
-}
-
-export interface Company {
-  name: string
-  catchPhrase: string
-  bs: string
-}
-
-let invoices: Invoice[] = null!
-let users: User[] = null!
-
-let invoicesPromise: Promise<void>
-let usersPromise: Promise<void>
-
-const ensureInvoices = async () => {
-  if (!invoicesPromise) {
-    invoicesPromise = Promise.resolve().then(async () => {
-      const response = await fetch('https://jsonplaceholder.typicode.com/posts')
-      const data = await response.json()
-      invoices = data.slice(0, 10)
-    })
-  }
-
-  await invoicesPromise
-}
-
-const ensureUsers = async () => {
-  if (!usersPromise) {
-    usersPromise = Promise.resolve().then(async () => {
-      const response = await fetch('https://jsonplaceholder.typicode.com/users')
-      const data = await response.json()
-      users = data.slice(0, 10)
-    })
-  }
-
-  await usersPromise
-}
-
-export async function fetchInvoices() {
-  return loaderDelayFn(() => ensureInvoices().then(() => invoices))
-}
-
-export async function fetchInvoiceById(id: number) {
-  return loaderDelayFn(() =>
-    ensureInvoices().then(() => {
-      return invoices.find((d) => d.id === id)
-    }),
-  )
-}
-
-export async function postInvoice(partialInvoice: Partial<Invoice>) {
-  return actionDelayFn(() => {
-    if (partialInvoice.title?.includes('error')) {
-      console.log('error')
-      throw new Error('Ouch!')
-    }
-    const invoice = {
-      id: invoices.length + 1,
-      title:
-        partialInvoice.title ?? `New Invoice ${String(Date.now()).slice(0, 5)}`,
-      body:
-        partialInvoice.body ??
-        shuffle(
-          `Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-      Fusce ac turpis quis ligula lacinia aliquet. Mauris ipsum. Nulla metus metus, ullamcorper vel, tincidunt sed, euismod in, nibh. Quisque volutpat condimentum velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Nam nec ante. 
-      Vestibulum sapien. Proin quam. Etiam ultrices. Suspendisse in justo eu magna luctus suscipit. Sed lectus. Integer euismod lacus luctus magna.  Integer id quam. Morbi mi. Quisque nisl felis, venenatis tristique, dignissim in, ultrices sit amet, augue. Proin sodales libero eget ante.
-      `.split(' '),
-        ).join(' '),
-    }
-    invoices = [...invoices, invoice]
-    return invoice
-  })
-}
-
-export async function patchInvoice({
-  id,
-  ...updatedInvoice
-}: PickAsRequired<Partial<Invoice>, 'id'>) {
-  return actionDelayFn(() => {
-    invoices = produce(invoices, (draft) => {
-      let invoice = draft.find((d) => d.id === id)
-      if (!invoice) {
-        throw new Error('Invoice not found.')
-      }
-      if (updatedInvoice.title?.toLocaleLowerCase()?.includes('error')) {
-        throw new Error('Ouch!')
-      }
-      Object.assign(invoice, updatedInvoice)
-    })
-
-    return invoices.find((d) => d.id === id)
-  })
-}
-
-export async function fetchUsers() {
-  return loaderDelayFn(() => ensureUsers().then(() => users))
-}
-
-export async function fetchUserById(id: number) {
-  return loaderDelayFn(() =>
-    ensureUsers().then(() => users.find((d) => d.id === id)),
-  )
-}
-
-export async function fetchRandomNumber() {
-  return loaderDelayFn(() => {
-    return Math.random()
-  })
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/router.tsx b/examples/solid/kitchen-sink-multi-file/src/router.tsx
deleted file mode 100644
index 4538c676b9..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/router.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { SolidRouter } from '@tanstack/solid-router'
-
-import { Spinner } from './components/Spinner'
-import { indexRoute } from './routes'
-import {
-  authenticatedIndexRoute,
-  authenticatedRoute,
-} from './routes/authenticated'
-import { dashboardRoute } from './routes/dashboard'
-import { dashboardIndexRoute } from './routes/dashboard/dashboard'
-import { invoicesRoute } from './routes/dashboard/invoices'
-import {
-  invoiceRoute,
-  updateInvoiceAction,
-} from './routes/dashboard/invoices/invoice'
-import {
-  createInvoiceAction,
-  invoicesIndexRoute,
-} from './routes/dashboard/invoices/invoices'
-import { usersRoute } from './routes/dashboard/users'
-import { userRoute } from './routes/dashboard/users/user'
-import { usersIndexRoute } from './routes/dashboard/users/users'
-import { expensiveRoute } from './routes/expensive'
-import { layoutRoute } from './routes/layout'
-import { layoutRouteA } from './routes/layout/layout-a'
-import { layoutRouteB } from './routes/layout/layout-b'
-import { rootRoute } from './routes/__root'
-
-const routeTree = rootRoute.addChildren([
-  indexRoute,
-  dashboardRoute.addChildren([
-    dashboardIndexRoute,
-    invoicesRoute.addChildren([invoicesIndexRoute, invoiceRoute]),
-    usersRoute.addChildren([usersIndexRoute, userRoute]),
-  ]),
-  expensiveRoute,
-  authenticatedRoute.addChildren([authenticatedIndexRoute]),
-  layoutRoute.addChildren([layoutRouteA, layoutRouteB]),
-])
-
-export const router = new SolidRouter({
-  routeTree,
-  defaultPendingComponent: Spinner,
-  onRouteChange: () => {
-    createInvoiceAction.clear()
-    updateInvoiceAction.clear()
-  },
-})
-
-declare module '@tanstack/solid-router' {
-  interface Register {
-    router: typeof router
-  }
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/__root.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/__root.tsx
deleted file mode 100644
index 1d3db671a3..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/__root.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { useLoaderClient } from '@tanstack/solid-loaders'
-import { Link, Outlet, RootRoute, useRouter } from '@tanstack/solid-router'
-import { For } from 'solid-js'
-import { Spinner } from '../components/Spinner'
-
-export const rootRoute = new RootRoute({
-  component: () => {
-    const router = useRouter()
-    const loaderClient = useLoaderClient()
-
-    return (
-      <>
-        <div class={`min-h-screen flex flex-col`}>
-          <div class={`flex items-center border-b gap-2`}>
-            <h1 class={`text-3xl p-2`}>Kitchen Sink</h1>
-            {/* Show a global spinner when the router is transitioning */}
-            <div
-              classList={{
-                'text-3xl duration-300 delay-0 opacity-0': true,
-                'duration-1000 opacity-40':
-                  router.status === 'pending' || loaderClient.state.isLoading,
-              }}
-            >
-              <Spinner />
-            </div>
-          </div>
-          <div class={`flex-1 flex`}>
-            <div class={`divide-y w-56`}>
-              <For
-                each={
-                  [
-                    ['/', 'Home'],
-                    ['/dashboard', 'Dashboard'],
-                    ['/expensive', 'Expensive'],
-                    ['/authenticated', 'Authenticated'],
-                    ['/layout-a', 'Layout A'],
-                    ['/layout-b', 'Layout B'],
-                  ] as const
-                }
-              >
-                {([to, label]) => (
-                  <div>
-                    <Link
-                      to={to}
-                      activeOptions={
-                        {
-                          // If the route points to the root of it's parent,
-                          // make sure it's only active if it's exact
-                          // exact: to === '.',
-                        }
-                      }
-                      class={`block py-2 px-3 text-blue-700`}
-                      // Make "active" links bold
-                      activeProps={{ class: `font-bold` }}
-                    >
-                      {label}
-                    </Link>
-                  </div>
-                )}
-              </For>
-            </div>
-            <div class={`flex-1 border-l border-gray-200`}>
-              {/* Render our first route match */}
-              <Outlet />
-            </div>
-          </div>
-        </div>
-      </>
-    )
-  },
-})
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/authenticated/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/authenticated/index.tsx
deleted file mode 100644
index 084688c02e..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/authenticated/index.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { Outlet, Route } from '@tanstack/solid-router'
-import { createSignal, Show } from 'solid-js'
-import { useAuth } from '../../App'
-import { rootRoute } from '../__root'
-
-export const authenticatedRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: 'authenticated/',
-  component: () => <Auth />,
-})
-
-export const authenticatedIndexRoute = new Route({
-  getParentRoute: () => authenticatedRoute,
-  path: '/',
-  component: () => <Authenticated />,
-})
-
-function Auth() {
-  const [authStore, { login }] = useAuth()
-  const [username, setUsername] = createSignal('')
-
-  const onSubmit = (
-    e: Event & {
-      submitter: HTMLElement
-    },
-  ) => {
-    e.preventDefault()
-
-    login(username())
-  }
-
-  return (
-    <Show
-      when={authStore.status === 'loggedIn'}
-      fallback={() => (
-        <div class="p-2">
-          <div>You must log in!</div>
-          <div class="h-2" />
-          <form onSubmit={onSubmit} class="flex gap-2">
-            <input
-              value={username()}
-              onInput={(e) => setUsername(e.currentTarget.value)}
-              placeholder="Username"
-              class="border p-1 px-2 rounded"
-            />
-            <button
-              type="submit"
-              class="text-sm bg-blue-500 text-white border inline-block py-1 px-2 rounded"
-            >
-              Login
-            </button>
-          </form>
-        </div>
-      )}
-    >
-      <Outlet />
-    </Show>
-  )
-}
-
-function Authenticated() {
-  const [authStore, { logout }] = useAuth()
-
-  return (
-    <div class="p-2">
-      You're authenticated! Your username is{' '}
-      <strong>{authStore.username}</strong>
-      <div class="h-2" />
-      <button
-        onClick={logout}
-        class="text-sm bg-blue-500 text-white border inline-block py-1 px-2 rounded"
-      >
-        Log out
-      </button>
-      <div class="h-2" />
-      <div>
-        This authentication example is obviously very contrived and simple. It
-        doesn't cover the use case of a redirected login page, but does
-        illustrate how easy it is to simply wrap routes with ternary logic to
-        either show a login prompt or redirect (probably with the `Navigate`
-        component).
-      </div>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx
deleted file mode 100644
index 8cf4da2e4e..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/dashboard.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useLoaderInstance } from '@tanstack/solid-loaders'
-import { Route } from '@tanstack/solid-router'
-import { dashboardRoute, invoicesLoader } from '.'
-
-export const dashboardIndexRoute = new Route({
-  getParentRoute: () => dashboardRoute,
-  path: '/',
-  component: () => <DashboardHome />,
-})
-
-function DashboardHome() {
-  const invoicesLoaderInstance = useLoaderInstance({ key: invoicesLoader.key })
-
-  return (
-    <div class="p-2">
-      <div class="p-2">
-        Welcome to the dashboard! You have{' '}
-        <strong>
-          {invoicesLoaderInstance.state.data.length} total invoices
-        </strong>
-        .
-      </div>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/index.tsx
deleted file mode 100644
index e16b90cc47..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/index.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Loader } from '@tanstack/solid-loaders'
-import { Link, Outlet, Route } from '@tanstack/solid-router'
-import { For } from 'solid-js'
-import { fetchInvoices } from '../../mockTodos'
-import { rootRoute } from '../__root'
-
-export const invoicesLoader = new Loader({
-  key: 'invoices',
-  loader: async () => {
-    console.log('Fetching invoices...')
-    return fetchInvoices()
-  },
-})
-
-export const dashboardRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: 'dashboard',
-  component: () => <Dashboard />,
-  onLoad: ({ preload }) => invoicesLoader.load({ preload }),
-})
-
-function Dashboard() {
-  return (
-    <>
-      <div class="flex items-center border-b">
-        <h2 class="text-xl p-2">Dashboard</h2>
-        <Link
-          to="/dashboard/invoices/$invoiceId"
-          params={{
-            invoiceId: 3,
-          }}
-          class="py-1 px-2 text-xs bg-blue-500 text-white rounded-full"
-        >
-          1 New Invoice
-        </Link>
-      </div>
-      <div class="flex flex-wrap divide-x">
-        <For
-          each={
-            [
-              ['/dashboard', 'Summary', undefined, true],
-              ['/dashboard/invoices', 'Invoices'],
-              ['/dashboard/users', 'Users', true],
-            ] as const
-          }
-        >
-          {([to, label, search, exact]) => (
-            <Link
-              to={to}
-              search={search}
-              activeOptions={{ exact }}
-              activeProps={{ class: `font-bold` }}
-              class="p-2"
-            >
-              {label}
-            </Link>
-          )}
-        </For>
-      </div>
-      <hr />
-      <Outlet />
-    </>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx
deleted file mode 100644
index 140325456c..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/index.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { useAction } from '@tanstack/solid-actions'
-import { useLoaderInstance } from '@tanstack/solid-loaders'
-import { Link, Outlet, Route } from '@tanstack/solid-router'
-import { For, Show } from 'solid-js'
-import { dashboardRoute, invoicesLoader } from '..'
-import { Spinner } from '../../../components/Spinner'
-import { updateInvoiceAction } from './invoice'
-import { createInvoiceAction } from './invoices'
-
-export const invoicesRoute = new Route({
-  getParentRoute: () => dashboardRoute,
-  path: 'invoices',
-  component: () => <Invoices />,
-})
-
-function Invoices() {
-  const invoicesLoaderInstance = useLoaderInstance({
-    key: invoicesLoader.key,
-  })
-
-  // Get the action for a child route
-  const createInvoice = useAction({ key: createInvoiceAction.key })
-  const updateInvoice = useAction({ key: updateInvoiceAction.key })
-
-  return (
-    <div class="flex-1 flex">
-      <div class="divide-y w-48">
-        <For each={invoicesLoaderInstance.state.data || []}>
-          {(invoice) => {
-            const pendingInvoice = () =>
-              updateInvoice.state.submissions.find(
-                (d) => d.payload.id === invoice.id,
-              )
-
-            return (
-              <div>
-                <Link
-                  to="/dashboard/invoices/$invoiceId"
-                  params={{
-                    invoiceId: invoice?.id,
-                  }}
-                  preload="intent"
-                  class="block py-2 px-3 text-blue-700"
-                  activeProps={{ class: `font-bold` }}
-                >
-                  <pre class="text-sm">
-                    #{invoice.id} - {invoice.title.slice(0, 10)}
-                    <Show when={pendingInvoice()?.status === 'pending'}>
-                      <Spinner />
-                    </Show>
-                  </pre>
-                </Link>
-              </div>
-            )
-          }}
-        </For>
-        <For each={createInvoice.state?.submissions}>
-          {(action) => (
-            <div>
-              <Show when={action.status === 'pending'}>
-                <a href="#" class="block py-2 px-3 text-blue-700">
-                  <pre class="text-sm">
-                    #<Spinner /> - {action.payload.title?.slice(0, 10)}
-                  </pre>
-                </a>
-              </Show>
-            </div>
-          )}
-        </For>
-      </div>
-      <div class="flex-1 border-l border-gray-200">
-        <Outlet />
-      </div>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx
deleted file mode 100644
index d577d4cca8..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoice.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import { Action, useAction } from '@tanstack/solid-actions'
-import { Loader, useLoaderInstance } from '@tanstack/solid-loaders'
-import {
-  Link,
-  Route,
-  useNavigate,
-  useParams,
-  useSearch,
-} from '@tanstack/solid-router'
-import { createEffect, createSignal, Match, Show, Switch } from 'solid-js'
-import { z } from 'zod'
-import { invoicesRoute } from '.'
-import { invoicesLoader } from '..'
-import { InvoiceFields } from '../../../components/InvoiceFields'
-import { fetchInvoiceById, patchInvoice } from '../../../mockTodos'
-
-export const invoiceLoader = new Loader({
-  key: 'invoice',
-  loader: async (invoiceId: number) => {
-    console.log('Fetching invoice...')
-    const invoice = await fetchInvoiceById(invoiceId)
-
-    if (!invoice) {
-      throw new Error('Invoice not found!')
-    }
-
-    return invoice
-  },
-  onAllInvalidate: async () => {
-    await invoicesLoader.invalidateAll()
-  },
-})
-
-export const updateInvoiceAction = new Action({
-  key: 'updateInvoice',
-  action: patchInvoice,
-  onEachSuccess: async ({ payload }) => {
-    await invoiceLoader.invalidate({
-      variables: payload.id,
-    })
-  },
-})
-
-export const invoiceRoute = new Route({
-  getParentRoute: () => invoicesRoute,
-  path: '$invoiceId',
-  parseParams: (params) => ({
-    invoiceId: z.number().int().parse(Number(params.invoiceId)),
-  }),
-  stringifyParams: ({ invoiceId }) => ({ invoiceId: `${invoiceId}` }),
-  validateSearch: z.object({
-    showNotes: z.boolean().optional(),
-    notes: z.string().optional(),
-  }),
-  component: () => <InvoiceView />,
-  onLoad: async ({ params: { invoiceId }, preload }) =>
-    invoiceLoader.load({
-      variables: invoiceId,
-      preload,
-    }),
-})
-
-function InvoiceView() {
-  const params = useParams({ from: invoiceRoute.id })
-  const invoiceLoaderInstance = useLoaderInstance({
-    key: invoiceLoader.key,
-    variables: params.invoiceId,
-  })
-  const search = useSearch({ from: invoiceRoute.id })
-  const action = useAction({ key: updateInvoiceAction.key })
-  const navigate = useNavigate({ from: invoiceRoute.id })
-
-  const [notes, setNotes] = createSignal(search.notes ?? ``)
-
-  createEffect(() => {
-    const notesData = notes()
-    navigate({
-      search: (old) => ({ ...old, notes: notesData ? notesData : undefined }),
-      replace: true,
-    })
-  })
-
-  return (
-    <form
-      onSubmit={(event) => {
-        event.preventDefault()
-        event.stopPropagation()
-        const formData = new FormData(event.target as HTMLFormElement)
-        action.submit({
-          id: params.invoiceId,
-          title: formData.get('title') as string,
-          body: formData.get('body') as string,
-        })
-      }}
-      class="p-2 space-y-2"
-    >
-      <InvoiceFields
-        invoice={invoiceLoaderInstance.state.data}
-        disabled={action.state.submissions.at(-1)?.status === 'pending'}
-      />
-      <div>
-        <Link
-          search={(old) => ({
-            ...old,
-            showNotes: old?.showNotes ? undefined : true,
-          })}
-          class="text-blue-700"
-        >
-          <Show when={!!search.showNotes} keyed fallback="Show Notes">
-            Close Notes
-          </Show>
-        </Link>
-        <Show when={search.showNotes}>
-          <div>
-            <div class="h-2" />
-            <textarea
-              value={notes()}
-              onChange={(e) => setNotes(e.currentTarget.value)}
-              rows={5}
-              class="shadow w-full p-2 rounded"
-              placeholder="Write some notes here..."
-            />
-            <div class="italic text-xs">
-              Notes are stored in the URL. Try copying the URL into a new tab!
-            </div>
-          </div>
-        </Show>
-      </div>
-      <div>
-        <button
-          class="bg-blue-500 rounded p-2 uppercase text-white font-black disabled:opacity-50"
-          disabled={action.state?.latestSubmission?.status === 'pending'}
-        >
-          Save
-        </button>
-      </div>
-      <Show
-        when={action.state?.latestSubmission?.payload?.id === params.invoiceId}
-      >
-        <div>
-          <Switch>
-            <Match when={action.state?.latestSubmission?.status === 'success'}>
-              <div class="inline-block px-2 py-1 rounded bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
-                Saved!
-              </div>
-            </Match>
-            <Match when={action.state.latestSubmission?.status === 'error'}>
-              <div class="inline-block px-2 py-1 rounded bg-red-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
-                Failed to save.
-              </div>
-            </Match>
-          </Switch>
-        </div>
-      </Show>
-    </form>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx
deleted file mode 100644
index d2932f2f51..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/invoices/invoices.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import { Action, useAction } from '@tanstack/solid-actions'
-import { Route } from '@tanstack/solid-router'
-import { Match, Switch } from 'solid-js'
-import { invoicesRoute } from '.'
-import { invoicesLoader } from '..'
-import { InvoiceFields } from '../../../components/InvoiceFields'
-import { Invoice, postInvoice } from '../../../mockTodos'
-
-export const createInvoiceAction = new Action({
-  key: 'createInvoice',
-  action: postInvoice,
-  onEachSuccess: async () => {
-    await invoicesLoader.invalidateAll()
-  },
-})
-
-export const invoicesIndexRoute = new Route({
-  getParentRoute: () => invoicesRoute,
-  path: '/',
-  component: () => <InvoicesHome />,
-})
-
-function InvoicesHome() {
-  const action = useAction({ key: createInvoiceAction.key })
-
-  return (
-    <>
-      <div class="p-2">
-        <form
-          onSubmit={(event) => {
-            event.preventDefault()
-            event.stopPropagation()
-            const formData = new FormData(event.target as HTMLFormElement)
-            action.submit({
-              title: formData.get('title') as string,
-              body: formData.get('body') as string,
-            })
-          }}
-          class="space-y-2"
-        >
-          <div>Create a new Invoice:</div>
-          <InvoiceFields invoice={{} as Invoice} />
-          <div>
-            <button
-              class="bg-blue-500 rounded p-2 uppercase text-white font-black disabled:opacity-50"
-              // disabled={action.current?.status === 'pending'}
-            >
-              Create
-            </button>
-          </div>
-          <Switch>
-            <Match when={action.state.latestSubmission?.status === 'success'}>
-              <div class="inline-block px-2 py-1 rounded bg-green-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
-                Created!
-              </div>
-            </Match>
-            <Match when={action.state.latestSubmission?.status === 'error'}>
-              <div class="inline-block px-2 py-1 rounded bg-red-500 text-white animate-bounce [animation-iteration-count:2.5] [animation-duration:.3s]">
-                Failed to create.
-              </div>
-            </Match>
-          </Switch>
-        </form>
-      </div>
-    </>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx
deleted file mode 100644
index 32c8a9ed8d..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/index.tsx
+++ /dev/null
@@ -1,169 +0,0 @@
-import { Loader, useLoaderInstance } from '@tanstack/solid-loaders'
-import {
-  Link,
-  MatchRoute,
-  Outlet,
-  Route,
-  useNavigate,
-  useSearch,
-} from '@tanstack/solid-router'
-import { createEffect, createMemo, createSignal, For } from 'solid-js'
-import { z } from 'zod'
-import { dashboardRoute } from '..'
-import { Spinner } from '../../../components/Spinner'
-import { fetchUsers } from '../../../mockTodos'
-
-const usersViewSortBy = z.enum(['name', 'id', 'email'])
-export type UsersViewSortBy = z.infer<typeof usersViewSortBy>
-
-export const usersLoader = new Loader({
-  key: 'users',
-  loader: async () => {
-    console.log('Fetching users...')
-    return fetchUsers()
-  },
-})
-
-export const usersRoute = new Route({
-  getParentRoute: () => dashboardRoute,
-  path: 'users',
-  component: () => <Users />,
-  validateSearch: z.object({
-    usersView: z
-      .object({
-        sortBy: usersViewSortBy.optional(),
-        filterBy: z.string().optional(),
-      })
-      .optional(),
-  }).parse,
-  preSearchFilters: [
-    // Persist (or set as default) the usersView search param
-    // while navigating within or to this route (or it's children!)
-    (search) => ({
-      ...search,
-      usersView: {
-        ...search.usersView,
-      },
-    }),
-  ],
-  onLoad: async ({ preload }) => usersLoader.load({ preload }),
-})
-
-function Users() {
-  const navigate = useNavigate({ from: usersRoute.id })
-  const usersLoaderInstance = useLoaderInstance({ key: usersLoader.key })
-  const users = () => usersLoaderInstance.state.data
-  const search = useSearch({ from: usersRoute.id })
-
-  const sortBy = () => search.usersView?.sortBy ?? 'name'
-  const filterBy = () => search.usersView?.filterBy ?? ''
-
-  const [filterDraft, setFilterDraft] = createSignal(filterBy() ?? '')
-
-  const sortedUsers = createMemo(() => {
-    if (!users) return []
-
-    return !sortBy
-      ? users()
-      : [...users()].sort((a, b) => {
-          return a[sortBy()] > b[sortBy()] ? 1 : -1
-        })
-  })
-
-  const filteredUsers = createMemo(() => {
-    if (!filterBy()) return sortedUsers()
-
-    return sortedUsers().filter((user) =>
-      user.name.toLowerCase().includes(filterBy().toLowerCase()),
-    )
-  }, [sortedUsers, filterBy])
-
-  const setSortBy = (sortBy: UsersViewSortBy) =>
-    navigate({
-      search: (old) => {
-        return {
-          ...old,
-          usersView: {
-            sortBy,
-          },
-        }
-      },
-      replace: true,
-    })
-
-  createEffect(() => {
-    const filter = filterDraft()
-    navigate({
-      search: (old) => {
-        return {
-          ...old,
-          usersView: {
-            ...old?.usersView,
-            filterBy: filter || undefined,
-          },
-        }
-      },
-      replace: true,
-    })
-  })
-
-  return (
-    <div class="flex-1 flex">
-      <div class="divide-y">
-        <div class="py-2 px-3 flex gap-2 items-center bg-gray-100">
-          <div>Sort By:</div>
-          <select
-            value={sortBy()}
-            onChange={(e) =>
-              setSortBy(e.currentTarget.value as UsersViewSortBy)
-            }
-            class="flex-1 border p-1 px-2 rounded"
-          >
-            <For each={['name', 'id', 'email'] as const}>
-              {(d) => <option value={d}>{d}</option>}
-            </For>
-          </select>
-        </div>
-        <div class="py-2 px-3 flex gap-2 items-center bg-gray-100">
-          <div>Filter By:</div>
-          <input
-            value={filterDraft()}
-            onInput={(e) => setFilterDraft(e.currentTarget.value)}
-            placeholder="Search Names..."
-            class="min-w-0 flex-1 border p-1 px-2 rounded"
-          />
-        </div>
-        <For each={filteredUsers()}>
-          {(user) => (
-            <div>
-              <Link
-                to="/dashboard/users/$userId"
-                params={{
-                  userId: user.id,
-                }}
-                class="block py-2 px-3 text-blue-700"
-                activeProps={{ class: `font-bold` }}
-              >
-                <pre class="text-sm">
-                  {user.name}{' '}
-                  <MatchRoute
-                    to="/dashboard/users/$userId"
-                    params={{
-                      userId: user.id,
-                    }}
-                    pending
-                  >
-                    <Spinner />
-                  </MatchRoute>
-                </pre>
-              </Link>
-            </div>
-          )}
-        </For>
-      </div>
-      <div class="flex-initial border-l border-gray-200">
-        <Outlet />
-      </div>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx
deleted file mode 100644
index 8e6691708c..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/user.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Loader, useLoaderInstance } from '@tanstack/solid-loaders'
-import { Route, useParams } from '@tanstack/solid-router'
-import { usersRoute } from '.'
-import { loaderClient } from '../../../loaderClient'
-import { fetchUserById } from '../../../mockTodos'
-
-export const userLoader = new Loader({
-  key: 'user',
-  loader: async (userId: number) => {
-    console.log(`Fetching user with id ${userId}...`)
-    return fetchUserById(userId)
-  },
-  onAllInvalidate: async () => {
-    await loaderClient
-      .getLoader({
-        key: 'users',
-      })
-      .invalidateAll()
-  },
-})
-
-export const userRoute = new Route({
-  getParentRoute: () => usersRoute,
-  path: '$userId',
-  parseParams: ({ userId }) => ({ userId: Number(userId) }),
-  stringifyParams: ({ userId }) => ({ userId: `${userId}` }),
-  component: () => <User />,
-  onLoad: async ({ params: { userId }, preload }) =>
-    userLoader.load({ variables: userId, preload }),
-})
-
-function User() {
-  const params = useParams({ from: userRoute.id })
-  const userLoaderInstance = useLoaderInstance({
-    key: userLoader.key,
-    variables: params.userId,
-  })
-
-  const user = userLoaderInstance.state.data
-
-  return (
-    <>
-      <h4 class="p-2 font-bold">{user?.name}</h4>
-      <pre class="text-sm whitespace-pre-wrap">
-        {JSON.stringify(user, null, 2)}
-      </pre>
-    </>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx
deleted file mode 100644
index 4bdead5463..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/dashboard/users/users.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Route } from '@tanstack/solid-router'
-import { usersRoute } from '.'
-
-export const usersIndexRoute = new Route({
-  getParentRoute: () => usersRoute,
-  path: '/',
-  component: () => <UsersIndex />,
-})
-
-function UsersIndex() {
-  return (
-    <div class="p-2 space-y-2">
-      <p>
-        Normally, setting default search parameters would either need to be done
-        manually in every link to a page, or as a side-effect (not a great
-        experience).
-      </p>
-      <p>
-        Instead, we can use <strong>search filters</strong> to provide defaults
-        or even persist search params for links to routes (and child routes).
-      </p>
-      <p>
-        A good example of this is the sorting and filtering of the users list.
-        In a traditional router, both would be lost while navigating around
-        individual users or even changing each sort/filter option unless each
-        state was manually passed from the current route into each new link we
-        created (that's a lot of tedious and error-prone work). With TanStack
-        router and search filters, they are persisted with little effort.
-      </p>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/expensive/Expensive.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/expensive/Expensive.tsx
deleted file mode 100644
index fd29d131b6..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/expensive/Expensive.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-export default function Expensive() {
-  return (
-    <div class={`p-2`}>
-      I am an "expensive" component... which really just means that I was
-      code-split 😉
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/expensive/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/expensive/index.tsx
deleted file mode 100644
index 7fa7507b4b..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/expensive/index.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import { lazy, Route } from '@tanstack/solid-router'
-import { rootRoute } from '../__root'
-
-export const expensiveRoute = new Route({
-  getParentRoute: () => rootRoute,
-  // Your elements can be asynchronous, which means you can code-split!
-  path: 'expensive',
-  component: lazy(() => import('./Expensive')),
-})
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/index.tsx
deleted file mode 100644
index ac648e17ee..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/index.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Link, Route } from '@tanstack/solid-router'
-import { rootRoute } from './__root'
-
-export const indexRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: '/',
-  component: () => <Home />,
-})
-
-function Home() {
-  return (
-    <div class={`p-2`}>
-      <div class={`text-lg`}>Welcome Home!</div>
-      <hr class={`my-2`} />
-      <Link
-        to="/dashboard/invoices/$invoiceId"
-        params={{
-          invoiceId: 3,
-        }}
-        class={`py-1 px-2 text-xs bg-blue-500 text-white rounded-full`}
-      >
-        1 New Invoice
-      </Link>
-      <hr class={`my-2`} />
-      <div class={`max-w-xl`}>
-        As you navigate around take note of the UX. It should feel
-        suspense-like, where routes are only rendered once all of their data and
-        elements are ready.
-        <hr class={`my-2`} />
-        To exaggerate async effects, play with the artificial request delay
-        slider in the bottom-left corner.
-        <hr class={`my-2`} />
-        The last 2 sliders determine if link-hover preloading is enabled (and
-        how long those preloads stick around) and also whether to cache rendered
-        route data (and for how long). Both of these default to 0 (or off).
-      </div>
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/layout/index.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/layout/index.tsx
deleted file mode 100644
index 49b448a66d..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/layout/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Loader, useLoaderInstance } from '@tanstack/solid-loaders'
-import { Outlet, Route } from '@tanstack/solid-router'
-import { fetchRandomNumber } from '../../mockTodos'
-
-import { loaderDelayFn } from '../../utils'
-import { rootRoute } from '../__root'
-
-export const randomIdLoader = new Loader({
-  key: 'random',
-  loader: () => {
-    return fetchRandomNumber()
-  },
-})
-
-export const layoutRoute = new Route({
-  getParentRoute: () => rootRoute,
-  id: 'layout',
-  component: () => <LayoutWrapper />,
-  onLoad: async () => {
-    return loaderDelayFn(() => {
-      return {
-        random: Math.random(),
-      }
-    })
-  },
-})
-
-function LayoutWrapper() {
-  const loaderInstance = useLoaderInstance({ key: randomIdLoader.key })
-  const random = loaderInstance.state.data
-
-  return (
-    <div>
-      <div>Layout</div>
-      <div>Random #: {random as number}</div>
-      <hr />
-      <Outlet />
-    </div>
-  )
-}
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx
deleted file mode 100644
index a3b342b148..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-a.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Route } from '@tanstack/solid-router'
-import { layoutRoute } from '.'
-
-export function LayoutA() {
-  return (
-    <div>
-      <div>Layout A</div>
-    </div>
-  )
-}
-
-export const layoutRouteA = new Route({
-  getParentRoute: () => layoutRoute,
-  path: 'layout-a',
-  component: LayoutA,
-})
diff --git a/examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx b/examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx
deleted file mode 100644
index 6135c76fcc..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/routes/layout/layout-b.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Route } from '@tanstack/solid-router'
-import { layoutRoute } from '.'
-
-export function LayoutB() {
-  return (
-    <div>
-      <div>Layout B</div>
-    </div>
-  )
-}
-
-export const layoutRouteB = new Route({
-  getParentRoute: () => layoutRoute,
-  path: 'layout-b',
-  component: LayoutB,
-})
diff --git a/examples/solid/kitchen-sink-multi-file/src/utils.tsx b/examples/solid/kitchen-sink-multi-file/src/utils.tsx
deleted file mode 100644
index f0f784e0bc..0000000000
--- a/examples/solid/kitchen-sink-multi-file/src/utils.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Accessor, createEffect, createSignal, Setter } from 'solid-js'
-
-export async function loaderDelayFn<T>(fn: (...args: any[]) => Promise<T> | T) {
-  const delay = Number(sessionStorage.getItem('loaderDelay') ?? 0)
-  const delayPromise = new Promise((r) => setTimeout(r, delay))
-
-  const [res] = await Promise.all([fn(), delayPromise])
-
-  return res
-}
-
-export async function actionDelayFn<T>(fn: (...args: any[]) => Promise<T> | T) {
-  const delay = Number(sessionStorage.getItem('actionDelay') ?? 0)
-  await new Promise((r) => setTimeout(r, delay))
-  return fn()
-}
-
-export function shuffle<T>(arr: T[]): T[] {
-  var i = arr.length
-  if (i == 0) return arr
-  const copy = [...arr]
-  while (--i) {
-    var j = Math.floor(Math.random() * (i + 1))
-    var a = copy[i]
-    var b = copy[j]
-    copy[i] = b!
-    copy[j] = a!
-  }
-  return copy
-}
-
-export function useSessionStorage<T>(
-  key: string,
-  initialValue: T,
-): [Accessor<T>, Setter<T>] {
-  const [signal, setSignal] = createSignal<T>(
-    ((): T => {
-      const stored = sessionStorage.getItem(key)
-      return stored ? (JSON.parse(stored) as T) : initialValue
-    })(),
-  )
-
-  createEffect(() => {
-    const value = signal()
-    sessionStorage.setItem(key, JSON.stringify(value))
-  })
-
-  return [signal, setSignal]
-}
diff --git a/examples/solid/kitchen-sink-multi-file/tsconfig.json b/examples/solid/kitchen-sink-multi-file/tsconfig.json
deleted file mode 100644
index 2205af3aa2..0000000000
--- a/examples/solid/kitchen-sink-multi-file/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "strict": true,
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vite/client"],
-    "noEmit": true,
-    "isolatedModules": true
-  },
-  "files": ["src/index.tsx"],
-  "include": [
-    "src"
-  ]
-}
diff --git a/examples/solid/kitchen-sink-multi-file/vite.config.js b/examples/solid/kitchen-sink-multi-file/vite.config.js
deleted file mode 100644
index 22b9712d92..0000000000
--- a/examples/solid/kitchen-sink-multi-file/vite.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { defineConfig } from 'vite'
-import solidPlugin from 'vite-plugin-solid'
-
-export default defineConfig({
-  plugins: [solidPlugin()],
-  server: {
-    port: 3000,
-  },
-  build: {
-    target: 'esnext',
-  },
-})
diff --git a/examples/solid/with-trpc-solid-query/.gitignore b/examples/solid/with-trpc-solid-query/.gitignore
deleted file mode 100644
index d451ff16c1..0000000000
--- a/examples/solid/with-trpc-solid-query/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-node_modules
-.DS_Store
-dist
-dist-ssr
-*.local
diff --git a/examples/solid/with-trpc-solid-query/README.md b/examples/solid/with-trpc-solid-query/README.md
deleted file mode 100644
index 32519da48c..0000000000
--- a/examples/solid/with-trpc-solid-query/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Example
-
-To run this example:
-
-- `pnpm install`
-- `pnpm start`
diff --git a/examples/solid/with-trpc-solid-query/index.html b/examples/solid/with-trpc-solid-query/index.html
deleted file mode 100644
index a25d590327..0000000000
--- a/examples/solid/with-trpc-solid-query/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <title>Solid-Router TRPC</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <script src="/src/index.tsx" type="module"></script>
-  </body>
-</html>
diff --git a/examples/solid/with-trpc-solid-query/package.json b/examples/solid/with-trpc-solid-query/package.json
deleted file mode 100644
index 90907c0394..0000000000
--- a/examples/solid/with-trpc-solid-query/package.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "tanstack-router-solid-example-with-trpc-solid-query",
-  "version": "0.0.0",
-  "private": true,
-  "scripts": {
-    "dev": "concurrently 'pnpm:dev:*'",
-    "dev:client": "wait-port 4000 && vite",
-    "dev:server": "tsx server/server.ts",
-    "build": "vite build",
-    "serve": "vite preview",
-    "start": "vite"
-  },
-  "dependencies": {
-    "@tanstack/solid-router": "workspace:*",
-    "@tanstack/solid-loaders": "workspace:*",
-    "@trpc/client": "^10.0.0-rc.6",
-    "solid-trpc": "0.0.11-rc.2",
-    "@trpc/server": "^10.0.0-rc.6",
-    "@tanstack/solid-query": "4.24.4",
-    "express": "^4.18.2",
-    "immer": "^9.0.15",
-    "vite": "^2.8.6",
-    "zod": "^3.19.1"
-  },
-  "devDependencies": {
-    "solid-js": "^1.6.10",
-    "vite-plugin-solid": "^2.5.0",
-    "concurrently": "^7.6.0",
-    "tsx": "^3.11.0",
-    "wait-port": "^1.0.4"
-  }
-}
diff --git a/examples/solid/with-trpc-solid-query/server/server.ts b/examples/solid/with-trpc-solid-query/server/server.ts
deleted file mode 100644
index 5dcbcc3a3b..0000000000
--- a/examples/solid/with-trpc-solid-query/server/server.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { initTRPC } from '@trpc/server'
-import { createHTTPServer } from '@trpc/server/adapters/standalone'
-
-const t = initTRPC.create()
-
-const POSTS = [
-  { id: '1', title: 'First post' },
-  { id: '2', title: 'Second post' },
-  { id: '3', title: 'Third post' },
-]
-
-const appRouter = t.router({
-  hello: t.procedure.query(async () => {
-    await new Promise((r) => setTimeout(r, 500))
-    return 'Hello world!'
-  }),
-  posts: t.procedure.query(async (_) => {
-    await new Promise((r) => setTimeout(r, 500))
-    return POSTS
-  }),
-  post: t.procedure.input(String).query(async (req) => {
-    await new Promise((r) => setTimeout(r, 500))
-    return POSTS.find((p) => p.id === req.input)
-  }),
-})
-
-export type AppRouter = typeof appRouter
-
-const server = createHTTPServer({
-  router: appRouter,
-  responseMeta() {
-    return {
-      headers: {
-        'Access-Control-Allow-Origin': `*`,
-        'Access-Control-Request-Method': '*',
-        'Access-Control-Allow-Methods': 'OPTIONS, GET',
-        'Access-Control-Allow-Headers': '*',
-      },
-      status: 200,
-    }
-  },
-})
-
-server.listen(4000)
diff --git a/examples/solid/with-trpc-solid-query/src/App.tsx b/examples/solid/with-trpc-solid-query/src/App.tsx
deleted file mode 100644
index 486bb3b552..0000000000
--- a/examples/solid/with-trpc-solid-query/src/App.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { QueryClient } from '@tanstack/solid-query'
-import {
-  Link,
-  Outlet,
-  RootRoute,
-  Route,
-  RouterProvider,
-  SolidRouter,
-  useParams,
-} from '@tanstack/solid-router'
-import { httpBatchLink } from '@trpc/client'
-import { Component, For, Match, Switch } from 'solid-js'
-import { createTRPCSolid } from 'solid-trpc'
-import { AppRouter } from '../server/server'
-
-const queryClient = new QueryClient()
-
-export function Spinner() {
-  return (
-    <div class="animate-spin px-3 text-2xl inline-flex items-center justify-center">
-      ⍥
-    </div>
-  )
-}
-
-const rootRoute = new RootRoute({
-  component: () => {
-    return (
-      <>
-        <div class="p-2 flex gap-2 text-lg">
-          <Link
-            to="/"
-            activeProps={{
-              class: 'font-bold',
-            }}
-            activeOptions={{ exact: true }}
-          >
-            Home
-          </Link>{' '}
-          <Link
-            to="/posts"
-            activeProps={{
-              class: 'font-bold',
-            }}
-          >
-            Posts
-          </Link>
-        </div>
-        <hr />
-        <Outlet /> {/* Start rendering router matches */}
-      </>
-    )
-  },
-})
-
-const indexRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: '/',
-  component: () => {
-    const helloQuery = trpc.hello.useQuery()
-
-    return (
-      <div>
-        <div class="p-2 text-xl">{helloQuery.data}</div>
-      </div>
-    )
-  },
-})
-
-const postsRoute = new Route({
-  getParentRoute: () => rootRoute,
-  path: 'posts',
-  errorComponent: () => 'Oh crap!',
-  // onLoad: async () => {}
-  component: () => {
-    const postsQuery = trpc.posts.useQuery()
-
-    return (
-      <Switch>
-        <Match when={postsQuery.isLoading}>
-          <Spinner />
-        </Match>
-        <Match when={postsQuery.data}>
-          <div class="p-2 flex gap-2">
-            <ul class="list-disc pl-4">
-              <For each={postsQuery.data}>
-                {(post) => (
-                  <li class="whitespace-nowrap">
-                    <Link
-                      to={postRoute.fullPath}
-                      params={{
-                        postId: post.id,
-                      }}
-                      class="block py-1 text-blue-800 hover:text-blue-600"
-                      activeProps={{ class: 'text-black font-bold' }}
-                    >
-                      <div>{post.title.substring(0, 20)}</div>
-                    </Link>
-                  </li>
-                )}
-              </For>
-            </ul>
-            <hr />
-            <Outlet />
-          </div>
-        </Match>
-      </Switch>
-    )
-  },
-})
-
-const postsIndexRoute = new Route({
-  getParentRoute: () => postsRoute,
-  path: '/',
-  component: () => {
-    return (
-      <>
-        <div>Select a post.</div>
-      </>
-    )
-  },
-})
-
-const postRoute = new Route({
-  getParentRoute: () => postsRoute,
-  path: '$postId',
-  onLoad: async () => {
-    // TODO: Prefetch post using TRPC
-    return {}
-  },
-  component: () => {
-    const params = useParams({ from: postRoute.id })
-    const postQuery = trpc.post.useQuery(() => params.postId)
-
-    return (
-      <Switch>
-        <Match when={postQuery.isLoading}>
-          <Spinner />
-        </Match>
-        <Match when={postQuery.data}>
-          <div class="space-y-2">
-            <h4 class="text-xl font-bold underline">{postQuery.data?.title}</h4>
-          </div>
-        </Match>
-      </Switch>
-    )
-  },
-})
-
-const routeTree = rootRoute.addChildren([
-  indexRoute,
-  postsRoute.addChildren([postsIndexRoute, postRoute]),
-])
-
-// Set up a SolidRouter instance
-const router = new SolidRouter({
-  routeTree,
-  defaultPreload: 'intent',
-  defaultPendingComponent: Spinner,
-})
-
-declare module '@tanstack/solid-router' {
-  interface Register {
-    router: typeof router
-  }
-}
-
-export const trpc = createTRPCSolid<AppRouter>({})
-
-const trpcClient = trpc.createClient({
-  links: [
-    httpBatchLink({
-      url: 'http://localhost:4000',
-    }),
-  ],
-})
-
-const Root: Component = () => (
-  <trpc.Provider client={trpcClient} queryClient={queryClient}>
-    <RouterProvider router={router} />
-  </trpc.Provider>
-)
-
-export default Root
diff --git a/examples/solid/with-trpc-solid-query/src/index.tsx b/examples/solid/with-trpc-solid-query/src/index.tsx
deleted file mode 100644
index 2979cc861b..0000000000
--- a/examples/solid/with-trpc-solid-query/src/index.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-/* @refresh reload */
-import { render } from 'solid-js/web'
-
-import App from './App'
-
-render(() => <App />, document.getElementById('root') as HTMLElement)
diff --git a/examples/solid/with-trpc-solid-query/tsconfig.json b/examples/solid/with-trpc-solid-query/tsconfig.json
deleted file mode 100644
index 249b2732a7..0000000000
--- a/examples/solid/with-trpc-solid-query/tsconfig.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "strict": true,
-    "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "types": ["vite/client"],
-    "noEmit": true,
-    "isolatedModules": true
-  }
-}
diff --git a/examples/solid/with-trpc-solid-query/vite.config.js b/examples/solid/with-trpc-solid-query/vite.config.js
deleted file mode 100644
index 22b9712d92..0000000000
--- a/examples/solid/with-trpc-solid-query/vite.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { defineConfig } from 'vite'
-import solidPlugin from 'vite-plugin-solid'
-
-export default defineConfig({
-  plugins: [solidPlugin()],
-  server: {
-    port: 3000,
-  },
-  build: {
-    target: 'esnext',
-  },
-})
diff --git a/media/logo.svg b/media/logo.svg
index 1c17083eb4..0729102fb8 100644
--- a/media/logo.svg
+++ b/media/logo.svg
@@ -10,7 +10,7 @@
                 <path d="M76.1109918,91 L89.6216773,114.999606 L80.3968824,115 C78.6058059,115 76.9515387,114.041975 76.0601262,112.488483 L69.9456773,101.831606 L76.1109918,91 Z M118.814677,103.999606 L113.944933,112.488483 C113.053521,114.041975 111.399254,115 109.608177,115 L97.1836773,114.999606 L91,104 L118.814677,103.999606 Z M102.995798,71 L111,84.540954 L103.052984,98 L87.0061086,98 L79,84.3838793 L86.9562003,71 L102.995798,71 Z M124.136677,74.2726062 L128.577138,82.0115174 C129.461464,83.5526583 129.461464,85.4473417 128.577138,86.9884826 L122.257677,97.9996062 L110,98 L124.136677,74.2726062 Z M80,72 L66.1336773,95.1896062 L61.4279211,86.9884826 C60.543596,85.4473417 60.543596,83.5526583 61.4279211,82.0115174 L67.1716773,71.9996062 L80,72 Z M109.608177,54 C111.399254,54 113.053521,54.958025 113.944933,56.5115174 L120.835677,68.5206062 L114.929178,79 L100.820677,53.9996062 L109.608177,54 Z M93.7696773,53.9996062 L100,65 L71.1886773,64.9996062 L76.0601262,56.5115174 C76.9515387,54.958025 78.6058059,54 80.3968824,54 L93.7696773,53.9996062 Z" id="Polygon-3" fill="#FFD94C"></path>
                 <path d="M54.8601729,98.3577578 C56.1715224,97.6082856 57.8360246,98.0746014 58.5779424,99.3993034 L58.5779424,99.3993034 L59.0525843,100.24352 C62.8563392,106.982993 66.8190116,113.380176 70.9406016,119.435068 C75.8078808,126.585427 81.28184,133.82411 87.3624792,141.151115 C88.3168778,142.30114 88.1849437,144.011176 87.065686,144.997937 L87.065686,144.997937 L86.4542085,145.534625 C66.3465389,163.103314 53.2778188,166.612552 47.2480482,156.062341 C41.3500652,145.742717 43.4844915,126.982888 53.6513274,99.7828526 C53.876818,99.1795821 54.3045861,98.675291 54.8601729,98.3577578 Z M140.534177,119.041504 C141.986131,118.785177 143.375496,119.742138 143.65963,121.194242 L143.65963,121.194242 L143.812815,121.986376 C148.782365,147.995459 145.283348,161 133.315764,161 C121.609745,161 106.708724,149.909007 88.6127018,127.727022 C88.2113495,127.235047 87.9945723,126.617371 88,125.981509 C88.013158,124.480686 89.2357854,123.274651 90.730918,123.287756 L90.730918,123.287756 L91.6846544,123.294531 C99.3056979,123.335994 106.714387,123.071591 113.910723,122.501323 C122.409039,121.82788 131.283523,120.674607 140.534177,119.041504 Z M147.408726,63.8119663 C147.932139,62.4026903 149.508386,61.6634537 150.954581,62.149012 L150.954581,62.149012 L151.742552,62.4154854 C177.583763,71.217922 187.402356,80.8916805 181.198332,91.4367609 C175.129904,101.751366 157.484347,109.260339 128.26166,113.963678 C127.613529,114.067994 126.948643,113.945969 126.382735,113.618843 C125.047025,112.846729 124.602046,111.158214 125.388848,109.847438 L125.388848,109.847438 L125.889328,109.0105 C129.877183,102.31633 133.481358,95.6542621 136.701854,89.0242957 C140.50501,81.1948179 144.073967,72.7907081 147.408726,63.8119663 Z M61.7383398,56.0363218 C62.3864708,55.9320063 63.0513565,56.0540315 63.6172646,56.3811573 C64.9529754,57.153271 65.3979538,58.8417862 64.6111517,60.1525615 L64.6111517,60.1525615 L64.1106718,60.9895001 C60.1228168,67.6836699 56.5186416,74.3457379 53.2981462,80.9757043 C49.49499,88.8051821 45.9260328,97.2092919 42.5912744,106.188034 C42.0678608,107.59731 40.4916142,108.336546 39.045419,107.850988 L39.045419,107.850988 L38.2574475,107.584515 C12.4162372,98.782078 2.59764398,89.1083195 8.80166786,78.5632391 C14.8700957,68.2486335 32.515653,60.7396611 61.7383398,56.0363218 Z M103.545792,24.4653746 C123.653461,6.89668641 136.722181,3.38744778 142.751952,13.9376587 C148.649935,24.2572826 146.515508,43.0171122 136.348673,70.2171474 C136.123182,70.8204179 135.695414,71.324709 135.139827,71.6422422 C133.828478,72.3917144 132.163975,71.9253986 131.422058,70.6006966 L131.422058,70.6006966 L130.947416,69.7564798 C127.143661,63.0170065 123.180988,56.6198239 119.059398,50.564932 C114.192119,43.4145727 108.71816,36.1758903 102.637521,28.8488847 C101.683122,27.6988602 101.815056,25.9888243 102.934314,25.0020629 L102.934314,25.0020629 Z M57.6842361,8 C69.3902551,8 84.2912758,19.0909926 102.387298,41.2729777 C102.788651,41.7649527 103.005428,42.3826288 103,43.0184911 C102.986842,44.5193144 101.764215,45.7253489 100.269082,45.7122445 L100.269082,45.7122445 L99.3153456,45.7054689 C91.6943021,45.6640063 84.2856126,45.9284091 77.0892772,46.4986773 C68.5909612,47.17212 59.7164767,48.325393 50.4658235,49.9584962 C49.0138691,50.2148231 47.6245044,49.2578618 47.3403697,47.805758 L47.3403697,47.805758 L47.1871846,47.0136235 C42.2176347,21.0045412 45.7166519,8 57.6842361,8 Z" id="Combined-Shape" fill="#FF4154"></path>
             </g>
-            <path d="M259.694943,160 L259.694943,128.137 L277.109943,128.137 L293.492943,160 L315.422943,160 L298.523943,125.17 C303.597943,123.106 307.596943,119.537 310.520943,114.463 C313.444943,109.389 314.906943,104.186 314.906943,98.854 C314.906943,90.254 312.477443,83.245 307.618443,77.827 C302.759443,72.409 294.911943,69.7 284.075943,69.7 L284.075943,69.7 L240.086943,69.7 L240.086943,160 L259.694943,160 Z M284.333943,109.561 L259.694943,109.561 L259.694943,88.276 L284.333943,88.276 C287.945943,88.276 290.547443,89.2865 292.138443,91.3075 C293.729443,93.3285 294.524943,95.844 294.524943,98.854 C294.524943,105.992 291.127943,109.561 284.333943,109.561 L284.333943,109.561 Z M344.774094,161.548 C355.266094,161.548 363.823094,157.549 370.445094,149.551 L370.445094,149.551 L359.609094,138.715 C355.739094,143.359 350.794094,145.681 344.774094,145.681 C341.076094,145.681 338.023094,144.6705 335.615094,142.6495 C333.207094,140.6285 331.917094,137.554 331.745094,133.426 L331.745094,133.426 L373.928094,133.426 C374.272094,131.19 374.444094,127.965 374.444094,123.751 C374.444094,113.603 371.692094,105.863 366.188094,100.531 C360.684094,95.199 353.546094,92.533 344.774094,92.533 C335.142094,92.533 327.509594,95.629 321.876594,101.821 C316.243594,108.013 313.427094,116.398 313.427094,126.976 C313.427094,137.812 316.222094,146.283 321.812094,152.389 C327.402094,158.495 335.056094,161.548 344.774094,161.548 Z M356.513094,119.365 L331.874094,119.365 C332.304094,115.925 333.594094,113.2375 335.744094,111.3025 C337.894094,109.3675 340.646094,108.4 344.000094,108.4 C351.396094,108.4 355.567094,112.055 356.513094,119.365 L356.513094,119.365 Z M401.086245,161.548 C408.052245,161.548 413.513245,159.398 417.469245,155.098 L417.469245,155.098 L417.469245,160 L436.045245,160 L436.045245,118.333 C436.045245,101.133 426.714245,92.533 408.052245,92.533 C397.302245,92.533 387.885245,95.285 379.801245,100.789 L379.801245,100.789 L385.606245,115.108 C392.572245,110.464 399.624245,108.142 406.762245,108.142 C410.116245,108.142 412.739245,108.9375 414.631245,110.5285 C416.523245,112.1195 417.469245,114.42 417.469245,117.43 L417.469245,117.43 L417.469245,121.042 C414.029245,119.494 409.213245,118.72 403.021245,118.72 C395.883245,118.72 389.648245,120.5475 384.316245,124.2025 C378.984245,127.8575 376.318245,133.082 376.318245,139.876 C376.318245,146.842 378.618745,152.1955 383.219745,155.9365 C387.820745,159.6775 393.776245,161.548 401.086245,161.548 Z M404.698245,145.81 C397.990245,145.81 394.636245,143.875 394.636245,140.005 C394.636245,135.791 398.506245,133.684 406.246245,133.684 C410.288245,133.684 414.029245,134.2 417.469245,135.232 L417.469245,135.232 L417.469245,141.166 C413.599245,144.262 409.342245,145.81 404.698245,145.81 Z M471.975396,161.548 C486.939396,161.548 496.614396,154.109 501.000396,139.231 L501.000396,139.231 L483.069396,134.071 C481.091396,140.435 477.393396,143.617 471.975396,143.617 C468.535396,143.617 465.697396,142.0905 463.461396,139.0375 C461.225396,135.9845 460.107396,132.007 460.107396,127.105 C460.107396,122.203 461.246896,118.204 463.525896,115.108 C465.804896,112.012 468.707396,110.464 472.233396,110.464 C477.307396,110.464 480.919396,113.302 483.069396,118.978 L483.069396,118.978 L500.871396,113.173 C496.571396,99.413 486.939396,92.533 471.975396,92.533 C462.687396,92.533 455.226896,95.6505 449.593896,101.8855 C443.960896,108.1205 441.144396,116.527 441.144396,127.105 C441.144396,137.855 443.939396,146.283 449.529396,152.389 C455.119396,158.495 462.601396,161.548 471.975396,161.548 Z M526.868547,161.548 C532.802547,161.548 537.790547,160.559 541.832547,158.581 L541.832547,158.581 L543.896547,142.843 C540.112547,144.563 536.328547,145.423 532.544547,145.423 C531.512547,145.423 530.631047,145.1005 529.900047,144.4555 C529.169047,143.8105 528.803547,142.886 528.803547,141.682 L528.803547,141.682 L528.803547,110.464 L543.122547,110.464 L543.122547,94.081 L528.803547,94.081 L528.803547,66.862 L510.227547,75.763 L510.227547,94.081 L501.197547,94.081 L501.197547,110.464 L510.227547,110.464 L510.227547,143.488 C510.227547,155.528 515.774547,161.548 526.868547,161.548 Z M635.493849,160 L635.493849,141.037 L592.149849,141.037 L592.149849,69.7 L572.541849,69.7 L572.541849,160 L635.493849,160 Z M663.684,161.548 C673.058,161.548 680.454,158.495 685.872,152.389 C691.29,146.283 693.999,137.855 693.999,127.105 C693.999,116.441 691.2685,108.013 685.8075,101.821 C680.3465,95.629 672.972,92.533 663.684,92.533 C654.31,92.533 646.871,95.629 641.367,101.821 C635.863,108.013 633.111,116.441 633.111,127.105 C633.111,137.855 635.8415,146.283 641.3025,152.389 C646.7635,158.495 654.224,161.548 663.684,161.548 Z M663.684,143.488 C660.072,143.488 657.191,142.0475 655.041,139.1665 C652.891,136.2855 651.816,132.265 651.816,127.105 C651.816,121.945 652.891,117.903 655.041,114.979 C657.191,112.055 660.072,110.593 663.684,110.593 C667.382,110.593 670.2415,112.055 672.2625,114.979 C674.2835,117.903 675.294,121.945 675.294,127.105 C675.294,132.265 674.2835,136.2855 672.2625,139.1665 C670.2415,142.0475 667.382,143.488 663.684,143.488 Z M727.994151,161.548 C742.958151,161.548 752.633151,154.109 757.019151,139.231 L757.019151,139.231 L739.088151,134.071 C737.110151,140.435 733.412151,143.617 727.994151,143.617 C724.554151,143.617 721.716151,142.0905 719.480151,139.0375 C717.244151,135.9845 716.126151,132.007 716.126151,127.105 C716.126151,122.203 717.265651,118.204 719.544651,115.108 C721.823651,112.012 724.726151,110.464 728.252151,110.464 C733.326151,110.464 736.938151,113.302 739.088151,118.978 L739.088151,118.978 L756.890151,113.173 C752.590151,99.413 742.958151,92.533 727.994151,92.533 C718.706151,92.533 711.245651,95.6505 705.612651,101.8855 C699.979651,108.1205 697.163151,116.527 697.163151,127.105 C697.163151,137.855 699.958151,146.283 705.548151,152.389 C711.138151,158.495 718.620151,161.548 727.994151,161.548 Z M783.919302,161.548 C790.885302,161.548 796.346302,159.398 800.302302,155.098 L800.302302,155.098 L800.302302,160 L818.878302,160 L818.878302,118.333 C818.878302,101.133 809.547302,92.533 790.885302,92.533 C780.135302,92.533 770.718302,95.285 762.634302,100.789 L762.634302,100.789 L768.439302,115.108 C775.405302,110.464 782.457302,108.142 789.595302,108.142 C792.949302,108.142 795.572302,108.9375 797.464302,110.5285 C799.356302,112.1195 800.302302,114.42 800.302302,117.43 L800.302302,117.43 L800.302302,121.042 C796.862302,119.494 792.046302,118.72 785.854302,118.72 C778.716302,118.72 772.481302,120.5475 767.149302,124.2025 C761.817302,127.8575 759.151302,133.082 759.151302,139.876 C759.151302,146.842 761.451802,152.1955 766.052802,155.9365 C770.653802,159.6775 776.609302,161.548 783.919302,161.548 Z M787.531302,145.81 C780.823302,145.81 777.469302,143.875 777.469302,140.005 C777.469302,135.791 781.339302,133.684 789.079302,133.684 C793.121302,133.684 796.862302,134.2 800.302302,135.232 L800.302302,135.232 L800.302302,141.166 C796.432302,144.262 792.175302,145.81 787.531302,145.81 Z M847.068453,161.548 C853.002453,161.548 857.990453,160.559 862.032453,158.581 L862.032453,158.581 L864.096453,142.843 C860.312453,144.563 856.528453,145.423 852.744453,145.423 C851.712453,145.423 850.830953,145.1005 850.099953,144.4555 C849.368953,143.8105 849.003453,142.886 849.003453,141.682 L849.003453,141.682 L849.003453,110.464 L863.322453,110.464 L863.322453,94.081 L849.003453,94.081 L849.003453,66.862 L830.427453,75.763 L830.427453,94.081 L821.397453,94.081 L821.397453,110.464 L830.427453,110.464 L830.427453,143.488 C830.427453,155.528 835.974453,161.548 847.068453,161.548 Z M878.741604,87.76 C881.751604,87.76 884.288604,86.7065 886.352604,84.5995 C888.416604,82.4925 889.448604,79.977 889.448604,77.053 C889.448604,74.043 888.416604,71.5275 886.352604,69.5065 C884.288604,67.4855 881.751604,66.475 878.741604,66.475 C875.731604,66.475 873.173104,67.507 871.066104,69.571 C868.959104,71.635 867.905604,74.129 867.905604,77.053 C867.905604,79.977 868.980604,82.4925 871.130604,84.5995 C873.280604,86.7065 875.817604,87.76 878.741604,87.76 Z M888.029604,160 L888.029604,94.081 L869.324604,94.081 L869.324604,160 L888.029604,160 Z M925.120755,161.548 C934.494755,161.548 941.890755,158.495 947.308755,152.389 C952.726755,146.283 955.435755,137.855 955.435755,127.105 C955.435755,116.441 952.705255,108.013 947.244255,101.821 C941.783255,95.629 934.408755,92.533 925.120755,92.533 C915.746755,92.533 908.307755,95.629 902.803755,101.821 C897.299755,108.013 894.547755,116.441 894.547755,127.105 C894.547755,137.855 897.278255,146.283 902.739255,152.389 C908.200255,158.495 915.660755,161.548 925.120755,161.548 Z M925.120755,143.488 C921.508755,143.488 918.627755,142.0475 916.477755,139.1665 C914.327755,136.2855 913.252755,132.265 913.252755,127.105 C913.252755,121.945 914.327755,117.903 916.477755,114.979 C918.627755,112.055 921.508755,110.593 925.120755,110.593 C928.818755,110.593 931.678255,112.055 933.699255,114.979 C935.720255,117.903 936.730755,121.945 936.730755,127.105 C936.730755,132.265 935.720255,136.2855 933.699255,139.1665 C931.678255,142.0475 928.818755,143.488 925.120755,143.488 Z M980.529906,160 L980.529906,125.428 C980.529906,120.354 981.454406,116.613 983.303406,114.205 C985.152406,111.797 988.097906,110.593 992.139906,110.593 C995.923906,110.593 998.611406,111.7755 1000.20241,114.1405 C1001.79341,116.5055 1002.58891,120.354 1002.58891,125.686 L1002.58891,125.686 L1002.58891,160 L1021.29391,160 L1021.29391,117.172 C1021.29391,108.486 1019.01491,102.208 1014.45691,98.338 C1009.89891,94.468 1004.56691,92.533 998.460906,92.533 C990.720906,92.533 984.743906,95.07 980.529906,100.144 L980.529906,100.144 L980.529906,94.081 L961.824906,94.081 L961.824906,160 L980.529906,160 Z" id="ReactRouter" fill="#002C4B" fill-rule="nonzero"></path>
+            <path d="M259.694943,160 L259.694943,128.137 L277.109943,128.137 L293.492943,160 L315.422943,160 L298.523943,125.17 C303.597943,123.106 307.596943,119.537 310.520943,114.463 C313.444943,109.389 314.906943,104.186 314.906943,98.854 C314.906943,90.254 312.477443,83.245 307.618443,77.827 C302.759443,72.409 294.911943,69.7 284.075943,69.7 L284.075943,69.7 L240.086943,69.7 L240.086943,160 L259.694943,160 Z M284.333943,109.561 L259.694943,109.561 L259.694943,88.276 L284.333943,88.276 C287.945943,88.276 290.547443,89.2865 292.138443,91.3075 C293.729443,93.3285 294.524943,95.844 294.524943,98.854 C294.524943,105.992 291.127943,109.561 284.333943,109.561 L284.333943,109.561 Z M344.774094,161.548 C355.266094,161.548 363.823094,157.549 370.445094,149.551 L370.445094,149.551 L359.609094,138.715 C355.739094,143.359 350.794094,145.681 344.774094,145.681 C341.076094,145.681 338.023094,144.6705 335.615094,142.6495 C333.207094,140.6285 331.917094,137.554 331.745094,133.426 L331.745094,133.426 L373.928094,133.426 C374.272094,131.19 374.444094,127.965 374.444094,123.751 C374.444094,113.603 371.692094,105.863 366.188094,100.531 C360.684094,95.199 353.546094,92.533 344.774094,92.533 C335.142094,92.533 327.509594,95.629 321.876594,101.821 C316.243594,108.013 313.427094,116.398 313.427094,126.976 C313.427094,137.812 316.222094,146.283 321.812094,152.389 C327.402094,158.495 335.056094,161.548 344.774094,161.548 Z M356.513094,119.365 L331.874094,119.365 C332.304094,115.925 333.594094,113.2375 335.744094,111.3025 C337.894094,109.3675 340.646094,108.4 344.000094,108.4 C351.396094,108.4 355.567094,112.055 356.513094,119.365 L356.513094,119.365 Z M401.086245,161.548 C408.052245,161.548 413.513245,159.398 417.469245,155.098 L417.469245,155.098 L417.469245,160 L436.045245,160 L436.045245,118.333 C436.045245,101.133 426.714245,92.533 408.052245,92.533 C397.302245,92.533 387.885245,95.285 379.801245,100.789 L379.801245,100.789 L385.606245,115.108 C392.572245,110.464 399.624245,108.142 406.762245,108.142 C410.116245,108.142 412.739245,108.9375 414.631245,110.5285 C416.523245,112.1195 417.469245,114.42 417.469245,117.43 L417.469245,117.43 L417.469245,121.042 C414.029245,119.494 409.213245,118.72 403.021245,118.72 C395.883245,118.72 389.648245,120.5475 384.316245,124.2025 C378.984245,127.8575 376.318245,133.082 376.318245,139.876 C376.318245,146.842 378.618745,152.1955 383.219745,155.9365 C387.820745,159.6775 393.776245,161.548 401.086245,161.548 Z M404.698245,145.81 C397.990245,145.81 394.636245,143.875 394.636245,140.005 C394.636245,135.791 398.506245,133.684 406.246245,133.684 C410.288245,133.684 414.029245,134.2 417.469245,135.232 L417.469245,135.232 L417.469245,141.166 C413.599245,144.262 409.342245,145.81 404.698245,145.81 Z M471.975396,161.548 C486.939396,161.548 496.614396,154.109 501.000396,139.231 L501.000396,139.231 L483.069396,134.071 C481.091396,140.435 477.393396,143.617 471.975396,143.617 C468.535396,143.617 465.697396,142.0905 463.461396,139.0375 C461.225396,135.9845 460.107396,132.007 460.107396,127.105 C460.107396,122.203 461.246896,118.204 463.525896,115.108 C465.804896,112.012 468.707396,110.464 472.233396,110.464 C477.307396,110.464 480.919396,113.302 483.069396,118.978 L483.069396,118.978 L500.871396,113.173 C496.571396,99.413 486.939396,92.533 471.975396,92.533 C462.687396,92.533 455.226896,95.6505 449.593896,101.8855 C443.960896,108.1205 441.144396,116.527 441.144396,127.105 C441.144396,137.855 443.939396,146.283 449.529396,152.389 C455.119396,158.495 462.601396,161.548 471.975396,161.548 Z M526.868547,161.548 C532.802547,161.548 537.790547,160.559 541.832547,158.581 L541.832547,158.581 L543.896547,142.843 C540.112547,144.563 536.328547,145.423 532.544547,145.423 C531.512547,145.423 530.631047,145.1005 529.900047,144.4555 C529.169047,143.8105 528.803547,142.886 528.803547,141.682 L528.803547,141.682 L528.803547,110.464 L543.122547,110.464 L543.122547,94.081 L528.803547,94.081 L528.803547,66.862 L510.227547,75.763 L510.227547,94.081 L501.197547,94.081 L501.197547,110.464 L510.227547,110.464 L510.227547,143.488 C510.227547,155.528 515.774547,161.548 526.868547,161.548 Z M635.493849,160 L635.493849,141.037 L592.149849,141.037 L592.149849,69.7 L572.541849,69.7 L572.541849,160 L635.493849,160 Z M663.684,161.548 C673.058,161.548 680.454,158.495 685.872,152.389 C691.29,146.283 693.999,137.855 693.999,127.105 C693.999,116.441 691.2685,108.013 685.8075,101.821 C680.3465,95.629 672.972,92.533 663.684,92.533 C654.31,92.533 646.871,95.629 641.367,101.821 C635.863,108.013 633.111,116.441 633.111,127.105 C633.111,137.855 635.8415,146.283 641.3025,152.389 C646.7635,158.495 654.224,161.548 663.684,161.548 Z M663.684,143.488 C660.072,143.488 657.191,142.0475 655.041,139.1665 C652.891,136.2855 651.816,132.265 651.816,127.105 C651.816,121.945 652.891,117.903 655.041,114.979 C657.191,112.055 660.072,110.593 663.684,110.593 C667.382,110.593 670.2415,112.055 672.2625,114.979 C674.2835,117.903 675.294,121.945 675.294,127.105 C675.294,132.265 674.2835,136.2855 672.2625,139.1665 C670.2415,142.0475 667.382,143.488 663.684,143.488 Z M727.994151,161.548 C742.958151,161.548 752.633151,154.109 757.019151,139.231 L757.019151,139.231 L739.088151,134.071 C737.110151,140.435 733.412151,143.617 727.994151,143.617 C724.554151,143.617 721.716151,142.0905 719.480151,139.0375 C717.244151,135.9845 716.126151,132.007 716.126151,127.105 C716.126151,122.203 717.265651,118.204 719.544651,115.108 C721.823651,112.012 724.726151,110.464 728.252151,110.464 C733.326151,110.464 736.938151,113.302 739.088151,118.978 L739.088151,118.978 L756.890151,113.173 C752.590151,99.413 742.958151,92.533 727.994151,92.533 C718.706151,92.533 711.245651,95.6505 705.612651,101.8855 C699.979651,108.1205 697.163151,116.527 697.163151,127.105 C697.163151,137.855 699.958151,146.283 705.548151,152.389 C711.138151,158.495 718.620151,161.548 727.994151,161.548 Z M783.919302,161.548 C790.885302,161.548 796.346302,159.398 800.302302,155.098 L800.302302,155.098 L800.302302,160 L818.878302,160 L818.878302,118.333 C818.878302,101.133 809.547302,92.533 790.885302,92.533 C780.135302,92.533 770.718302,95.285 762.634302,100.789 L762.634302,100.789 L768.439302,115.108 C775.405302,110.464 782.457302,108.142 789.595302,108.142 C792.949302,108.142 795.572302,108.9375 797.464302,110.5285 C799.356302,112.1195 800.302302,114.42 800.302302,117.43 L800.302302,117.43 L800.302302,121.042 C796.862302,119.494 792.046302,118.72 785.854302,118.72 C778.716302,118.72 772.481302,120.5475 767.149302,124.2025 C761.817302,127.8575 759.151302,133.082 759.151302,139.876 C759.151302,146.842 761.451802,152.1955 766.052802,155.9365 C770.653802,159.6775 776.609302,161.548 783.919302,161.548 Z M787.531302,145.81 C780.823302,145.81 777.469302,143.875 777.469302,140.005 C777.469302,135.791 781.339302,133.684 789.079302,133.684 C793.121302,133.684 796.862302,134.2 800.302302,135.232 L800.302302,135.232 L800.302302,141.166 C796.432302,144.262 792.175302,145.81 787.531302,145.81 Z M847.068453,161.548 C853.002453,161.548 857.990453,160.559 862.032453,158.581 L862.032453,158.581 L864.096453,142.843 C860.312453,144.563 856.528453,145.423 852.744453,145.423 C851.712453,145.423 850.830953,145.1005 850.099953,144.4555 C849.368953,143.8105 849.003453,142.886 849.003453,141.682 L849.003453,141.682 L849.003453,110.464 L863.322453,110.464 L863.322453,94.081 L849.003453,94.081 L849.003453,66.862 L830.427453,75.763 L830.427453,94.081 L821.397453,94.081 L821.397453,110.464 L830.427453,110.464 L830.427453,143.488 C830.427453,155.528 835.974453,161.548 847.068453,161.548 Z M878.741604,87.76 C881.751604,87.76 884.288604,86.7065 886.352604,84.5995 C888.416604,82.4925 889.448604,79.977 889.448604,77.053 C889.448604,74.043 888.416604,71.5275 886.352604,69.5065 C884.288604,67.4855 881.751604,66.475 878.741604,66.475 C875.731604,66.475 873.173104,67.507 871.066104,69.571 C868.959104,71.635 867.905604,74.129 867.905604,77.053 C867.905604,79.977 868.980604,82.4925 871.130604,84.5995 C873.280604,86.7065 875.817604,87.76 878.741604,87.76 Z M888.029604,160 L888.029604,94.081 L869.324604,94.081 L869.324604,160 L888.029604,160 Z M925.120755,161.548 C934.494755,161.548 941.890755,158.495 947.308755,152.389 C952.726755,146.283 955.435755,137.855 955.435755,127.105 C955.435755,116.441 952.705255,108.013 947.244255,101.821 C941.783255,95.629 934.408755,92.533 925.120755,92.533 C915.746755,92.533 908.307755,95.629 902.803755,101.821 C897.299755,108.013 894.547755,116.441 894.547755,127.105 C894.547755,137.855 897.278255,146.283 902.739255,152.389 C908.200255,158.495 915.660755,161.548 925.120755,161.548 Z M925.120755,143.488 C921.508755,143.488 918.627755,142.0475 916.477755,139.1665 C914.327755,136.2855 913.252755,132.265 913.252755,127.105 C913.252755,121.945 914.327755,117.903 916.477755,114.979 C918.627755,112.055 921.508755,110.593 925.120755,110.593 C928.818755,110.593 931.678255,112.055 933.699255,114.979 C935.720255,117.903 936.730755,121.945 936.730755,127.105 C936.730755,132.265 935.720255,136.2855 933.699255,139.1665 C931.678255,142.0475 928.818755,143.488 925.120755,143.488 Z M980.529906,160 L980.529906,125.428 C980.529906,120.354 981.454406,116.613 983.303406,114.205 C985.152406,111.797 988.097906,110.593 992.139906,110.593 C995.923906,110.593 998.611406,111.7755 1000.20241,114.1405 C1001.79341,116.5055 1002.58891,120.354 1002.58891,125.686 L1002.58891,125.686 L1002.58891,160 L1021.29391,160 L1021.29391,117.172 C1021.29391,108.486 1019.01491,102.208 1014.45691,98.338 C1009.89891,94.468 1004.56691,92.533 998.460906,92.533 C990.720906,92.533 984.743906,95.07 980.529906,100.144 L980.529906,100.144 L980.529906,94.081 L961.824906,94.081 L961.824906,160 L980.529906,160 Z" id="Router" fill="#002C4B" fill-rule="nonzero"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/package.json b/package.json
index 2ceb666b4d..fc7f31e3dc 100644
--- a/package.json
+++ b/package.json
@@ -34,10 +34,9 @@
       "@tanstack/loaders": "workspace:*",
       "@tanstack/actions": "workspace:*",
       "@tanstack/react-store": "workspace:*",
-      "@tanstack/react-router": "workspace:*",
       "@tanstack/react-actions": "workspace:*",
       "@tanstack/react-loaders": "workspace:*",
-      "@tanstack/react-router-devtools": "workspace:*",
+      "@tanstack/router-devtools": "workspace:*",
       "@tanstack/solid-router": "workspace:*",
       "@tanstack/solid-store": "workspace:*",
       "@tanstack/solid-loaders": "workspace:*",
diff --git a/packages/loaders/src/index.ts b/packages/loaders/src/index.ts
index 5b0c741541..c05e5a9a92 100644
--- a/packages/loaders/src/index.ts
+++ b/packages/loaders/src/index.ts
@@ -16,10 +16,10 @@ export type RegisteredLoaders = Register extends {
   loaderClient: LoaderClient<infer TLoaders>
 }
   ? TLoaders
-  : Loader[]
+  : Record<string, Loader>
 
 export interface LoaderClientOptions<
-  TLoaders extends Loader<any, any, any, any>[],
+  TLoaders extends Record<string, AnyLoader>,
 > {
   getLoaders: () => TLoaders
   defaultMaxAge?: number
@@ -56,18 +56,31 @@ export interface DehydratedLoaderClient {
   >
 }
 
+type ResolveLoaders<TLoaders extends Record<string, AnyLoader>> = {
+  [TKey in keyof TLoaders]: TLoaders[TKey] extends Loader<
+    infer _,
+    infer TVariables,
+    infer TData,
+    infer TError
+  >
+    ? Loader<_, TVariables, TData, TError>
+    : Loader
+}
+
 // A loader client that tracks instances of loaders by unique key like react query
 export class LoaderClient<
-  TLoaders extends Loader<any, any, any, any>[] = Loader[],
+  _TLoaders extends Record<string, AnyLoader> = Record<string, Loader>,
+  TLoaders extends ResolveLoaders<_TLoaders> = ResolveLoaders<_TLoaders>,
 > {
-  options: LoaderClientOptions<TLoaders>
-  loaders: Record<string, Loader>
+  options: LoaderClientOptions<_TLoaders>
+  loaders: TLoaders
+  loaderInstances: Record<string, LoaderInstance> = {}
   __store: LoaderClientStore
   state: LoaderClientStore['state']
 
   initialized = false
 
-  constructor(options: LoaderClientOptions<TLoaders>) {
+  constructor(options: LoaderClientOptions<_TLoaders>) {
     this.options = options
     this.__store = new Store(
       {
@@ -82,111 +95,76 @@ export class LoaderClient<
     ) as LoaderClientStore
 
     this.state = this.__store.state
-    this.loaders = {}
+    this.loaders = {} as any
   }
 
   init = () => {
-    this.options.getLoaders().forEach((loader) => {
-      loader.client = this
-
-      this.loaders[loader.key] = loader
-    })
+    Object.entries(this.options.getLoaders()).forEach(
+      ([key, loader]: [string, Loader]) => {
+        ;(this.loaders as any)[key] = loader.init(key)
+      },
+    )
     this.initialized = true
   }
 
-  getLoader<TKey extends TLoaders[number]['key']>(opts: {
-    key: TKey
-  }): LoaderByKey<TLoaders, TKey> {
-    if (!this.initialized) this.init()
-
-    return this.loaders[opts.key as any] as any
-  }
-
-  dehydrate = (): DehydratedLoaderClient => {
-    return {
-      loaders: Object.values(this.loaders).reduce(
-        (acc, loader) => ({
-          ...acc,
-          [loader.key]: Object.values(loader.instances).reduce(
-            (acc, instance) => ({
-              ...acc,
-              [instance.hashedKey]: {
-                hashedKey: instance.hashedKey,
-                variables: instance.variables,
-                state: instance.state,
-              },
-            }),
-            {},
-          ),
-        }),
-        {},
-      ),
-    }
-  }
-
-  hydrate = (data: DehydratedLoaderClient) => {
-    Object.entries(data.loaders).forEach(([loaderKey, instances]) => {
-      const loader = this.getLoader({ key: loaderKey }) as Loader
-
-      Object.values(instances).forEach((dehydratedInstance) => {
-        let instance = loader.instances[dehydratedInstance.hashedKey]
-
-        if (!instance) {
-          instance = loader.instances[dehydratedInstance.hashedKey] =
-            loader.getInstance({
-              variables: dehydratedInstance.variables,
-            })
-        }
-
-        instance.__store.setState(() => dehydratedInstance.state)
-      })
-    })
-  }
+  // dehydrate = (): DehydratedLoaderClient => {
+  //   return {
+  //     loaders: Object.values(this.loaders).reduce(
+  //       (acc, loader) => ({
+  //         ...acc,
+  //         [loader.key]: Object.values(loader.instances).reduce(
+  //           (acc, instance) => ({
+  //             ...acc,
+  //             [instance.hashedKey]: {
+  //               hashedKey: instance.hashedKey,
+  //               variables: instance.variables,
+  //               state: instance.state,
+  //             },
+  //           }),
+  //           {},
+  //         ),
+  //       }),
+  //       {},
+  //     ),
+  //   }
+  // }
+
+  // hydrate = (data: DehydratedLoaderClient) => {
+  //   Object.entries(data.loaders).forEach(([loaderKey, instances]) => {
+  //     const loader = this.getLoader({ key: loaderKey }) as Loader
+
+  //     Object.values(instances).forEach((dehydratedInstance) => {
+  //       let instance = loader.instances[dehydratedInstance.hashedKey]
+
+  //       if (!instance) {
+  //         instance = loader.instances[dehydratedInstance.hashedKey] =
+  //           loader.getInstance({
+  //             variables: dehydratedInstance.variables,
+  //           })
+  //       }
+
+  //       instance.__store.setState(() => dehydratedInstance.state)
+  //     })
+  //   })
+  // }
 }
 
 export type LoaderByKey<
-  TLoaders extends Loader<any, any, any, any>[],
-  TKey extends TLoaders[number]['key'],
-  TResolvedLoader extends {
-    [TLoader in TLoaders[number] as number]: TLoader extends Loader<
-      TKey,
-      infer TVariables,
-      infer TData,
-      infer TError
-    >
-      ? Loader<TKey, TVariables, TData, TError>
-      : never
-  } = {
-    [TLoader in TLoaders[number] as number]: TLoader extends Loader<
-      TKey,
-      infer TVariables,
-      infer TData,
-      infer TError
-    >
-      ? Loader<TKey, TVariables, TData, TError>
-      : never
-  },
-> = TResolvedLoader[number] extends never ? Loader : TResolvedLoader[number]
+  TLoaders extends Record<string, AnyLoader>,
+  TKey extends keyof TLoaders,
+> = TLoaders[TKey]
 
 export type LoaderInstanceByKey<
-  TLoaders extends Loader<any, any, any, any>[],
-  TKey extends TLoaders[number]['key'],
-  TResolvedLoaderInstance extends {
-    [TLoader in TLoaders[number] as number]: TLoader extends {
-      options: LoaderOptions<TKey, infer TVariables, infer TData, infer TError>
-    }
-      ? LoaderInstance<TKey, TVariables, TData, TError>
-      : never
-  } = {
-    [TLoader in TLoaders[number] as number]: TLoader extends {
-      options: LoaderOptions<TKey, infer TVariables, infer TData, infer TError>
-    }
-      ? LoaderInstance<TKey, TVariables, TData, TError>
-      : never
-  },
-> = TResolvedLoaderInstance[number] extends never
-  ? LoaderInstance
-  : TResolvedLoaderInstance[number]
+  TLoaders extends Record<string, AnyLoader>,
+  TKey extends keyof TLoaders,
+> = TLoaders[TKey] extends Loader<
+  infer _,
+  infer TVariables,
+  infer TData,
+  infer TError
+>
+  ? LoaderInstance<_, TVariables, TData, TError>
+  : never
 
 export type LoaderCallback<TKey extends string, TVariables, TData, TError> = (
   loader: Loader<TKey, TVariables, TData, TError>,
@@ -228,7 +206,13 @@ export interface LoaderOptions<
   TData = unknown,
   TError = Error,
 > {
-  key: TKey
+  fn: (
+    variables: TVariables,
+    loaderOpts: {
+      loaderInstance: LoaderInstance<TKey, TVariables, TData, TError>
+      signal?: AbortSignal
+    },
+  ) => TData | Promise<TData>
   // The max age to consider loader data fresh (not-stale) in milliseconds from the time of fetch
   // Defaults to 1000. Only stale loader data is refetched.
   maxAge?: number
@@ -236,14 +220,7 @@ export interface LoaderOptions<
   // The max age to client the loader data in milliseconds from the time of route inactivity
   // before it is garbage collected.
   gcMaxAge?: number
-  loader: (
-    variables: TVariables,
-    loaderOpts: {
-      loaderInstance: LoaderInstance<TKey, TVariables, TData, TError>
-      signal?: AbortSignal
-    },
-  ) => TData | Promise<TData>
-  onAllInvalidate?: LoaderCallback<TKey, TVariables, TData, TError>
+  onInvalidate?: LoaderCallback<TKey, TVariables, TData, TError>
   onEachInvalidate?: LoaderInstanceCallback<TKey, TVariables, TData, TError>
   onLatestSuccess?: LoaderInstanceCallback<TKey, TVariables, TData, TError>
   onEachSuccess?: LoaderInstanceCallback<TKey, TVariables, TData, TError>
@@ -296,6 +273,8 @@ export type VariablesFn<
 const visibilityChangeEvent = 'visibilitychange'
 const focusEvent = 'focus'
 
+export type AnyLoader = Loader<any, any, any, any>
+
 export class Loader<
   TKey extends string = string,
   TVariables = unknown,
@@ -309,7 +288,7 @@ export class Loader<
     error: TError
   }
   options: LoaderOptions<TKey, TVariables, TData, TError>
-  key: TKey
+  key!: TKey
   client?: LoaderClient<any>
   instances: Record<string, LoaderInstance<TKey, TVariables, TData, TError>>
 
@@ -317,7 +296,6 @@ export class Loader<
 
   constructor(options: LoaderOptions<TKey, TVariables, TData, TError>) {
     this.options = options
-    this.key = this.options.key
     this.instances = {}
 
     // addEventListener does not exist in React Native, but window does
@@ -330,6 +308,11 @@ export class Loader<
     }
   }
 
+  init = (key: TKey) => {
+    this.key = key
+    return this as Loader<TKey, TVariables, TData, TError>
+  }
+
   dispose = () => {
     if (typeof window !== 'undefined' && window.removeEventListener) {
       // Be sure to unsubscribe if a new handler is set
@@ -388,7 +371,7 @@ export class Loader<
     return this.getInstance(opts).fetch(opts as any)
   }
 
-  invalidate: VariablesFn<
+  invalidateInstance: VariablesFn<
     TVariables,
     Promise<void>,
     {
@@ -396,10 +379,10 @@ export class Loader<
     }
   > = async (opts: any = {}) => {
     await this.getInstance(opts).invalidate()
-    await this.options.onAllInvalidate?.(this)
+    await this.options.onInvalidate?.(this)
   }
 
-  invalidateAll = async () => {
+  invalidate = async () => {
     await Promise.all(
       Object.values(this.instances).map((loader) => loader.invalidate()),
     )
@@ -675,7 +658,7 @@ export class LoaderInstance<
       try {
         const loaderImpl =
           this.loader.client?.options.wrapLoaderFn?.(this) ??
-          this.loader.options.loader
+          this.loader.options.fn
 
         const data = await loaderImpl(this.variables as any, {
           loaderInstance: this,
diff --git a/packages/react-actions/src/index.tsx b/packages/react-actions/src/index.tsx
index cfb0250b37..7a28420b6d 100644
--- a/packages/react-actions/src/index.tsx
+++ b/packages/react-actions/src/index.tsx
@@ -57,7 +57,7 @@ export function useAction<
 
   const action = allOpts.action ?? actionClient.getAction({ key: allOpts.key })
 
-  useStore(action.__store, (d) => allOpts?.track?.(d as any) ?? d, true)
+  useStore(action.__store, (d) => allOpts?.track?.(d as any) ?? d)
 
   return action as any
 }
@@ -72,7 +72,7 @@ export function useActionClient(opts?: {
       'useActionClient must be used inside a <ActionClientProvider> component!',
     )
 
-  useStore(actionClient.__store, (d) => opts?.track?.(d as any) ?? d, true)
+  useStore(actionClient.__store, (d) => opts?.track?.(d as any) ?? d)
 
   return actionClient
 }
diff --git a/packages/react-loaders/src/index.tsx b/packages/react-loaders/src/index.tsx
index 16c15592d7..7e9f8c7590 100644
--- a/packages/react-loaders/src/index.tsx
+++ b/packages/react-loaders/src/index.tsx
@@ -102,7 +102,7 @@ export function useLoaderInstance<
     'useLoaderInstance must be used inside a <LoaderClientProvider> component!',
   )
 
-  const loader = optsLoader ?? loaderClient.getLoader({ key: optsKey })
+  const loader = optsLoader ?? loaderClient.loaders[optsKey]
   const loaderInstance = loader.getInstance({
     variables: opts?.variables,
   })
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
deleted file mode 100644
index 85558bdae0..0000000000
--- a/packages/react-router/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "name": "@tanstack/react-router",
-  "author": "Tanner Linsley",
-  "version": "0.0.1-beta.82",
-  "license": "MIT",
-  "repository": "tanstack/router",
-  "homepage": "https://tanstack.com/router/",
-  "description": "",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "react",
-    "location",
-    "@tanstack/react-router",
-    "router",
-    "routing",
-    "async",
-    "async router",
-    "typescript"
-  ],
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/tannerlinsley"
-  },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/index.js",
-  "browser": "build/umd/index.production.js",
-  "types": "build/types/index.d.ts",
-  "engines": {
-    "node": ">=12"
-  },
-  "files": [
-    "build/**",
-    "src"
-  ],
-  "sideEffects": false,
-  "peerDependencies": {
-    "react": ">=16",
-    "react-dom": ">=16"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "@tanstack/router": "workspace:*",
-    "@tanstack/react-store": "workspace:*"
-  },
-  "devDependencies": {
-    "babel-plugin-transform-async-to-promises": "^0.8.18"
-  }
-}
diff --git a/packages/react-router/tsconfig.json b/packages/react-router/tsconfig.json
deleted file mode 100644
index 40bee4528e..0000000000
--- a/packages/react-router/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "composite": true,
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./build/types"
-  },
-  "files": ["src/index.tsx"],
-  "include": [
-    "src"
-    //  "__tests__/**/*.test.*"
-  ]
-}
diff --git a/packages/react-store/src/index.tsx b/packages/react-store/src/index.tsx
index a25536a68a..df41b1227e 100644
--- a/packages/react-store/src/index.tsx
+++ b/packages/react-store/src/index.tsx
@@ -1,7 +1,8 @@
-import { Store, AnyUpdater, shallow } from '@tanstack/store'
-
+import { AnyUpdater, Store } from '@tanstack/store'
 import { useSyncExternalStoreWithSelector } from 'use-sync-external-store/shim/with-selector'
 
+export * from '@tanstack/store'
+
 export type NoInfer<T> = [T][T extends any ? 0 : never]
 
 export function useStore<
@@ -11,16 +12,44 @@ export function useStore<
 >(
   store: Store<TState, TUpdater>,
   selector: (state: NoInfer<TState>) => TSelected = (d) => d as any,
-  compareShallow?: boolean,
 ) {
   const slice = useSyncExternalStoreWithSelector(
     store.subscribe,
     () => store.state,
     () => store.state,
     selector,
-    compareShallow ? shallow : undefined,
+    shallow,
   )
 
   return slice
 }
 
+export function shallow<T>(objA: T, objB: T) {
+  if (Object.is(objA, objB)) {
+    return true
+  }
+
+  if (
+    typeof objA !== 'object' ||
+    objA === null ||
+    typeof objB !== 'object' ||
+    objB === null
+  ) {
+    return false
+  }
+
+  const keysA = Object.keys(objA)
+  if (keysA.length !== Object.keys(objB).length) {
+    return false
+  }
+
+  for (let i = 0; i < keysA.length; i++) {
+    if (
+      !Object.prototype.hasOwnProperty.call(objB, keysA[i] as string) ||
+      !Object.is(objA[keysA[i] as keyof T], objB[keysA[i] as keyof T])
+    ) {
+      return false
+    }
+  }
+  return true
+}
diff --git a/packages/router-cli/bin/tsr.js b/packages/router-cli/bin/tsr.js
deleted file mode 100755
index 145a9a772c..0000000000
--- a/packages/router-cli/bin/tsr.js
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require('../build/cjs/index')
diff --git a/packages/router-cli/package.json b/packages/router-cli/package.json
deleted file mode 100644
index 35c985e79a..0000000000
--- a/packages/router-cli/package.json
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "name": "@tanstack/router-cli",
-  "author": "Tanner Linsley",
-  "version": "0.0.1-beta.69",
-  "license": "MIT",
-  "repository": "tanstack/router",
-  "homepage": "https://tanstack.com/router",
-  "description": "",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "react",
-    "location",
-    "router",
-    "routing",
-    "async",
-    "async router",
-    "typescript"
-  ],
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/tannerlinsley"
-  },
-  "type": "commonjs",
-  "bin": {
-    "tsr": "bin/tsr.js"
-  },
-  "engines": {
-    "node": ">=12"
-  },
-  "files": [
-    "build/**",
-    "src/**",
-    "bin/**"
-  ],
-  "sideEffects": false,
-  "module": "bin/tsr.js",
-  "main": "bin/tsr.js",
-  "browser": "bin/tsr.js",
-  "types": "build/types/index.d.ts",
-  "dependencies": {
-    "@babel/core": "^7.20.2",
-    "@babel/plugin-syntax-jsx": "^7.18.6",
-    "@babel/plugin-syntax-typescript": "^7.20.0",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/template": "^7.18.10",
-    "@babel/types": "^7.20.2",
-    "@types/fs-extra": "^9.0.13",
-    "@types/klaw": "^3.0.3",
-    "@types/through2": "^2.0.38",
-    "@types/yargs": "^17.0.15",
-    "chokidar": "^3.5.3",
-    "dedent": "^0.7.0",
-    "fs-extra": "^10.1.0",
-    "klaw": "^4.0.1",
-    "nodemon": "^2.0.20",
-    "through2": "^4.0.2",
-    "yargs": "^17.6.2"
-  }
-}
diff --git a/packages/router-cli/src/config.ts b/packages/router-cli/src/config.ts
deleted file mode 100644
index 8f2b453939..0000000000
--- a/packages/router-cli/src/config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import path from 'path'
-import fs from 'fs-extra'
-
-export type Config = {
-  rootDirectory: string
-  sourceDirectory: string
-  routesDirectory: string
-  routeGenDirectory: string
-}
-
-const configFilePathJson = path.resolve(process.cwd(), 'tsr.config.json')
-
-export async function getConfig() {
-  return fs.readJson(configFilePathJson)
-}
diff --git a/packages/router-cli/src/generate.ts b/packages/router-cli/src/generate.ts
deleted file mode 100644
index caadb956b2..0000000000
--- a/packages/router-cli/src/generate.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { generator } from './generator'
-import { Config } from './config'
-
-export async function generate(config: Config) {
-  try {
-    await generator(config)
-    process.exit(0)
-  } catch (err) {
-    console.error(err)
-    process.exit(1)
-  }
-}
diff --git a/packages/router-cli/src/generator.ts b/packages/router-cli/src/generator.ts
deleted file mode 100644
index d5a21a8883..0000000000
--- a/packages/router-cli/src/generator.ts
+++ /dev/null
@@ -1,513 +0,0 @@
-import klaw from 'klaw'
-import through2 from 'through2'
-import path from 'path'
-import fs from 'fs-extra'
-import crypto from 'crypto'
-import {
-  detectExports,
-  ensureBoilerplate,
-  generateRouteConfig,
-  isolatedProperties,
-  isolateOptionToExport,
-} from './transformCode'
-import { Config } from './config'
-
-let latestTask = 0
-export const rootRouteName = '__root'
-export const rootRouteClientName = '__root.client'
-
-export type RouteNode = {
-  filename: string
-  clientFilename: string
-  fileNameNoExt: string
-  fullPath: string
-  fullDir: string
-  isDirectory: boolean
-  isIndex: boolean
-  variable: string
-  childRoutesDir?: string
-  genPath: string
-  genDir: string
-  genPathNoExt: string
-  parent?: RouteNode
-  hash?: string
-  importedFiles?: string[]
-  version?: number
-  changed?: boolean
-  new?: boolean
-  isRoot?: boolean
-  children?: RouteNode[]
-}
-
-export type IsolatedExport = {
-  key: string
-  exported: boolean
-  code?: string | null
-}
-
-let nodeCache: RouteNode[] = undefined!
-
-export async function generator(config: Config) {
-  console.log()
-
-  let first = false
-
-  if (!nodeCache) {
-    first = true
-    console.log('🔄 Generating routes...')
-    nodeCache = []
-  } else {
-    console.log('♻️  Regenerating routes...')
-  }
-
-  const taskId = latestTask + 1
-  latestTask = taskId
-
-  const checkLatest = () => {
-    if (latestTask !== taskId) {
-      console.log(`- Skipping since file changes were made while generating.`)
-      return false
-    }
-
-    return true
-  }
-
-  const start = Date.now()
-  let routeConfigImports: string[] = []
-  let routeConfigClientImports: string[] = []
-
-  let nodesChanged = false
-  const fileQueue: [string, string][] = []
-  const queueWriteFile = (filename: string, content: string) => {
-    fileQueue.push([filename, content])
-  }
-
-  async function reparent(dir: string): Promise<RouteNode[]> {
-    let dirList
-
-    try {
-      dirList = await fs.readdir(dir)
-    } catch (err) {
-      console.log()
-      console.error(
-        'TSR: Error reading the config.routesDirectory. Does it exist?',
-      )
-      console.log()
-      throw err
-    }
-
-    const dirListCombo = multiSortBy(
-      await Promise.all(
-        dirList.map(async (filename): Promise<RouteNode> => {
-          const fullPath = path.resolve(dir, filename)
-          const stat = await fs.lstat(fullPath)
-          const ext = path.extname(filename)
-
-          const clientFilename = filename.replace(ext, `.client${ext}`)
-
-          const pathFromRoutes = path.relative(config.routesDirectory, fullPath)
-          const genPath = path.resolve(config.routeGenDirectory, pathFromRoutes)
-
-          const genPathNoExt = removeExt(genPath)
-          const genDir = path.resolve(genPath, '..')
-
-          const fileNameNoExt = removeExt(filename)
-
-          return {
-            filename,
-            clientFilename,
-            fileNameNoExt,
-            fullPath,
-            fullDir: dir,
-            genPath,
-            genDir,
-            genPathNoExt,
-            variable: fileToVariable(removeExt(pathFromRoutes)),
-            isDirectory: stat.isDirectory(),
-            isIndex: fileNameNoExt === 'index',
-          }
-        }),
-      ),
-      [
-        (d) => (d.fileNameNoExt === 'index' ? -1 : 1),
-        (d) => d.fileNameNoExt,
-        (d) => (d.isDirectory ? 1 : -1),
-      ],
-    )
-
-    const reparented: typeof dirListCombo = []
-
-    dirListCombo.forEach(async (d, i) => {
-      if (d.isDirectory) {
-        const parent = reparented.find(
-          (dd) => !dd.isDirectory && dd.fileNameNoExt === d.filename,
-        )
-
-        if (parent) {
-          parent.childRoutesDir = d.fullPath
-        } else {
-          reparented.push(d)
-        }
-      } else {
-        reparented.push(d)
-      }
-    })
-
-    return Promise.all(
-      reparented.map(async (d) => {
-        if (d.childRoutesDir) {
-          const children = await reparent(d.childRoutesDir)
-
-          d = {
-            ...d,
-            children,
-          }
-
-          children.forEach((child) => (child.parent = d))
-
-          return d
-        }
-        return d
-      }),
-    )
-  }
-
-  const reparented = await reparent(config.routesDirectory)
-
-  async function buildRouteConfig(
-    nodes: RouteNode[],
-    depth = 1,
-  ): Promise<string> {
-    const children = nodes.map(async (n) => {
-      let node = nodeCache.find((d) => d.fullPath === n.fullPath)!
-
-      if (node) {
-        node.new = false
-      } else {
-        node = n
-        nodeCache.push(node)
-        if (!first) {
-          node.new = true
-        }
-      }
-
-      node.version = latestTask
-      if (node.fileNameNoExt === '__root') {
-        node.isRoot = true
-      }
-
-      const routeCode = await fs.readFile(node.fullPath, 'utf-8')
-
-      const hashSum = crypto.createHash('sha256')
-      hashSum.update(routeCode)
-      const hash = hashSum.digest('hex')
-
-      node.changed = node.hash !== hash
-      if (node.changed) {
-        nodesChanged = true
-        node.hash = hash
-
-        try {
-          // Ensure the boilerplate for the route exists
-          const code = await ensureBoilerplate(node, routeCode)
-
-          if (code) {
-            await fs.writeFile(node.fullPath, code)
-          }
-
-          let imports: IsolatedExport[] = []
-
-          if (!node.isRoot) {
-            // Generate the isolated files
-            const transforms = await Promise.all(
-              isolatedProperties.map(async (key): Promise<IsolatedExport> => {
-                let exported = false
-                let exports: string[] = []
-
-                const transformed = await isolateOptionToExport(
-                  node,
-                  routeCode,
-                  {
-                    isolate: key,
-                  },
-                )
-
-                if (transformed) {
-                  exports = await detectExports(transformed)
-                  if (exports.includes(key)) {
-                    exported = true
-                  }
-                }
-
-                return { key, exported, code: transformed }
-              }),
-            )
-
-            imports = transforms.filter(({ exported }) => exported)
-
-            node.importedFiles = await Promise.all(
-              imports.map(({ key, code }) => {
-                const importFilename = `${node.genPathNoExt}-${key}.tsx`
-                queueWriteFile(importFilename, code!)
-                return importFilename
-              }),
-            )
-          }
-
-          const routeConfigCode = await generateRouteConfig(
-            node,
-            routeCode,
-            imports,
-            false,
-          )
-
-          const clientRouteConfigCode = await generateRouteConfig(
-            node,
-            routeCode,
-            imports,
-            true,
-          )
-
-          queueWriteFile(node.genPath, routeConfigCode)
-          queueWriteFile(
-            path.resolve(node.genDir, node.clientFilename),
-            clientRouteConfigCode,
-          )
-        } catch (err) {
-          node.hash = ''
-        }
-      }
-
-      routeConfigImports.push(
-        `import { route as ${node.variable}Route } from './${removeExt(
-          path
-            .relative(config.routeGenDirectory, node.genPath)
-            .replace(/\\/gi, '/'),
-        )}'`,
-      )
-
-      routeConfigClientImports.push(
-        `import { route as ${node.variable}Route } from './${removeExt(
-          path
-            .relative(
-              config.routeGenDirectory,
-              path.resolve(node.genDir, node.clientFilename),
-            )
-            .replace(/\\/gi, '/'),
-        )}'`,
-      )
-
-      if (node.isRoot) {
-        return undefined
-      }
-
-      const route = `${node.variable}Route`
-
-      if (node.children?.length) {
-        const childConfigs = await buildRouteConfig(node.children, depth + 1)
-        return `${route}.addChildren([\n${spaces(
-          depth * 4,
-        )}${childConfigs}\n${spaces(depth * 2)}])`
-      }
-
-      return route
-    })
-
-    return (await Promise.all(children))
-      .filter(Boolean)
-      .join(`,\n${spaces(depth * 2)}`)
-  }
-
-  const routeConfigChildrenText = await buildRouteConfig(reparented)
-
-  routeConfigImports = multiSortBy(routeConfigImports, [
-    (d) => (d.includes('__root') ? -1 : 1),
-    (d) => d.split('/').length,
-    (d) => (d.endsWith("index'") ? -1 : 1),
-    (d) => d,
-  ])
-
-  routeConfigClientImports = multiSortBy(routeConfigClientImports, [
-    (d) => (d.includes('__root') ? -1 : 1),
-    (d) => d.split('/').length,
-    (d) => (d.endsWith("index.client'") ? -1 : 1),
-    (d) => d,
-  ])
-
-  const routeConfig = `export const routeTree = rootRoute.addChildren([\n  ${routeConfigChildrenText}\n])\nexport type __GeneratedRouteConfig = typeof routeTree`
-  const routeConfigClient = `export const routeTreeClient = rootRoute.addChildren([\n  ${routeConfigChildrenText}\n]) as __GeneratedRouteConfig`
-
-  const routeConfigFileContent = [
-    routeConfigImports.join('\n'),
-    routeConfig,
-  ].join('\n\n')
-
-  const routeConfigClientFileContent = [
-    `import type { __GeneratedRouteConfig } from './routeTree'`,
-    routeConfigClientImports.join('\n'),
-    routeConfigClient,
-  ].join('\n\n')
-
-  if (nodesChanged) {
-    queueWriteFile(
-      path.resolve(config.routeGenDirectory, 'routeTree.ts'),
-      routeConfigFileContent,
-    )
-    queueWriteFile(
-      path.resolve(config.routeGenDirectory, 'routeTree.client.ts'),
-      routeConfigClientFileContent,
-    )
-  }
-
-  // Do all of our file system manipulation at the end
-  await fs.mkdir(config.routeGenDirectory, { recursive: true })
-
-  if (!checkLatest()) return
-
-  await Promise.all(
-    fileQueue.map(async ([filename, content]) => {
-      await fs.ensureDir(path.dirname(filename))
-      const exists = await fs.pathExists(filename)
-      let current = ''
-      if (exists) {
-        current = await fs.readFile(filename, 'utf-8')
-      }
-      if (current !== content) {
-        await fs.writeFile(filename, content)
-      }
-    }),
-  )
-
-  if (!checkLatest()) return
-
-  const allFiles = await getAllFiles(config.routeGenDirectory)
-
-  if (!checkLatest()) return
-
-  const removedNodes: RouteNode[] = []
-
-  nodeCache = nodeCache.filter((d) => {
-    if (d.version !== latestTask) {
-      removedNodes.push(d)
-      return false
-    }
-    return true
-  })
-
-  const newNodes = nodeCache.filter((d) => d.new)
-  const updatedNodes = nodeCache.filter((d) => !d.new && d.changed)
-
-  const unusedFiles = allFiles.filter((d) => {
-    if (
-      d === path.resolve(config.routeGenDirectory, 'routeTree.ts') ||
-      d === path.resolve(config.routeGenDirectory, 'routeTree.client.ts')
-    ) {
-      return false
-    }
-
-    let node = nodeCache.find(
-      (n) =>
-        n.genPath === d ||
-        path.resolve(n.genDir, n.clientFilename) === d ||
-        n.importedFiles?.includes(d),
-    )
-
-    return !node
-  })
-
-  await Promise.all(
-    unusedFiles.map((d) => {
-      fs.remove(d)
-    }),
-  )
-
-  console.log(
-    `🌲 Processed ${nodeCache.length} routes in ${Date.now() - start}ms`,
-  )
-
-  if (newNodes.length || updatedNodes.length || removedNodes.length) {
-    if (newNodes.length) {
-      console.log(`🥳 Added ${newNodes.length} new routes`)
-    }
-
-    if (updatedNodes.length) {
-      console.log(`✅ Updated ${updatedNodes.length} routes`)
-    }
-
-    if (removedNodes.length) {
-      console.log(`🗑 Removed ${removedNodes.length} unused routes`)
-    }
-  } else {
-    console.log(`🎉 No changes were found. Carry on!`)
-  }
-}
-
-function getAllFiles(dir: string): Promise<string[]> {
-  return new Promise((resolve, reject) => {
-    const excludeDirFilter = through2.obj(function (item, enc, next) {
-      if (!item.stats.isDirectory()) this.push(item)
-      next()
-    })
-
-    const items: string[] = []
-
-    klaw(dir)
-      .pipe(excludeDirFilter)
-      .on('data', (item) => items.push(item.path))
-      .on('error', (err) => reject(err))
-      .on('end', () => resolve(items))
-  })
-}
-
-function fileToVariable(d: string) {
-  return d
-    .split('/')
-    .map((d, i) => (i > 0 ? capitalize(d) : d))
-    .join('')
-    .replace(/([^a-zA-Z0-9]|[\.])/gm, '')
-}
-
-export function removeExt(d: string) {
-  return d.substring(0, d.lastIndexOf('.')) || d
-}
-
-function spaces(d: number): string {
-  return Array.from({ length: d })
-    .map(() => ' ')
-    .join('')
-}
-
-export function multiSortBy<T>(
-  arr: T[],
-  accessors: ((item: T) => any)[] = [(d) => d],
-): T[] {
-  return arr
-    .map((d, i) => [d, i] as const)
-    .sort(([a, ai], [b, bi]) => {
-      for (const accessor of accessors) {
-        const ao = accessor(a)
-        const bo = accessor(b)
-
-        if (typeof ao === 'undefined') {
-          if (typeof bo === 'undefined') {
-            continue
-          }
-          return 1
-        }
-
-        if (ao === bo) {
-          continue
-        }
-
-        return ao > bo ? 1 : -1
-      }
-
-      return ai - bi
-    })
-    .map(([d]) => d)
-}
-
-function capitalize(s: string) {
-  if (typeof s !== 'string') return ''
-  return s.charAt(0).toUpperCase() + s.slice(1)
-}
diff --git a/packages/router-cli/src/index.ts b/packages/router-cli/src/index.ts
deleted file mode 100644
index 985630eba3..0000000000
--- a/packages/router-cli/src/index.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as yargs from 'yargs'
-import { getConfig } from './config'
-import { generate } from './generate'
-import { watch } from './watch'
-
-main()
-
-export function main() {
-  yargs
-    .scriptName('tsr')
-    .usage('$0 <cmd> [args]')
-    .command('generate', 'Generate the routes for a project', async (argv) => {
-      const config = await getConfig()
-      await generate(config)
-    })
-    .command(
-      'watch',
-      'Continuously watch and generate the routes for a project',
-      async (argv) => {
-        watch()
-      },
-    )
-    .help().argv
-}
diff --git a/packages/router-cli/src/transformCode.ts b/packages/router-cli/src/transformCode.ts
deleted file mode 100644
index bdef370b58..0000000000
--- a/packages/router-cli/src/transformCode.ts
+++ /dev/null
@@ -1,860 +0,0 @@
-import * as babel from '@babel/core'
-import * as t from '@babel/types'
-// @ts-ignore
-import syntaxTS from '@babel/plugin-syntax-typescript'
-import {
-  IsolatedExport,
-  removeExt,
-  rootRouteName,
-  rootRouteClientName,
-  RouteNode,
-} from './generator'
-import path from 'path'
-
-export const isolatedProperties = [
-  'component',
-  'errorComponent',
-  'pendingComponent',
-] as const
-
-export type IsolatedProperty = typeof isolatedProperties[number]
-
-type Opts = {
-  isolate: IsolatedProperty
-}
-
-const getBasePlugins = () => [
-  [
-    syntaxTS,
-    {
-      isTSX: true,
-    },
-  ],
-]
-
-export async function ensureBoilerplate(node: RouteNode, code: string) {
-  const relativeImportPath = path.relative(node.fullDir, node.genPathNoExt)
-
-  const originalFile = await babel.transformAsync(code, {
-    configFile: false,
-    babelrc: false,
-    plugins: [...getBasePlugins()],
-  })
-
-  const file = await babel.transformAsync(code, {
-    configFile: false,
-    babelrc: false,
-    plugins: [
-      ...getBasePlugins(),
-      {
-        visitor: {
-          Program: {
-            enter(programPath) {
-              // Remove all properties except for our isolated one
-              if (node.isRoot) {
-                let foundImport = false
-
-                programPath.traverse({
-                  ImportSpecifier(importPath) {
-                    if (
-                      t.isIdentifier(importPath.node.imported) &&
-                      importPath.node.imported.name === 'Route'
-                    ) {
-                      foundImport = true
-                    }
-                  },
-                })
-
-                if (!foundImport) {
-                  programPath.node.body.unshift(
-                    babel.template.statement(
-                      `import { Route } from '@tanstack/react-router'`,
-                    )(),
-                  )
-                }
-              } else {
-                let foundImport = false
-                programPath.traverse({
-                  ImportSpecifier(importPath) {
-                    if (
-                      t.isIdentifier(importPath.node.imported) &&
-                      importPath.node.imported.name === 'route'
-                    ) {
-                      foundImport = true
-                      if (t.isImportDeclaration(importPath.parentPath.node)) {
-                        if (
-                          importPath.parentPath.node.source.value !==
-                          relativeImportPath
-                        ) {
-                          importPath.parentPath.node.source.value =
-                            relativeImportPath
-                        }
-                      }
-                    }
-                  },
-                })
-                if (!foundImport) {
-                  programPath.node.body.unshift(
-                    babel.template.statement(
-                      `import { Route } from '${relativeImportPath.replace(
-                        /\\/gi,
-                        '/',
-                      )}'`,
-                    )(),
-                  )
-                }
-              }
-            },
-          },
-        },
-      },
-    ],
-  })
-
-  const separator = 'new Route('
-
-  if (!originalFile?.code) {
-    return `${file?.code}\n\n${separator}{\n\n})`
-  }
-
-  const originalHead = originalFile?.code?.substring(
-    0,
-    originalFile?.code?.indexOf(separator),
-  )
-
-  const generatedHead = file?.code?.substring(0, file?.code?.indexOf(separator))
-
-  if (originalHead !== generatedHead) {
-    return `${generatedHead}\n\n${originalFile?.code?.substring(
-      originalFile?.code?.indexOf(separator),
-    )}`
-  }
-
-  return
-}
-
-export async function isolateOptionToExport(
-  node: RouteNode,
-  code: string,
-  opts: Opts,
-) {
-  return (
-    await babel.transformAsync(code, {
-      configFile: false,
-      babelrc: false,
-      plugins: [...getBasePlugins(), plugin()],
-      ast: true,
-    })
-  )?.code
-
-  function plugin(): babel.PluginItem {
-    return {
-      visitor: {
-        Program: {
-          enter(programPath, state) {
-            // If we're the root, handle things a bit differently
-            if (node.isRoot) {
-              programPath.traverse({
-                Identifier(path) {
-                  if (
-                    path.node.name === 'Route' &&
-                    t.isCallExpression(path.parentPath.node)
-                  ) {
-                    const options = getRouteOptions(path)
-
-                    if (options) {
-                      const property = options.properties.find((property) => {
-                        return (
-                          t.isObjectProperty(property) &&
-                          t.isIdentifier(property.key) &&
-                          property.key.name === opts.isolate
-                        )
-                      })
-
-                      if (t.isObjectProperty(property)) {
-                        const program = path.findParent((d) => d.isProgram())
-
-                        if (program?.isProgram()) {
-                          program.node.body.push(
-                            babel.template.statement(
-                              `export const ${opts.isolate} = $VAR`,
-                            )({
-                              $VAR: property.value,
-                            }),
-                          )
-                        }
-                      }
-
-                      path
-                        .findParent((d) => d.isExpressionStatement())
-                        ?.remove()
-                    }
-                  }
-                },
-              })
-            }
-
-            // We're not in the root, handle things normally
-            if (!node.isRoot) {
-              // Remove all properties except for our isolated one
-              programPath.traverse({
-                Identifier(path) {
-                  if (path.node.name === 'generate') {
-                    const options = getRouteConfigGenerateOptions(path)
-
-                    if (options) {
-                      const property = options.properties.find((property) => {
-                        return (
-                          t.isObjectProperty(property) &&
-                          t.isIdentifier(property.key) &&
-                          property.key.name === opts.isolate
-                        )
-                      })
-
-                      if (
-                        t.isObjectProperty(property) &&
-                        t.isIdentifier(property.key)
-                      ) {
-                        if (property.key.name === opts.isolate) {
-                          const program = path.findParent((d) => d.isProgram())
-
-                          if (program?.isProgram()) {
-                            program.node.body.push(
-                              babel.template.statement(
-                                `export const ${opts.isolate} = $VAR`,
-                              )({
-                                $VAR: property.value,
-                              }),
-                            )
-                          }
-                        }
-                      }
-
-                      path
-                        .findParent((d) => d.isExpressionStatement())
-                        ?.remove()
-                    }
-                  }
-                },
-              })
-            }
-
-            cleanUnusedCode(programPath, state, [opts.isolate])
-          },
-        },
-      },
-    }
-  }
-}
-
-export async function detectExports(code: string) {
-  let exported: string[] = []
-
-  // try {
-  await babel.transformAsync(code, {
-    configFile: false,
-    babelrc: false,
-    plugins: [
-      ...getBasePlugins(),
-      {
-        visitor: {
-          ExportNamedDeclaration(path) {
-            if (t.isVariableDeclaration(path.node.declaration)) {
-              if (
-                t.isVariableDeclarator(path.node.declaration.declarations?.[0])
-              ) {
-                if (t.isIdentifier(path.node.declaration.declarations[0].id)) {
-                  exported.push(path.node.declaration.declarations[0].id.name)
-                }
-              }
-            }
-          },
-        },
-      },
-    ],
-    ast: true,
-  })
-
-  return exported
-}
-
-export async function generateRouteConfig(
-  node: RouteNode,
-  routeCode: string,
-  imports: IsolatedExport[],
-  clientOnly: boolean,
-) {
-  const relativeParentRoutePath = clientOnly
-    ? node.parent
-      ? removeExt(
-          path.relative(
-            node.genDir,
-            path.resolve(node.parent?.genDir, node.parent?.clientFilename),
-          ),
-        )
-      : `./${rootRouteClientName}`
-    : node.parent
-    ? removeExt(
-        path.relative(
-          node.genDir,
-          path.resolve(node.parent?.genDir, node.parent?.filename),
-        ),
-      )
-    : `./${rootRouteName}`
-
-  const pathName = node.isRoot
-    ? undefined
-    : node.fileNameNoExt.startsWith('__')
-    ? undefined
-    : node.fileNameNoExt === 'index'
-    ? '/'
-    : node.fileNameNoExt
-
-  const routeId = node.isRoot ? undefined : node.fileNameNoExt
-
-  function plugin(): babel.PluginItem {
-    return {
-      visitor: {
-        Program: {
-          enter(programPath, state) {
-            // Remove all of the isolated import properties from the config
-            programPath.traverse({
-              ImportSpecifier(path) {
-                if (t.isIdentifier(path.node.imported)) {
-                  if (!node.isRoot) {
-                    if (path.node.imported.name === 'route') {
-                      path.parentPath.remove()
-
-                      const program = path.findParent((d) => d.isProgram())
-
-                      if (program?.isProgram()) {
-                        program.node.body.unshift(
-                          babel.template.statement(
-                            `import { route as parentRoute } from '$IMPORT'`,
-                          )({
-                            $IMPORT: relativeParentRoutePath,
-                          }),
-                        )
-                      }
-                    }
-                  }
-                }
-              },
-              Identifier(iPath) {
-                let options
-
-                if (node.isRoot) {
-                  if (iPath.node.name === 'Route') {
-                    if (t.isCallExpression(iPath.parentPath.node)) {
-                      if (
-                        t.isExpressionStatement(
-                          iPath.parentPath.parentPath?.node,
-                        )
-                      ) {
-                        iPath.parentPath.parentPath?.replaceWith(
-                          t.variableDeclaration('const', [
-                            t.variableDeclarator(
-                              t.identifier('route'),
-                              iPath.parentPath.node,
-                            ),
-                          ]) as any,
-                        )
-                      }
-                    }
-                  }
-                } else {
-                  if (iPath.node.name === 'generate') {
-                    if (t.isMemberExpression(iPath.parentPath.node)) {
-                      if (t.isIdentifier(iPath.parentPath.node.object)) {
-                        iPath.node.name = 'Route'
-                        iPath.parentPath.node.object.name = 'parentRoute'
-
-                        options = getRouteConfigGenerateOptions(iPath)
-                      }
-                    }
-                  }
-                }
-
-                if (options) {
-                  options.properties = [
-                    ...(pathName
-                      ? [
-                          t.objectProperty(
-                            t.identifier('path'),
-                            t.stringLiteral(pathName),
-                          ),
-                        ]
-                      : routeId
-                      ? [
-                          t.objectProperty(
-                            t.identifier('id'),
-                            t.stringLiteral(routeId),
-                          ),
-                        ]
-                      : []),
-                    ...options.properties.map((property) => {
-                      if (
-                        t.isObjectProperty(property) &&
-                        t.isIdentifier(property.key) &&
-                        isolatedProperties.includes(
-                          property.key.name as IsolatedProperty,
-                        )
-                      ) {
-                        const key = property.key.name
-
-                        if (key === 'loader') {
-                          if (clientOnly) {
-                            return t.objectProperty(
-                              t.identifier('loader'),
-                              t.tSAsExpression(
-                                t.booleanLiteral(true),
-                                t.tsAnyKeyword(),
-                              ),
-                            )
-                          }
-                          return t.objectProperty(
-                            t.identifier(key),
-                            babel.template.expression(
-                              `(...args) => import('./${path.relative(
-                                node.genDir,
-                                node.genPathNoExt,
-                              )}-${key}').then(d => d.${key}.apply(d.${key}, (args as any)))`,
-                              {
-                                plugins: ['typescript'],
-                              },
-                            )({}),
-                          )
-                        }
-
-                        if (key === 'action') {
-                          if (clientOnly) {
-                            return t.objectProperty(
-                              t.identifier('action'),
-                              t.tSAsExpression(
-                                t.booleanLiteral(true),
-                                t.tSAnyKeyword(),
-                              ),
-                            )
-                          }
-                          return t.objectProperty(
-                            t.identifier(key),
-                            babel.template.expression(
-                              `(...payload: Parameters<typeof import('./${path.relative(
-                                node.genDir,
-                                node.genPathNoExt,
-                              )}-${key}').action>) => import('./${path.relative(
-                                node.genDir,
-                                node.genPathNoExt,
-                              )}-${key}').then(d => d.${key}.apply(d.${key}, (payload as any)))`,
-                              {
-                                plugins: ['typescript'],
-                              },
-                            )({}),
-                          )
-                        }
-
-                        if (clientOnly) {
-                          return t.objectProperty(
-                            t.identifier(key),
-                            babel.template.expression(`
-                                lazy(() => import('./${path.relative(
-                                  node.genDir,
-                                  node.genPathNoExt,
-                                )}-${key}').then(d => ({ default: d.${key} }) ))`)(),
-                          )
-                        }
-
-                        return t.objectProperty(
-                          t.identifier(key),
-                          property.value as any,
-                        )
-                      }
-
-                      return property
-                    }),
-                  ]
-
-                  const program = iPath.findParent((d) => d.isProgram())
-
-                  if (program?.isProgram() && options) {
-                    const index = program.node.body.findIndex(
-                      (d) =>
-                        d.start === iPath.parentPath.parentPath?.node.start,
-                    )
-
-                    if (node.isRoot) {
-                      program.node.body[index] = babel.template.statement(
-                        `const route = new Route(
-                          $OPTIONS
-                          )`,
-                      )({
-                        $OPTIONS: options,
-                      })
-                    } else {
-                      program.node.body[index] = babel.template.statement(
-                        `const route = new Route(
-                          $OPTIONS
-                          )`,
-                      )({
-                        $OPTIONS: options,
-                      })
-                    }
-                  }
-                }
-              },
-            })
-
-            programPath.node.body.unshift(
-              babel.template.statement(
-                `import { lazy } from '@tanstack/react-router'`,
-              )(),
-            )
-
-            // Add the route exports
-            programPath.node.body.push(
-              babel.template.statement(
-                clientOnly
-                  ? `export { route, route as ${node.variable}Route }`
-                  : `export { route }`,
-              )(),
-            )
-
-            cleanUnusedCode(programPath, state, [
-              'route',
-              `${node.variable}Route`,
-            ])
-          },
-        },
-      },
-    }
-  }
-
-  const code = (
-    await babel.transformAsync(routeCode, {
-      configFile: false,
-      babelrc: false,
-      plugins: [...getBasePlugins(), plugin()],
-      ast: true,
-    })
-  )?.code
-
-  if (!code) {
-    throw new Error('Error while generating a route file!')
-  }
-
-  return code
-}
-
-function getIdentifier(path: any) {
-  const parentPath = path.parentPath
-  if (parentPath.type === 'VariableDeclarator') {
-    const pp = parentPath
-    const name = pp.get('id')
-    return name.node.type === 'Identifier' ? name : null
-  }
-  if (parentPath.type === 'AssignmentExpression') {
-    const pp = parentPath
-    const name = pp.get('left')
-    return name.node.type === 'Identifier' ? name : null
-  }
-  if (path.node.type === 'ArrowFunctionExpression') {
-    return null
-  }
-  return path.node.id && path.node.id.type === 'Identifier'
-    ? path.get('id')
-    : null
-}
-
-function isIdentifierReferenced(ident: any) {
-  const b = ident.scope.getBinding(ident.node.name)
-  if (b && b.referenced) {
-    if (b.path.type === 'FunctionDeclaration') {
-      return !b.constantViolations
-        .concat(b.referencePaths)
-        .every((ref: any) => ref.findParent((p: any) => p === b.path))
-    }
-    return true
-  }
-  return false
-}
-function markFunction(path: any, state: any) {
-  const ident = getIdentifier(path)
-  if (ident && ident.node && isIdentifierReferenced(ident)) {
-    state.refs.add(ident)
-  }
-}
-function markImport(path: any, state: any) {
-  const local = path.get('local')
-  if (isIdentifierReferenced(local)) {
-    state.refs.add(local)
-  }
-}
-
-function getRouteConfigGenerateOptions(path: any): t.ObjectExpression | void {
-  const tryOptions = (node: any): t.ObjectExpression | void => {
-    if (t.isIdentifier(node)) {
-      const initNode = path.scope.getBinding(node.name)?.path.node
-      if (t.isVariableDeclarator(initNode)) {
-        return tryOptions(initNode.init)
-      }
-    } else if (t.isObjectExpression(node)) {
-      return node
-    }
-
-    return
-  }
-
-  if (
-    t.isMemberExpression(path.parentPath.node) &&
-    t.isCallExpression(path.parentPath.parentPath?.node)
-  ) {
-    const options = path.parentPath.parentPath?.node.arguments[0]
-
-    return tryOptions(options)
-  }
-}
-
-function getRouteOptions(path: any): t.ObjectExpression | void {
-  const tryOptions = (node: any): t.ObjectExpression | void => {
-    if (t.isIdentifier(node)) {
-      const initNode = path.scope.getBinding(node.name)?.path.node
-      if (t.isVariableDeclarator(initNode)) {
-        return tryOptions(initNode.init)
-      }
-    } else if (t.isObjectExpression(node)) {
-      return node
-    }
-
-    return
-  }
-
-  if (t.isCallExpression(path.parentPath?.node)) {
-    const options = path.parentPath?.node.arguments[0]
-
-    return tryOptions(options)
-  }
-}
-
-// All credit for this amazing function goes to the Next.js team
-// (and the Solid.js team for their derivative work).
-// https://github.com/vercel/next.js/blob/canary/packages/next/build/babel/plugins/next-ssg-transform.ts
-// https://github.com/solidjs/solid-start/blob/main/packages/start/server/routeData.js
-
-function cleanUnusedCode(
-  programPath: babel.NodePath<babel.types.Program>,
-  state: any,
-  keepExports: string[] = [],
-) {
-  state.refs = new Set()
-  state.done = false
-
-  function markVariable(variablePath: any, variableState: any) {
-    if (variablePath.node.id.type === 'Identifier') {
-      const local = variablePath.get('id')
-      if (isIdentifierReferenced(local)) {
-        variableState.refs.add(local)
-      }
-    } else if (variablePath.node.id.type === 'ObjectPattern') {
-      const pattern = variablePath.get('id')
-      const properties: any = pattern.get('properties')
-      properties.forEach((p: any) => {
-        const local = p.get(
-          p.node.type === 'ObjectProperty'
-            ? 'value'
-            : p.node.type === 'RestElement'
-            ? 'argument'
-            : (function () {
-                throw new Error('invariant')
-              })(),
-        )
-        if (isIdentifierReferenced(local)) {
-          variableState.refs.add(local)
-        }
-      })
-    } else if (variablePath.node.id.type === 'ArrayPattern') {
-      const pattern = variablePath.get('id')
-      const elements: any = pattern.get('elements')
-      elements.forEach((e: any) => {
-        let local
-        if (e.node && e.node.type === 'Identifier') {
-          local = e
-        } else if (e.node && e.node.type === 'RestElement') {
-          local = e.get('argument')
-        } else {
-          return
-        }
-        if (isIdentifierReferenced(local)) {
-          variableState.refs.add(local)
-        }
-      })
-    }
-  }
-
-  // Mark all variables and functions if used
-  programPath.traverse(
-    {
-      VariableDeclarator: markVariable,
-      FunctionDeclaration: markFunction,
-      FunctionExpression: markFunction,
-      ArrowFunctionExpression: markFunction,
-      ImportSpecifier: markImport,
-      ImportDefaultSpecifier: markImport,
-      ImportNamespaceSpecifier: markImport,
-      ExportDefaultDeclaration: markImport,
-      // ExportNamedDeclaration(path, state) {
-      //   if (t.isVariableDeclaration(path.node.declaration)) {
-      //     if (t.isVariableDeclarator(path.node.declaration.declarations?.[0])) {
-      //       if (t.isIdentifier(path.node.declaration.declarations[0].id)) {
-      //         if (
-      //           keepExports.includes(
-      //             path.node.declaration.declarations[0].id.name,
-      //           )
-      //         ) {
-      //           return
-      //         }
-      //       }
-      //       path.replaceWith(path.node.declaration.declarations[0])
-      //       return
-      //     }
-      //   }
-      //   path.remove()
-      // },
-      ImportDeclaration: (path) => {
-        if (path.node.source.value.endsWith('.css')) {
-          path.remove()
-        }
-      },
-    },
-    state,
-  )
-
-  // Sweet all of the remaining references and remove unused ones
-  const refs: any = state.refs
-  let count: number
-  function sweepFunction(sweepPath: any) {
-    const ident = getIdentifier(sweepPath)
-    if (
-      ident &&
-      ident.node &&
-      refs.has(ident) &&
-      !isIdentifierReferenced(ident)
-    ) {
-      ++count
-      if (
-        t.isAssignmentExpression(sweepPath.parentPath) ||
-        t.isVariableDeclarator(sweepPath.parentPath)
-      ) {
-        sweepPath.parentPath.remove()
-      } else {
-        sweepPath.remove()
-      }
-    }
-  }
-  function sweepImport(sweepPath: any) {
-    const local = sweepPath.get('local')
-    if (refs.has(local) && !isIdentifierReferenced(local)) {
-      ++count
-      sweepPath.remove()
-      if (sweepPath.parent.specifiers.length === 0) {
-        sweepPath.parentPath.remove()
-      }
-    }
-  }
-  do {
-    programPath.scope.crawl()
-    count = 0
-    programPath.traverse({
-      VariableDeclarator(variablePath) {
-        if (variablePath.node.id.type === 'Identifier') {
-          const local = variablePath.get('id')
-          if (refs.has(local) && !isIdentifierReferenced(local)) {
-            ++count
-
-            variablePath.remove()
-          }
-        } else if (variablePath.node.id.type === 'ObjectPattern') {
-          const pattern = variablePath.get('id')
-          const beforeCount = count
-          const properties: any = pattern.get('properties')
-          properties.forEach((p: any) => {
-            const local = p.get(
-              p.node.type === 'ObjectProperty'
-                ? 'value'
-                : p.node.type === 'RestElement'
-                ? 'argument'
-                : (function () {
-                    throw new Error('invariant')
-                  })(),
-            )
-            if (refs.has(local) && !isIdentifierReferenced(local)) {
-              ++count
-              p.remove()
-            }
-          })
-          if (
-            beforeCount !== count &&
-            (pattern.get('properties') as any).length < 1
-          ) {
-            variablePath.remove()
-          }
-        } else if (variablePath.node.id.type === 'ArrayPattern') {
-          const pattern = variablePath.get('id')
-          const beforeCount = count
-          const elements: any = pattern.get('elements')
-          elements.forEach((e: any) => {
-            let local
-            if (e.node && e.node.type === 'Identifier') {
-              local = e
-            } else if (e.node && e.node.type === 'RestElement') {
-              local = e.get('argument')
-            } else {
-              return
-            }
-            if (refs.has(local) && !isIdentifierReferenced(local)) {
-              ++count
-
-              e.remove()
-            }
-          })
-          if (
-            beforeCount !== count &&
-            (pattern.get('elements') as any).length < 1
-          ) {
-            variablePath.remove()
-          }
-        }
-      },
-      FunctionDeclaration: sweepFunction,
-      FunctionExpression: sweepFunction,
-      ArrowFunctionExpression: sweepFunction,
-      ImportSpecifier: sweepImport,
-      ImportDefaultSpecifier: sweepImport,
-      ImportNamespaceSpecifier: sweepImport,
-    })
-  } while (count)
-
-  // Do we need the * import for react?
-  let hasReact = false
-
-  // Mark react elements as having react
-  programPath.traverse({
-    JSXElement(path) {
-      hasReact = true
-    },
-  })
-
-  if (!hasReact) {
-    // Mark all variables and functions if used
-    programPath.traverse({
-      ImportDeclaration(path) {
-        if (
-          t.isStringLiteral(path.node.source) &&
-          path.node.source.value === 'react' &&
-          t.isImportNamespaceSpecifier(path.node.specifiers[0])
-        ) {
-          path.remove()
-        }
-      },
-    })
-  }
-}
diff --git a/packages/router-cli/src/watch.ts b/packages/router-cli/src/watch.ts
deleted file mode 100644
index 4505a96f1a..0000000000
--- a/packages/router-cli/src/watch.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import chokidar from 'chokidar'
-import path from 'path'
-import { getConfig } from './config'
-import { generator } from './generator'
-
-export async function watch() {
-  const configWatcher = chokidar.watch(
-    path.resolve(process.cwd(), 'tsr.config.js'),
-  )
-
-  let watcher = new chokidar.FSWatcher()
-
-  const generatorWatcher = async () => {
-    const config = await getConfig()
-
-    watcher.close()
-
-    console.log(`TSR: Watching routes (${config.routesDirectory})...`)
-    watcher = chokidar.watch(config.routesDirectory)
-
-    watcher.on('ready', async () => {
-      try {
-        await generator(config)
-      } catch (err) {
-        console.error(err)
-        console.log()
-      }
-
-      const handle = async () => {
-        try {
-          await generator(config)
-        } catch (err) {
-          console.error(err)
-          console.log()
-        }
-      }
-
-      watcher.on('change', handle)
-      watcher.on('add', handle)
-      watcher.on('addDir', handle)
-      watcher.on('unlink', handle)
-      watcher.on('unlinkDir', handle)
-    })
-  }
-
-  configWatcher.on('ready', generatorWatcher)
-  configWatcher.on('change', generatorWatcher)
-}
diff --git a/packages/router-cli/tsconfig.json b/packages/router-cli/tsconfig.json
deleted file mode 100644
index bf9a1a74a0..0000000000
--- a/packages/router-cli/tsconfig.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "composite": true,
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./build/types"
-  },
-  "files": ["src/index.ts"],
-  "include": ["src"]
-}
diff --git a/packages/react-router-devtools/README.md b/packages/router-devtools/README.md
similarity index 100%
rename from packages/react-router-devtools/README.md
rename to packages/router-devtools/README.md
diff --git a/packages/react-router-devtools/media/logo.sketch b/packages/router-devtools/media/logo.sketch
similarity index 100%
rename from packages/react-router-devtools/media/logo.sketch
rename to packages/router-devtools/media/logo.sketch
diff --git a/packages/react-router-devtools/media/logo.svg b/packages/router-devtools/media/logo.svg
similarity index 99%
rename from packages/react-router-devtools/media/logo.svg
rename to packages/router-devtools/media/logo.svg
index 1c17083eb4..0729102fb8 100644
--- a/packages/react-router-devtools/media/logo.svg
+++ b/packages/router-devtools/media/logo.svg
@@ -10,7 +10,7 @@
                 <path d="M76.1109918,91 L89.6216773,114.999606 L80.3968824,115 C78.6058059,115 76.9515387,114.041975 76.0601262,112.488483 L69.9456773,101.831606 L76.1109918,91 Z M118.814677,103.999606 L113.944933,112.488483 C113.053521,114.041975 111.399254,115 109.608177,115 L97.1836773,114.999606 L91,104 L118.814677,103.999606 Z M102.995798,71 L111,84.540954 L103.052984,98 L87.0061086,98 L79,84.3838793 L86.9562003,71 L102.995798,71 Z M124.136677,74.2726062 L128.577138,82.0115174 C129.461464,83.5526583 129.461464,85.4473417 128.577138,86.9884826 L122.257677,97.9996062 L110,98 L124.136677,74.2726062 Z M80,72 L66.1336773,95.1896062 L61.4279211,86.9884826 C60.543596,85.4473417 60.543596,83.5526583 61.4279211,82.0115174 L67.1716773,71.9996062 L80,72 Z M109.608177,54 C111.399254,54 113.053521,54.958025 113.944933,56.5115174 L120.835677,68.5206062 L114.929178,79 L100.820677,53.9996062 L109.608177,54 Z M93.7696773,53.9996062 L100,65 L71.1886773,64.9996062 L76.0601262,56.5115174 C76.9515387,54.958025 78.6058059,54 80.3968824,54 L93.7696773,53.9996062 Z" id="Polygon-3" fill="#FFD94C"></path>
                 <path d="M54.8601729,98.3577578 C56.1715224,97.6082856 57.8360246,98.0746014 58.5779424,99.3993034 L58.5779424,99.3993034 L59.0525843,100.24352 C62.8563392,106.982993 66.8190116,113.380176 70.9406016,119.435068 C75.8078808,126.585427 81.28184,133.82411 87.3624792,141.151115 C88.3168778,142.30114 88.1849437,144.011176 87.065686,144.997937 L87.065686,144.997937 L86.4542085,145.534625 C66.3465389,163.103314 53.2778188,166.612552 47.2480482,156.062341 C41.3500652,145.742717 43.4844915,126.982888 53.6513274,99.7828526 C53.876818,99.1795821 54.3045861,98.675291 54.8601729,98.3577578 Z M140.534177,119.041504 C141.986131,118.785177 143.375496,119.742138 143.65963,121.194242 L143.65963,121.194242 L143.812815,121.986376 C148.782365,147.995459 145.283348,161 133.315764,161 C121.609745,161 106.708724,149.909007 88.6127018,127.727022 C88.2113495,127.235047 87.9945723,126.617371 88,125.981509 C88.013158,124.480686 89.2357854,123.274651 90.730918,123.287756 L90.730918,123.287756 L91.6846544,123.294531 C99.3056979,123.335994 106.714387,123.071591 113.910723,122.501323 C122.409039,121.82788 131.283523,120.674607 140.534177,119.041504 Z M147.408726,63.8119663 C147.932139,62.4026903 149.508386,61.6634537 150.954581,62.149012 L150.954581,62.149012 L151.742552,62.4154854 C177.583763,71.217922 187.402356,80.8916805 181.198332,91.4367609 C175.129904,101.751366 157.484347,109.260339 128.26166,113.963678 C127.613529,114.067994 126.948643,113.945969 126.382735,113.618843 C125.047025,112.846729 124.602046,111.158214 125.388848,109.847438 L125.388848,109.847438 L125.889328,109.0105 C129.877183,102.31633 133.481358,95.6542621 136.701854,89.0242957 C140.50501,81.1948179 144.073967,72.7907081 147.408726,63.8119663 Z M61.7383398,56.0363218 C62.3864708,55.9320063 63.0513565,56.0540315 63.6172646,56.3811573 C64.9529754,57.153271 65.3979538,58.8417862 64.6111517,60.1525615 L64.6111517,60.1525615 L64.1106718,60.9895001 C60.1228168,67.6836699 56.5186416,74.3457379 53.2981462,80.9757043 C49.49499,88.8051821 45.9260328,97.2092919 42.5912744,106.188034 C42.0678608,107.59731 40.4916142,108.336546 39.045419,107.850988 L39.045419,107.850988 L38.2574475,107.584515 C12.4162372,98.782078 2.59764398,89.1083195 8.80166786,78.5632391 C14.8700957,68.2486335 32.515653,60.7396611 61.7383398,56.0363218 Z M103.545792,24.4653746 C123.653461,6.89668641 136.722181,3.38744778 142.751952,13.9376587 C148.649935,24.2572826 146.515508,43.0171122 136.348673,70.2171474 C136.123182,70.8204179 135.695414,71.324709 135.139827,71.6422422 C133.828478,72.3917144 132.163975,71.9253986 131.422058,70.6006966 L131.422058,70.6006966 L130.947416,69.7564798 C127.143661,63.0170065 123.180988,56.6198239 119.059398,50.564932 C114.192119,43.4145727 108.71816,36.1758903 102.637521,28.8488847 C101.683122,27.6988602 101.815056,25.9888243 102.934314,25.0020629 L102.934314,25.0020629 Z M57.6842361,8 C69.3902551,8 84.2912758,19.0909926 102.387298,41.2729777 C102.788651,41.7649527 103.005428,42.3826288 103,43.0184911 C102.986842,44.5193144 101.764215,45.7253489 100.269082,45.7122445 L100.269082,45.7122445 L99.3153456,45.7054689 C91.6943021,45.6640063 84.2856126,45.9284091 77.0892772,46.4986773 C68.5909612,47.17212 59.7164767,48.325393 50.4658235,49.9584962 C49.0138691,50.2148231 47.6245044,49.2578618 47.3403697,47.805758 L47.3403697,47.805758 L47.1871846,47.0136235 C42.2176347,21.0045412 45.7166519,8 57.6842361,8 Z" id="Combined-Shape" fill="#FF4154"></path>
             </g>
-            <path d="M259.694943,160 L259.694943,128.137 L277.109943,128.137 L293.492943,160 L315.422943,160 L298.523943,125.17 C303.597943,123.106 307.596943,119.537 310.520943,114.463 C313.444943,109.389 314.906943,104.186 314.906943,98.854 C314.906943,90.254 312.477443,83.245 307.618443,77.827 C302.759443,72.409 294.911943,69.7 284.075943,69.7 L284.075943,69.7 L240.086943,69.7 L240.086943,160 L259.694943,160 Z M284.333943,109.561 L259.694943,109.561 L259.694943,88.276 L284.333943,88.276 C287.945943,88.276 290.547443,89.2865 292.138443,91.3075 C293.729443,93.3285 294.524943,95.844 294.524943,98.854 C294.524943,105.992 291.127943,109.561 284.333943,109.561 L284.333943,109.561 Z M344.774094,161.548 C355.266094,161.548 363.823094,157.549 370.445094,149.551 L370.445094,149.551 L359.609094,138.715 C355.739094,143.359 350.794094,145.681 344.774094,145.681 C341.076094,145.681 338.023094,144.6705 335.615094,142.6495 C333.207094,140.6285 331.917094,137.554 331.745094,133.426 L331.745094,133.426 L373.928094,133.426 C374.272094,131.19 374.444094,127.965 374.444094,123.751 C374.444094,113.603 371.692094,105.863 366.188094,100.531 C360.684094,95.199 353.546094,92.533 344.774094,92.533 C335.142094,92.533 327.509594,95.629 321.876594,101.821 C316.243594,108.013 313.427094,116.398 313.427094,126.976 C313.427094,137.812 316.222094,146.283 321.812094,152.389 C327.402094,158.495 335.056094,161.548 344.774094,161.548 Z M356.513094,119.365 L331.874094,119.365 C332.304094,115.925 333.594094,113.2375 335.744094,111.3025 C337.894094,109.3675 340.646094,108.4 344.000094,108.4 C351.396094,108.4 355.567094,112.055 356.513094,119.365 L356.513094,119.365 Z M401.086245,161.548 C408.052245,161.548 413.513245,159.398 417.469245,155.098 L417.469245,155.098 L417.469245,160 L436.045245,160 L436.045245,118.333 C436.045245,101.133 426.714245,92.533 408.052245,92.533 C397.302245,92.533 387.885245,95.285 379.801245,100.789 L379.801245,100.789 L385.606245,115.108 C392.572245,110.464 399.624245,108.142 406.762245,108.142 C410.116245,108.142 412.739245,108.9375 414.631245,110.5285 C416.523245,112.1195 417.469245,114.42 417.469245,117.43 L417.469245,117.43 L417.469245,121.042 C414.029245,119.494 409.213245,118.72 403.021245,118.72 C395.883245,118.72 389.648245,120.5475 384.316245,124.2025 C378.984245,127.8575 376.318245,133.082 376.318245,139.876 C376.318245,146.842 378.618745,152.1955 383.219745,155.9365 C387.820745,159.6775 393.776245,161.548 401.086245,161.548 Z M404.698245,145.81 C397.990245,145.81 394.636245,143.875 394.636245,140.005 C394.636245,135.791 398.506245,133.684 406.246245,133.684 C410.288245,133.684 414.029245,134.2 417.469245,135.232 L417.469245,135.232 L417.469245,141.166 C413.599245,144.262 409.342245,145.81 404.698245,145.81 Z M471.975396,161.548 C486.939396,161.548 496.614396,154.109 501.000396,139.231 L501.000396,139.231 L483.069396,134.071 C481.091396,140.435 477.393396,143.617 471.975396,143.617 C468.535396,143.617 465.697396,142.0905 463.461396,139.0375 C461.225396,135.9845 460.107396,132.007 460.107396,127.105 C460.107396,122.203 461.246896,118.204 463.525896,115.108 C465.804896,112.012 468.707396,110.464 472.233396,110.464 C477.307396,110.464 480.919396,113.302 483.069396,118.978 L483.069396,118.978 L500.871396,113.173 C496.571396,99.413 486.939396,92.533 471.975396,92.533 C462.687396,92.533 455.226896,95.6505 449.593896,101.8855 C443.960896,108.1205 441.144396,116.527 441.144396,127.105 C441.144396,137.855 443.939396,146.283 449.529396,152.389 C455.119396,158.495 462.601396,161.548 471.975396,161.548 Z M526.868547,161.548 C532.802547,161.548 537.790547,160.559 541.832547,158.581 L541.832547,158.581 L543.896547,142.843 C540.112547,144.563 536.328547,145.423 532.544547,145.423 C531.512547,145.423 530.631047,145.1005 529.900047,144.4555 C529.169047,143.8105 528.803547,142.886 528.803547,141.682 L528.803547,141.682 L528.803547,110.464 L543.122547,110.464 L543.122547,94.081 L528.803547,94.081 L528.803547,66.862 L510.227547,75.763 L510.227547,94.081 L501.197547,94.081 L501.197547,110.464 L510.227547,110.464 L510.227547,143.488 C510.227547,155.528 515.774547,161.548 526.868547,161.548 Z M635.493849,160 L635.493849,141.037 L592.149849,141.037 L592.149849,69.7 L572.541849,69.7 L572.541849,160 L635.493849,160 Z M663.684,161.548 C673.058,161.548 680.454,158.495 685.872,152.389 C691.29,146.283 693.999,137.855 693.999,127.105 C693.999,116.441 691.2685,108.013 685.8075,101.821 C680.3465,95.629 672.972,92.533 663.684,92.533 C654.31,92.533 646.871,95.629 641.367,101.821 C635.863,108.013 633.111,116.441 633.111,127.105 C633.111,137.855 635.8415,146.283 641.3025,152.389 C646.7635,158.495 654.224,161.548 663.684,161.548 Z M663.684,143.488 C660.072,143.488 657.191,142.0475 655.041,139.1665 C652.891,136.2855 651.816,132.265 651.816,127.105 C651.816,121.945 652.891,117.903 655.041,114.979 C657.191,112.055 660.072,110.593 663.684,110.593 C667.382,110.593 670.2415,112.055 672.2625,114.979 C674.2835,117.903 675.294,121.945 675.294,127.105 C675.294,132.265 674.2835,136.2855 672.2625,139.1665 C670.2415,142.0475 667.382,143.488 663.684,143.488 Z M727.994151,161.548 C742.958151,161.548 752.633151,154.109 757.019151,139.231 L757.019151,139.231 L739.088151,134.071 C737.110151,140.435 733.412151,143.617 727.994151,143.617 C724.554151,143.617 721.716151,142.0905 719.480151,139.0375 C717.244151,135.9845 716.126151,132.007 716.126151,127.105 C716.126151,122.203 717.265651,118.204 719.544651,115.108 C721.823651,112.012 724.726151,110.464 728.252151,110.464 C733.326151,110.464 736.938151,113.302 739.088151,118.978 L739.088151,118.978 L756.890151,113.173 C752.590151,99.413 742.958151,92.533 727.994151,92.533 C718.706151,92.533 711.245651,95.6505 705.612651,101.8855 C699.979651,108.1205 697.163151,116.527 697.163151,127.105 C697.163151,137.855 699.958151,146.283 705.548151,152.389 C711.138151,158.495 718.620151,161.548 727.994151,161.548 Z M783.919302,161.548 C790.885302,161.548 796.346302,159.398 800.302302,155.098 L800.302302,155.098 L800.302302,160 L818.878302,160 L818.878302,118.333 C818.878302,101.133 809.547302,92.533 790.885302,92.533 C780.135302,92.533 770.718302,95.285 762.634302,100.789 L762.634302,100.789 L768.439302,115.108 C775.405302,110.464 782.457302,108.142 789.595302,108.142 C792.949302,108.142 795.572302,108.9375 797.464302,110.5285 C799.356302,112.1195 800.302302,114.42 800.302302,117.43 L800.302302,117.43 L800.302302,121.042 C796.862302,119.494 792.046302,118.72 785.854302,118.72 C778.716302,118.72 772.481302,120.5475 767.149302,124.2025 C761.817302,127.8575 759.151302,133.082 759.151302,139.876 C759.151302,146.842 761.451802,152.1955 766.052802,155.9365 C770.653802,159.6775 776.609302,161.548 783.919302,161.548 Z M787.531302,145.81 C780.823302,145.81 777.469302,143.875 777.469302,140.005 C777.469302,135.791 781.339302,133.684 789.079302,133.684 C793.121302,133.684 796.862302,134.2 800.302302,135.232 L800.302302,135.232 L800.302302,141.166 C796.432302,144.262 792.175302,145.81 787.531302,145.81 Z M847.068453,161.548 C853.002453,161.548 857.990453,160.559 862.032453,158.581 L862.032453,158.581 L864.096453,142.843 C860.312453,144.563 856.528453,145.423 852.744453,145.423 C851.712453,145.423 850.830953,145.1005 850.099953,144.4555 C849.368953,143.8105 849.003453,142.886 849.003453,141.682 L849.003453,141.682 L849.003453,110.464 L863.322453,110.464 L863.322453,94.081 L849.003453,94.081 L849.003453,66.862 L830.427453,75.763 L830.427453,94.081 L821.397453,94.081 L821.397453,110.464 L830.427453,110.464 L830.427453,143.488 C830.427453,155.528 835.974453,161.548 847.068453,161.548 Z M878.741604,87.76 C881.751604,87.76 884.288604,86.7065 886.352604,84.5995 C888.416604,82.4925 889.448604,79.977 889.448604,77.053 C889.448604,74.043 888.416604,71.5275 886.352604,69.5065 C884.288604,67.4855 881.751604,66.475 878.741604,66.475 C875.731604,66.475 873.173104,67.507 871.066104,69.571 C868.959104,71.635 867.905604,74.129 867.905604,77.053 C867.905604,79.977 868.980604,82.4925 871.130604,84.5995 C873.280604,86.7065 875.817604,87.76 878.741604,87.76 Z M888.029604,160 L888.029604,94.081 L869.324604,94.081 L869.324604,160 L888.029604,160 Z M925.120755,161.548 C934.494755,161.548 941.890755,158.495 947.308755,152.389 C952.726755,146.283 955.435755,137.855 955.435755,127.105 C955.435755,116.441 952.705255,108.013 947.244255,101.821 C941.783255,95.629 934.408755,92.533 925.120755,92.533 C915.746755,92.533 908.307755,95.629 902.803755,101.821 C897.299755,108.013 894.547755,116.441 894.547755,127.105 C894.547755,137.855 897.278255,146.283 902.739255,152.389 C908.200255,158.495 915.660755,161.548 925.120755,161.548 Z M925.120755,143.488 C921.508755,143.488 918.627755,142.0475 916.477755,139.1665 C914.327755,136.2855 913.252755,132.265 913.252755,127.105 C913.252755,121.945 914.327755,117.903 916.477755,114.979 C918.627755,112.055 921.508755,110.593 925.120755,110.593 C928.818755,110.593 931.678255,112.055 933.699255,114.979 C935.720255,117.903 936.730755,121.945 936.730755,127.105 C936.730755,132.265 935.720255,136.2855 933.699255,139.1665 C931.678255,142.0475 928.818755,143.488 925.120755,143.488 Z M980.529906,160 L980.529906,125.428 C980.529906,120.354 981.454406,116.613 983.303406,114.205 C985.152406,111.797 988.097906,110.593 992.139906,110.593 C995.923906,110.593 998.611406,111.7755 1000.20241,114.1405 C1001.79341,116.5055 1002.58891,120.354 1002.58891,125.686 L1002.58891,125.686 L1002.58891,160 L1021.29391,160 L1021.29391,117.172 C1021.29391,108.486 1019.01491,102.208 1014.45691,98.338 C1009.89891,94.468 1004.56691,92.533 998.460906,92.533 C990.720906,92.533 984.743906,95.07 980.529906,100.144 L980.529906,100.144 L980.529906,94.081 L961.824906,94.081 L961.824906,160 L980.529906,160 Z" id="ReactRouter" fill="#002C4B" fill-rule="nonzero"></path>
+            <path d="M259.694943,160 L259.694943,128.137 L277.109943,128.137 L293.492943,160 L315.422943,160 L298.523943,125.17 C303.597943,123.106 307.596943,119.537 310.520943,114.463 C313.444943,109.389 314.906943,104.186 314.906943,98.854 C314.906943,90.254 312.477443,83.245 307.618443,77.827 C302.759443,72.409 294.911943,69.7 284.075943,69.7 L284.075943,69.7 L240.086943,69.7 L240.086943,160 L259.694943,160 Z M284.333943,109.561 L259.694943,109.561 L259.694943,88.276 L284.333943,88.276 C287.945943,88.276 290.547443,89.2865 292.138443,91.3075 C293.729443,93.3285 294.524943,95.844 294.524943,98.854 C294.524943,105.992 291.127943,109.561 284.333943,109.561 L284.333943,109.561 Z M344.774094,161.548 C355.266094,161.548 363.823094,157.549 370.445094,149.551 L370.445094,149.551 L359.609094,138.715 C355.739094,143.359 350.794094,145.681 344.774094,145.681 C341.076094,145.681 338.023094,144.6705 335.615094,142.6495 C333.207094,140.6285 331.917094,137.554 331.745094,133.426 L331.745094,133.426 L373.928094,133.426 C374.272094,131.19 374.444094,127.965 374.444094,123.751 C374.444094,113.603 371.692094,105.863 366.188094,100.531 C360.684094,95.199 353.546094,92.533 344.774094,92.533 C335.142094,92.533 327.509594,95.629 321.876594,101.821 C316.243594,108.013 313.427094,116.398 313.427094,126.976 C313.427094,137.812 316.222094,146.283 321.812094,152.389 C327.402094,158.495 335.056094,161.548 344.774094,161.548 Z M356.513094,119.365 L331.874094,119.365 C332.304094,115.925 333.594094,113.2375 335.744094,111.3025 C337.894094,109.3675 340.646094,108.4 344.000094,108.4 C351.396094,108.4 355.567094,112.055 356.513094,119.365 L356.513094,119.365 Z M401.086245,161.548 C408.052245,161.548 413.513245,159.398 417.469245,155.098 L417.469245,155.098 L417.469245,160 L436.045245,160 L436.045245,118.333 C436.045245,101.133 426.714245,92.533 408.052245,92.533 C397.302245,92.533 387.885245,95.285 379.801245,100.789 L379.801245,100.789 L385.606245,115.108 C392.572245,110.464 399.624245,108.142 406.762245,108.142 C410.116245,108.142 412.739245,108.9375 414.631245,110.5285 C416.523245,112.1195 417.469245,114.42 417.469245,117.43 L417.469245,117.43 L417.469245,121.042 C414.029245,119.494 409.213245,118.72 403.021245,118.72 C395.883245,118.72 389.648245,120.5475 384.316245,124.2025 C378.984245,127.8575 376.318245,133.082 376.318245,139.876 C376.318245,146.842 378.618745,152.1955 383.219745,155.9365 C387.820745,159.6775 393.776245,161.548 401.086245,161.548 Z M404.698245,145.81 C397.990245,145.81 394.636245,143.875 394.636245,140.005 C394.636245,135.791 398.506245,133.684 406.246245,133.684 C410.288245,133.684 414.029245,134.2 417.469245,135.232 L417.469245,135.232 L417.469245,141.166 C413.599245,144.262 409.342245,145.81 404.698245,145.81 Z M471.975396,161.548 C486.939396,161.548 496.614396,154.109 501.000396,139.231 L501.000396,139.231 L483.069396,134.071 C481.091396,140.435 477.393396,143.617 471.975396,143.617 C468.535396,143.617 465.697396,142.0905 463.461396,139.0375 C461.225396,135.9845 460.107396,132.007 460.107396,127.105 C460.107396,122.203 461.246896,118.204 463.525896,115.108 C465.804896,112.012 468.707396,110.464 472.233396,110.464 C477.307396,110.464 480.919396,113.302 483.069396,118.978 L483.069396,118.978 L500.871396,113.173 C496.571396,99.413 486.939396,92.533 471.975396,92.533 C462.687396,92.533 455.226896,95.6505 449.593896,101.8855 C443.960896,108.1205 441.144396,116.527 441.144396,127.105 C441.144396,137.855 443.939396,146.283 449.529396,152.389 C455.119396,158.495 462.601396,161.548 471.975396,161.548 Z M526.868547,161.548 C532.802547,161.548 537.790547,160.559 541.832547,158.581 L541.832547,158.581 L543.896547,142.843 C540.112547,144.563 536.328547,145.423 532.544547,145.423 C531.512547,145.423 530.631047,145.1005 529.900047,144.4555 C529.169047,143.8105 528.803547,142.886 528.803547,141.682 L528.803547,141.682 L528.803547,110.464 L543.122547,110.464 L543.122547,94.081 L528.803547,94.081 L528.803547,66.862 L510.227547,75.763 L510.227547,94.081 L501.197547,94.081 L501.197547,110.464 L510.227547,110.464 L510.227547,143.488 C510.227547,155.528 515.774547,161.548 526.868547,161.548 Z M635.493849,160 L635.493849,141.037 L592.149849,141.037 L592.149849,69.7 L572.541849,69.7 L572.541849,160 L635.493849,160 Z M663.684,161.548 C673.058,161.548 680.454,158.495 685.872,152.389 C691.29,146.283 693.999,137.855 693.999,127.105 C693.999,116.441 691.2685,108.013 685.8075,101.821 C680.3465,95.629 672.972,92.533 663.684,92.533 C654.31,92.533 646.871,95.629 641.367,101.821 C635.863,108.013 633.111,116.441 633.111,127.105 C633.111,137.855 635.8415,146.283 641.3025,152.389 C646.7635,158.495 654.224,161.548 663.684,161.548 Z M663.684,143.488 C660.072,143.488 657.191,142.0475 655.041,139.1665 C652.891,136.2855 651.816,132.265 651.816,127.105 C651.816,121.945 652.891,117.903 655.041,114.979 C657.191,112.055 660.072,110.593 663.684,110.593 C667.382,110.593 670.2415,112.055 672.2625,114.979 C674.2835,117.903 675.294,121.945 675.294,127.105 C675.294,132.265 674.2835,136.2855 672.2625,139.1665 C670.2415,142.0475 667.382,143.488 663.684,143.488 Z M727.994151,161.548 C742.958151,161.548 752.633151,154.109 757.019151,139.231 L757.019151,139.231 L739.088151,134.071 C737.110151,140.435 733.412151,143.617 727.994151,143.617 C724.554151,143.617 721.716151,142.0905 719.480151,139.0375 C717.244151,135.9845 716.126151,132.007 716.126151,127.105 C716.126151,122.203 717.265651,118.204 719.544651,115.108 C721.823651,112.012 724.726151,110.464 728.252151,110.464 C733.326151,110.464 736.938151,113.302 739.088151,118.978 L739.088151,118.978 L756.890151,113.173 C752.590151,99.413 742.958151,92.533 727.994151,92.533 C718.706151,92.533 711.245651,95.6505 705.612651,101.8855 C699.979651,108.1205 697.163151,116.527 697.163151,127.105 C697.163151,137.855 699.958151,146.283 705.548151,152.389 C711.138151,158.495 718.620151,161.548 727.994151,161.548 Z M783.919302,161.548 C790.885302,161.548 796.346302,159.398 800.302302,155.098 L800.302302,155.098 L800.302302,160 L818.878302,160 L818.878302,118.333 C818.878302,101.133 809.547302,92.533 790.885302,92.533 C780.135302,92.533 770.718302,95.285 762.634302,100.789 L762.634302,100.789 L768.439302,115.108 C775.405302,110.464 782.457302,108.142 789.595302,108.142 C792.949302,108.142 795.572302,108.9375 797.464302,110.5285 C799.356302,112.1195 800.302302,114.42 800.302302,117.43 L800.302302,117.43 L800.302302,121.042 C796.862302,119.494 792.046302,118.72 785.854302,118.72 C778.716302,118.72 772.481302,120.5475 767.149302,124.2025 C761.817302,127.8575 759.151302,133.082 759.151302,139.876 C759.151302,146.842 761.451802,152.1955 766.052802,155.9365 C770.653802,159.6775 776.609302,161.548 783.919302,161.548 Z M787.531302,145.81 C780.823302,145.81 777.469302,143.875 777.469302,140.005 C777.469302,135.791 781.339302,133.684 789.079302,133.684 C793.121302,133.684 796.862302,134.2 800.302302,135.232 L800.302302,135.232 L800.302302,141.166 C796.432302,144.262 792.175302,145.81 787.531302,145.81 Z M847.068453,161.548 C853.002453,161.548 857.990453,160.559 862.032453,158.581 L862.032453,158.581 L864.096453,142.843 C860.312453,144.563 856.528453,145.423 852.744453,145.423 C851.712453,145.423 850.830953,145.1005 850.099953,144.4555 C849.368953,143.8105 849.003453,142.886 849.003453,141.682 L849.003453,141.682 L849.003453,110.464 L863.322453,110.464 L863.322453,94.081 L849.003453,94.081 L849.003453,66.862 L830.427453,75.763 L830.427453,94.081 L821.397453,94.081 L821.397453,110.464 L830.427453,110.464 L830.427453,143.488 C830.427453,155.528 835.974453,161.548 847.068453,161.548 Z M878.741604,87.76 C881.751604,87.76 884.288604,86.7065 886.352604,84.5995 C888.416604,82.4925 889.448604,79.977 889.448604,77.053 C889.448604,74.043 888.416604,71.5275 886.352604,69.5065 C884.288604,67.4855 881.751604,66.475 878.741604,66.475 C875.731604,66.475 873.173104,67.507 871.066104,69.571 C868.959104,71.635 867.905604,74.129 867.905604,77.053 C867.905604,79.977 868.980604,82.4925 871.130604,84.5995 C873.280604,86.7065 875.817604,87.76 878.741604,87.76 Z M888.029604,160 L888.029604,94.081 L869.324604,94.081 L869.324604,160 L888.029604,160 Z M925.120755,161.548 C934.494755,161.548 941.890755,158.495 947.308755,152.389 C952.726755,146.283 955.435755,137.855 955.435755,127.105 C955.435755,116.441 952.705255,108.013 947.244255,101.821 C941.783255,95.629 934.408755,92.533 925.120755,92.533 C915.746755,92.533 908.307755,95.629 902.803755,101.821 C897.299755,108.013 894.547755,116.441 894.547755,127.105 C894.547755,137.855 897.278255,146.283 902.739255,152.389 C908.200255,158.495 915.660755,161.548 925.120755,161.548 Z M925.120755,143.488 C921.508755,143.488 918.627755,142.0475 916.477755,139.1665 C914.327755,136.2855 913.252755,132.265 913.252755,127.105 C913.252755,121.945 914.327755,117.903 916.477755,114.979 C918.627755,112.055 921.508755,110.593 925.120755,110.593 C928.818755,110.593 931.678255,112.055 933.699255,114.979 C935.720255,117.903 936.730755,121.945 936.730755,127.105 C936.730755,132.265 935.720255,136.2855 933.699255,139.1665 C931.678255,142.0475 928.818755,143.488 925.120755,143.488 Z M980.529906,160 L980.529906,125.428 C980.529906,120.354 981.454406,116.613 983.303406,114.205 C985.152406,111.797 988.097906,110.593 992.139906,110.593 C995.923906,110.593 998.611406,111.7755 1000.20241,114.1405 C1001.79341,116.5055 1002.58891,120.354 1002.58891,125.686 L1002.58891,125.686 L1002.58891,160 L1021.29391,160 L1021.29391,117.172 C1021.29391,108.486 1019.01491,102.208 1014.45691,98.338 C1009.89891,94.468 1004.56691,92.533 998.460906,92.533 C990.720906,92.533 984.743906,95.07 980.529906,100.144 L980.529906,100.144 L980.529906,94.081 L961.824906,94.081 L961.824906,160 L980.529906,160 Z" id="Router" fill="#002C4B" fill-rule="nonzero"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/packages/react-router-devtools/media/repo-dark.png b/packages/router-devtools/media/repo-dark.png
similarity index 100%
rename from packages/react-router-devtools/media/repo-dark.png
rename to packages/router-devtools/media/repo-dark.png
diff --git a/packages/react-router-devtools/package.json b/packages/router-devtools/package.json
similarity index 88%
rename from packages/react-router-devtools/package.json
rename to packages/router-devtools/package.json
index b0e76879f7..c98d613097 100644
--- a/packages/react-router-devtools/package.json
+++ b/packages/router-devtools/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@tanstack/react-router-devtools",
+  "name": "@tanstack/router-devtools",
   "author": "Tanner Linsley",
   "version": "0.0.1-beta.82",
   "license": "MIT",
@@ -12,7 +12,7 @@
   "keywords": [
     "react",
     "location",
-    "@tanstack/react-router",
+    "@tanstack/router",
     "router",
     "routing",
     "async",
@@ -42,6 +42,6 @@
   "dependencies": {
     "@babel/runtime": "^7.16.7",
     "date-fns": "^2.29.1",
-    "@tanstack/react-router": "workspace:*"
+    "@tanstack/router": "workspace:*"
   }
 }
diff --git a/packages/react-router-devtools/src/Explorer.tsx b/packages/router-devtools/src/Explorer.tsx
similarity index 100%
rename from packages/react-router-devtools/src/Explorer.tsx
rename to packages/router-devtools/src/Explorer.tsx
diff --git a/packages/react-router-devtools/src/devtools.tsx b/packages/router-devtools/src/devtools.tsx
similarity index 99%
rename from packages/react-router-devtools/src/devtools.tsx
rename to packages/router-devtools/src/devtools.tsx
index 590cce6cb1..cd627f9ddd 100644
--- a/packages/react-router-devtools/src/devtools.tsx
+++ b/packages/router-devtools/src/devtools.tsx
@@ -3,10 +3,9 @@ import {
   last,
   routerContext,
   invariant,
-  useRouter,
   AnyRouter,
   useStore,
-} from '@tanstack/react-router'
+} from '@tanstack/router'
 
 import useLocalStorage from './useLocalStorage'
 import {
diff --git a/packages/react-router-devtools/src/index.tsx b/packages/router-devtools/src/index.tsx
similarity index 100%
rename from packages/react-router-devtools/src/index.tsx
rename to packages/router-devtools/src/index.tsx
diff --git a/packages/react-router-devtools/src/styledComponents.ts b/packages/router-devtools/src/styledComponents.ts
similarity index 100%
rename from packages/react-router-devtools/src/styledComponents.ts
rename to packages/router-devtools/src/styledComponents.ts
diff --git a/packages/react-router-devtools/src/theme.tsx b/packages/router-devtools/src/theme.tsx
similarity index 100%
rename from packages/react-router-devtools/src/theme.tsx
rename to packages/router-devtools/src/theme.tsx
diff --git a/packages/react-router-devtools/src/useLocalStorage.ts b/packages/router-devtools/src/useLocalStorage.ts
similarity index 100%
rename from packages/react-router-devtools/src/useLocalStorage.ts
rename to packages/router-devtools/src/useLocalStorage.ts
diff --git a/packages/react-router-devtools/src/useMediaQuery.ts b/packages/router-devtools/src/useMediaQuery.ts
similarity index 100%
rename from packages/react-router-devtools/src/useMediaQuery.ts
rename to packages/router-devtools/src/useMediaQuery.ts
diff --git a/packages/react-router-devtools/src/utils.ts b/packages/router-devtools/src/utils.ts
similarity index 98%
rename from packages/react-router-devtools/src/utils.ts
rename to packages/router-devtools/src/utils.ts
index 3f282c6c63..6c2930edf4 100644
--- a/packages/react-router-devtools/src/utils.ts
+++ b/packages/router-devtools/src/utils.ts
@@ -1,5 +1,5 @@
 import React from 'react'
-import { AnyRouteMatch, RouteMatch } from '@tanstack/react-router'
+import { AnyRouteMatch, RouteMatch } from '@tanstack/router'
 
 import { Theme, useTheme } from './theme'
 import useMediaQuery from './useMediaQuery'
diff --git a/packages/react-router-devtools/tsconfig.json b/packages/router-devtools/tsconfig.json
similarity index 100%
rename from packages/react-router-devtools/tsconfig.json
rename to packages/router-devtools/tsconfig.json
diff --git a/packages/router/package.json b/packages/router/package.json
index e4a113f61e..2d0600d39f 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -34,10 +34,14 @@
     "src"
   ],
   "sideEffects": false,
+  "peerDependencies": {
+    "react": ">=16",
+    "react-dom": ">=16"
+  },
   "dependencies": {
     "@babel/runtime": "^7.16.7",
-    "@tanstack/store": "workspace:*",
     "tiny-invariant": "^1.3.1",
-    "tiny-warning": "^1.0.3"
+    "tiny-warning": "^1.0.3",
+    "@tanstack/react-store": "workspace:*"
   }
 }
diff --git a/packages/router/src/frameworks.ts b/packages/router/src/frameworks.ts
deleted file mode 100644
index ca3010e3a0..0000000000
--- a/packages/router/src/frameworks.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export interface FrameworkGenerics {
-  // The following properties are used internally
-  // and are extended by framework adapters, but cannot be
-  // pre-defined as constraints:
-  //
-  // Component: any
-  // ErrorComponent: any
-}
-
-export type GetFrameworkGeneric<U> = U extends keyof FrameworkGenerics
-  ? FrameworkGenerics[U]
-  : any
diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index f4d6b6ff44..3e1e1b2b29 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -1,7 +1,6 @@
 export { default as invariant } from 'tiny-invariant'
 export { default as warning } from 'tiny-warning'
 export * from './history'
-export * from './frameworks'
 export * from './link'
 export * from './path'
 export * from './qss'
@@ -11,4 +10,4 @@ export * from './routeMatch'
 export * from './router'
 export * from './searchParams'
 export * from './utils'
-// export * from './routeError'
+export * from './react'
diff --git a/packages/router/src/path.ts b/packages/router/src/path.ts
index 498769c9b4..c60605315b 100644
--- a/packages/router/src/path.ts
+++ b/packages/router/src/path.ts
@@ -1,4 +1,3 @@
-import invariant from 'tiny-invariant'
 import { AnyPathParams } from './route'
 import { MatchLocation } from './router'
 import { last } from './utils'
diff --git a/packages/react-router/src/index.tsx b/packages/router/src/react.tsx
similarity index 89%
rename from packages/react-router/src/index.tsx
rename to packages/router/src/react.tsx
index 97815cbe54..26519b8ccc 100644
--- a/packages/react-router/src/index.tsx
+++ b/packages/router/src/react.tsx
@@ -1,38 +1,35 @@
 import * as React from 'react'
-
+import { NoInfer, useStore } from '@tanstack/react-store'
+import invariant from 'tiny-invariant'
+import warning from 'tiny-warning'
 import {
-  RegisteredRoutesInfo,
-  RegisteredRouter,
-  RouterStore,
-  last,
-  warning,
-  RouterOptions,
-  RouteMatch,
-  MatchRouteOptions,
-  AnyRoutesInfo,
-  DefaultRoutesInfo,
-  functionalUpdate,
-  RoutesInfo,
-  ValidFromPath,
   LinkOptions,
-  RouteByPath,
-  ResolveRelativePath,
-  NoInfer,
   ToOptions,
-  invariant,
-  Router,
-  AnyRootRoute,
-  RootRoute,
-  AnyRouteMatch,
+  ResolveRelativePath,
+  ValidFromPath,
   NavigateOptions,
+} from './link'
+import { AnyRootRoute, RootRoute, Route } from './route'
+import {
+  RouteByPath,
+  AnyRoutesInfo,
+  RoutesInfo,
+  DefaultRoutesInfo,
+} from './routeInfo'
+import { AnyRouteMatch, RouteMatch } from './routeMatch'
+import {
+  RegisteredRoutesInfo,
+  MatchRouteOptions,
+  RegisteredRouter,
   RouterConstructorOptions,
-} from '@tanstack/router'
-import { useStore } from '@tanstack/react-store'
+  RouterOptions,
+  RouterState,
+  Router,
+} from './router'
+import { functionalUpdate, last } from './utils'
 
 //
 
-export * from '@tanstack/router'
-
 export { useStore }
 
 //
@@ -112,24 +109,6 @@ export type MakeLinkOptions<
     children?: ReactNode | ((state: { isActive: boolean }) => ReactNode)
   }
 
-declare module '@tanstack/router' {
-  interface FrameworkGenerics {
-    Component: RouteComponent
-    ErrorComponent: RouteComponent<{
-      error: Error
-      info: { componentStack: string }
-    }>
-  }
-
-  interface RouterOptions<TRouteTree> {
-    // ssrFooter?: () => JSX.Element | Node
-  }
-
-  interface FrameworkRouteOptions {
-    wrapInSuspense?: boolean
-  }
-}
-
 export type PromptProps = {
   message: string
   condition?: boolean | any
@@ -311,24 +290,6 @@ export type MatchesProviderProps = {
   children: ReactNode
 }
 
-export class ReactRouter<
-  TRouteConfig extends AnyRootRoute = RootRoute,
-  TRoutesInfo extends AnyRoutesInfo = RoutesInfo<TRouteConfig>,
-> extends Router<TRouteConfig, TRoutesInfo> {
-  constructor(opts: RouterConstructorOptions<TRouteConfig>) {
-    super({
-      ...opts,
-      loadComponent: async (component) => {
-        if (component.preload) {
-          await component.preload()
-        }
-
-        return component as any
-      },
-    })
-  }
-}
-
 export type RouterProps<
   TRouteConfig extends AnyRootRoute = RootRoute,
   TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo,
@@ -374,12 +335,11 @@ export function useRouterContext(): RegisteredRouter {
   return value.router
 }
 
-export function useRouter<T = RouterStore>(
+export function useRouter<T = RouterState>(
   track?: (state: Router['__store']) => T,
-  shallow?: boolean,
 ): RegisteredRouter {
   const router = useRouterContext()
-  useStore(router.__store, track as any, shallow)
+  useStore(router.__store, track as any)
   return router
 }
 
@@ -398,7 +358,6 @@ export function useMatch<
   from: TFrom
   strict?: TStrict
   track?: (match: TRouteMatch) => any
-  shallow?: boolean
 }): TStrict extends true ? TRouteMatch : TRouteMatch | undefined {
   const router = useRouterContext()
   const nearestMatch = useMatches()[0]!
@@ -428,30 +387,42 @@ export function useMatch<
     )
   }
 
-  useStore(
-    match!.__store as any,
-    (d) => opts?.track?.(match as any) ?? match,
-    opts?.shallow,
-  )
+  useStore(match!.__store as any, (d) => opts?.track?.(match as any) ?? match)
 
   return match as any
 }
 
-export function useRoute<
-  TId extends keyof RegisteredRoutesInfo['routesById'] = '/',
->(routeId: TId): RegisteredRoutesInfo['routesById'][TId] {
-  const router = useRouterContext()
-  const resolvedRoute = router.getRoute(routeId as any)
-
-  invariant(
-    resolvedRoute,
-    `Could not find a route for route "${
-      routeId as string
-    }"! Did you forget to add it to your route?`,
-  )
-
-  return resolvedRoute as any
-}
+// export function useRoute<
+//   TId extends keyof RegisteredRoutesInfo['routesById'] = '/',
+// >(routeId: TId): RegisteredRoutesInfo['routesById'][TId] {
+//   const router = useRouterContext()
+//   const resolvedRoute = router.getRoute(routeId as any)
+
+//   invariant(
+//     resolvedRoute,
+//     `Could not find a route for route "${
+//       routeId as string
+//     }"! Did you forget to add it to your route?`,
+//   )
+
+//   return resolvedRoute as any
+// }
+
+export type RouteFromIdOrRoute<T> = T extends RegisteredRoutesInfo['routeUnion']
+  ? T
+  : T extends keyof RegisteredRoutesInfo['routesById']
+  ? RegisteredRoutesInfo['routesById'][T]
+  : T extends string
+  ? keyof RegisteredRoutesInfo['routesById']
+  : never
+
+// export function useRoute<TRouteOrId>(
+//   route: TRouteOrId extends string
+//     ? keyof RegisteredRoutesInfo['routeIds']
+//     : RegisteredRoutesInfo['routeUnion'],
+// ): RouteFromIdOrRoute<TRouteOrId> {
+//   return null as any
+// }
 
 export function useSearch<
   TFrom extends keyof RegisteredRoutesInfo['routesById'],
@@ -465,7 +436,7 @@ export function useSearch<
 }): TStrict extends true ? TSelected : TSelected | undefined {
   const { track, ...matchOpts } = opts as any
   const match = useMatch(matchOpts)
-  useStore(match.__store, (d: any) => opts?.track?.(d.search) ?? d.search, true)
+  useStore(match.__store, (d: any) => opts?.track?.(d.search) ?? d.search)
 
   return (match as unknown as RouteMatch).state.search as any
 }
@@ -480,14 +451,10 @@ export function useParams<
   track?: (search: TDefaultSelected) => TSelected
 }): TSelected {
   const router = useRouterContext()
-  useStore(
-    router.__store,
-    (d) => {
-      const params = last(d.currentMatches)?.params as any
-      return opts?.track?.(params) ?? params
-    },
-    true,
-  )
+  useStore(router.__store, (d) => {
+    const params = last(d.currentMatches)?.params as any
+    return opts?.track?.(params) ?? params
+  })
 
   return last(router.state.currentMatches)?.params as any
 }
@@ -567,7 +534,7 @@ function SubOutlet({
   match: RouteMatch
 }) {
   const router = useRouterContext()
-  useStore(match!.__store, (store) => [store.status, store.error], true)
+  useStore(match!.__store, (store) => [store.status, store.error])
 
   const defaultPending = React.useCallback(() => null, [])
 
diff --git a/packages/router/src/route.ts b/packages/router/src/route.ts
index 7cff636b18..6e42c7032a 100644
--- a/packages/router/src/route.ts
+++ b/packages/router/src/route.ts
@@ -1,4 +1,3 @@
-import { GetFrameworkGeneric } from './frameworks'
 import { ParsePathParams } from './link'
 import { RouteMatch } from './routeMatch'
 import { AnyRouter, Router, RouterContext } from './router'
@@ -12,10 +11,10 @@ import {
 import invariant from 'tiny-invariant'
 import { joinPaths, trimPath, trimPathRight } from './path'
 import { DefaultRoutesInfo } from './routeInfo'
+import { RouteComponent, useMatch } from './react'
 
 export const rootRouteId = '__root__' as const
 export type RootRouteId = typeof rootRouteId
-
 export type AnyPathParams = {}
 export type AnySearchSchema = {}
 export type AnyContext = {}
@@ -33,8 +32,6 @@ export type RouteOptionsBase<TCustomId, TPath> =
 export type RouteOptionsBaseIntersection<TCustomId, TPath> =
   UnionToIntersection<RouteOptionsBase<TCustomId, TPath>>
 
-export interface FrameworkRouteOptions {}
-
 export type MetaOptions = keyof PickRequired<RouteMeta> extends never
   ? {
       meta?: RouteMeta
@@ -98,6 +95,7 @@ export type RouteOptions<
   TParentRoute extends AnyRoute = AnyRoute,
   TCustomId extends string = string,
   TPath extends string = string,
+  TLoader = unknown,
   TParentSearchSchema extends {} = {},
   TSearchSchema extends AnySearchSchema = {},
   TFullSearchSchema extends AnySearchSchema = TSearchSchema,
@@ -108,65 +106,70 @@ export type RouteOptions<
   TAllParentContext extends AnyContext = AnyContext,
   TRouteContext extends RouteContext = RouteContext,
   TContext extends AnyContext = TRouteContext,
-> = RouteOptionsBase<TCustomId, TPath> &
-  FrameworkRouteOptions & {
-    getParentRoute: () => TParentRoute
-    // If true, this route will be matched as case-sensitive
-    caseSensitive?: boolean
-    // Filter functions that can manipulate search params *before* they are passed to links and navigate
-    // calls that match this route.
-    preSearchFilters?: SearchFilter<TFullSearchSchema>[]
-    // Filter functions that can manipulate search params *after* they are passed to links and navigate
-    // calls that match this route.
-    postSearchFilters?: SearchFilter<TFullSearchSchema>[]
-    // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`
-    component?: GetFrameworkGeneric<'Component'> // , NoInfer<TParentAllLoaderData>>
-    // The content to be rendered when the route encounters an error
-    errorComponent?: GetFrameworkGeneric<'ErrorComponent'> // , NoInfer<TParentAllLoaderData>>
-    // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
-    pendingComponent?: GetFrameworkGeneric<'Component'> //, NoInfer<TParentAllLoaderData>>
-    // This async function is called before a route is loaded.
-    // If an error is thrown here, the route's loader will not be called.
-    // If thrown during a navigation, the navigation will be cancelled and the error will be passed to the `onLoadError` function.
-    // If thrown during a preload event, the error will be logged to the console.
-    beforeLoad?: (opts: {
-      router: AnyRouter
-      match: RouteMatch
-    }) => Promise<void> | void
-    // This function will be called if the route's loader throws an error **during an attempted navigation**.
-    // If you want to redirect due to an error, call `router.navigate()` from within this function.
-    onBeforeLoadError?: (err: any) => void
-    validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>
-    // This function will be called if the route's validateSearch option throws an error **during an attempted validation**.
-    // If you want to redirect due to an error, call `router.navigate()` from within this function.
-    // If you want to display the errorComponent, rethrow the error
-    onValidateSearchError?: (err: any) => void
-    // An asynchronous function responsible for preparing or fetching data for the route before it is rendered
-    onLoad?: OnLoadFn<
-      TSearchSchema,
-      TFullSearchSchema,
-      TAllParams,
-      NoInfer<TRouteContext>,
-      TContext
-    >
-    onLoadError?: (err: any) => void
-    onError?: (err: any) => void
-    // This function is called
-    // when moving from an inactive state to an active one. Likewise, when moving from
-    // an active to an inactive state, the return function (if provided) is called.
-    onLoaded?: (matchContext: {
-      params: TAllParams
-      search: TFullSearchSchema
-    }) =>
-      | void
-      | undefined
-      | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)
-    // This function is called when the route remains active from one transition to the next.
-    onTransition?: (match: {
-      params: TAllParams
-      search: TFullSearchSchema
-    }) => void
-  } & MetaOptions &
+> = RouteOptionsBase<TCustomId, TPath> & {
+  getParentRoute: () => TParentRoute
+  // If true, this route will be matched as case-sensitive
+  caseSensitive?: boolean
+  // Filter functions that can manipulate search params *before* they are passed to links and navigate
+  // calls that match this route.
+  preSearchFilters?: SearchFilter<TFullSearchSchema>[]
+  // Filter functions that can manipulate search params *after* they are passed to links and navigate
+  // calls that match this route.
+  postSearchFilters?: SearchFilter<TFullSearchSchema>[]
+  // The content to be rendered when the route is matched. If no component is provided, defaults to `<Outlet />`
+  component?: RouteComponent //
+  // The content to be rendered when the route encounters an error
+  errorComponent?: RouteComponent<{
+    error: Error
+    info: { componentStack: string }
+  }> //
+  // If supported by your framework, the content to be rendered as the fallback content until the route is ready to render
+  pendingComponent?: RouteComponent //
+  wrapInSuspense?: boolean
+
+  // This async function is called before a route is loaded.
+  // If an error is thrown here, the route's loader will not be called.
+  // If thrown during a navigation, the navigation will be cancelled and the error will be passed to the `onLoadError` function.
+  // If thrown during a preload event, the error will be logged to the console.
+  beforeLoad?: (opts: {
+    router: AnyRouter
+    match: RouteMatch
+  }) => Promise<void> | void
+  // This function will be called if the route's loader throws an error **during an attempted navigation**.
+  // If you want to redirect due to an error, call `router.navigate()` from within this function.
+  onBeforeLoadError?: (err: any) => void
+  validateSearch?: SearchSchemaValidator<TSearchSchema, TParentSearchSchema>
+  // This function will be called if the route's validateSearch option throws an error **during an attempted validation**.
+  // If you want to redirect due to an error, call `router.navigate()` from within this function.
+  // If you want to display the errorComponent, rethrow the error
+  onValidateSearchError?: (err: any) => void
+  // An asynchronous function responsible for preparing or fetching data for the route before it is rendered
+  onLoad?: OnLoadFn<
+    TLoader,
+    TSearchSchema,
+    TFullSearchSchema,
+    TAllParams,
+    NoInfer<TRouteContext>,
+    TContext
+  >
+  onLoadError?: (err: any) => void
+  onError?: (err: any) => void
+  // This function is called
+  // when moving from an inactive state to an active one. Likewise, when moving from
+  // an active to an inactive state, the return function (if provided) is called.
+  onLoaded?: (matchContext: {
+    params: TAllParams
+    search: TFullSearchSchema
+  }) =>
+    | void
+    | undefined
+    | ((match: { params: TAllParams; search: TFullSearchSchema }) => void)
+  // This function is called when the route remains active from one transition to the next.
+  onTransition?: (match: {
+    params: TAllParams
+    search: TFullSearchSchema
+  }) => void
+} & MetaOptions &
   ContextOptions<
     TParentRoute,
     TAllParams,
@@ -226,6 +229,7 @@ export type ParentParams<TParentParams> = AnyPathParams extends TParentParams
     }
 
 export type OnLoadFn<
+  TLoader = unknown,
   TSearchSchema extends AnySearchSchema = {},
   TFullSearchSchema extends AnySearchSchema = {},
   TAllParams = {},
@@ -239,7 +243,7 @@ export type OnLoadFn<
     TContext,
     TAllContext
   >,
-) => Promise<any> | void
+) => Promise<TLoader> | TLoader
 
 export interface LoaderContext<
   TSearchSchema extends AnySearchSchema = {},
@@ -306,6 +310,7 @@ export interface AnyRoute
     any,
     any,
     any,
+    any,
     any
   > {}
 
@@ -324,6 +329,7 @@ export class Route<
     TCustomId,
     TPath
   >,
+  TLoaders = unknown,
   TSearchSchema extends AnySearchSchema = {},
   TFullSearchSchema extends AnySearchSchema = ResolveFullSearchSchema<
     TParentRoute,
@@ -354,6 +360,7 @@ export class Route<
     fullPath: TFullPath
     customId: TCustomId
     id: TId
+    loader: TLoaders
     searchSchema: TSearchSchema
     fullSearchSchema: TFullSearchSchema
     params: TParams
@@ -371,6 +378,7 @@ export class Route<
     TParentRoute,
     TCustomId,
     TPath,
+    TLoaders,
     InferFullSearchSchema<TParentRoute>,
     TSearchSchema,
     InferFullSearchSchema<TParentRoute> & TSearchSchema,
@@ -400,6 +408,7 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
+      TLoaders,
       InferFullSearchSchema<TParentRoute>,
       TSearchSchema,
       TFullSearchSchema,
@@ -424,6 +433,7 @@ export class Route<
       TParentRoute,
       TCustomId,
       TPath,
+      TLoaders,
       InferFullSearchSchema<TParentRoute>,
       TSearchSchema,
       TFullSearchSchema,
@@ -496,6 +506,7 @@ export class Route<
     TFullPath,
     TCustomId,
     TId,
+    TLoaders,
     TSearchSchema,
     TFullSearchSchema,
     TParams,
@@ -512,36 +523,19 @@ export class Route<
     return this as any
   }
 
-  // generate = (
-  //   options: Omit<
-  //     RouteOptions<
-  //       TParentRoute,
-  //       TCustomId,
-  //       TPath,
-  //       InferFullSearchSchema<TParentRoute>,
-  //       TSearchSchema,
-  //       TFullSearchSchema,
-  //       TParentRoute['__types']['allParams'],
-  //       TParams,
-  //       TAllParams,
-  //       TParentContext,
-  //       TAllParentContext,
-  //       TRouteContext,
-  //       TContext
-  //     >,
-  //     'path'
-  //   >,
-  // ) => {
-  //   invariant(
-  //     false,
-  //     `route.generate() is used by TanStack Router's file-based routing code generation and should not actually be called during runtime. `,
-  //   )
-  // }
+  useMatch = () => {
+    // return useMatch(this)
+  }
+
+  useLoader = () => {
+    return useLoader({ from: this.id })
+  }
 }
 
-export type AnyRootRoute = RootRoute<any, any, any>
+export type AnyRootRoute = RootRoute<any, any, any, any>
 
 export class RootRoute<
+  TLoaders = unknown,
   TSearchSchema extends AnySearchSchema = {},
   TContext extends RouteContext = RouteContext,
   TRouterContext extends RouterContext = RouterContext,
@@ -551,6 +545,7 @@ export class RootRoute<
   '/',
   string,
   RootRouteId,
+  TLoaders,
   TSearchSchema,
   TSearchSchema,
   {},
@@ -567,6 +562,7 @@ export class RootRoute<
         AnyRoute,
         RootRouteId,
         '',
+        TLoaders,
         {},
         TSearchSchema,
         NoInfer<TSearchSchema>,
@@ -589,6 +585,7 @@ export class RootRoute<
 
   static withRouterContext = <TRouterContext extends RouterContext>() => {
     return <
+      TLoaders = unknown,
       TSearchSchema extends AnySearchSchema = {},
       TContext extends RouterContext = RouterContext,
     >(
@@ -597,6 +594,7 @@ export class RootRoute<
           AnyRoute,
           RootRouteId,
           '',
+          TLoaders,
           {},
           TSearchSchema,
           NoInfer<TSearchSchema>,
@@ -608,7 +606,10 @@ export class RootRoute<
         >,
         'path' | 'id' | 'getParentRoute' | 'caseSensitive'
       >,
-    ) => new RootRoute<TSearchSchema, TContext, TRouterContext>(options as any)
+    ) =>
+      new RootRoute<TLoaders, TSearchSchema, TContext, TRouterContext>(
+        options as any,
+      )
   }
 }
 
diff --git a/packages/router/src/routeInfo.ts b/packages/router/src/routeInfo.ts
index 6d1dbe51eb..147ea653f4 100644
--- a/packages/router/src/routeInfo.ts
+++ b/packages/router/src/routeInfo.ts
@@ -55,6 +55,7 @@ export interface RoutesInfoInner<
     TRouteUnion['__types']['fullPath'], // TFullPath,
     TRouteUnion['__types']['customId'], // TCustomId,
     TRouteUnion['__types']['id'], // TId,
+    TRouteUnion['__types']['loader'], // TId,
     MergeUnion<TRouteUnion['__types']['searchSchema']> & {}, // TSearchSchema,
     MergeUnion<TRouteUnion['__types']['fullSearchSchema']> & {}, // TFullSearchSchema,
     MergeUnion<TRouteUnion['__types']['params']>, // TParams,
@@ -92,6 +93,7 @@ export type ParseRouteChildren<TRouteTree> = TRouteTree extends Route<
   any,
   any,
   any,
+  any,
   infer TChildren,
   any
 >
diff --git a/packages/router/src/routeMatch.ts b/packages/router/src/routeMatch.ts
index 19bcc7d350..78cc879fe3 100644
--- a/packages/router/src/routeMatch.ts
+++ b/packages/router/src/routeMatch.ts
@@ -1,12 +1,12 @@
-import { Store } from '@tanstack/store'
+import { Store } from '@tanstack/react-store'
 //
-import { GetFrameworkGeneric } from './frameworks'
-import { AnyRoute, AnySearchSchema, Route } from './route'
+import { RouteComponent } from './react'
+import { AnyRoute, Route } from './route'
 import { AnyRoutesInfo, DefaultRoutesInfo } from './routeInfo'
 import { AnyRouter, isRedirect, ParsedLocation, Router } from './router'
-import { Expand, pick, replaceEqualDeep } from './utils'
+import { replaceEqualDeep } from './utils'
 
-export interface RouteMatchStore<
+export interface RouteMatchState<
   TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo,
   TRoute extends AnyRoute = Route,
 > {
@@ -16,6 +16,7 @@ export interface RouteMatchStore<
   status: 'idle' | 'pending' | 'success' | 'error'
   error?: unknown
   updatedAt: number
+  loader: TRoute['__types']['loader']
 }
 
 const componentTypes = [
@@ -25,7 +26,7 @@ const componentTypes = [
 ] as const
 
 export interface PendingRouteMatchInfo {
-  state: RouteMatchStore<any, any>
+  state: RouteMatchState<any, any>
   routeContext: {}
   context: {}
 }
@@ -38,18 +39,21 @@ export class RouteMatch<
 > {
   route!: TRoute
   router!: Router<TRoutesInfo['routeTree'], TRoutesInfo>
-  __store!: Store<RouteMatchStore<TRoutesInfo, TRoute>>
-  state!: RouteMatchStore<TRoutesInfo, TRoute>
+  __store!: Store<RouteMatchState<TRoutesInfo, TRoute>>
+  state!: RouteMatchState<TRoutesInfo, TRoute>
   id!: string
   pathname!: string
   params!: TRoute['__types']['allParams']
 
   routeContext?: TRoute['__types']['routeContext']
-  context?: TRoute['__types']['context']
-
-  component?: GetFrameworkGeneric<'Component'>
-  errorComponent?: GetFrameworkGeneric<'ErrorComponent'>
-  pendingComponent?: GetFrameworkGeneric<'Component'>
+  context!: TRoute['__types']['context']
+
+  component?: RouteComponent
+  errorComponent?: RouteComponent<{
+    error: Error
+    info: { componentStack: string }
+  }>
+  pendingComponent?: RouteComponent
   abortController = new AbortController()
   parentMatch?: RouteMatch
   pendingInfo?: PendingRouteMatchInfo
@@ -77,12 +81,13 @@ export class RouteMatch<
       id: opts.id,
       pathname: opts.pathname,
       params: opts.params,
-      __store: new Store<RouteMatchStore<TRoutesInfo, TRoute>>(
+      __store: new Store<RouteMatchState<TRoutesInfo, TRoute>>(
         {
           updatedAt: 0,
           routeSearch: {},
           search: {} as any,
           status: 'idle',
+          loader: undefined,
         },
         {
           onUpdate: (next) => {
@@ -97,9 +102,7 @@ export class RouteMatch<
     componentTypes.map(async (type) => {
       const component = this.route.options[type]
 
-      if (typeof this[type] !== 'function') {
-        this[type] = component
-      }
+      this[type] = component as any
     })
 
     if (this.state.status === 'idle' && !this.#hasLoaders()) {
@@ -164,7 +167,8 @@ export class RouteMatch<
         throw err
       }
 
-      const errorHandler = this.route.options.onValidateSearchError ?? this.route.options.onError
+      const errorHandler =
+        this.route.options.onValidateSearchError ?? this.route.options.onError
       errorHandler?.(err)
       const error = new (Error as any)('Invalid search params found', {
         cause: err,
@@ -188,17 +192,17 @@ export class RouteMatch<
           search,
         }) || ({} as any)
 
-        const context = {
-          ...(this.parentMatch?.context ?? this.router?.options.context),
-          ...routeContext,
-        } as any
-    
-        return {
-          routeSearch,
-          search,
-          context,
-          routeContext,
-        }
+      const context = {
+        ...(this.parentMatch?.context ?? this.router?.options.context),
+        ...routeContext,
+      } as any
+
+      return {
+        routeSearch,
+        search,
+        context,
+        routeContext,
+      }
     } catch (err) {
       this.route.options.onError?.(err)
       throw err
@@ -241,7 +245,6 @@ export class RouteMatch<
       return
     }
 
-    // TODO: Should load promises be tracked based on location?
     this.__loadPromise = Promise.resolve().then(async () => {
       const loadId = '' + Date.now() + Math.random()
       this.#latestId = loadId
@@ -270,14 +273,14 @@ export class RouteMatch<
           componentTypes.map(async (type) => {
             const component = this.route.options[type]
 
-            if (this[type]?.preload) {
-              this[type] = await this.router.options.loadComponent!(component)
+            if (component?.preload) {
+              await component.preload()
             }
           }),
         )
       })()
 
-      const dataPromise = Promise.resolve().then(() => {
+      const loaderPromise = Promise.resolve().then(() => {
         if (this.route.options.onLoad) {
           return this.route.options.onLoad({
             params: this.params,
@@ -293,13 +296,17 @@ export class RouteMatch<
       })
 
       try {
-        await Promise.all([componentsPromise, dataPromise])
+        const [_, loader] = await Promise.all([
+          componentsPromise,
+          loaderPromise,
+        ])
         if ((latestPromise = checkLatest())) return await latestPromise
         this.__store.setState((s) => ({
           ...s,
           error: undefined,
           status: 'success',
           updatedAt: Date.now(),
+          loader,
         }))
       } catch (err) {
         if (isRedirect(err)) {
@@ -309,7 +316,8 @@ export class RouteMatch<
           return
         }
 
-        const errorHandler = this.route.options.onLoadError ?? this.route.options.onError
+        const errorHandler =
+          this.route.options.onLoadError ?? this.route.options.onError
         try {
           errorHandler?.(err)
         } catch (errorHandlerErr) {
diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
index fc6ec3cf83..4fb9e13d25 100644
--- a/packages/router/src/router.ts
+++ b/packages/router/src/router.ts
@@ -1,10 +1,8 @@
-import { Store } from '@tanstack/store'
+import { Store } from '@tanstack/react-store'
 import invariant from 'tiny-invariant'
 
 //
 
-import { GetFrameworkGeneric } from './frameworks'
-
 import {
   LinkInfo,
   LinkOptions,
@@ -29,9 +27,10 @@ import {
   AnyRoute,
   RootRoute,
   AnyContext,
+  AnyRootRoute,
 } from './route'
 import { RoutesInfo, AnyRoutesInfo, RoutesById } from './routeInfo'
-import { AnyRouteMatch, RouteMatch, RouteMatchStore } from './routeMatch'
+import { AnyRouteMatch, RouteMatch, RouteMatchState } from './routeMatch'
 import { defaultParseSearch, defaultStringifySearch } from './searchParams'
 import {
   functionalUpdate,
@@ -49,6 +48,7 @@ import {
   createMemoryHistory,
   RouterHistory,
 } from './history'
+import { RouteComponent } from './react'
 
 export interface Register {
   // router: Router
@@ -105,16 +105,19 @@ type RouterContextOptions<TRouteTree extends AnyRoute> =
         context: TRouteTree['__types']['routerContext']
       }
 
-export interface RouterOptions<TRouteTree extends AnyRoute> {
+export interface RouterOptions<TRouteTree extends AnyRootRoute> {
   history?: RouterHistory
   stringifySearch?: SearchSerializer
   parseSearch?: SearchParser
   filterRoutes?: FilterRoutesFn
   defaultPreload?: false | 'intent'
   defaultPreloadDelay?: number
-  defaultComponent?: GetFrameworkGeneric<'Component'>
-  defaultErrorComponent?: GetFrameworkGeneric<'ErrorComponent'>
-  defaultPendingComponent?: GetFrameworkGeneric<'Component'>
+  defaultComponent?: RouteComponent
+  defaultErrorComponent?: RouteComponent<{
+    error: Error
+    info: { componentStack: string }
+  }>
+  defaultPendingComponent?: RouteComponent
   defaultLoaderMaxAge?: number
   defaultLoaderGcMaxAge?: number
   caseSensitive?: boolean
@@ -122,9 +125,6 @@ export interface RouterOptions<TRouteTree extends AnyRoute> {
   basepath?: string
   Router?: (router: AnyRouter) => void
   createRoute?: (opts: { route: AnyRoute; router: AnyRouter }) => void
-  loadComponent?: (
-    component: GetFrameworkGeneric<'Component'>,
-  ) => Promise<GetFrameworkGeneric<'Component'>>
   onRouteChange?: () => void
   fetchServerDataFn?: FetchServerDataFn
   context?: TRouteTree['__types']['routerContext']
@@ -135,7 +135,7 @@ type FetchServerDataFn = (ctx: {
   routeMatch: RouteMatch
 }) => Promise<any>
 
-export interface RouterStore<
+export interface RouterState<
   TRoutesInfo extends AnyRoutesInfo = AnyRoutesInfo,
   TState extends LocationState = LocationState,
 > {
@@ -188,7 +188,7 @@ type LinkCurrentTargetElement = {
 
 export interface DehydratedRouterState
   extends Pick<
-    RouterStore,
+    RouterState,
     'status' | 'latestLocation' | 'currentLocation' | 'lastUpdated'
   > {
   currentMatches: DehydratedRouteMatch[]
@@ -202,7 +202,7 @@ export type MatchCache = Record<string, MatchCacheEntry>
 
 interface DehydratedRouteMatch {
   id: string
-  state: Pick<RouteMatchStore<any, any>, 'status'>
+  state: Pick<RouteMatchState<any, any>, 'status'>
 }
 
 export interface RouterContext {}
@@ -263,8 +263,8 @@ export class Router<
   nextAction: undefined | 'push' | 'replace'
   navigationPromise: undefined | Promise<void>
 
-  __store: Store<RouterStore<TRoutesInfo>>
-  state: RouterStore<TRoutesInfo>
+  __store: Store<RouterState<TRoutesInfo>>
+  state: RouterState<TRoutesInfo>
   startedLoadingAt = Date.now()
   resolveNavigation: () => void = () => {}
 
@@ -278,7 +278,7 @@ export class Router<
       fetchServerDataFn: options?.fetchServerDataFn ?? defaultFetchServerDataFn,
     }
 
-    this.__store = new Store<RouterStore<TRoutesInfo>>(
+    this.__store = new Store<RouterState<TRoutesInfo>>(
       getInitialRouterState(),
       {
         onUpdate: (state) => {
@@ -671,7 +671,9 @@ export class Router<
 
             firstBadMatchIndex = firstBadMatchIndex ?? index
 
-            const errorHandler = match.route.options.onBeforeLoadError ?? match.route.options.onError
+            const errorHandler =
+              match.route.options.onBeforeLoadError ??
+              match.route.options.onError
             try {
               errorHandler?.(err)
             } catch (errorHandlerErr) {
@@ -1249,7 +1251,7 @@ export class Router<
 // Detect if we're in the DOM
 const isServer = typeof window === 'undefined' || !window.document.createElement
 
-function getInitialRouterState(): RouterStore<any, any> {
+function getInitialRouterState(): RouterState<any, any> {
   return {
     status: 'idle',
     latestLocation: null!,
diff --git a/packages/solid-actions/package.json b/packages/solid-actions/package.json
deleted file mode 100644
index 524f973bbd..0000000000
--- a/packages/solid-actions/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "name": "@tanstack/solid-actions",
-  "author": "Tanner Linsley",
-  "version": "0.0.1-beta.68",
-  "license": "MIT",
-  "repository": "tanstack/router",
-  "homepage": "https://tanstack.com/router/",
-  "description": "",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "solid",
-    "location",
-    "@tanstack/solid-actions",
-    "router",
-    "routing",
-    "async",
-    "async router",
-    "typescript"
-  ],
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/tannerlinsley"
-  },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/index.js",
-  "browser": "build/umd/index.production.js",
-  "types": "build/types/index.d.ts",
-  "engines": {
-    "node": ">=12"
-  },
-  "files": [
-    "build/**",
-    "src"
-  ],
-  "sideEffects": false,
-  "peerDependencies": {
-    "solid-js": ">=1.6"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "@tanstack/actions": "workspace:*",
-    "@tanstack/solid-store": "workspace:*",
-    "tiny-invariant": "^1.0.5"
-  },
-  "devDependencies": {
-    "babel-plugin-transform-async-to-promises": "^0.8.18"
-  }
-}
diff --git a/packages/solid-actions/src/index.tsx b/packages/solid-actions/src/index.tsx
deleted file mode 100644
index 088d5b3b90..0000000000
--- a/packages/solid-actions/src/index.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import {
-  Action,
-  ActionByKey,
-  ActionClient,
-  ActionClientStore,
-  ActionStore,
-  RegisteredActions,
-} from '@tanstack/actions'
-import { useStore } from '@tanstack/solid-store'
-import { createContext, createRenderEffect, useContext } from 'solid-js'
-import invariant from 'tiny-invariant'
-
-export * from '@tanstack/actions'
-
-const actionClientContext = createContext<ActionClient<any>>(null as any)
-
-export function ActionClientProvider(props: {
-  actionClient: ActionClient<any>
-  children: any
-}) {
-  return (
-    <actionClientContext.Provider value={props.actionClient}>
-      {props.children}
-    </actionClientContext.Provider>
-  )
-}
-
-export function useAction<
-  TKey extends string,
-  TAction,
-  TActionFromKey extends ActionByKey<RegisteredActions, TKey>,
-  TResolvedAction extends unknown extends TAction
-    ? TActionFromKey
-    : TAction extends Action<any, any, any, any>
-    ? TAction
-    : never,
-  TPayload extends TResolvedAction['__types']['payload'],
-  TResponse extends TResolvedAction['__types']['response'],
-  TError extends TResolvedAction['__types']['error'],
->(
-  opts: (
-    | {
-        key: TKey
-      }
-    | { action: TAction }
-  ) & {
-    track?: (actionStore: ActionStore<TPayload, TResponse, TError>) => any
-  },
-): TResolvedAction {
-  const allOpts = opts as typeof opts & {
-    action?: Action<any, any, any, any>
-    key?: TKey
-  }
-
-  const actionClient = useContext(actionClientContext)
-
-  if (!actionClient) {
-    invariant(
-      'useActionClient must be used inside a <ActionClientProvider> component!',
-    )
-  }
-
-  const action = allOpts.action ?? actionClient!.getAction({ key: allOpts.key })
-
-  const actionCopy = { ...action }
-
-  const state = useStore(action.__store, (s) => allOpts?.track?.(s) ?? s)
-
-  createRenderEffect(() => {
-    Object.assign(actionCopy, action, { state })
-  })
-
-  return actionCopy as any
-}
-
-export function useActionClient(opts?: {
-  track?: (actionClientStore: ActionClientStore) => any
-}): ActionClient<RegisteredActions> {
-  const actionClient = useContext(actionClientContext)
-
-  if (!actionClient)
-    invariant(
-      'useActionClient must be used inside a <ActionClientProvider> component!',
-    )
-
-  const actionClientCopy = { ...actionClient }
-
-  const state = useStore(
-    actionClient!.__store,
-    (s) => opts?.track?.(s as any) ?? s,
-  )
-
-  createRenderEffect(() => {
-    Object.assign(actionClientCopy, actionClient, { state })
-  })
-
-  return actionClientCopy as any
-}
diff --git a/packages/solid-actions/transform.js b/packages/solid-actions/transform.js
deleted file mode 100644
index d62bbfe50e..0000000000
--- a/packages/solid-actions/transform.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const babelJest = require('babel-jest')
-
-module.exports = babelJest.default.createTransformer({
-  presets: [
-    'babel-preset-solid',
-    '@babel/preset-env',
-    '@babel/preset-typescript',
-  ],
-})
diff --git a/packages/solid-actions/tsconfig.json b/packages/solid-actions/tsconfig.json
deleted file mode 100644
index d911a2f96d..0000000000
--- a/packages/solid-actions/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "rootDir": "./src",
-    "outDir": "./build/solid",
-    "declarationDir": "./build/lib",
-    "tsBuildInfoFile": "./build/.tsbuildinfo",
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "emitDeclarationOnly": false
-  },
-  "include": ["src"]
-}
\ No newline at end of file
diff --git a/packages/solid-loaders/package.json b/packages/solid-loaders/package.json
deleted file mode 100644
index 4403d68908..0000000000
--- a/packages/solid-loaders/package.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "name": "@tanstack/solid-loaders",
-  "author": "Tanner Linsley",
-  "version": "0.0.1-beta.68",
-  "license": "MIT",
-  "repository": "tanstack/router",
-  "homepage": "https://tanstack.com/router/",
-  "description": "",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "solid",
-    "location",
-    "@tanstack/solid-loader",
-    "router",
-    "routing",
-    "async",
-    "async router",
-    "typescript"
-  ],
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/tannerlinsley"
-  },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/index.js",
-  "browser": "build/umd/index.production.js",
-  "types": "build/types/index.d.ts",
-  "engines": {
-    "node": ">=12"
-  },
-  "files": [
-    "build/**",
-    "src"
-  ],
-  "sideEffects": false,
-  "peerDependencies": {
-    "solid-js": ">=1.6"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "@tanstack/loaders": "workspace:*",
-    "@tanstack/solid-store": "workspace:*",
-    "tiny-invariant": "^1.0.5"
-  },
-  "devDependencies": {
-    "babel-plugin-transform-async-to-promises": "^0.8.18"
-  }
-}
diff --git a/packages/solid-loaders/src/index.tsx b/packages/solid-loaders/src/index.tsx
deleted file mode 100644
index 0882b57237..0000000000
--- a/packages/solid-loaders/src/index.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import {
-  Loader,
-  LoaderClient,
-  LoaderClientOptions,
-  LoaderClientStore,
-  LoaderInstance,
-  LoaderInstanceByKey,
-  LoaderStore,
-  NullableLoaderInstance,
-  RegisteredLoaders,
-  VariablesOptions,
-} from '@tanstack/loaders'
-import {
-  createContext,
-  createRenderEffect,
-  on,
-  splitProps,
-  useContext,
-} from 'solid-js'
-import { createStore } from 'solid-js/store'
-import invariant from 'tiny-invariant'
-
-import { useStore } from '@tanstack/solid-store'
-
-export * from '@tanstack/loaders'
-
-//
-
-export type NoInfer<T> = [T][T extends any ? 0 : never]
-
-const loaderClientContext = createContext<LoaderClient<any>>(null as any)
-
-export function LoaderClientProvider(
-  props: {
-    loaderClient: LoaderClient<any>
-    children: any
-  } & Pick<LoaderClientOptions<any>, 'defaultGcMaxAge' | 'defaultMaxAge'>,
-) {
-  const [coreProps, optionProps] = splitProps(props, [
-    'loaderClient',
-    'children',
-  ])
-
-  const [loaderClient, setLoaderClient] = createStore(coreProps.loaderClient)
-
-  createRenderEffect(
-    on(
-      () => [coreProps.loaderClient.options, optionProps],
-      ([loaderOptions, optionProps]) => {
-        setLoaderClient('options', (o) => ({
-          ...o,
-          ...loaderOptions,
-          ...optionProps,
-        }))
-      },
-    ),
-  )
-
-  return (
-    <loaderClientContext.Provider value={loaderClient}>
-      {coreProps.children}
-    </loaderClientContext.Provider>
-  )
-}
-
-type NullableLoaderInstance_<TLoaderInstance> =
-  TLoaderInstance extends LoaderInstance<
-    infer TKey,
-    infer TVariables,
-    infer TData,
-    infer TError
-  >
-    ? NullableLoaderInstance<TKey, TVariables, TData, TError>
-    : never
-
-export function useLoaderInstance<
-  TKey extends RegisteredLoaders[number]['__types']['key'],
-  TLoader,
-  TStrict,
-  TLoaderInstanceFromKey extends LoaderInstanceByKey<RegisteredLoaders, TKey>,
-  TResolvedLoaderInstance extends unknown extends TLoader
-    ? TLoaderInstanceFromKey
-    : TLoader extends Loader<
-        infer TTKey,
-        infer TTVariables,
-        infer TTData,
-        infer TTError
-      >
-    ? LoaderInstance<TTKey, TTVariables, TTData, TTError>
-    : never,
-  TVariables extends TResolvedLoaderInstance['__types']['variables'],
-  TData extends TResolvedLoaderInstance['__types']['data'],
-  TError extends TResolvedLoaderInstance['__types']['error'],
->(
-  opts: (
-    | {
-        key: TKey
-      }
-    | {
-        loader: TLoader
-      }
-  ) & {
-    strict?: TStrict
-    track?: (loaderStore: LoaderStore<TData, TError>) => any
-    throwOnError?: boolean
-  } & VariablesOptions<TVariables>,
-): TStrict extends false
-  ? NullableLoaderInstance_<TResolvedLoaderInstance>
-  : TResolvedLoaderInstance {
-  const allOpts = opts as any
-
-  // opts as typeof opts & {
-  //   key?: TKey
-  //   loader?: Loader<any, any, any, any>
-  // }
-
-  const loaderClient = useContext(loaderClientContext)!
-
-  invariant(
-    loaderClient || allOpts.loader,
-    'useLoaderInstance must be used inside a <LoaderClientProvider> component!',
-  )
-
-  const loader = allOpts.loader ?? loaderClient.getLoader({ key: allOpts.key })
-  const loaderInstance = loader.getInstance({
-    variables: allOpts?.variables,
-  } as any)
-
-  if (
-    loaderInstance.state.status === 'error' &&
-    (allOpts.throwOnError ?? true)
-  ) {
-    throw loaderInstance.state.error
-  }
-
-  if (allOpts?.strict ?? true) {
-    invariant(
-      typeof loaderInstance.state.data !== undefined,
-      `useLoaderInstance:
-  Loader instance { key: ${loader.key}, variables: ${allOpts.variables} }) is currently in a "${loaderInstance.state.status}" state. By default useLoaderInstance will throw an error if the loader instance is not in a "success" state. To avoid this error:
-  
-  - Load the loader instance before using it (e.g. via your router's onLoad or loader option)
-
-  - Set opts.strict to false and handle the loading state in your component`,
-    )
-  }
-
-  const loaderInstanceCopy = { ...loaderInstance }
-
-  const state = useStore(
-    loaderInstance.__store,
-    (s) => allOpts?.track?.(s as any) ?? s,
-  )
-
-  createRenderEffect(() => {
-    Object.assign(loaderInstanceCopy, loaderInstance, { state })
-  })
-
-  return loaderInstanceCopy as any
-}
-
-export function useLoaderClient(opts?: {
-  track?: (loaderClientStore: LoaderClientStore) => any
-}): LoaderClient<RegisteredLoaders> {
-  const loaderClient = useContext(loaderClientContext)!
-
-  if (!loaderClient)
-    invariant(
-      'useLoaderClient must be used inside a <LoaderClientProvider> component!',
-    )
-
-  const loaderClientCopy = { ...loaderClient }
-
-  const state = useStore(
-    loaderClient.__store,
-    (s) => opts?.track?.(s as any) ?? s,
-  )
-
-  createRenderEffect(() => {
-    Object.assign(loaderClientCopy, loaderClient, { state })
-  })
-
-  return loaderClientCopy as any
-}
diff --git a/packages/solid-loaders/transform.js b/packages/solid-loaders/transform.js
deleted file mode 100644
index d62bbfe50e..0000000000
--- a/packages/solid-loaders/transform.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const babelJest = require('babel-jest')
-
-module.exports = babelJest.default.createTransformer({
-  presets: [
-    'babel-preset-solid',
-    '@babel/preset-env',
-    '@babel/preset-typescript',
-  ],
-})
diff --git a/packages/solid-loaders/tsconfig.json b/packages/solid-loaders/tsconfig.json
deleted file mode 100644
index d911a2f96d..0000000000
--- a/packages/solid-loaders/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "rootDir": "./src",
-    "outDir": "./build/solid",
-    "declarationDir": "./build/lib",
-    "tsBuildInfoFile": "./build/.tsbuildinfo",
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "emitDeclarationOnly": false
-  },
-  "include": ["src"]
-}
\ No newline at end of file
diff --git a/packages/solid-router/package.json b/packages/solid-router/package.json
deleted file mode 100644
index 86c838a54f..0000000000
--- a/packages/solid-router/package.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "name": "@tanstack/solid-router",
-  "author": "Tanner Linsley",
-  "version": "0.0.1-beta.68",
-  "license": "MIT",
-  "repository": "tanstack/router",
-  "homepage": "https://tanstack.com/router/",
-  "description": "",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "solid",
-    "location",
-    "@tanstack/solid-router",
-    "router",
-    "routing",
-    "async",
-    "async router",
-    "typescript"
-  ],
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/tannerlinsley"
-  },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/index.js",
-  "browser": "build/umd/index.production.js",
-  "types": "build/types/index.d.ts",
-  "engines": {
-    "node": ">=12"
-  },
-  "files": [
-    "build/**",
-    "src"
-  ],
-  "sideEffects": false,
-  "peerDependencies": {
-    "solid-js": ">=1.6"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "@tanstack/solid-store": "workspace:*",
-    "@tanstack/router": "workspace:*"
-  },
-  "devDependencies": {
-    "babel-plugin-transform-async-to-promises": "^0.8.18"
-  }
-}
diff --git a/packages/solid-router/src/index.tsx b/packages/solid-router/src/index.tsx
deleted file mode 100644
index e6da426bce..0000000000
--- a/packages/solid-router/src/index.tsx
+++ /dev/null
@@ -1,810 +0,0 @@
-import {
-  AnyRootRoute,
-  AnyRouteMatch,
-  AnyRoutesInfo,
-  DefaultRoutesInfo,
-  functionalUpdate,
-  invariant,
-  last,
-  LinkOptions,
-  MatchRouteOptions,
-  NavigateOptions,
-  NoInfer,
-  RegisteredRouter,
-  RegisteredRoutesInfo,
-  ResolveRelativePath,
-  RootRoute,
-  RouteByPath,
-  RouteMatch,
-  Router,
-  RouterConstructorOptions,
-  RouterOptions,
-  RouterStore,
-  RoutesInfo,
-  ToOptions,
-  ValidFromPath,
-  warning,
-} from '@tanstack/router'
-import { useStore } from '@tanstack/solid-store'
-import {
-  createContext,
-  createEffect,
-  createRenderEffect,
-  createSignal,
-  ErrorBoundary,
-  JSX,
-  JSXElement,
-  lazy as solidLazy,
-  Match,
-  on,
-  onMount,
-  Show,
-  splitProps,
-  Suspense,
-  Switch,
-  useContext,
-  useTransition,
-} from 'solid-js'
-import { createStore } from 'solid-js/store'
-import { untrack } from 'solid-js/web'
-
-export * from '@tanstack/router'
-export { useStore }
-
-// -------------------------- Types -------------------
-
-export type SyncRouteComponent<TProps = {}> = (props: TProps) => JSXElement
-
-export type RouteComponent<TProps = {}> = SyncRouteComponent<TProps> & {
-  preload?: () => Promise<void>
-}
-
-export function lazy(
-  importer: () => Promise<{ default: SyncRouteComponent }>,
-): RouteComponent {
-  const lazyComp = solidLazy(importer)
-  let preloaded: Promise<SyncRouteComponent>
-
-  const finalComp = lazyComp as unknown as RouteComponent
-
-  finalComp.preload = async () => {
-    if (!preloaded) {
-      await importer()
-    }
-  }
-
-  return finalComp
-}
-
-// !Todo need to remove bound events being supported
-export type AnchorAttributes = Omit<
-  JSX.AnchorHTMLAttributes<HTMLAnchorElement>,
-  'style'
-> & {
-  style?: JSX.CSSProperties
-}
-
-export type LinkPropsOptions<
-  TFrom extends RegisteredRoutesInfo['routePaths'] = '/',
-  TTo extends string = '',
-> = LinkOptions<RegisteredRoutesInfo, TFrom, TTo> & {
-  // A function that returns additional props for the `active` state of this link. These props override other props passed to the link (`style`'s are merged, `className`'s are concatenated)
-  activeProps?: AnchorAttributes | (() => AnchorAttributes)
-  // A function that returns additional props for the `inactive` state of this link. These props override other props passed to the link (`style`'s are merged, `className`'s are concatenated)
-  inactiveProps?: AnchorAttributes | (() => AnchorAttributes)
-}
-
-export type MakeUseMatchRouteOptions<
-  TFrom extends RegisteredRoutesInfo['routePaths'] = '/',
-  TTo extends string = '',
-> = ToOptions<RegisteredRoutesInfo, TFrom, TTo> & MatchRouteOptions
-
-export type MakeMatchRouteOptions<
-  TFrom extends RegisteredRoutesInfo['routePaths'] = '/',
-  TTo extends string = '',
-> = ToOptions<RegisteredRoutesInfo, TFrom, TTo> &
-  MatchRouteOptions & {
-    // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
-    children?:
-      | JSXElement
-      | ((
-          params: RouteByPath<
-            RegisteredRoutesInfo,
-            ResolveRelativePath<TFrom, NoInfer<TTo>>
-          >['__types']['allParams'],
-        ) => JSXElement)
-  }
-
-export type MakeLinkPropsOptions<
-  TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/',
-  TTo extends string = '',
-> = LinkPropsOptions<TFrom, TTo> & AnchorAttributes
-
-export type MakeLinkOptions<
-  TFrom extends RegisteredRoutesInfo['routePaths'] = '/',
-  TTo extends string = '',
-> = LinkPropsOptions<TFrom, TTo> &
-  AnchorAttributes &
-  Omit<AnchorAttributes, 'children'> & {
-    // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns
-    children?: JSXElement | ((state: { isActive: boolean }) => JSXElement)
-  }
-
-declare module '@tanstack/router' {
-  interface FrameworkGenerics {
-    Component: RouteComponent
-    ErrorComponent: RouteComponent<{
-      error: Error
-      info: { componentStack: string }
-    }>
-  }
-
-  interface FrameworkRouteOptions {
-    wrapInSuspense?: boolean
-  }
-}
-
-export type PromptProps = {
-  message: string
-  when?: boolean | any
-  children?: JSXElement
-}
-
-type ClickEventHandler = JSX.EventHandlerUnion<HTMLAnchorElement, MouseEvent>
-type FocusEventHandler = JSX.EventHandlerUnion<HTMLAnchorElement, FocusEvent>
-type TouchEventHandler = JSX.EventHandlerUnion<HTMLAnchorElement, TouchEvent>
-
-type HandlerEvent =
-  | ClickEventHandler
-  | FocusEventHandler
-  | TouchEventHandler
-  | undefined
-
-// copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/2bd0b3271c992ed9c22055f7151216f64afd7a3b/types/react/index.d.ts#L909-L935
-interface SyntheticEvent<T = Element> {
-  bubbles: boolean
-  /**
-   * A reference to the element on which the event listener is registered.
-   */
-  currentTarget: EventTarget & T
-  cancelable: boolean
-  defaultPrevented: boolean
-  eventPhase: number
-  isTrusted: boolean
-  nativeEvent: Event
-  preventDefault(): void
-  isDefaultPrevented(): boolean
-  stopPropagation(): void
-  isPropagationStopped(): boolean
-  persist(): void
-  // If you thought this should be `EventTarget & T`, see https://github.com/DefinitelyTyped/DefinitelyTyped/pull/12239
-  /**
-   * A reference to the element from which the event was originally dispatched.
-   * This might be a child element to the element on which the event listener is registered.
-   *
-   * @see currentTarget
-   */
-  target: EventTarget
-  timeStamp: number
-  type: string
-}
-
-export class SolidRouter<
-  TRouteConfig extends AnyRootRoute = RootRoute,
-  TRoutesInfo extends AnyRoutesInfo = RoutesInfo<TRouteConfig>,
-> extends Router<TRouteConfig, TRoutesInfo> {
-  constructor(opts: RouterConstructorOptions<TRouteConfig>) {
-    super({
-      ...opts,
-      loadComponent: async (component) => {
-        if (component.preload) {
-          await component.preload()
-        }
-
-        return component
-      },
-    })
-  }
-}
-
-export function useParams<
-  TFrom extends keyof RegisteredRoutesInfo['routesById'] = '/',
-  TDefaultSelected = RegisteredRoutesInfo['allParams'] &
-    RegisteredRoutesInfo['routesById'][TFrom]['__types']['allParams'],
-  TSelected = TDefaultSelected,
->(opts?: {
-  from: TFrom
-  track?: (search: TDefaultSelected) => TSelected
-}): TSelected {
-  const router = useRouterContext()
-
-  return useStore(router.__store, (d) => {
-    const params = last(d.currentMatches)?.params as any
-    return opts?.track?.(params) ?? params
-  })
-}
-
-type MatchesContextValue = AnyRouteMatch[]
-export const matchesContext = createContext<MatchesContextValue>(null!)
-export const routerContext = createContext<{ router: RegisteredRouter }>(null!)
-
-export function useRouterContext(): RegisteredRouter {
-  const value = useContext(routerContext)!
-  warning(value, 'useRouter must be used inside a <Router> component!')
-  // useStore(value.router.__store)
-
-  return value.router
-}
-
-export type RouterProps<
-  TRouteConfig extends AnyRootRoute = RootRoute,
-  TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo,
-> = RouterOptions<TRouteConfig> & {
-  router: Router<TRouteConfig, TRoutesInfo>
-}
-
-export function RouterProvider<
-  TRouteConfig extends AnyRootRoute = RootRoute,
-  TRoutesInfo extends AnyRoutesInfo = DefaultRoutesInfo,
->(props: RouterProps<TRouteConfig, TRoutesInfo>) {
-  const [routerProps, rest] = splitProps(props, ['router'])
-
-  const [matches, setMatches] = createStore<MatchesContextValue>([undefined!])
-  routerProps.router.update(rest)
-
-  const store = useStore(routerProps.router.__store, (s) => s)
-
-  onMount(routerProps.router.mount)
-
-  createEffect(
-    on(
-      () => [store.currentMatches, store.status] as const,
-      ([matches]) => {
-        setMatches(([undefined!] as MatchesContextValue).concat(matches))
-      },
-    ),
-  )
-
-  return (
-    <routerContext.Provider value={{ router: routerProps.router as any }}>
-      <matchesContext.Provider value={matches}>
-        <CatchBoundary
-          errorComponent={ErrorComponent}
-          onCatch={() => {
-            warning(
-              false,
-              `Error in router! Consider setting an 'errorComponent' in your RootRoute! 👍`,
-            )
-          }}
-        >
-          {() => <Outlet />}
-        </CatchBoundary>
-      </matchesContext.Provider>
-    </routerContext.Provider>
-  )
-}
-
-export function Outlet() {
-  const matchesContext = useMatches()
-
-  const matches = () => matchesContext.slice(1)
-  const match = () => matches()[0]
-
-  // I made this keyed and watching both of match and matches so it does a deep inspection and will rerender on the changes correctly
-  return (
-    <Show when={match() && matches()} keyed>
-      <SubOutlet matches={matches().slice()} match={match() as any} />
-    </Show>
-  )
-}
-
-function SubOutlet(props: { matches: RouteMatch[]; match: RouteMatch }) {
-  const router = useRouterContext()
-
-  const PendingComponent = () =>
-    props.match.pendingComponent ?? router.options.defaultPendingComponent
-
-  const OutletComponent = () =>
-    props.match.errorComponent ?? router.options.defaultErrorComponent
-
-  return (
-    <matchesContext.Provider value={props.matches.slice()}>
-      <SuspenseWrapper
-        wrapInSuspense={props.match.route.options.wrapInSuspense ?? true}
-        pendingComponent={PendingComponent() as any}
-      >
-        <ErrorBoundaryWrapper
-          boundaryComponent={
-            OutletComponent() ? (OutletComponent() as any) : undefined
-          }
-          onCatch={() =>
-            warning(false, `Error in route match: ${props.match.id}`)
-          }
-        >
-          {() => <Inner match={props.match} />}
-        </ErrorBoundaryWrapper>
-      </SuspenseWrapper>
-    </matchesContext.Provider>
-  )
-}
-
-function Inner(props: { match: RouteMatch }) {
-  const router = useRouterContext()
-
-  return (
-    <Switch
-      fallback={() => {
-        invariant(
-          false,
-          'Idle routeMatch status encountered during rendering! You should never see this. File an issue!',
-        )
-      }}
-    >
-      <Match when={props.match.state.status === 'error'}>
-        {() => {
-          throw props.match.state.error
-        }}
-      </Match>
-      <Match when={props.match.state.status === 'success'}>
-        <Switch fallback={Outlet}>
-          <Match when={props.match.component} keyed>
-            {(Component) => <Component />}
-          </Match>
-          <Match when={router.options.defaultComponent} keyed>
-            {(DefaultComponent) => <DefaultComponent />}
-          </Match>
-        </Switch>
-      </Match>
-      <Match when={props.match.state.status === 'pending'}>
-        {() => {
-          throw props.match.__loadPromise
-        }}
-      </Match>
-    </Switch>
-  )
-}
-
-function SuspenseWrapper(props: {
-  wrapInSuspense: boolean
-  children: JSXElement
-  pendingComponent?: JSXElement
-}) {
-  return (
-    <Show when={props.wrapInSuspense} fallback={props.children}>
-      <Suspense
-        fallback={() => (
-          <Show when={props.pendingComponent}>{props.pendingComponent}</Show>
-        )}
-      >
-        {/* Suspense is never resolving if there isn't a wrapping html element around it*/}
-        <div id="suspense">{props.children}</div>
-      </Suspense>
-    </Show>
-  )
-}
-
-function ErrorBoundaryWrapper(props: {
-  children: JSXElement
-  boundaryComponent?: (props: any) => JSXElement
-  onCatch: () => void
-}) {
-  return (
-    <Show when={props.boundaryComponent} fallback={props.children}>
-      <CatchBoundary
-        errorComponent={props.boundaryComponent}
-        onCatch={props.onCatch}
-      >
-        {() => props.children}
-      </CatchBoundary>
-    </Show>
-  )
-}
-
-export function useMatches(): RouteMatch[] {
-  return useContext(matchesContext)!
-}
-
-// -------------------------- Utils -------------------
-export function useLinkProps<
-  TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/',
-  TTo extends string = '',
->(options: MakeLinkPropsOptions<TFrom, TTo>): AnchorAttributes {
-  const router = useRouterContext()
-
-  const {
-    // custom props
-    type,
-    children,
-    target,
-    activeProps = () => ({ class: 'active' }),
-    inactiveProps = () => ({}),
-    activeOptions,
-    disabled,
-    // fromCurrent,
-    hash,
-    search,
-    params,
-    to = '.',
-    preload,
-    preloadDelay,
-    replace,
-    class: klass,
-    // element props
-    style,
-    onClick,
-    onFocus,
-    onMouseEnter,
-    onMouseLeave,
-    onTouchStart,
-    ...rest
-  } = options
-
-  const linkInfo = router.buildLink(options as any)
-
-  if (linkInfo.type === 'external') {
-    const { href } = linkInfo
-    return { href }
-  }
-
-  const {
-    handleClick,
-    handleFocus,
-    handleEnter,
-    handleLeave,
-    handleTouchStart,
-    isActive,
-    next,
-  } = linkInfo
-
-  const [, start] = useTransition()
-
-  const internalHandleClick = (e: Event) => {
-    start(() => handleClick(e))
-  }
-
-  const composeHandlers =
-    (handlers: (undefined | ((e: any) => void) | HandlerEvent)[]) =>
-    (e: SyntheticEvent) => {
-      if (!e) return
-      if (e.persist) e.persist()
-      handlers.filter(Boolean).forEach((handler) => {
-        if (e.defaultPrevented) return
-        if (typeof handler === 'function') handler(e)
-      })
-    }
-
-  // Get the active props
-  const resolvedActiveProps: AnchorAttributes = isActive
-    ? functionalUpdate(activeProps as any, {}) ?? {}
-    : {}
-
-  // Get the inactive props
-  const resolvedInactiveProps: AnchorAttributes = isActive
-    ? {}
-    : functionalUpdate(inactiveProps, {}) ?? {}
-
-  return {
-    ...resolvedActiveProps,
-    ...resolvedInactiveProps,
-    ...rest,
-    href: disabled ? undefined : next.href,
-    onClick: composeHandlers([onClick, internalHandleClick]),
-    onFocus: composeHandlers([onFocus, handleFocus]),
-    onMouseEnter: composeHandlers([onMouseEnter, handleEnter]),
-    onMouseLeave: composeHandlers([onMouseLeave, handleLeave]),
-    onTouchStart: composeHandlers([onTouchStart, handleTouchStart]),
-    target,
-    style: {
-      ...style,
-      ...resolvedActiveProps.style,
-      ...resolvedInactiveProps.style,
-    },
-    class:
-      [klass, resolvedActiveProps.class, resolvedInactiveProps.class]
-        .filter(Boolean)
-        .join(' ') || undefined,
-    ...(disabled
-      ? {
-          role: 'link',
-          'aria-disabled': true,
-        }
-      : undefined),
-    ['data-status']: isActive ? 'active' : undefined,
-  }
-}
-
-// -------------------------- Components -------------------
-
-export interface LinkFn<
-  TDefaultFrom extends RegisteredRoutesInfo['routePaths'] = '/',
-  TDefaultTo extends string = '',
-> {
-  <
-    TFrom extends RegisteredRoutesInfo['routePaths'] = TDefaultFrom,
-    TTo extends string = TDefaultTo,
-  >(
-    props: MakeLinkOptions<TFrom, TTo>,
-  ): JSXElement
-}
-
-export const Link: LinkFn = (props: any) => {
-  const linkProps = useLinkProps(props)
-
-  return (
-    <a
-      {...{
-        ref: props.ref as any,
-        ...linkProps,
-        children:
-          typeof props.children === 'function'
-            ? props.children({
-                isActive: (linkProps as any)['data-status'] === 'active',
-              })
-            : props.children,
-      }}
-    />
-  )
-}
-
-export function Navigate<
-  TFrom extends RegisteredRoutesInfo['routePaths'] = '/',
-  TTo extends string = '',
->(props: NavigateOptions<RegisteredRoutesInfo, TFrom, TTo>): null {
-  const router = useRouterContext()
-
-  createRenderEffect(() => {
-    router.navigate(props as any)
-  }, [])
-
-  return null
-}
-
-export function useMatch<
-  TFrom extends keyof RegisteredRoutesInfo['routesById'],
-  TStrict extends boolean = true,
-  TRouteMatch = RouteMatch<
-    RegisteredRoutesInfo,
-    RegisteredRoutesInfo['routesById'][TFrom]
-  >,
->(opts?: {
-  from: TFrom
-  strict?: TStrict
-  track?: (match: TRouteMatch) => any
-}): TStrict extends true ? TRouteMatch : TRouteMatch | undefined {
-  const router = useRouterContext()
-  const nearestMatch = () => useMatches()[0]!
-  const match = () =>
-    opts?.from
-      ? router.state.currentMatches.find((d) => d.route.id === opts?.from)
-      : nearestMatch()
-
-  invariant(
-    match(),
-    `Could not find ${
-      opts?.from ? `an active match from "${opts.from}"` : 'a nearest match!'
-    }`,
-  )
-
-  if (opts?.strict ?? true) {
-    invariant(
-      nearestMatch().route.id == match()?.route.id,
-      `useMatch("${
-        match()?.route.id as string
-      }") is being called in a component that is meant to render the '${
-        nearestMatch().route.id
-      }' route. Did you mean to 'useMatch("${
-        match()?.route.id as string
-      }", { strict: false })' or 'useRoute("${
-        match()?.route.id as string
-      }")' instead?`,
-    )
-  }
-
-  return useStore(
-    match()!.__store as any,
-    (d) => opts?.track?.(match() as any) ?? match(),
-  )
-}
-
-export function useRoute<
-  TId extends keyof RegisteredRoutesInfo['routesById'] = '/',
->(routeId: TId): RegisteredRoutesInfo['routesById'][TId] {
-  const router = useRouterContext()
-  const resolvedRoute = () => router.getRoute(routeId as any)
-
-  invariant(
-    resolvedRoute(),
-    `Could not find a route for route "${
-      routeId as string
-    }"! Did you forget to add it to your route?`,
-  )
-
-  return resolvedRoute as any
-}
-
-// Return a wrapped memo around for reactivity. Might want to change this so it's simular to the other APIs.
-export function useSearch<
-  TFrom extends keyof RegisteredRoutesInfo['routesById'],
-  TStrict extends boolean = true,
-  TSearch = RegisteredRoutesInfo['routesById'][TFrom]['__types']['fullSearchSchema'],
-  TSelected = TSearch,
->(opts?: {
-  from: TFrom
-  strict?: TStrict
-  track?: (search: TSearch) => TSelected
-}): TStrict extends true ? TSelected : TSelected | undefined {
-  const match = useMatch(opts)
-
-  return useStore(
-    (match as any).__store,
-    (s: any) => opts?.track?.(s?.search) ?? s?.search,
-    { removeMissingKeys: true },
-  )
-}
-
-export function useRouter<T = RouterStore>(
-  track?: (state: Router['state']) => T,
-): RouterStore {
-  const router = useRouterContext()
-
-  return useStore(router.__store, (d) => track?.(d as any) ?? d) as any
-}
-
-export function useNavigate<
-  TDefaultFrom extends keyof RegisteredRoutesInfo['routesById'] = '/',
->(defaultOpts?: { from?: TDefaultFrom }) {
-  const router = useRouterContext()
-  return function <
-    TFrom extends keyof RegisteredRoutesInfo['routesById'] = TDefaultFrom,
-    TTo extends string = '',
-  >(opts?: MakeLinkOptions<TFrom, TTo>) {
-    return router.navigate({ ...defaultOpts, ...(opts as any) })
-  }
-}
-
-export function useMatchRoute() {
-  const router = useRouterContext()
-
-  return function <
-    TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/',
-    TTo extends string = '',
-  >(opts: MakeUseMatchRouteOptions<TFrom, TTo>) {
-    const { pending, caseSensitive, ...rest } = opts
-
-    return router.matchRoute(rest as any, {
-      pending,
-      caseSensitive,
-    })
-  }
-}
-
-export function MatchRoute<
-  TFrom extends ValidFromPath<RegisteredRoutesInfo> = '/',
-  TTo extends string = '',
->(props: MakeMatchRouteOptions<TFrom, TTo>): any {
-  const matchRoute = useMatchRoute()
-  const params = matchRoute(props)
-
-  return (
-    <Show when={params}>
-      <Show
-        when={typeof props.children === 'function'}
-        fallback={props.children as JSXElement}
-      >
-        {(props.children as any)(params)}
-      </Show>
-    </Show>
-  )
-}
-
-function CatchBoundary(props: {
-  children: (props: { error?: string }) => JSXElement
-  errorComponent: any
-  onCatch: (error: any) => void
-}) {
-  return (
-    <ErrorBoundary
-      fallback={(error, reset) => {
-        console.error(error)
-        props.onCatch(error)
-        return (
-          <div class="errorBoundary">
-            <CatchBoundaryInner
-              reset={reset}
-              errorState={{ error }}
-              errorComponent={props.errorComponent}
-            >
-              {(err: any) => props.children(err)}
-            </CatchBoundaryInner>
-          </div>
-        )
-      }}
-    >
-      <div class="catchBoundary">{props.children({})}</div>
-    </ErrorBoundary>
-  )
-}
-
-function CatchBoundaryInner(props: {
-  children: any
-  errorComponent: any
-  errorState: { error: any }
-  reset: () => void
-}) {
-  const [activeErrorState, setActiveErrorState] = createSignal(props.errorState)
-  let previousRef: string | undefined
-
-  const router = useRouterContext()
-  const errorComponent = props.errorComponent ?? ErrorComponent
-
-  createEffect(() => {
-    if (activeErrorState()) {
-      if (router.state.currentLocation.key !== previousRef) {
-        setActiveErrorState({} as any)
-      }
-    }
-
-    previousRef = router.state.currentLocation.key
-  })
-
-  createEffect(() => {
-    if (props.errorState.error) {
-      setActiveErrorState(props.errorState)
-    }
-    // props.reset()
-  })
-
-  return (
-    <Show
-      when={props.errorState.error && activeErrorState().error}
-      fallback={props.children}
-    >
-      <div class="flex flex-col gap-2">
-        {typeof errorComponent === 'function' && errorComponent.length
-          ? untrack(() => errorComponent(props.errorState))
-          : errorComponent}
-        <button
-          class="border border-red-500 w-16 text-red-500"
-          onClick={props.reset}
-        >
-          Reset
-        </button>
-      </div>
-    </Show>
-  )
-}
-
-export function ErrorComponent(props: { error: any }) {
-  return (
-    // @ts-ignore
-    <div style={{ padding: '.5rem', 'max-width': '100%' }}>
-      {/* @ts-ignore */}
-      <strong style={{ 'font-size': '1.2rem' }}>Something went wrong!</strong>
-      {/* @ts-ignore */}
-      <div style={{ height: '.5rem' }} />
-      <div>
-        <pre
-          // @ts-ignore
-          style={{
-            // @ts-ignore
-            'font-size': '.7em',
-            // @ts-ignore
-            border: '1px solid red',
-            // @ts-ignore
-            'border-radius': '.25rem',
-            // @ts-ignore
-            padding: '.5rem',
-            // @ts-ignore
-            color: 'red',
-            // @ts-ignore
-            overflow: 'auto',
-          }}
-        >
-          <Show when={props?.error?.message}>
-            <code>{props.error.message}</code>
-          </Show>
-        </pre>
-      </div>
-    </div>
-  )
-}
diff --git a/packages/solid-router/transform.js b/packages/solid-router/transform.js
deleted file mode 100644
index d62bbfe50e..0000000000
--- a/packages/solid-router/transform.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const babelJest = require('babel-jest')
-
-module.exports = babelJest.default.createTransformer({
-  presets: [
-    'babel-preset-solid',
-    '@babel/preset-env',
-    '@babel/preset-typescript',
-  ],
-})
diff --git a/packages/solid-router/tsconfig.json b/packages/solid-router/tsconfig.json
deleted file mode 100644
index d911a2f96d..0000000000
--- a/packages/solid-router/tsconfig.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "rootDir": "./src",
-    "outDir": "./build/solid",
-    "declarationDir": "./build/lib",
-    "tsBuildInfoFile": "./build/.tsbuildinfo",
-    "jsx": "preserve",
-    "jsxImportSource": "solid-js",
-    "emitDeclarationOnly": false
-  },
-  "include": ["src"]
-}
\ No newline at end of file
diff --git a/packages/solid-store/package.json b/packages/solid-store/package.json
deleted file mode 100644
index cc108cdb17..0000000000
--- a/packages/solid-store/package.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  "name": "@tanstack/solid-store",
-  "author": "Tanner Linsley",
-  "version": "0.0.1-beta.62",
-  "license": "MIT",
-  "repository": "tanstack/solid-store",
-  "homepage": "https://tanstack.com/",
-  "description": "",
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
-  },
-  "keywords": [
-    "loaders",
-    "solid",
-    "typescript"
-  ],
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/tannerlinsley"
-  },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/index.js",
-  "browser": "build/umd/index.production.js",
-  "types": "build/types/index.d.ts",
-  "engines": {
-    "node": ">=12"
-  },
-  "files": [
-    "build/**",
-    "src"
-  ],
-  "sideEffects": false,
-  "peerDependencies": {
-    "solid-js": ">=1.6"
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.16.7",
-    "@tanstack/store": "workspace:*"
-  },
-  "devDependencies": {
-    "@types/use-sync-external-store": "^0.0.3"
-  }
-}
diff --git a/packages/solid-store/src/index.tsx b/packages/solid-store/src/index.tsx
deleted file mode 100644
index 3eb73091a1..0000000000
--- a/packages/solid-store/src/index.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { AnyUpdater, Store } from '@tanstack/store'
-import { onCleanup, onMount } from 'solid-js'
-import { createStore, reconcile } from 'solid-js/store'
-
-export type NoInfer<T> = [T][T extends any ? 0 : never]
-
-export function useStore<
-  TState extends object,
-  TSelected extends object = NoInfer<TState>,
-  TUpdater extends AnyUpdater = AnyUpdater,
->(
-  routerStore: Store<TState, TUpdater>,
-  selector: (state: NoInfer<TState>) => TSelected = (d) => d as any,
-  options: { removeMissingKeys?: boolean } = {},
-): TSelected {
-  const [state, setState] = createStore<{ state: TSelected }>({
-    state: selector(routerStore.state),
-  })
-
-  onMount(() => {
-    const unsubscribe = routerStore.subscribe((tState) => {
-      const updatedState = selector(tState)
-
-      setState('state', (s) => {
-        /* This is needed for removing keys that have been removed. Example is useSearch
-         when the params are removed. Need to make it more than just shallow, but 
-         should be okay for now. */
-        if (options.removeMissingKeys) {
-          const missingKeys = shallowFindMissingKeys(s, updatedState)
-          return reconcile({ ...updatedState, ...missingKeys })(s)
-        }
-        return reconcile(updatedState)(s)
-      })
-    })
-    onCleanup(unsubscribe)
-  })
-
-  return state.state
-}
-
-function shallowFindMissingKeys<TState extends Object>(
-  oldState: TState,
-  newState: TState,
-): Record<keyof TState, undefined> {
-  const oldStateKeys = Object.keys(oldState) as (keyof typeof oldState)[]
-  const missingKeys: Record<keyof TState, undefined> = oldStateKeys.reduce(
-    (acc, key) => {
-      if (newState[key] === undefined) {
-        acc[key] = undefined
-      }
-
-      return acc
-    },
-    {} as Record<keyof TState, undefined>,
-  )
-
-  return missingKeys
-}
diff --git a/packages/solid-store/tsconfig.json b/packages/solid-store/tsconfig.json
deleted file mode 100644
index 40bee4528e..0000000000
--- a/packages/solid-store/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "composite": true,
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "outDir": "./build/types"
-  },
-  "files": ["src/index.tsx"],
-  "include": [
-    "src"
-    //  "__tests__/**/*.test.*"
-  ]
-}
diff --git a/packages/store/src/index.ts b/packages/store/src/index.ts
index 2bdc974bd1..fe44f1e2cb 100644
--- a/packages/store/src/index.ts
+++ b/packages/store/src/index.ts
@@ -67,57 +67,3 @@ export class Store<
     this.#flush()
   }
 }
-
-
-export function shallow<T>(objA: T, objB: T) {
-  if (Object.is(objA, objB)) {
-    return true
-  }
-
-  if (
-    typeof objA !== 'object' ||
-    objA === null ||
-    typeof objB !== 'object' ||
-    objB === null
-  ) {
-    return false
-  }
-
-  // if (objA instanceof Map && objB instanceof Map) {
-  //   if (objA.size !== objB.size) return false
-
-  //   for (const [key, value] of objA) {
-  //     if (!Object.is(value, objB.get(key))) {
-  //       return false
-  //     }
-  //   }
-  //   return true
-  // }
-
-  // if (objA instanceof Set && objB instanceof Set) {
-  //   if (objA.size !== objB.size) return false
-
-  //   for (const value of objA) {
-  //     if (!objB.has(value)) {
-  //       return false
-  //     }
-  //   }
-  //   return true
-  // }
-
-  const keysA = Object.keys(objA)
-  if (keysA.length !== Object.keys(objB).length) {
-    return false
-  }
-
-  for (let i = 0; i < keysA.length; i++) {
-    if (
-      !Object.prototype.hasOwnProperty.call(objB, keysA[i] as string) ||
-      !Object.is(objA[keysA[i] as keyof T], objB[keysA[i] as keyof T])
-    ) {
-      return false
-    }
-  }
-  return true
-}
-
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4579dbfc24..f7c627af11 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,10 +6,9 @@ overrides:
   '@tanstack/loaders': workspace:*
   '@tanstack/actions': workspace:*
   '@tanstack/react-store': workspace:*
-  '@tanstack/react-router': workspace:*
   '@tanstack/react-actions': workspace:*
   '@tanstack/react-loaders': workspace:*
-  '@tanstack/react-router-devtools': workspace:*
+  '@tanstack/router-devtools': workspace:*
   '@tanstack/solid-router': workspace:*
   '@tanstack/solid-store': workspace:*
   '@tanstack/solid-loaders': workspace:*
@@ -124,8 +123,8 @@ importers:
     specifiers:
       '@tanstack/react-actions': workspace:*
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.8
       '@vitejs/plugin-react': ^1.1.3
@@ -138,8 +137,8 @@ importers:
     dependencies:
       '@tanstack/react-actions': link:../../../packages/react-actions
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@vitejs/plugin-react': 1.3.2
       axios: 1.2.0
       immer: 9.0.16
@@ -157,9 +156,9 @@ importers:
       '@babel/generator': ^7.20.4
       '@rollup/plugin-babel': ^6.0.2
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
       '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': workspace:*
       '@types/express': ^4.17.14
       '@types/jsesc': ^3.0.1
       '@vitejs/plugin-react': ^2.2.0
@@ -178,9 +177,9 @@ importers:
       vite-plugin-babel: ^1.1.2
     dependencies:
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
-      '@tanstack/router-cli': link:../../../packages/router-cli
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       axios: 1.2.0
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
@@ -208,9 +207,9 @@ importers:
       '@babel/generator': ^7.20.4
       '@rollup/plugin-babel': ^6.0.2
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
       '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': workspace:*
       '@types/express': ^4.17.14
       '@types/jsesc': ^3.0.1
       '@vitejs/plugin-react': ^2.2.0
@@ -229,9 +228,9 @@ importers:
       vite-plugin-babel: ^1.1.2
     dependencies:
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
-      '@tanstack/router-cli': link:../../../packages/router-cli
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       axios: 1.2.0
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
@@ -259,9 +258,9 @@ importers:
       '@babel/generator': ^7.20.4
       '@rollup/plugin-babel': ^6.0.2
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
       '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': workspace:*
       '@types/express': ^4.17.14
       '@types/jsesc': ^3.0.1
       '@vitejs/plugin-react': ^2.2.0
@@ -280,9 +279,9 @@ importers:
       vite-plugin-babel: ^1.1.2
     dependencies:
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
-      '@tanstack/router-cli': link:../../../packages/router-cli
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       axios: 1.2.0
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
@@ -310,9 +309,9 @@ importers:
       '@babel/generator': ^7.20.4
       '@rollup/plugin-babel': ^6.0.2
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
       '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': workspace:*
       '@types/express': ^4.17.14
       '@types/jsesc': ^3.0.1
       '@vitejs/plugin-react': ^2.2.0
@@ -331,9 +330,9 @@ importers:
       vite-plugin-babel: ^1.1.2
     dependencies:
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
-      '@tanstack/router-cli': link:../../../packages/router-cli
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       axios: 1.2.0
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
@@ -359,8 +358,8 @@ importers:
     specifiers:
       '@tanstack/react-actions': workspace:*
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.8
       '@vitejs/plugin-react': ^1.1.3
@@ -373,8 +372,8 @@ importers:
     dependencies:
       '@tanstack/react-actions': link:../../../packages/react-actions
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@vitejs/plugin-react': 1.3.2
       axios: 1.2.0
       immer: 9.0.16
@@ -389,9 +388,9 @@ importers:
   examples/react/kitchen-sink-route-gen-wip:
     specifiers:
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
       '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': workspace:*
       '@types/node': ^18.11.9
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.8
@@ -408,9 +407,9 @@ importers:
       zod: ^3.19.1
     dependencies:
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
-      '@tanstack/router-cli': link:../../../packages/router-cli
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-cli': 0.0.1-beta.69
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@vitejs/plugin-react': 1.3.2
       axios: 1.2.0
       immer: 9.0.16
@@ -431,8 +430,8 @@ importers:
     specifiers:
       '@tanstack/react-actions': workspace:*
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.8
       '@vitejs/plugin-react': ^1.1.3
@@ -445,8 +444,8 @@ importers:
     dependencies:
       '@tanstack/react-actions': link:../../../packages/react-actions
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@vitejs/plugin-react': 1.3.2
       axios: 1.2.0
       immer: 9.0.16
@@ -460,8 +459,8 @@ importers:
 
   examples/react/quickstart:
     specifiers:
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.8
       '@vitejs/plugin-react': ^1.1.3
@@ -469,12 +468,43 @@ importers:
       react-dom: ^18.2.0
       vite: ^2.8.6
     dependencies:
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
+      '@vitejs/plugin-react': 1.3.2
+      react: 18.2.0
+      react-dom: 18.2.0_react@18.2.0
+      vite: 2.9.15
+    devDependencies:
+      '@types/react': 18.0.26
+      '@types/react-dom': 18.0.9
+
+  examples/react/start-kitchen-sink-single-file:
+    specifiers:
+      '@tanstack/react-actions': workspace:*
+      '@tanstack/react-loaders': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
+      '@types/react': ^18.0.25
+      '@types/react-dom': ^18.0.8
+      '@vitejs/plugin-react': ^1.1.3
+      axios: ^1.1.3
+      immer: ^9.0.15
+      react: ^18.2.0
+      react-dom: ^18.2.0
+      vite: ^2.8.6
+      zod: ^3.19.1
+    dependencies:
+      '@tanstack/react-actions': link:../../../packages/react-actions
+      '@tanstack/react-loaders': link:../../../packages/react-loaders
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@vitejs/plugin-react': 1.3.2
+      axios: 1.2.0
+      immer: 9.0.16
       react: 18.2.0
       react-dom: 18.2.0_react@18.2.0
       vite: 2.9.15
+      zod: 3.20.2
     devDependencies:
       '@types/react': 18.0.26
       '@types/react-dom': 18.0.9
@@ -484,9 +514,8 @@ importers:
       '@astrojs/netlify': ^1.2.1
       '@astrojs/react': ^1.2.2
       '@tanstack/react-loaders': workspace:*
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
       '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@types/jsesc': ^3.0.1
       astro: ^1.6.12
       concurrently: ^7.6.0
@@ -498,9 +527,8 @@ importers:
       '@astrojs/netlify': 1.2.1
       '@astrojs/react': 1.2.2_biqbaboplfbrettd7655fr4n2y
       '@tanstack/react-loaders': link:../../../packages/react-loaders
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
       '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       astro: 1.6.12
       concurrently: 7.6.0
       jsesc: 3.0.2
@@ -514,8 +542,8 @@ importers:
     specifiers:
       '@tanstack/react-query': ^4.14.1
       '@tanstack/react-query-devtools': ^4.14.1
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@types/react': ^18.0.25
       '@types/react-dom': ^18.0.8
       '@vitejs/plugin-react': ^1.1.3
@@ -528,8 +556,8 @@ importers:
     dependencies:
       '@tanstack/react-query': 4.18.0_biqbaboplfbrettd7655fr4n2y
       '@tanstack/react-query-devtools': 4.18.0_2ryzfomli4bbns3rdhwnpgjdhm
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@vitejs/plugin-react': 1.3.2
       axios: 1.2.0
       immer: 9.0.16
@@ -546,8 +574,8 @@ importers:
       '@tanstack/react-loaders': workspace:*
       '@tanstack/react-query': ^4.14.1
       '@tanstack/react-query-devtools': ^4.14.1
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@trpc/client': ^10.0.0-rc.6
       '@trpc/react-query': ^10.0.0-rc.6
       '@trpc/server': ^10.0.0-rc.6
@@ -568,8 +596,8 @@ importers:
       '@tanstack/react-loaders': link:../../../packages/react-loaders
       '@tanstack/react-query': 4.18.0_biqbaboplfbrettd7655fr4n2y
       '@tanstack/react-query-devtools': 4.18.0_2ryzfomli4bbns3rdhwnpgjdhm
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@trpc/client': 10.4.1_@trpc+server@10.4.1
       '@trpc/react-query': 10.4.1_vfg2wewkjrohb7a47nwqf7fxxi
       '@trpc/server': 10.4.1
@@ -592,8 +620,8 @@ importers:
     specifiers:
       '@tanstack/react-query': ^4.14.1
       '@tanstack/react-query-devtools': ^4.14.1
-      '@tanstack/react-router': workspace:*
-      '@tanstack/react-router-devtools': workspace:*
+      '@tanstack/router': workspace:*
+      '@tanstack/router-devtools': workspace:*
       '@trpc/client': ^10.0.0-rc.6
       '@trpc/react-query': ^10.0.0-rc.6
       '@trpc/server': ^10.0.0-rc.6
@@ -613,8 +641,8 @@ importers:
     dependencies:
       '@tanstack/react-query': 4.18.0_biqbaboplfbrettd7655fr4n2y
       '@tanstack/react-query-devtools': 4.18.0_2ryzfomli4bbns3rdhwnpgjdhm
-      '@tanstack/react-router': link:../../../packages/react-router
-      '@tanstack/react-router-devtools': link:../../../packages/react-router-devtools
+      '@tanstack/router': link:../../../packages/router
+      '@tanstack/router-devtools': link:../../../packages/router-devtools
       '@trpc/client': 10.4.1_@trpc+server@10.4.1
       '@trpc/react-query': 10.4.1_vfg2wewkjrohb7a47nwqf7fxxi
       '@trpc/server': 10.4.1
@@ -633,79 +661,6 @@ importers:
       tsx: 3.12.1
       wait-port: 1.0.4
 
-  examples/solid/basic:
-    specifiers:
-      '@tanstack/solid-loaders': workspace:*
-      '@tanstack/solid-router': workspace:*
-      solid-js: ^1.6.10
-      typescript: ^4.9.5
-      vite: ^4.1.1
-      vite-plugin-solid: ^2.5.0
-    dependencies:
-      '@tanstack/solid-loaders': link:../../../packages/solid-loaders
-      '@tanstack/solid-router': link:../../../packages/solid-router
-      solid-js: 1.6.10
-    devDependencies:
-      typescript: 4.9.5
-      vite: 4.1.1
-      vite-plugin-solid: 2.5.0_solid-js@1.6.10+vite@4.1.1
-
-  examples/solid/kitchen-sink-multi-file:
-    specifiers:
-      '@tanstack/solid-actions': workspace:*
-      '@tanstack/solid-loaders': workspace:*
-      '@tanstack/solid-router': workspace:*
-      immer: ^9.0.15
-      solid-js: ^1.6.10
-      vite: ^2.8.6
-      vite-plugin-solid: ^2.5.0
-      zod: ^3.19.1
-    dependencies:
-      '@tanstack/solid-actions': link:../../../packages/solid-actions
-      '@tanstack/solid-loaders': link:../../../packages/solid-loaders
-      '@tanstack/solid-router': link:../../../packages/solid-router
-      immer: 9.0.16
-      vite: 2.9.15
-      zod: 3.20.2
-    devDependencies:
-      solid-js: 1.6.10
-      vite-plugin-solid: 2.5.0_vp7o2dnng5gpgzrurwft77jxlm
-
-  examples/solid/with-trpc-solid-query:
-    specifiers:
-      '@tanstack/solid-loaders': workspace:*
-      '@tanstack/solid-query': 4.24.4
-      '@tanstack/solid-router': workspace:*
-      '@trpc/client': ^10.0.0-rc.6
-      '@trpc/server': ^10.0.0-rc.6
-      concurrently: ^7.6.0
-      express: ^4.18.2
-      immer: ^9.0.15
-      solid-js: ^1.6.10
-      solid-trpc: 0.0.11-rc.2
-      tsx: ^3.11.0
-      vite: ^2.8.6
-      vite-plugin-solid: ^2.5.0
-      wait-port: ^1.0.4
-      zod: ^3.19.1
-    dependencies:
-      '@tanstack/solid-loaders': link:../../../packages/solid-loaders
-      '@tanstack/solid-query': 4.24.4_solid-js@1.6.10
-      '@tanstack/solid-router': link:../../../packages/solid-router
-      '@trpc/client': 10.4.1_@trpc+server@10.4.1
-      '@trpc/server': 10.4.1
-      express: 4.18.2
-      immer: 9.0.16
-      solid-trpc: 0.0.11-rc.2_c6vyg5yqxqhg5c275qbswkj5lq
-      vite: 2.9.15
-      zod: 3.20.2
-    devDependencies:
-      concurrently: 7.6.0
-      solid-js: 1.6.10
-      tsx: 3.12.1
-      vite-plugin-solid: 2.5.0_vp7o2dnng5gpgzrurwft77jxlm
-      wait-port: 1.0.4
-
   packages/actions:
     specifiers:
       '@tanstack/store': workspace:*
@@ -742,29 +697,6 @@ importers:
       '@tanstack/react-store': link:../react-store
       tiny-invariant: 1.3.1
 
-  packages/react-router:
-    specifiers:
-      '@babel/runtime': ^7.16.7
-      '@tanstack/react-store': workspace:*
-      '@tanstack/router': workspace:*
-      babel-plugin-transform-async-to-promises: ^0.8.18
-    dependencies:
-      '@babel/runtime': 7.20.6
-      '@tanstack/react-store': link:../react-store
-      '@tanstack/router': link:../router
-    devDependencies:
-      babel-plugin-transform-async-to-promises: 0.8.18
-
-  packages/react-router-devtools:
-    specifiers:
-      '@babel/runtime': ^7.16.7
-      '@tanstack/react-router': workspace:*
-      date-fns: ^2.29.1
-    dependencies:
-      '@babel/runtime': 7.20.6
-      '@tanstack/react-router': link:../react-router
-      date-fns: 2.29.3
-
   packages/react-store:
     specifiers:
       '@tanstack/store': workspace:*
@@ -779,106 +711,24 @@ importers:
   packages/router:
     specifiers:
       '@babel/runtime': ^7.16.7
-      '@tanstack/store': workspace:*
+      '@tanstack/react-store': workspace:*
       tiny-invariant: ^1.3.1
       tiny-warning: ^1.0.3
     dependencies:
       '@babel/runtime': 7.20.6
-      '@tanstack/store': link:../store
+      '@tanstack/react-store': link:../react-store
       tiny-invariant: 1.3.1
       tiny-warning: 1.0.3
 
-  packages/router-cli:
-    specifiers:
-      '@babel/core': ^7.20.2
-      '@babel/plugin-syntax-jsx': ^7.18.6
-      '@babel/plugin-syntax-typescript': ^7.20.0
-      '@babel/preset-env': ^7.20.2
-      '@babel/template': ^7.18.10
-      '@babel/types': ^7.20.2
-      '@types/fs-extra': ^9.0.13
-      '@types/klaw': ^3.0.3
-      '@types/through2': ^2.0.38
-      '@types/yargs': ^17.0.15
-      chokidar: ^3.5.3
-      dedent: ^0.7.0
-      fs-extra: ^10.1.0
-      klaw: ^4.0.1
-      nodemon: ^2.0.20
-      through2: ^4.0.2
-      yargs: ^17.6.2
-    dependencies:
-      '@babel/core': 7.20.5
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.5
-      '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.5
-      '@babel/preset-env': 7.20.2_@babel+core@7.20.5
-      '@babel/template': 7.18.10
-      '@babel/types': 7.20.5
-      '@types/fs-extra': 9.0.13
-      '@types/klaw': 3.0.3
-      '@types/through2': 2.0.38
-      '@types/yargs': 17.0.15
-      chokidar: 3.5.3
-      dedent: 0.7.0
-      fs-extra: 10.1.0
-      klaw: 4.0.1
-      nodemon: 2.0.20
-      through2: 4.0.2
-      yargs: 17.6.2
-
-  packages/solid-actions:
-    specifiers:
-      '@babel/runtime': ^7.16.7
-      '@tanstack/actions': workspace:*
-      '@tanstack/solid-store': workspace:*
-      babel-plugin-transform-async-to-promises: ^0.8.18
-      tiny-invariant: ^1.0.5
-    dependencies:
-      '@babel/runtime': 7.20.6
-      '@tanstack/actions': link:../actions
-      '@tanstack/solid-store': link:../solid-store
-      tiny-invariant: 1.3.1
-    devDependencies:
-      babel-plugin-transform-async-to-promises: 0.8.18
-
-  packages/solid-loaders:
-    specifiers:
-      '@babel/runtime': ^7.16.7
-      '@tanstack/loaders': workspace:*
-      '@tanstack/solid-store': workspace:*
-      babel-plugin-transform-async-to-promises: ^0.8.18
-      tiny-invariant: ^1.0.5
-    dependencies:
-      '@babel/runtime': 7.20.6
-      '@tanstack/loaders': link:../loaders
-      '@tanstack/solid-store': link:../solid-store
-      tiny-invariant: 1.3.1
-    devDependencies:
-      babel-plugin-transform-async-to-promises: 0.8.18
-
-  packages/solid-router:
+  packages/router-devtools:
     specifiers:
       '@babel/runtime': ^7.16.7
       '@tanstack/router': workspace:*
-      '@tanstack/solid-store': workspace:*
-      babel-plugin-transform-async-to-promises: ^0.8.18
+      date-fns: ^2.29.1
     dependencies:
       '@babel/runtime': 7.20.6
       '@tanstack/router': link:../router
-      '@tanstack/solid-store': link:../solid-store
-    devDependencies:
-      babel-plugin-transform-async-to-promises: 0.8.18
-
-  packages/solid-store:
-    specifiers:
-      '@babel/runtime': ^7.16.7
-      '@tanstack/store': workspace:*
-      '@types/use-sync-external-store': ^0.0.3
-    dependencies:
-      '@babel/runtime': 7.20.6
-      '@tanstack/store': link:../store
-    devDependencies:
-      '@types/use-sync-external-store': 0.0.3
+      date-fns: 2.29.3
 
   packages/store:
     specifiers: {}
@@ -2253,6 +2103,7 @@ packages:
     cpu: [arm]
     os: [android]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/android-arm64/0.16.17:
@@ -2261,6 +2112,7 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/android-x64/0.16.17:
@@ -2269,6 +2121,7 @@ packages:
     cpu: [x64]
     os: [android]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/darwin-arm64/0.16.17:
@@ -2277,6 +2130,7 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/darwin-x64/0.16.17:
@@ -2285,6 +2139,7 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/freebsd-arm64/0.16.17:
@@ -2293,6 +2148,7 @@ packages:
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/freebsd-x64/0.16.17:
@@ -2301,6 +2157,7 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-arm/0.16.17:
@@ -2309,6 +2166,7 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-arm64/0.16.17:
@@ -2317,6 +2175,7 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-ia32/0.16.17:
@@ -2325,6 +2184,7 @@ packages:
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-loong64/0.14.54:
@@ -2333,6 +2193,7 @@ packages:
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-loong64/0.15.16:
@@ -2349,6 +2210,7 @@ packages:
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-mips64el/0.16.17:
@@ -2357,6 +2219,7 @@ packages:
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-ppc64/0.16.17:
@@ -2365,6 +2228,7 @@ packages:
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-riscv64/0.16.17:
@@ -2373,6 +2237,7 @@ packages:
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-s390x/0.16.17:
@@ -2381,6 +2246,7 @@ packages:
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/linux-x64/0.16.17:
@@ -2389,6 +2255,7 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/netbsd-x64/0.16.17:
@@ -2397,6 +2264,7 @@ packages:
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/openbsd-x64/0.16.17:
@@ -2405,6 +2273,7 @@ packages:
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/sunos-x64/0.16.17:
@@ -2413,6 +2282,7 @@ packages:
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/win32-arm64/0.16.17:
@@ -2421,6 +2291,7 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/win32-ia32/0.16.17:
@@ -2429,6 +2300,7 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@esbuild/win32-x64/0.16.17:
@@ -2437,6 +2309,7 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: false
     optional: true
 
   /@faker-js/faker/6.3.1:
@@ -3563,10 +3436,6 @@ packages:
     resolution: {integrity: sha512-PP4mG8MD08sq64RZCqMfXMYfaj7+Oulwg7xZ/fJoEOdTZNcPIgaOkHajZvUBsNLbi/0ViMvJB4cFkL2Jg2WPbw==}
     dev: false
 
-  /@tanstack/query-core/4.24.4:
-    resolution: {integrity: sha512-9dqjv9eeB6VHN7lD3cLo16ZAjfjCsdXetSAD5+VyKqLUvcKTL0CklGQRJu+bWzdrS69R6Ea4UZo8obHYZnG6aA==}
-    dev: false
-
   /@tanstack/react-query-devtools/4.18.0_2ryzfomli4bbns3rdhwnpgjdhm:
     resolution: {integrity: sha512-L51D0AUqLTs7J+W7RypJrUEKXsS0y0eEhXAgO+rhcZH6i8jVrKLhcNZStQSnE+UpZqPm73uxt2e8TJgYfzz0nw==}
     peerDependencies:
@@ -3600,13 +3469,30 @@ packages:
       use-sync-external-store: 1.2.0_react@18.2.0
     dev: false
 
-  /@tanstack/solid-query/4.24.4_solid-js@1.6.10:
-    resolution: {integrity: sha512-aAFNJ3liO0JiBwhAiE/1uwvViz0fokCMwUILUlueHuCZ95LDq+I9Pw9pYjoXLyPoFfp36N398AyV8pALZqbDRg==}
-    peerDependencies:
-      solid-js: ^1.5.7
+  /@tanstack/router-cli/0.0.1-beta.69:
+    resolution: {integrity: sha512-LjE3E6ESgUrL7wCpyKYx9T3/DMKLpWlNd+U0hqJIyiwm+YLUTZIzCqgyUqxTKQI90+4Sbcl/chehk3tc/Tu3rg==}
+    engines: {node: '>=12'}
+    hasBin: true
     dependencies:
-      '@tanstack/query-core': 4.24.4
-      solid-js: 1.6.10
+      '@babel/core': 7.20.5
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.5
+      '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.5
+      '@babel/preset-env': 7.20.2_@babel+core@7.20.5
+      '@babel/template': 7.18.10
+      '@babel/types': 7.20.7
+      '@types/fs-extra': 9.0.13
+      '@types/klaw': 3.0.3
+      '@types/through2': 2.0.38
+      '@types/yargs': 17.0.15
+      chokidar: 3.5.3
+      dedent: 0.7.0
+      fs-extra: 10.1.0
+      klaw: 4.0.1
+      nodemon: 2.0.20
+      through2: 4.0.2
+      yargs: 17.6.2
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
   /@testing-library/dom/8.19.0:
@@ -5217,6 +5103,7 @@ packages:
 
   /csstype/3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
+    dev: true
 
   /current-git-branch/1.1.0:
     resolution: {integrity: sha512-n5mwGZllLsFzxDPtTmadqGe4IIBPfqPbiIRX4xgFR9VK/Bx47U+94KiVkxSKAKN6/s43TlkztS2GZpgMKzwQ8A==}
@@ -5620,6 +5507,7 @@ packages:
     cpu: [x64]
     os: [android]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-android-64/0.15.16:
@@ -5636,6 +5524,7 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-android-arm64/0.15.16:
@@ -5652,6 +5541,7 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-darwin-64/0.15.16:
@@ -5668,6 +5558,7 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-darwin-arm64/0.15.16:
@@ -5684,6 +5575,7 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-freebsd-64/0.15.16:
@@ -5700,6 +5592,7 @@ packages:
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-freebsd-arm64/0.15.16:
@@ -5716,6 +5609,7 @@ packages:
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-32/0.15.16:
@@ -5732,6 +5626,7 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-64/0.15.16:
@@ -5748,6 +5643,7 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-arm/0.15.16:
@@ -5764,6 +5660,7 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-arm64/0.15.16:
@@ -5780,6 +5677,7 @@ packages:
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-mips64le/0.15.16:
@@ -5796,6 +5694,7 @@ packages:
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-ppc64le/0.15.16:
@@ -5812,6 +5711,7 @@ packages:
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-riscv64/0.15.16:
@@ -5828,6 +5728,7 @@ packages:
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-linux-s390x/0.15.16:
@@ -5844,6 +5745,7 @@ packages:
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-netbsd-64/0.15.16:
@@ -5860,6 +5762,7 @@ packages:
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-openbsd-64/0.15.16:
@@ -5876,6 +5779,7 @@ packages:
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-sunos-64/0.15.16:
@@ -5892,6 +5796,7 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-windows-32/0.15.16:
@@ -5908,6 +5813,7 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-windows-64/0.15.16:
@@ -5924,6 +5830,7 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
+    dev: false
     optional: true
 
   /esbuild-windows-arm64/0.15.16:
@@ -5961,6 +5868,7 @@ packages:
       esbuild-windows-32: 0.14.54
       esbuild-windows-64: 0.14.54
       esbuild-windows-arm64: 0.14.54
+    dev: false
 
   /esbuild/0.15.16:
     resolution: {integrity: sha512-o6iS9zxdHrrojjlj6pNGC2NAg86ECZqIETswTM5KmJitq+R1YmahhWtMumeQp9lHqJaROGnsBi2RLawGnfo5ZQ==}
@@ -6019,6 +5927,7 @@ packages:
       '@esbuild/win32-arm64': 0.16.17
       '@esbuild/win32-ia32': 0.16.17
       '@esbuild/win32-x64': 0.16.17
+    dev: false
 
   /escalade/3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@@ -7347,6 +7256,7 @@ packages:
   /is-what/4.1.8:
     resolution: {integrity: sha512-yq8gMao5upkPoGEU9LsB2P+K3Kt8Q3fQFCGyNCWOAnJAMzEXVV9drYb0TXr42TTliLLhKIBvulgAXgtLLnwzGA==}
     engines: {node: '>=12.13'}
+    dev: false
 
   /is-wsl/2.2.0:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
@@ -7958,13 +7868,6 @@ packages:
       yargs-parser: 20.2.9
     dev: true
 
-  /merge-anything/5.1.4:
-    resolution: {integrity: sha512-7PWKwGOs5WWcpw+/OvbiFiAvEP6bv/QHiicigpqMGKIqPPAtGhBLR8LFJW+Zu6m9TXiR/a8+AiPlGG0ko1ruoQ==}
-    engines: {node: '>=12.13'}
-    dependencies:
-      is-what: 4.1.8
-    dev: true
-
   /merge-descriptors/1.0.1:
     resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
 
@@ -9938,6 +9841,7 @@ packages:
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
+    dev: false
 
   /rollup/2.79.1:
     resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
@@ -9952,6 +9856,7 @@ packages:
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
+    dev: false
 
   /run-async/2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
@@ -10242,42 +10147,12 @@ packages:
       smart-buffer: 4.2.0
     dev: true
 
-  /solid-js/1.6.10:
-    resolution: {integrity: sha512-Sf0e6PQCEFkFtbPq0L+93Ua81YQOefBEbvDJ0YXT92b6Lzw0k7UvzSd2l1BbYM+yzE3UmepU1tyMDc/3nIByjA==}
-    dependencies:
-      csstype: 3.1.1
-
   /solid-js/1.6.5:
     resolution: {integrity: sha512-q1/wIIRmrWltNnP3PW/e29eRWCC24hX5amBiOXomw2kDiM6JZZ10l+chK/Oi/6ipwUxeabYl5YD2lJOObY9heA==}
     dependencies:
       csstype: 3.1.1
     dev: true
 
-  /solid-refresh/0.4.3_solid-js@1.6.10:
-    resolution: {integrity: sha512-7+4/gYsVi0BlM4PzT1PU1TB5nW3Hv8FWuB+Kw/ofWui7KQkWBf+dVZOrReQYHEmLCzytHUa2JysUXgzVALJmSw==}
-    peerDependencies:
-      solid-js: ^1.3
-    dependencies:
-      '@babel/generator': 7.20.5
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/types': 7.20.5
-      solid-js: 1.6.10
-    dev: true
-
-  /solid-trpc/0.0.11-rc.2_c6vyg5yqxqhg5c275qbswkj5lq:
-    resolution: {integrity: sha512-hmxf1svB6qf40t81WFMT9329Je7T+hF0/kfLZH/XSkT3jtzjjI8PeZMjc3CRFpMY/BubQQ0gWCFpUhxvlnNl+w==}
-    peerDependencies:
-      '@tanstack/solid-query': ^4.6.1
-      '@trpc/client': ^10.0.0-rc.2
-      '@trpc/server': ^10.0.0-rc.2
-      solid-js: ^1.5.3
-    dependencies:
-      '@tanstack/solid-query': 4.24.4_solid-js@1.6.10
-      '@trpc/client': 10.4.1_@trpc+server@10.4.1
-      '@trpc/server': 10.4.1
-      solid-js: 1.6.10
-    dev: false
-
   /sort-keys/2.0.0:
     resolution: {integrity: sha512-/dPCrG1s3ePpWm6yBbxZq5Be1dXGLyLn9Z791chDC3NFrpkVbWGzkBwPN1knaciexFXgRJ7hzdnwZ4stHSDmjg==}
     engines: {node: '>=4'}
@@ -10959,12 +10834,6 @@ packages:
     engines: {node: '>=4.2.0'}
     hasBin: true
 
-  /typescript/4.9.5:
-    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
-
   /ufo/1.0.1:
     resolution: {integrity: sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA==}
     dev: false
@@ -11298,42 +11167,6 @@ packages:
       vite: 3.2.4
     dev: true
 
-  /vite-plugin-solid/2.5.0_solid-js@1.6.10+vite@4.1.1:
-    resolution: {integrity: sha512-VneGd3RyFJvwaiffsqgymeMaofn0IzQLPwDzafTV2f1agoWeeJlk5VrI5WqT9BTtLe69vNNbCJWqLhHr9fOdDw==}
-    peerDependencies:
-      solid-js: ^1.3.17 || ^1.4.0 || ^1.5.0 || ^1.6.0
-      vite: ^3.0.0 || ^4.0.0
-    dependencies:
-      '@babel/core': 7.20.5
-      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.5
-      babel-preset-solid: 1.6.10_@babel+core@7.20.5
-      merge-anything: 5.1.4
-      solid-js: 1.6.10
-      solid-refresh: 0.4.3_solid-js@1.6.10
-      vite: 4.1.1
-      vitefu: 0.2.4_vite@4.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /vite-plugin-solid/2.5.0_vp7o2dnng5gpgzrurwft77jxlm:
-    resolution: {integrity: sha512-VneGd3RyFJvwaiffsqgymeMaofn0IzQLPwDzafTV2f1agoWeeJlk5VrI5WqT9BTtLe69vNNbCJWqLhHr9fOdDw==}
-    peerDependencies:
-      solid-js: ^1.3.17 || ^1.4.0 || ^1.5.0 || ^1.6.0
-      vite: ^3.0.0 || ^4.0.0
-    dependencies:
-      '@babel/core': 7.20.5
-      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.5
-      babel-preset-solid: 1.6.10_@babel+core@7.20.5
-      merge-anything: 5.1.4
-      solid-js: 1.6.10
-      solid-refresh: 0.4.3_solid-js@1.6.10
-      vite: 2.9.15
-      vitefu: 0.2.4_vite@2.9.15
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /vite/2.9.15:
     resolution: {integrity: sha512-fzMt2jK4vQ3yK56te3Kqpkaeq9DkcZfBbzHwYpobasvgYmP2SoAr6Aic05CsB4CzCZbsDv4sujX3pkEGhLabVQ==}
     engines: {node: '>=12.2.0'}
@@ -11356,6 +11189,7 @@ packages:
       rollup: 2.77.3
     optionalDependencies:
       fsevents: 2.3.2
+    dev: false
 
   /vite/3.2.4:
     resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==}
@@ -11389,39 +11223,6 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /vite/4.1.1:
-    resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      esbuild: 0.16.17
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.13.0
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
   /vite/4.1.1_@types+node@17.0.45:
     resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -11501,28 +11302,6 @@ packages:
       vite: 3.2.4
     dev: false
 
-  /vitefu/0.2.4_vite@2.9.15:
-    resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
-    peerDependencies:
-      vite: ^3.0.0 || ^4.0.0
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      vite: 2.9.15
-    dev: true
-
-  /vitefu/0.2.4_vite@4.1.1:
-    resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
-    peerDependencies:
-      vite: ^3.0.0 || ^4.0.0
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      vite: 4.1.1
-    dev: true
-
   /vitest/0.26.2:
     resolution: {integrity: sha512-Jvqxh6SDy9SsuslkDjts0iDewDIdq4rveEt69YgDuAb1tVDGV0lDepVaeAFraoySWqneJmOt4TngFFNhlw7GfA==}
     engines: {node: '>=v14.16.0'}
diff --git a/scripts/config.ts b/scripts/config.ts
index ca8c7cf337..1e7a9cb9c7 100644
--- a/scripts/config.ts
+++ b/scripts/config.ts
@@ -11,6 +11,16 @@ export const packages: Package[] = [
     entryFile: 'src/index.ts',
     globals: {},
   },
+  {
+    name: '@tanstack/react-store',
+    packageDir: 'react-store',
+    srcDir: 'src',
+    jsName: 'ReactLoaders',
+    entryFile: 'src/index.tsx',
+    globals: {
+      react: 'React',
+    },
+  },
   {
     name: '@tanstack/router',
     packageDir: 'router',
@@ -28,16 +38,8 @@ export const packages: Package[] = [
     globals: {},
   },
   {
-    name: '@tanstack/actions',
-    packageDir: 'actions',
-    srcDir: 'src',
-    jsName: 'ActionsCore',
-    entryFile: 'src/index.ts',
-    globals: {},
-  },
-  {
-    name: '@tanstack/react-store',
-    packageDir: 'react-store',
+    name: '@tanstack/react-loaders',
+    packageDir: 'react-loaders',
     srcDir: 'src',
     jsName: 'ReactLoaders',
     entryFile: 'src/index.tsx',
@@ -46,84 +48,31 @@ export const packages: Package[] = [
     },
   },
   {
-    name: '@tanstack/react-actions',
-    packageDir: 'react-actions',
+    name: '@tanstack/actions',
+    packageDir: 'actions',
     srcDir: 'src',
-    jsName: 'ReactActions',
-    entryFile: 'src/index.tsx',
-    globals: {
-      react: 'React',
-    },
+    jsName: 'ActionsCore',
+    entryFile: 'src/index.ts',
+    globals: {},
   },
   {
-    name: '@tanstack/react-loaders',
-    packageDir: 'react-loaders',
+    name: '@tanstack/react-actions',
+    packageDir: 'react-actions',
     srcDir: 'src',
-    jsName: 'ReactLoaders',
+    jsName: 'ReactActions',
     entryFile: 'src/index.tsx',
     globals: {
       react: 'React',
     },
   },
   {
-    name: '@tanstack/react-router-devtools',
-    packageDir: 'react-router-devtools',
+    name: '@tanstack/router-devtools',
+    packageDir: 'router-devtools',
     srcDir: 'src',
-    jsName: 'ReactRouterDevtools',
+    jsName: 'TanStackRouterDevtools',
     entryFile: 'src/index.tsx',
-    globals: { react: 'React', '@tanstack/react-router': 'ReactRouter' },
+    globals: { react: 'React', '@tanstack/router': 'Router' },
   },
-  // {
-  //   name: '@tanstack/solid-store',
-  //   packageDir: 'solid-store',
-  //   srcDir: 'src',
-  //   jsName: 'SolidStore',
-  //   entryFile: 'src/index.tsx',
-  //   globals: {
-  //     'solid-js': 'Solid',
-  //   },
-  // },
-  // {
-  //   name: '@tanstack/solid-loaders',
-  //   packageDir: 'solid-loaders',
-  //   srcDir: 'src',
-  //   jsName: 'SolidLoaders',
-  //   entryFile: 'src/index.tsx',
-  //   globals: {
-  //     'solid-js': 'Solid',
-  //   },
-  // },
-  // {
-  //   name: '@tanstack/solid-actions',
-  //   packageDir: 'solid-actions',
-  //   srcDir: 'src',
-  //   jsName: 'SolidActions',
-  //   entryFile: 'src/index.tsx',
-  //   globals: {
-  //     'solid-js': 'Solid',
-  //   },
-  // },
-  // {
-  //   name: '@tanstack/solid-router',
-  //   packageDir: 'solid-router',
-  //   srcDir: 'src',
-  //   jsName: 'SolidRouter',
-  //   entryFile: 'src/index.tsx',
-  //   globals: {
-  //     'solid-js/store': 'SolidStore',
-  //     'solid-js': 'Solid',
-  //     '@tanstack/router': 'RouterCore',
-  //   },
-  // },
-  // {
-  //   name: '@tanstack/router-cli',
-  //   packageDir: 'router-cli',
-  //   srcDir: 'src',
-  //   jsName: 'RouterCli',
-  //   entryFile: 'src/index.ts',
-  //   // esm: false,
-  //   umd: false,
-  // },
 ]
 
 export const latestBranch = 'main'
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 302f6d3e9f..9569685d6d 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -17,8 +17,8 @@
     "baseUrl": ".",
     "paths": {
       "@tanstack/router": ["packages/router"],
-      "@tanstack/react-router": ["packages/react-router"],
-      "@tanstack/react-router-devtools": ["packages/react-router-devtools"],
+      "@tanstack/router": ["packages/react-router"],
+      "@tanstack/router-devtools": ["packages/router-devtools"],
       "@tanstack/solid-router": ["packages/solid-router"],
       "@tanstack/router-cli": ["packages/router-cli"]
     }
diff --git a/tsconfig.json b/tsconfig.json
index 3e640396d6..27de67dca5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,18 +1,14 @@
 {
   "files": [],
   "references": [
-    { "path": "packages/router" },
     { "path": "packages/store" },
-    { "path": "packages/actions" },
-    { "path": "packages/loaders" },
-    { "path": "packages/react-router" },
-    { "path": "packages/react-router-devtools" },
     { "path": "packages/react-store" },
+    { "path": "packages/router" },
+    { "path": "packages/actions" },
     { "path": "packages/react-actions" },
+    { "path": "packages/loaders" },
     { "path": "packages/react-loaders" },
-    { "path": "packages/solid-router" }
-    // { "path": "packages/react-router-devtools" },
-    // { "path": "examples/react/kitchen-sink/tsconfig.dev.json" }
+    { "path": "packages/router-devtools" }
   ]
   // "include": ["examples/*"]
   // "exclude": ["node_modules"]